lu_zero 14/12/02 13:36:00 Modified: libav-9999.ebuild ChangeLog Added: libav-11.1.ebuild Log: New point release (Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path 1.75 media-video/libav/libav-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-9999.ebuild?rev=1.75&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-9999.ebuild?rev=1.75&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-9999.ebuild?r1=1.74&r2=1.75 Index: libav-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- libav-9999.ebuild 17 Sep 2014 00:11:43 -0000 1.74 +++ libav-9999.ebuild 2 Dec 2014 13:36:00 -0000 1.75 @@ -1,6 +1,6 @@ # 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.74 2014/09/17 00:11:43 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.75 2014/12/02 13:36:00 lu_zero Exp $ EAPI=5 @@ -96,11 +96,8 @@ 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}] ) - X? ( - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] - >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] - ) + X? ( >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}] + >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) " @@ -212,7 +209,7 @@ for i in alsa oss jack; do use ${i} || myconf+=( --disable-indev=${i} ) done - use X && myconf+=( --enable-x11grab ) + use X && myconf+=( --enable-libxcb ) # Outdevs for i in alsa oss ; do use ${i} || myconf+=( --disable-outdev=${i} ) 1.226 media-video/libav/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/ChangeLog?rev=1.226&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/ChangeLog?rev=1.226&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/ChangeLog?r1=1.225&r2=1.226 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v retrieving revision 1.225 retrieving revision 1.226 diff -u -r1.225 -r1.226 --- ChangeLog 27 Oct 2014 12:34:05 -0000 1.225 +++ ChangeLog 2 Dec 2014 13:36:00 -0000 1.226 @@ -1,6 +1,12 @@ # 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.225 2014/10/27 12:34:05 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.226 2014/12/02 13:36:00 lu_zero Exp $ + +*libav-11.1 (02 Dec 2014) + + 02 Dec 2014; Luca Barbato <lu_z...@gentoo.org> +libav-11.1.ebuild, + libav-9999.ebuild: + New point release 27 Oct 2014; Luca Barbato <lu_z...@gentoo.org> libav-10.5.ebuild: Fix bug #526180 1.1 media-video/libav/libav-11.1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-11.1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-11.1.ebuild?rev=1.1&content-type=text/plain Index: libav-11.1.ebuild =================================================================== # 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-11.1.ebuild,v 1.1 2014/12/02 13:36:00 lu_zero Exp $ EAPI=5 if [[ ${PV} == *9999 ]] ; then SCM="git-2" : ${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} DESCRIPTION="Complete solution to record, convert and stream audio and video" HOMEPAGE="http://libav.org/"; if [[ ${PV} == *9999 ]] ; then SRC_URI="" elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot SRC_URI="http://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz"; else # Official release SRC_URI="http://${PN}.org/releases/${P}.tar.xz"; fi LICENSE="LGPL-2.1 gpl? ( GPL-3 )" SLOT="0/10" [[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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 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" # String for CPU features in the useflag[:configure_option] form # if :configure_option isn't set, it will use 'useflag' as configure option CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext altivec avx mmx mmxext neon ssse3 vis avx2" for i in ${CPU_FEATURES} ; do IUSE+=" ${i%:*}" done RDEPEND=" !media-video/ffmpeg:0 alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) cdio? ( || ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] <dev-libs/libcdio-0.90[-minimal,${MULTILIB_USEDEP}] ) ) encode? ( aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] ) amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] ) faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] ) fdk? ( >=media-libs/fdk-aac-0.1.2[${MULTILIB_USEDEP}] ) mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] ) theora? ( >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] ) 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.2:=[${MULTILIB_USEDEP}] ) xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] ) ) frei0r? ( media-plugins/frei0r-plugins ) gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}] >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}] ) jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] ) jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] ) opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] ) ssl? ( openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) !openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] ) ) 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}] ) 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}] ) X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) " DEPEND="${RDEPEND} >=sys-devel/make-3.81 doc? ( app-text/texi2html ) ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) mmx? ( dev-lang/yasm ) rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) 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 ) " RDEPEND="${RDEPEND} abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" # faac can't be binary distributed # openssl support marked as nonfree # faac and aac are concurent implementations # amr and aac require at least lgpl3 # x264 requires gpl2 REQUIRED_USE="bindist? ( !faac !openssl !fdk ) 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 RESTRICT="test" MULTILIB_WRAPPED_HEADERS=( /usr/include/libavutil/avconfig.h ) src_prepare() { epatch_user # if we have snapshot then we need to hardcode the version if [[ ${PV%_p*} != ${PV} ]]; then sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die fi TOOLS=( aviocat graph2dot ismindex pktdumper qt-faststart trasher ) use zlib && TOOLS+=( cws2fws ) MAKEOPTS+=" V=1" } multilib_src_configure() { local myconf=( ${EXTRA_LIBAV_CONF} ) local uses i myconf+=( $(use_enable gpl) $(use_enable gpl version3) --enable-avfilter ) # enabled by default uses="debug doc network zlib" for i in ${uses}; do use ${i} || myconf+=( --disable-${i} ) done use bzip2 || myconf+=( --disable-bzlib ) use sdl || myconf+=( --disable-avplay ) if use ssl; then use openssl && myconf+=( --enable-openssl --enable-nonfree ) \ || myconf+=( --enable-gnutls ) fi use custom-cflags && myconf+=( --disable-optimizations ) use cpudetection && myconf+=( --enable-runtime-cpudetect ) use vdpau || myconf+=( --disable-vdpau ) use vaapi && myconf+=( --enable-vaapi ) # Encoders if use encode; then use faac && myconf+=( --enable-nonfree ) use fdk && myconf+=( --enable-nonfree --enable-libfdk-aac ) use mp3 && myconf+=( --enable-libmp3lame ) use amr && myconf+=( --enable-libvo-amrwbenc ) use aac && myconf+=( --enable-libvo-aacenc ) uses="faac theora vorbis wavpack webp x264 x265 xvid" for i in ${uses}; do use ${i} && myconf+=( --enable-lib${i} ) done else myconf+=( --disable-encoders ) fi # libavdevice options use cdio && myconf+=( --enable-libcdio ) use ieee1394 && myconf+=( --enable-libdc1394 ) use pulseaudio && myconf+=( --enable-libpulse ) # Indevs # v4l1 is gone since linux-headers-2.6.38 myconf+=( --disable-indev=v4l ) use v4l || myconf+=( --disable-indev=v4l2 ) for i in alsa oss jack; do use ${i} || myconf+=( --disable-indev=${i} ) done use X && myconf+=( --enable-x11grab ) # Outdevs for i in alsa oss ; do use ${i} || myconf+=( --disable-outdev=${i} ) done # 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 ) # Decoders use amr && myconf+=( --enable-libopencore-amrwb --enable-libopencore-amrnb ) uses="gsm opus rtmp schroedinger speex vpx" for i in ${uses}; do use ${i} && myconf+=( --enable-lib${i} ) done use jpeg2k && myconf+=( --enable-libopenjpeg ) # CPU features for i in ${CPU_FEATURES}; do use ${i%:*} || myconf+=( --disable-${i#*:} ) done # pass the right -mfpu as extra use neon && myconf+=( --extra-cflags=-mfpu=neon ) # disable mmx accelerated code if PIC is required # as the provided asm decidedly is not PIC for x86. if use pic && [[ ${ABI} == x86 ]]; then myconf+=( --disable-mmx --disable-mmxext ) fi # Option to force building pic use pic && myconf+=( --enable-pic ) # cross compile support if tc-is-cross-compiler ; then myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- ) case ${CHOST} in *freebsd*) myconf+=( --target-os=freebsd ) ;; mingw32*) myconf+=( --target-os=mingw32 ) ;; *linux*) myconf+=( --target-os=linux ) ;; esac fi # Misc stuff use hardcoded-tables && myconf+=( --enable-hardcoded-tables ) # Specific workarounds for too-few-registers arch... if [[ ${ABI} == x86 ]]; then local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS} filter-flags -fforce-addr -momit-leaf-frame-pointer append-flags -fomit-frame-pointer is-flag -O? || append-flags -O2 if use debug; then # no need to warn about debug if not using debug flag ewarn "" ewarn "Debug information will be almost useless as the frame pointer is omitted." ewarn "This makes debugging harder, so crashes that has no fixed behavior are" ewarn "difficult to fix. Please have that in mind." ewarn "" fi fi set -- "${S}"/configure \ --prefix="${EPREFIX}"/usr \ --libdir="${EPREFIX}"/usr/$(get_libdir) \ --shlibdir="${EPREFIX}"/usr/$(get_libdir) \ --mandir="${EPREFIX}"/usr/share/man \ --enable-shared \ --cc="$(tc-getCC)" \ --ar="$(tc-getAR)" \ --optflags="${CFLAGS}" \ --extra-cflags="${CFLAGS}" \ $(use_enable static-libs static) \ "${myconf[@]}" echo "${@}" "${@}" || die } multilib_src_compile() { emake if use tools; then tc-export CC emake ${TOOLS[@]/#/tools/} fi } multilib_src_install() { emake DESTDIR="${D}" install install-man use doc && dodoc doc/*.html if use tools; then dobin ${TOOLS[@]/#/tools/} fi } multilib_src_install_all() { dodoc Changelog README INSTALL } multilib_src_test() { LD_LIBRARY_PATH="${BUILD_DIR}/libavcore:${BUILD_DIR}/libswscale:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil" \ emake -j1 fate }
