diff options
author | Mike Frysinger <vapier@gentoo.org> | 2010-01-17 21:29:52 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2010-01-17 21:29:52 +0000 |
commit | 61cf84e5f9e1bb0fc4c500ed6a01eaf901b9084b (patch) | |
tree | c5cbf761b7be9ab9fc465d56a110a17c4f9caffa /media-tv/xbmc | |
parent | Replace jpeg-compat with slotted <jpeg-7. (diff) | |
download | historical-61cf84e5f9e1bb0fc4c500ed6a01eaf901b9084b.tar.gz historical-61cf84e5f9e1bb0fc4c500ed6a01eaf901b9084b.tar.bz2 historical-61cf84e5f9e1bb0fc4c500ed6a01eaf901b9084b.zip |
Add fix from upstream for high cpu usage with jpeg images #300909 by mikopp.
Package-Manager: portage-2.2_rc61/cvs/Linux x86_64
Diffstat (limited to 'media-tv/xbmc')
-rw-r--r-- | media-tv/xbmc/ChangeLog | 9 | ||||
-rw-r--r-- | media-tv/xbmc/Manifest | 18 | ||||
-rw-r--r-- | media-tv/xbmc/files/xbmc-9.11-jpeg-speedup.patch | 18 | ||||
-rw-r--r-- | media-tv/xbmc/xbmc-9.11-r1.ebuild | 198 |
4 files changed, 239 insertions, 4 deletions
diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog index a7d58465f224..327f2ec60f52 100644 --- a/media-tv/xbmc/ChangeLog +++ b/media-tv/xbmc/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-tv/xbmc # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.42 2010/01/17 21:26:51 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.43 2010/01/17 21:29:52 vapier Exp $ + +*xbmc-9.11-r1 (17 Jan 2010) + + 17 Jan 2010; Mike Frysinger <vapier@gentoo.org> +xbmc-9.11-r1.ebuild, + +files/xbmc-9.11-jpeg-speedup.patch: + Add fix from upstream for high cpu usage with jpeg images #300909 by + mikopp. 17 Jan 2010; Mike Frysinger <vapier@gentoo.org> xbmc-9.11.ebuild, xbmc-9999.ebuild: diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest index 9b60c02b5a45..25b80b0009f5 100644 --- a/media-tv/xbmc/Manifest +++ b/media-tv/xbmc/Manifest @@ -1,6 +1,18 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +AUX xbmc-9.11-jpeg-speedup.patch 804 RMD160 2aff1749ee8f4b85ce9199a78fcfb779c373d086 SHA1 ecef76650156b7fcba60f909496e43ae83bafd20 SHA256 3115b8668b60e307536a9314fc02c837d4f94f89571d403761b614a22447e2d8 AUX xbmc-9.11-wavpack.patch 2637 RMD160 35a7f5446aaef27ff563da4a8200616fffb66e00 SHA1 0f9a2845a5b9d0b554569f1379af0557b071ef69 SHA256 b09e9072f0a2d4451588c40b0b300611944ba7d4cefbae0c400389ed9f8485dc DIST xbmc-9.11.tar.gz 141420517 RMD160 0d0890ba373e05af95a66360aed8871b384849f2 SHA1 71956ed8630d46662e49de9d96304308078f10b5 SHA256 e810aaaf1c380bbe923d9e30e2e472577081b7b893e12a7ef4bb70a911c3db87 -EBUILD xbmc-9.11.ebuild 4849 RMD160 6e8920a667a25caf5fdc3deff7bfe21ad0cf4228 SHA1 c6db3c41c69c7c8d775ce4556a2e8d87e45624c0 SHA256 8d99fa5748e02c16a7314bf1d66eb5f0131f9e97de6ebefaeb87116930f90805 -EBUILD xbmc-9999.ebuild 4653 RMD160 e57463c16d73a62e13f2b5e2e0aec134146f0d86 SHA1 518d2effa79d1f71a3d05e603e7ab63a5079598e SHA256 bb7a1a55fc34ad119e3c208ff2b0575de4c68d221c33a9880b6ea7ab756e6f34 -MISC ChangeLog 6416 RMD160 0f3b8142107e59cee55383ecfe12fd1c0f072803 SHA1 24c6e4885e6dfa3d8bcd987ef111487511887326 SHA256 c0c7d4ebb0c3b5064f4095ebae283c972c29a1adc1c23d7f75f88119f765866d +EBUILD xbmc-9.11-r1.ebuild 4947 RMD160 c77f00c34f68a8baf241379570c0d57e70ef7364 SHA1 1eaeb7840949663b964c81be2ba0160d709aa38b SHA256 8fa87a8b2b08e863d85a6af1100eeb1e982da223985ec3df2a3e8f594dea1e66 +EBUILD xbmc-9.11.ebuild 4890 RMD160 2a8dd1a37a0d97a5d568b84170f27551923a1212 SHA1 06d01a46a475c3c32cf5df0cdcb89e5d94d84962 SHA256 1d3f9e1fb0877d4e113a5437e8f6fbfa3c413db61dbfe82e0e6b663696879737 +EBUILD xbmc-9999.ebuild 4694 RMD160 ee53e1635e9351f8ac0af0300c36a2f927d0b039 SHA1 5b85cf80e642ea7df052a60581f083028c43f7a5 SHA256 e3091664862a5e3c82fb84cc4cd3dbf287469f351ada947978e893ef36c91b6f +MISC ChangeLog 6807 RMD160 7767faef1dbb9700ad0a821d99f7db36ded9b5d4 SHA1 43cafa75d2a37d2723bf9339bf597f1758aeb883 SHA256 3a54310eb3b1fa6348e440e1948df38df813da8fc53174500985ab4583aef871 MISC metadata.xml 358 RMD160 8354f40b2d941f8ebc0db2cd8b99b6c16b2dafa8 SHA1 0eebcbd3433e90ea0d4ae42a3bcb4eb03cbd3482 SHA256 a0f7b8cfe098a2c32ef837e1cda5e5417b4d470472b19c92ac3c8ecb4b653aae +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iF4EAREIAAYFAktTgVkACgkQTwhj9JtAlp5CRwD6A0UV0HQ+tm5igzcNtxgRDmF9 +cuBLse0UlG7CDhuOX18BAIDRkeFA7jjFDmFLbThbOvp6hdFLceZyolMbrR2xy4uc +=FTDJ +-----END PGP SIGNATURE----- diff --git a/media-tv/xbmc/files/xbmc-9.11-jpeg-speedup.patch b/media-tv/xbmc/files/xbmc-9.11-jpeg-speedup.patch new file mode 100644 index 000000000000..63cadbf51a56 --- /dev/null +++ b/media-tv/xbmc/files/xbmc-9.11-jpeg-speedup.patch @@ -0,0 +1,18 @@ +fix from upstream +http://bugs.gentoo.org/300909 + +r26689 | jmarshallnz | 2010-01-11 14:30:08 -0500 (Mon, 11 Jan 2010) | 2 lines +fixed: Ticket #7810 - high cpu load during loading of images with libjpeg7, thanks to akawaka. + +Index: xbmc/lib/cximage-6.0/CxImage/ximajpg.cpp +=================================================================== +--- xbmc/lib/cximage-6.0/CxImage/ximajpg.cpp (revision 26688) ++++ xbmc/lib/cximage-6.0/CxImage/ximajpg.cpp (revision 26689) +@@ -220,6 +220,7 @@ bool CxImageJPG::Decode(CxFile * hFile)
+
+ // Set the scale <ignacio>
+ cinfo.scale_denom = GetJpegScale();
++ cinfo.scale_num = 1; +
+ // Borrowed the idea from GIF implementation <ignacio>
+ if (info.nEscape == -1) {
diff --git a/media-tv/xbmc/xbmc-9.11-r1.ebuild b/media-tv/xbmc/xbmc-9.11-r1.ebuild new file mode 100644 index 000000000000..3272415ee454 --- /dev/null +++ b/media-tv/xbmc/xbmc-9.11-r1.ebuild @@ -0,0 +1,198 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9.11-r1.ebuild,v 1.1 2010/01/17 21:29:52 vapier Exp $ + +EAPI="2" + +inherit eutils + +# Use XBMC_ESVN_REPO_URI to track a different branch +ESVN_REPO_URI=${XBMC_ESVN_REPO_URI:-http://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk} +ESVN_PROJECT=${ESVN_REPO_URI##*/svnroot/} +ESVN_PROJECT=${ESVN_PROJECT%/*} +if [[ ${PV} == "9999" ]] ; then + inherit subversion autotools + KEYWORDS="" +else + inherit autotools + MY_P=${P/_/-} + SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" + KEYWORDS="~amd64 ~x86" + S=${WORKDIR}/${MY_P} +fi + +DESCRIPTION="XBMC is a free and open source media-player and entertainment hub" +HOMEPAGE="http://xbmc.org/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="aac alsa altivec avahi css debug joystick midi opengl profile pulseaudio sse sse2 vdpau xrandr" + +RDEPEND="opengl? ( virtual/opengl ) + app-arch/bzip2 + || ( app-arch/unrar app-arch/unrar-gpl ) + app-arch/unzip + app-arch/zip + app-i18n/enca + >=dev-lang/python-2.4 + dev-libs/boost + dev-libs/fribidi + dev-libs/libcdio + dev-libs/libpcre + dev-libs/lzo + >=dev-python/pysqlite-2 + media-libs/a52dec + media-libs/alsa-lib + aac? ( media-libs/faac ) + media-libs/faad2 + media-libs/flac + media-libs/fontconfig + media-libs/freetype + media-libs/glew + media-libs/jasper + media-libs/jbigkit + media-libs/jpeg + >=media-libs/libass-0.9.7 + media-libs/libdca + css? ( media-libs/libdvdcss ) + media-libs/libmad + media-libs/libmms + media-libs/libmpeg2 + media-libs/libogg + media-libs/libsamplerate + media-libs/libsdl[alsa,audio,video,X] + media-libs/libvorbis + media-libs/sdl-gfx + media-libs/sdl-image[gif,jpeg,png] + media-libs/sdl-mixer + media-libs/sdl-sound + media-libs/tiff + pulseaudio? ( media-sound/pulseaudio ) + media-sound/wavpack + media-video/ffmpeg + avahi? ( net-dns/avahi ) + net-misc/curl + || ( net-fs/samba-libs[smbclient] <net-fs/samba-3.3 ) + sys-apps/dbus + sys-apps/hal + sys-libs/zlib + virtual/mysql + x11-apps/xdpyinfo + x11-apps/mesa-progs + vdpau? ( + || ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 ) + media-video/ffmpeg[vdpau] + ) + x11-libs/libXinerama + xrandr? ( x11-libs/libXrandr ) + x11-libs/libXrender" +DEPEND="${RDEPEND} + x11-proto/xineramaproto + dev-util/cmake + x86? ( dev-lang/nasm )" + +src_unpack() { + if [[ ${PV} == "9999" ]] ; then + subversion_src_unpack + cd "${S}" + rm -f configure + else + unpack ${A} + cd "${S}" + fi + + # Fix case sensitivity + mv media/Fonts/{a,A}rial.ttf || die + mv media/{S,s}plash.png || die +} + +src_prepare() { + epatch "${FILESDIR}"/${P}-wavpack.patch + epatch "${FILESDIR}"/${P}-jpeg-speedup.patch #300909 + # http://xbmc.org/trac/ticket/8218 + sed -i \ + -e 's: ftell64: dll_ftell64:' \ + xbmc/cores/DllLoader/exports/wrapper.c || die + sed -i \ + -e '1i#include <stdlib.h>\n#include <string.h>\n' \ + xbmc/lib/libid3tag/libid3tag/metadata.c || die + + # some dirs ship generated autotools, some dont + local d + for d in . xbmc/cores/dvdplayer/Codecs/libbdnav ; do + [[ -d ${d} ]] || continue + [[ -e ${d}/configure ]] && continue + pushd ${d} >/dev/null + einfo "Generating autotools in ${d}" + eautoreconf + popd >/dev/null + done + + local squish #290564 + use altivec && squish="-DSQUISH_USE_ALTIVEC=1 -maltivec" + use sse && squish="-DSQUISH_USE_SSE=1 -msse" + use sse2 && squish="-DSQUISH_USE_SSE=2 -msse2" + sed -i \ + -e '/^CXXFLAGS/{s:-D[^=]*=.::;s:-m[[:alnum:]]*::}' \ + -e "1iCXXFLAGS += ${squish}" \ + xbmc/lib/libsquish/Makefile.in || die + + # Fix XBMC's final version string showing as "exported" + # instead of the SVN revision number. + export SVN_REV=${ESVN_WC_REVISION:-exported} + + # Avoid lsb-release dependency + sed -i \ + -e 's:/usr/bin/lsb_release -d:cat /etc/gentoo-release:' \ + xbmc/utils/SystemInfo.cpp + + # Do not use termcap #262822 + sed -i 's:-ltermcap::' xbmc/lib/libPython/Python/configure + + epatch_user #293109 + + # Tweak autotool timestamps to avoid regeneration + find . -type f -print0 | xargs -0 touch -r configure +} + +src_configure() { + # Disable documentation generation + export ac_cv_path_LATEX=no + # Avoid help2man + export HELP2MAN=$(type -P help2man || echo true) + + econf \ + --disable-ccache \ + --disable-optimizations \ + --enable-external-libraries \ + --enable-goom \ + $(use_enable avahi) \ + $(use_enable css dvdcss) \ + $(use_enable debug) \ + $(use_enable aac faac) \ + $(use_enable joystick) \ + $(use_enable midi mid) \ + $(use_enable opengl gl) \ + $(use_enable profile profiling) \ + $(use_enable pulseaudio pulse) \ + $(use_enable vdpau) \ + $(use_enable xrandr) +} + +src_install() { + einstall || die "Install failed!" + + insinto /usr/share/xbmc/web/styles/ + doins -r "${S}"/web/*/styles/*/ || die + + insinto /usr/share/applications + doins tools/Linux/xbmc.desktop + doicon tools/Linux/xbmc.png + + dodoc README.linux known_issues.txt + rm "${D}"/usr/share/xbmc/{README.linux,LICENSE.GPL,*.txt} +} + +pkg_postinst() { + elog "Visit http://xbmc.org/wiki/?title=XBMC_Online_Manual" +} |