[gentoo-commits] gentoo-x86 commit in app-emulation/emul-linux-x86-medialibs: emul-linux-x86-medialibs-20140508-r2.ebuild ChangeLog
mgorny 14/05/29 21:15:13 Modified: emul-linux-x86-medialibs-20140508-r2.ebuild ChangeLog Log: Add USE=pulseaudio to allow breaking pre-built ffmpeg. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!) Revision ChangesPath 1.2 app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r2.ebuild?rev=1.2view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r2.ebuild?rev=1.2content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r2.ebuild?r1=1.1r2=1.2 Index: emul-linux-x86-medialibs-20140508-r2.ebuild === RCS file: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r2.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- emul-linux-x86-medialibs-20140508-r2.ebuild 27 May 2014 19:01:02 - 1.1 +++ emul-linux-x86-medialibs-20140508-r2.ebuild 29 May 2014 21:15:13 - 1.2 @@ -1,13 +1,13 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r2.ebuild,v 1.1 2014/05/27 19:01:02 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r2.ebuild,v 1.2 2014/05/29 21:15:13 mgorny Exp $ EAPI=5 inherit emul-linux-x86 LICENSE=APL-1.0 GPL-2 BSD BSD-2 public-domain LGPL-2 MPL-1.1 LGPL-2.1 !abi_x86_32? ( MPEG-4 ) KEYWORDS=-* ~amd64 -IUSE=abi_x86_32 +IUSE=abi_x86_32 +pulseaudio DEPEND= # required libs @@ -26,12 +26,12 @@ media-libs/libpng[abi_x86_32(-)] media-libs/libvorbis[abi_x86_32(-)] media-sound/jack-audio-connection-kit[abi_x86_32(-)] - media-sound/pulseaudio[abi_x86_32(-)] sci-libs/fftw[abi_x86_32(-)] virtual/jpeg:62[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXfixes[abi_x86_32(-)] + pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)] ) ) !=app-emulation/emul-linux-x86-sdl-20081109 !=app-emulation/emul-linux-x86-soundlibs-20110101 @@ -77,6 +77,13 @@ PDEPEND=!abi_x86_32? ( ~app-emulation/emul-linux-x86-soundlibs-${PV} ) +pkg_pretend() { + if use abi_x86_32 ! use pulseaudio; then + ewarn You have disabled USE=pulseaudio. This is known to break pre-built + ewarn libavfilter. If you need it, please turn USE=pulseaudio back on. + fi +} + src_prepare() { # Include all libv4l libs, bug #348277 ALLOWED=${S}/usr/lib32/libv4l/ 1.98 app-emulation/emul-linux-x86-medialibs/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog?rev=1.98view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog?rev=1.98content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog?r1=1.97r2=1.98 Index: ChangeLog === RCS file: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog,v retrieving revision 1.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- ChangeLog 29 May 2014 16:39:58 - 1.97 +++ ChangeLog 29 May 2014 21:15:13 - 1.98 @@ -1,6 +1,10 @@ # ChangeLog for app-emulation/emul-linux-x86-medialibs # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog,v 1.97 2014/05/29 16:39:58 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog,v 1.98 2014/05/29 21:15:13 mgorny Exp $ + + 29 May 2014; Michał Górny mgo...@gentoo.org + emul-linux-x86-medialibs-20140508-r2.ebuild: + Add USE=pulseaudio to allow breaking pre-built ffmpeg. 29 May 2014; Michał Górny mgo...@gentoo.org -emul-linux-x86-medialibs-20140508-r1.ebuild,
[gentoo-commits] gentoo-x86 commit in app-emulation/emul-linux-x86-medialibs: emul-linux-x86-medialibs-20140508-r2.ebuild ChangeLog
mgorny 14/05/27 19:01:02 Modified: ChangeLog Added:emul-linux-x86-medialibs-20140508-r2.ebuild Log: Use multilib packages to fulfill remaining pre-built library dependencies instead of pulling in other emul-linux-x86 sets. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!) Revision ChangesPath 1.96 app-emulation/emul-linux-x86-medialibs/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog?rev=1.96view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog?rev=1.96content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog?r1=1.95r2=1.96 Index: ChangeLog === RCS file: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- ChangeLog 21 May 2014 19:11:58 - 1.95 +++ ChangeLog 27 May 2014 19:01:02 - 1.96 @@ -1,6 +1,14 @@ # ChangeLog for app-emulation/emul-linux-x86-medialibs # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog,v 1.95 2014/05/21 19:11:58 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog,v 1.96 2014/05/27 19:01:02 mgorny Exp $ + +*emul-linux-x86-medialibs-20140508-r2 (27 May 2014) + + 27 May 2014; Michał Górny mgo...@gentoo.org + +emul-linux-x86-medialibs-20140508-r2.ebuild, + +files/remove-native-20140508-r2: + Use multilib packages to fulfill remaining pre-built library dependencies + instead of pulling in other emul-linux-x86 sets. *emul-linux-x86-medialibs-20140508-r1 (21 May 2014) 1.1 app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r2.ebuild?rev=1.1view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r2.ebuild?rev=1.1content-type=text/plain Index: emul-linux-x86-medialibs-20140508-r2.ebuild === # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r2.ebuild,v 1.1 2014/05/27 19:01:02 mgorny Exp $ EAPI=5 inherit emul-linux-x86 LICENSE=APL-1.0 GPL-2 BSD BSD-2 public-domain LGPL-2 MPL-1.1 LGPL-2.1 !abi_x86_32? ( MPEG-4 ) KEYWORDS=-* ~amd64 IUSE=abi_x86_32 DEPEND= # required libs RDEPEND= !abi_x86_32? ( ~app-emulation/emul-linux-x86-baselibs-${PV} ~app-emulation/emul-linux-x86-xlibs-${PV} ~app-emulation/emul-linux-x86-db-${PV} ) abi_x86_32? ( app-arch/bzip2[abi_x86_32(-)] dev-libs/glib[abi_x86_32(-)] dev-libs/libxml2[abi_x86_32(-)] media-libs/alsa-lib[abi_x86_32(-)] media-libs/freetype[abi_x86_32(-)] media-libs/libpng[abi_x86_32(-)] media-libs/libvorbis[abi_x86_32(-)] media-sound/jack-audio-connection-kit[abi_x86_32(-)] media-sound/pulseaudio[abi_x86_32(-)] sci-libs/fftw[abi_x86_32(-)] virtual/jpeg:62[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXfixes[abi_x86_32(-)] ) !=app-emulation/emul-linux-x86-sdl-20081109 !=app-emulation/emul-linux-x86-soundlibs-20110101 # supplied libs RDEPEND=${RDEPEND} abi_x86_32? ( =media-libs/libvpx-1.2.0_pre[abi_x86_32(-)] =media-libs/xvid-1.3.2-r1[abi_x86_32(-)] =media-sound/lame-3.99.5-r1[abi_x86_32(-)] =media-libs/faac-1.28-r4[abi_x86_32(-)] =media-libs/faad2-2.7-r3[abi_x86_32(-)] =media-libs/libtheora-1.1.1-r1[abi_x86_32(-)] =media-libs/libcuefile-477-r1[abi_x86_32(-)] =media-libs/libreplaygain-477-r1[abi_x86_32(-)] =media-libs/libmad-0.15.1b-r8[abi_x86_32(-)] =media-libs/libdca-0.0.5-r3[abi_x86_32(-)] =media-libs/speex-1.2_rc1-r2[abi_x86_32(-)] =media-libs/libdvdread-4.2.0-r1[abi_x86_32(-)] =media-libs/libdvdnav-4.2.0-r1[abi_x86_32(-)] =media-libs/libv4l-0.9.5-r1[abi_x86_32(-)] =media-libs/libid3tag-0.15.1b-r4[abi_x86_32(-)]