diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-05-14 15:58:12 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-05-14 15:58:12 +0000 |
| commit | d285d1d0aa09f1ca7d7093b1b64d68b74325eb6e (patch) | |
| tree | 7a512267c572cdeed36e62620f4e27437b64d266 /media-tv | |
| parent | Stable for HPPA (bug #319615). (diff) | |
| download | historical-d285d1d0aa09f1ca7d7093b1b64d68b74325eb6e.tar.gz historical-d285d1d0aa09f1ca7d7093b1b64d68b74325eb6e.tar.bz2 historical-d285d1d0aa09f1ca7d7093b1b64d68b74325eb6e.zip | |
Don't apply -libpng14.patch with libpng12 wrt #319721 by Martin von Gagern.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'media-tv')
| -rw-r--r-- | media-tv/xbmc/ChangeLog | 6 | ||||
| -rw-r--r-- | media-tv/xbmc/Manifest | 6 | ||||
| -rw-r--r-- | media-tv/xbmc/files/xbmc-9.11-libpng14.patch | 1 | ||||
| -rw-r--r-- | media-tv/xbmc/xbmc-9.11-r3.ebuild | 6 |
4 files changed, 13 insertions, 6 deletions
diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog index aecf2de81c17..5bdf1a720b63 100644 --- a/media-tv/xbmc/ChangeLog +++ b/media-tv/xbmc/ChangeLog @@ -1,6 +1,10 @@ # 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.51 2010/05/10 12:35:50 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.52 2010/05/14 15:58:12 ssuominen Exp $ + + 14 May 2010; Samuli Suominen <ssuominen@gentoo.org> xbmc-9.11-r3.ebuild: + Don't apply -libpng14.patch with libpng12 wrt #319721 by Martin von + Gagern. 10 May 2010; Samuli Suominen <ssuominen@gentoo.org> xbmc-9.11-r3.ebuild, +files/xbmc-9.11-libpng14.patch: diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest index c610dbf0b9a1..4ced107f143e 100644 --- a/media-tv/xbmc/Manifest +++ b/media-tv/xbmc/Manifest @@ -1,10 +1,10 @@ AUX xbmc-9.11-jpeg-speedup.patch 804 RMD160 2aff1749ee8f4b85ce9199a78fcfb779c373d086 SHA1 ecef76650156b7fcba60f909496e43ae83bafd20 SHA256 3115b8668b60e307536a9314fc02c837d4f94f89571d403761b614a22447e2d8 -AUX xbmc-9.11-libpng14.patch 4233 RMD160 88be2b989033f2529ff54d8e9570b6da8098aa85 SHA1 1ae96c28d4caa0d1d75c4e020249eca2bce0db96 SHA256 0a2922d7cf4c97bf8c769134c2bc9dbffbb0ba1aeafda790e38829318d6c5bbe +AUX xbmc-9.11-libpng14.patch 4263 RMD160 90a82d1783f2237416c0932c968347394f303bf9 SHA1 69407df931476df7fd20b30ddc42142d11602d8f SHA256 0516a466f2646867478781251d665e87f6f0697fcd9ce29b91c87194fafc7da6 AUX xbmc-9.11-use-cdio-system-headers-on-non-win32.patch 3623 RMD160 d8b6d48a07265238bc1bd6425c53e7a52a679751 SHA1 1d4d41d00973c4199f866a7988a709a188683403 SHA256 ceb6952025c8baf5bb4eed18380c9bf6022893407f22a3e587eebd657863ab83 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-r3.ebuild 5045 RMD160 47dc73171045b03e54fa70e690835a60ad790521 SHA1 c2fed5a0bd61791521052bb162630e156ae45235 SHA256 c16351b3266b4354ee9a37746ca55574d6e6b462ff2922f191319bc0a3ce1a9a +EBUILD xbmc-9.11-r3.ebuild 5082 RMD160 0ad34972905c5bd13af3dee3a4e0ef748ecb9492 SHA1 4da442ca485c22986676a61babd1e25d745e2b71 SHA256 60d2dcc3f02136746ff6da63036125c1b2a1e7426f9c712dbee099b5a421132c EBUILD xbmc-9.11.ebuild 4870 RMD160 a1f738d3d5647f8f19e11b8c0485f8d0512db411 SHA1 aa3f3552a9525ef278d595e73afdd95dbdc8a491 SHA256 326c6107cc741ebc95078152bdb7504c8f9433ef1d14b3476f82caf97cd4171d EBUILD xbmc-9999.ebuild 4692 RMD160 0bfdc087511bc54aaa9c9cd614beb25fdcf363c3 SHA1 39ccb0837dd50829b52059f9266db1e6247300a1 SHA256 e9d6d0da73944ae8a6e5652f069b02d6c3f9fa40fd2ff3ccdd766e4c17137a82 -MISC ChangeLog 8270 RMD160 b31b2b1c07835b609986f933f6cc19db0ea18213 SHA1 e3b50be34c6a13f1b693767820bd473168969bdd SHA256 5f64f74ed7abcc1eb3cb66d6d53a632c4e6924510aec20889dae51c0189becd6 +MISC ChangeLog 8426 RMD160 088367b22fedd1bff176363dad37355d53ef6555 SHA1 79dfa4f9504ba0fd175b32074719813513b753c3 SHA256 d93df57385745c79ff468a7beed80dd9748edf25834904114d274bc2f380d415 MISC metadata.xml 358 RMD160 8354f40b2d941f8ebc0db2cd8b99b6c16b2dafa8 SHA1 0eebcbd3433e90ea0d4ae42a3bcb4eb03cbd3482 SHA256 a0f7b8cfe098a2c32ef837e1cda5e5417b4d470472b19c92ac3c8ecb4b653aae diff --git a/media-tv/xbmc/files/xbmc-9.11-libpng14.patch b/media-tv/xbmc/files/xbmc-9.11-libpng14.patch index 2e66de904feb..b5af087eb4b4 100644 --- a/media-tv/xbmc/files/xbmc-9.11-libpng14.patch +++ b/media-tv/xbmc/files/xbmc-9.11-libpng14.patch @@ -1,3 +1,4 @@ +http://bugs.gentoo.org/319113 http://repos.archlinux.org/wsvn/community/xbmc/trunk/libpng14.patch diff -Nur xbmc-9.11.orig/xbmc/lib/cximage-6.0/CxImage/ximapng.cpp xbmc-9.11/xbmc/lib/cximage-6.0/CxImage/ximapng.cpp diff --git a/media-tv/xbmc/xbmc-9.11-r3.ebuild b/media-tv/xbmc/xbmc-9.11-r3.ebuild index 4c5c47fe07e3..1c221e0c864d 100644 --- a/media-tv/xbmc/xbmc-9.11-r3.ebuild +++ b/media-tv/xbmc/xbmc-9.11-r3.ebuild @@ -1,6 +1,6 @@ # 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-r3.ebuild,v 1.4 2010/05/10 12:35:50 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9.11-r3.ebuild,v 1.5 2010/05/14 15:58:12 ssuominen Exp $ EAPI="2" @@ -107,7 +107,9 @@ src_unpack() { } src_prepare() { - epatch "${FILESDIR}"/${P}-libpng14.patch # 319113 + has_version ">=media-libs/libpng-1.4" && epatch \ + "${FILESDIR}"/${P}-libpng14.patch + epatch "${FILESDIR}"/${P}-wavpack.patch epatch "${FILESDIR}"/${P}-jpeg-speedup.patch #300909 epatch "${FILESDIR}"/${P}-use-cdio-system-headers-on-non-win32.patch #303030, upstream: #8026 |