lu_zero 14/09/17 00:11:43 Modified: ChangeLog libav-9999.ebuild Log: Update depencencies and allow to override the EGIT variables (Portage version: 2.2.12/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path 1.222 media-video/libav/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/ChangeLog?rev=1.222&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/ChangeLog?rev=1.222&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/ChangeLog?r1=1.221&r2=1.222 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v retrieving revision 1.221 retrieving revision 1.222 diff -u -r1.221 -r1.222 --- ChangeLog 13 Sep 2014 09:34:20 -0000 1.221 +++ ChangeLog 17 Sep 2014 00:11:43 -0000 1.222 @@ -1,6 +1,9 @@ # ChangeLog for media-video/libav # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.221 2014/09/13 09:34:20 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.222 2014/09/17 00:11:43 lu_zero Exp $ + + 17 Sep 2014; Luca Barbato <[email protected]> libav-9999.ebuild: + Update depencencies and allow to override the EGIT variables 13 Sep 2014; Michał Górny <[email protected]> libav-10.3.ebuild, libav-10.9999.ebuild, libav-9999.ebuild: 1.74 media-video/libav/libav-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-9999.ebuild?rev=1.74&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-9999.ebuild?rev=1.74&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-9999.ebuild?r1=1.73&r2=1.74 Index: libav-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- libav-9999.ebuild 13 Sep 2014 09:34:20 -0000 1.73 +++ libav-9999.ebuild 17 Sep 2014 00:11:43 -0000 1.74 @@ -1,13 +1,15 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.73 2014/09/13 09:34:20 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.74 2014/09/17 00:11:43 lu_zero Exp $ EAPI=5 if [[ ${PV} == *9999 ]] ; then SCM="git-2" - EGIT_REPO_URI="git://git.libav.org/libav.git" - [[ ${PV%9999} != "" ]] && EGIT_BRANCH="release/${PV%.9999}" + : ${EGIT_REPO_URI:="git://git.libav.org/libav.git"} + if [[ ${PV%9999} != "" ]] ; then + : ${EGIT_BRANCH:="release/${PV%.9999}"} + fi fi inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM} @@ -28,8 +30,8 @@ ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" IUSE="aac alsa amr bindist +bzip2 cdio cpudetection custom-cflags debug doc - +encode faac fdk frei0r +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k mp3 - +network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl + +encode faac fdk frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k + mp3 +network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl static-libs test theora threads tools truetype v4l vaapi vdpau vorbis vpx X wavpack webp x264 x265 xvid +zlib" @@ -68,7 +70,7 @@ webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] ) x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] ) - x265? ( >=media-libs/x265-1.0:=[${MULTILIB_USEDEP}] ) + x265? ( >=media-libs/x265-1.2:=[${MULTILIB_USEDEP}] ) xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] ) ) frei0r? ( media-plugins/frei0r-plugins ) @@ -89,7 +91,8 @@ sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] ) schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] ) speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] ) - truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] ) + truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] ) + fontconfig? ( >=media-libs/fontconfig-2.10[${MULTILIB_USEDEP}] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] ) vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] ) vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] ) @@ -111,6 +114,7 @@ ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) test? ( sys-devel/bc ) truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) + fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) v4l? ( sys-kernel/linux-headers ) " @@ -127,6 +131,7 @@ rtmp? ( network ) amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) cdio? ( gpl ) x265? ( gpl ) test? ( encode zlib ) + fontconfig? ( truetype ) " # Test on live ebuild are not possible as they require trunk fate @@ -215,6 +220,7 @@ # libavfilter options multilib_is_native_abi && use frei0r && myconf+=( --enable-frei0r ) use truetype && myconf+=( --enable-libfreetype ) + use fontconfig && myconf+=( --enable-libfontconfig ) # Threads; we only support pthread for now use threads && myconf+=( --enable-pthreads )
