diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2015-02-27 22:24:32 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2015-02-27 22:24:32 +0000 |
| commit | a8467f8f54a3d77bf1737a4df64fc56f19fd7d3d (patch) | |
| tree | 1ad3342a5e9ebcc1e46c7b35aeead96eddadd772 /media-libs/libpostproc | |
| parent | Add patch to fix crasher bug triggered on hardened x86_64 machines with USE=X... (diff) | |
| download | gentoo-2-a8467f8f54a3d77bf1737a4df64fc56f19fd7d3d.tar.gz gentoo-2-a8467f8f54a3d77bf1737a4df64fc56f19fd7d3d.tar.bz2 gentoo-2-a8467f8f54a3d77bf1737a4df64fc56f19fd7d3d.zip | |
Use USE=libav to control ffmpeg/libav linking. Patch provided by Nikoli in https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/62.
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'media-libs/libpostproc')
| -rw-r--r-- | media-libs/libpostproc/ChangeLog | 7 | ||||
| -rw-r--r-- | media-libs/libpostproc/libpostproc-10.20140517-r1.ebuild | 8 | ||||
| -rw-r--r-- | media-libs/libpostproc/libpostproc-9999.ebuild | 8 |
3 files changed, 14 insertions, 9 deletions
diff --git a/media-libs/libpostproc/ChangeLog b/media-libs/libpostproc/ChangeLog index e951dc88b050..3e26e371ddd1 100644 --- a/media-libs/libpostproc/ChangeLog +++ b/media-libs/libpostproc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-libs/libpostproc # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libpostproc/ChangeLog,v 1.35 2015/01/31 01:31:21 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libpostproc/ChangeLog,v 1.36 2015/02/27 22:24:32 mgorny Exp $ + + 27 Feb 2015; Michał Górny <mgorny@gentoo.org> + libpostproc-10.20140517-r1.ebuild, libpostproc-9999.ebuild: + Use USE=libav to control ffmpeg/libav linking. Patch provided by Nikoli in + https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/62. 31 Jan 2015; Patrick Lauer <patrick@gentoo.org> metadata.xml: Remove unneded useflag description from metadata.xml diff --git a/media-libs/libpostproc/libpostproc-10.20140517-r1.ebuild b/media-libs/libpostproc/libpostproc-10.20140517-r1.ebuild index c1086e940556..06df16991521 100644 --- a/media-libs/libpostproc/libpostproc-10.20140517-r1.ebuild +++ b/media-libs/libpostproc/libpostproc-10.20140517-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libpostproc/libpostproc-10.20140517-r1.ebuild,v 1.9 2015/01/30 17:00:05 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libpostproc/libpostproc-10.20140517-r1.ebuild,v 1.10 2015/02/27 22:24:32 mgorny Exp $ EAPI="5" @@ -36,13 +36,13 @@ for i in ${CPU_FEATURES}; do IUSE="${IUSE} ${i%:*}" done -DEPEND=">=virtual/ffmpeg-9-r1[${MULTILIB_USEDEP}]" -RDEPEND="${DEPEND} - !<media-video/libav-0.8.2-r2 +RDEPEND=" + >=media-video/libav-0.8.2-r2:0= !media-video/ffmpeg:0 abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) " +DEPEND="${RDEPEND}" multilib_src_configure() { local myconf=( ${EXTRA_LIBPOSTPROC_CONF} ) diff --git a/media-libs/libpostproc/libpostproc-9999.ebuild b/media-libs/libpostproc/libpostproc-9999.ebuild index 1a93af1feaf6..9f3f0977be92 100644 --- a/media-libs/libpostproc/libpostproc-9999.ebuild +++ b/media-libs/libpostproc/libpostproc-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libpostproc/libpostproc-9999.ebuild,v 1.12 2015/01/30 17:00:05 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libpostproc/libpostproc-9999.ebuild,v 1.13 2015/02/27 22:24:32 mgorny Exp $ EAPI="5" @@ -36,13 +36,13 @@ for i in ${CPU_FEATURES}; do IUSE="${IUSE} ${i%:*}" done -DEPEND=">=virtual/ffmpeg-9-r1[${MULTILIB_USEDEP}]" -RDEPEND="${DEPEND} - !<media-video/libav-0.8.2-r2 +RDEPEND=" + >=media-video/libav-0.8.2-r2:0= !media-video/ffmpeg:0 abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) " +DEPEND="${RDEPEND}" multilib_src_configure() { local myconf=( ${EXTRA_LIBPOSTPROC_CONF} ) |