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 | 892ce8904365baa2bbfed47b026ec9c138262578 (patch) | |
| tree | decb1d8016a175f17f499a691416720857d91102 /media-tv/xbmc | |
| parent | Stable for HPPA (bug #319615). (diff) | |
| download | gentoo-2-892ce8904365baa2bbfed47b026ec9c138262578.tar.gz gentoo-2-892ce8904365baa2bbfed47b026ec9c138262578.tar.bz2 gentoo-2-892ce8904365baa2bbfed47b026ec9c138262578.zip | |
Don't apply -libpng14.patch with libpng12 wrt #319721 by Martin von Gagern.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'media-tv/xbmc')
| -rw-r--r-- | media-tv/xbmc/ChangeLog | 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 |
3 files changed, 10 insertions, 3 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/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 |