diff options
| author |   Michael Weber <xmw@gentoo.org> | 2013-02-23 14:48:11 +0000 |
|---|---|---|
| committer | Michael Weber <xmw@gentoo.org> | 2013-02-23 14:48:11 +0000 |
| commit | 9965f0292c6f4248f8c77267dc9545d4790c8db9 (patch) | |
| tree | c24b5e15f009289bc58fcf442ef4183cce2cf666 /x11-wm/xpra | |
| parent | Stable for alpha, wrt bug #458188 (diff) | |
| download | gentoo-2-9965f0292c6f4248f8c77267dc9545d4790c8db9.tar.gz gentoo-2-9965f0292c6f4248f8c77267dc9545d4790c8db9.tar.bz2 gentoo-2-9965f0292c6f4248f8c77267dc9545d4790c8db9.zip | |
Apply old-libav.patch for ffmpeg and <libav-9 (thanks Benda Xu, bug 458808)
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)
Diffstat (limited to 'x11-wm/xpra')
| -rw-r--r-- | x11-wm/xpra/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-wm/xpra/xpra-0.8.4.ebuild | 4 | ||||
| -rw-r--r-- | x11-wm/xpra/xpra-0.8.5.ebuild | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/x11-wm/xpra/ChangeLog b/x11-wm/xpra/ChangeLog index 20569df3aee6..8c38bad32feb 100644 --- a/x11-wm/xpra/ChangeLog +++ b/x11-wm/xpra/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-wm/xpra # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/ChangeLog,v 1.50 2013/02/18 05:52:04 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/ChangeLog,v 1.51 2013/02/23 14:48:11 xmw Exp $ + + 23 Feb 2013; Michael Weber <xmw@gentoo.org> xpra-0.8.4.ebuild, + xpra-0.8.5.ebuild: + Apply old-libav.patch for ffmpeg and <libav-9 (thanks Benda Xu, bug 458808) *xpra-0.8.5 (18 Feb 2013) diff --git a/x11-wm/xpra/xpra-0.8.4.ebuild b/x11-wm/xpra/xpra-0.8.4.ebuild index 98793e249b73..ddad4644ad52 100644 --- a/x11-wm/xpra/xpra-0.8.4.ebuild +++ b/x11-wm/xpra/xpra-0.8.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.8.4.ebuild,v 1.1 2013/02/13 22:57:36 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.8.4.ebuild,v 1.2 2013/02/23 14:48:11 xmw Exp $ EAPI=5 @@ -49,7 +49,7 @@ DEPEND="${COMMON_DEPEND} python_prepare_all() { epatch "${FILESDIR}"/${PN}-0.7.1-ignore-gentoo-no-compile.patch epatch "${FILESDIR}"/${PN}-0.8.0-prefix.patch - if has_version media-video/ffmpeg ; then + if ! has_version ">=media-video/libav-9" ; then epatch patches/old-libav.patch fi diff --git a/x11-wm/xpra/xpra-0.8.5.ebuild b/x11-wm/xpra/xpra-0.8.5.ebuild index 3ea61c0ee71b..c3bc792481fc 100644 --- a/x11-wm/xpra/xpra-0.8.5.ebuild +++ b/x11-wm/xpra/xpra-0.8.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.8.5.ebuild,v 1.1 2013/02/18 05:52:04 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.8.5.ebuild,v 1.2 2013/02/23 14:48:11 xmw Exp $ EAPI=5 @@ -49,7 +49,7 @@ DEPEND="${COMMON_DEPEND} python_prepare_all() { epatch "${FILESDIR}"/${PN}-0.7.1-ignore-gentoo-no-compile.patch epatch "${FILESDIR}"/${PN}-0.8.0-prefix.patch - if has_version media-video/ffmpeg ; then + if ! has_version ">=media-video/libav-9" ; then epatch patches/old-libav.patch fi |