mgorny 14/06/14 08:09:19 Modified: ChangeLog Added: ffmpeg-1.2.6-r1.ebuild Log: Backport the multilib support to the version having wider keywords, pointed out by Arfrever. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path 1.750 media-video/ffmpeg/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.750&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.750&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.749&r2=1.750 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v retrieving revision 1.749 retrieving revision 1.750 diff -u -r1.749 -r1.750 --- ChangeLog 14 Jun 2014 02:46:27 -0000 1.749 +++ ChangeLog 14 Jun 2014 08:09:19 -0000 1.750 @@ -1,6 +1,12 @@ # ChangeLog for media-video/ffmpeg # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.749 2014/06/14 02:46:27 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.750 2014/06/14 08:09:19 mgorny Exp $ + +*ffmpeg-1.2.6-r1 (14 Jun 2014) + + 14 Jun 2014; Michał Górny <mgo...@gentoo.org> +ffmpeg-1.2.6-r1.ebuild: + Backport the multilib support to the version having wider keywords, pointed + out by Arfrever. 14 Jun 2014; Mike Gilbert <flop...@gentoo.org> ffmpeg-2.2.3-r1.ebuild: Add ~x86 keyword, tested by Arfrever. 1.1 media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild?rev=1.1&content-type=text/plain Index: ffmpeg-1.2.6-r1.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild,v 1.1 2014/06/14 08:09:19 mgorny Exp $ EAPI="4" SCM="" if [ "${PV#9999}" != "${PV}" ] ; then SCM="git-2" EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git" fi inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM} DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec." HOMEPAGE="http://ffmpeg.org/"; if [ "${PV#9999}" != "${PV}" ] ; then SRC_URI="" elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot SRC_URI="mirror://gentoo/${P}.tar.bz2" else # Release SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"; fi FFMPEG_REVISION="${PV#*_p}" LICENSE="GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )" SLOT="0" if [ "${PV#9999}" = "${PV}" ] ; then KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" fi IUSE=" aac aacplus alsa amr bindist bluray +bzip2 cdio celt cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r gnutls gsm +hardcoded-tables +iconv iec61883 ieee1394 jack jpeg2k libass libcaca libsoxr libv4l modplug mp3 +network openal openssl opus oss pic pulseaudio rtmp schroedinger sdl speex static-libs test theora threads truetype twolame v4l vaapi vdpau vorbis vpx X x264 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 ssse3 vis neon" for i in ${CPU_FEATURES}; do IUSE="${IUSE} ${i%:*}" done FFTOOLS="aviocat cws2fws ffescape ffeval fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart trasher" for i in ${FFTOOLS}; do IUSE="${IUSE} +fftools_$i" done RDEPEND=" alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) amr? ( media-libs/opencore-amr[${MULTILIB_USEDEP}] ) bluray? ( media-libs/libbluray[${MULTILIB_USEDEP}] ) bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] ) cdio? ( || ( dev-libs/libcdio-paranoia[${MULTILIB_USEDEP}] <dev-libs/libcdio-0.90[-minimal,${MULTILIB_USEDEP}] ) ) celt? ( >=media-libs/celt-0.11.1[${MULTILIB_USEDEP}] ) encode? ( aac? ( media-libs/vo-aacenc[${MULTILIB_USEDEP}] ) aacplus? ( media-libs/libaacplus[${MULTILIB_USEDEP}] ) amr? ( media-libs/vo-amrwbenc[${MULTILIB_USEDEP}] ) faac? ( media-libs/faac[${MULTILIB_USEDEP}] ) fdk? ( media-libs/fdk-aac[${MULTILIB_USEDEP}] ) mp3? ( >=media-sound/lame-3.98.3[${MULTILIB_USEDEP}] ) theora? ( >=media-libs/libtheora-1.1.1[${MULTILIB_USEDEP},encode] media-libs/libogg[${MULTILIB_USEDEP}] ) twolame? ( media-sound/twolame[${MULTILIB_USEDEP}] ) x264? ( >=media-libs/x264-0.0.20111017[${MULTILIB_USEDEP}] ) xvid? ( >=media-libs/xvid-1.1.0[${MULTILIB_USEDEP}] ) ) flite? ( app-accessibility/flite[${MULTILIB_USEDEP}] ) fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] ) frei0r? ( media-plugins/frei0r-plugins ) gnutls? ( >=net-libs/gnutls-2.12.16[${MULTILIB_USEDEP}] ) gsm? ( >=media-sound/gsm-1.0.12-r1[${MULTILIB_USEDEP}] ) iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] ) iec61883? ( media-libs/libiec61883[${MULTILIB_USEDEP}] sys-libs/libraw1394[${MULTILIB_USEDEP}] sys-libs/libavc1394[${MULTILIB_USEDEP}] ) ieee1394? ( media-libs/libdc1394[${MULTILIB_USEDEP}] sys-libs/libraw1394[${MULTILIB_USEDEP}] ) jack? ( media-sound/jack-audio-connection-kit[${MULTILIB_USEDEP}] ) jpeg2k? ( >=media-libs/openjpeg-1.3-r2:0[${MULTILIB_USEDEP}] ) libass? ( media-libs/libass[${MULTILIB_USEDEP}] ) libcaca? ( media-libs/libcaca[${MULTILIB_USEDEP}] ) libsoxr? ( media-libs/soxr[${MULTILIB_USEDEP}] ) libv4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) modplug? ( media-libs/libmodplug[${MULTILIB_USEDEP}] ) openal? ( >=media-libs/openal-1.1[${MULTILIB_USEDEP}] ) openssl? ( dev-libs/openssl[${MULTILIB_USEDEP}] ) opus? ( media-libs/opus[${MULTILIB_USEDEP}] ) pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] ) rtmp? ( >=media-video/rtmpdump-2.2f[${MULTILIB_USEDEP}] ) sdl? ( >=media-libs/libsdl-1.2.13-r1[sound,video,${MULTILIB_USEDEP}] ) schroedinger? ( media-libs/schroedinger[${MULTILIB_USEDEP}] ) speex? ( >=media-libs/speex-1.2_beta3[${MULTILIB_USEDEP}] ) truetype? ( media-libs/freetype:2[${MULTILIB_USEDEP}] ) vaapi? ( >=x11-libs/libva-0.32[${MULTILIB_USEDEP}] ) vdpau? ( x11-libs/libvdpau[${MULTILIB_USEDEP}] ) vorbis? ( media-libs/libvorbis[${MULTILIB_USEDEP}] media-libs/libogg[${MULTILIB_USEDEP}] ) vpx? ( >=media-libs/libvpx-0.9.6[${MULTILIB_USEDEP}] ) X? ( x11-libs/libX11[${MULTILIB_USEDEP}] x11-libs/libXext[${MULTILIB_USEDEP}] x11-libs/libXfixes[${MULTILIB_USEDEP}] ) zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] ) !media-video/qt-faststart !media-libs/libpostproc " DEPEND="${RDEPEND} >=sys-devel/make-3.81 doc? ( app-text/texi2html ) fontconfig? ( virtual/pkgconfig[${MULTILIB_USEDEP}] ) gnutls? ( virtual/pkgconfig[${MULTILIB_USEDEP}] ) ieee1394? ( virtual/pkgconfig[${MULTILIB_USEDEP}] ) libv4l? ( virtual/pkgconfig[${MULTILIB_USEDEP}] ) mmx? ( dev-lang/yasm ) rtmp? ( virtual/pkgconfig[${MULTILIB_USEDEP}] ) schroedinger? ( virtual/pkgconfig[${MULTILIB_USEDEP}] ) test? ( net-misc/wget ) truetype? ( virtual/pkgconfig[${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 is license-incompatible with ffmpeg REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl ) libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode )" S=${WORKDIR}/${P/_/-} src_prepare() { if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot export revision=git-N-${FFMPEG_REVISION} fi epatch "${FILESDIR}/dirac_arith_hardened.patch" epatch_user } multilib_src_configure() { local myconf=( ${EXTRA_FFMPEG_CONF} ) # options to use as use_enable in the foo[:bar] form. # This will feed configure with $(use_enable foo bar) # or $(use_enable foo foo) if no :bar is set. local ffuse=( bzip2:bzlib cpudetection:runtime-cpudetect debug doc gnutls hardcoded-tables iconv network openssl sdl:ffplay vaapi vdpau zlib ) use openssl && myconf+=( --enable-nonfree ) # Encoders if use encode then ffuse+=( aac:libvo-aacenc amr:libvo-amrwbenc mp3:libmp3lame fdk:libfdk-aac ) for i in aacplus faac theora twolame x264 xvid; do ffuse+=( ${i}:lib${i} ) done # Licensing. if use aac || use amr ; then myconf+=( --enable-version3 ) fi if use aacplus || use faac || use fdk ; then myconf+=( --enable-nonfree ) fi else myconf+=( --disable-encoders ) fi # libavdevice options ffuse+=( cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal ) # Indevs use v4l || myconf+=( --disable-indev=v4l2 ) for i in alsa oss jack ; do use ${i} || myconf+=( --disable-indev=${i} ) done ffuse+=( libv4l:libv4l2 pulseaudio:libpulse X:x11grab ) # Outdevs for i in alsa oss sdl ; do use ${i} || myconf+=( --disable-outdev=${i} ) done # libavfilter options ffuse+=( flite:libflite frei0r fontconfig libass truetype:libfreetype ) # libswresample options ffuse+=( libsoxr ) # Threads; we only support pthread for now but ffmpeg supports more ffuse+=( threads:pthreads ) # Decoders ffuse+=( amr:libopencore-amrwb amr:libopencore-amrnb jpeg2k:libopenjpeg ) use amr && myconf+=( --enable-version3 ) for i in bluray celt gsm modplug opus rtmp schroedinger speex vorbis vpx; do ffuse+=( ${i}:lib${i} ) done for i in "${ffuse[@]}" ; do myconf+=( $(use_enable ${i%:*} ${i#*:}) ) done # (temporarily) disable non-multilib deps if ! multilib_is_native_abi; then myconf+=( --disable-frei0r ) fi # CPU features for i in ${CPU_FEATURES}; do use ${i%:*} || myconf+=( --disable-${i#*:} ) done if use pic ; then myconf+=( --enable-pic ) # disable asm code if PIC is required # as the provided asm decidedly is not PIC for x86. [[ ${ABI} == x86 ]] && myconf+=( --disable-asm ) fi [[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004 # Try to get cpu type based on CFLAGS. # Bug #172723 # We need to do this so that features of that CPU will be better used # If they contain an unknown CPU it will not hurt since ffmpeg's configure # will just ignore it. for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do [[ ${i} = native ]] && i="host" # bug #273421 myconf+=( --cpu=${i} ) break done # Mandatory configuration myconf=( --enable-gpl --enable-postproc --enable-avfilter --enable-avresample --disable-stripping "${myconf[@]}" ) # 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 "${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)" \ --cxx="$(tc-getCXX)" \ --ar="$(tc-getAR)" \ --optflags="${CFLAGS}" \ --extra-cflags="${CFLAGS}" \ --extra-cxxflags="${CXXFLAGS}" \ $(use_enable static-libs static) \ "${myconf[@]}" || die } multilib_src_compile() { emake V=1 if multilib_is_native_abi; then for i in ${FFTOOLS} ; do if use fftools_${i} ; then emake V=1 tools/${i} fi done fi } multilib_src_install() { emake V=1 DESTDIR="${D}" install install-man if multilib_is_native_abi; then for i in ${FFTOOLS} ; do if use fftools_${i} ; then dobin tools/${i} fi done fi } multilib_src_install_all() { dodoc Changelog README CREDITS doc/*.txt doc/APIchanges doc/RELEASE_NOTES use doc && dohtml -r doc/* if use examples ; then dodoc -r doc/examples docompress -x /usr/share/doc/${PF}/examples fi } multilib_src_test() { LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \ emake V=1 fate }
