version bump
authorAlexis Ballier <aballier@gentoo.org>
Wed, 23 Nov 2011 21:33:44 +0000 (21:33 +0000)
committerAlexis Ballier <aballier@gentoo.org>
Wed, 23 Nov 2011 21:33:44 +0000 (21:33 +0000)
Package-Manager: portage-2.2.0_alpha77/cvs/Linux x86_64

media-video/ffmpeg/ChangeLog
media-video/ffmpeg/Manifest
media-video/ffmpeg/ffmpeg-0.8.7.ebuild [new file with mode: 0644]

index b2128de6b4b092fc5cc64f3983b72d9e5b66be66..d14f4ada7f7bda6461c246446c0f374ef40f335a 100644 (file)
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.489 2011/11/23 21:28:43 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.490 2011/11/23 21:33:44 aballier Exp $
+
+*ffmpeg-0.8.7 (23 Nov 2011)
+
+  23 Nov 2011; Alexis Ballier <aballier@gentoo.org> +ffmpeg-0.8.7.ebuild:
+  version bump
 
 *ffmpeg-0.7.8 (23 Nov 2011)
 
index de716a97ae0c32fb0e3430fea8b365bc8f67c99b..5cc54ac262d46e8022d7a1c529a2bdd8a6b4e492 100644 (file)
@@ -7,18 +7,20 @@ DIST ffmpeg-0.7.7.tar.bz2 4531586 RMD160 1123b0e38811dfd4f4f1cb0f7678518f9084903
 DIST ffmpeg-0.7.8.tar.bz2 4530406 RMD160 8f69a6bc5caaba4e3d440c2d5dc96a946454a52c SHA1 df4983c028a61d4bf3baceab3bae535b91b8928a SHA256 548197968e69b732c12b2cad3173eb6933a9573a7b1f5b29be36d31b9977c9f3
 DIST ffmpeg-0.8.5.tar.bz2 4523772 RMD160 16659c26a5158aeee454ce555562ca059af6fa04 SHA1 a69d909958b23f8b2509ddda6cdeba2601edf5ff SHA256 f63df1ee08c2c64a4b3f106a88dd055b9f19e3457f1d7c23d8b8169e0a0ef115
 DIST ffmpeg-0.8.6.tar.bz2 4527768 RMD160 9dace19db0f6337956403b3f13da3980361dd777 SHA1 ad7eaefa5072ca3c11778f9186fab35558a04478 SHA256 0ec9084438a26514455d49a72008d0b563d5a3c9d137cd22e46cb86bdc8bf6f0
+DIST ffmpeg-0.8.7.tar.bz2 4527751 RMD160 5ccc0cfcfaf77b2f7e7cc51190d00bc22db85866 SHA1 e6c391769b1e45afd8e3f41b734c17ba1437f4a9 SHA256 e074656390bfff51c2915d3334306dd7748bab8589a8d04128143c7b8962d0e1
 EBUILD ffmpeg-0.7.6.ebuild 8428 RMD160 605d4178c97232660275ed3e7b516b734f26dd83 SHA1 ad4e689edb43fd0cb9afd1c056b16981219b5b03 SHA256 763a13877018d508fa73c76560d88894ccd260513b585294c4f077d4e3974faa
 EBUILD ffmpeg-0.7.7.ebuild 8435 RMD160 838e2cfd74d3eed768a346d5cea73dfe195cc22f SHA1 1660c3caa7bff0fd070fdf864e5eb172d14fde4b SHA256 e68ae64c91924e456a16fb9dee00cecf6516a7fee0c814fa5788fd7473bab1fc
 EBUILD ffmpeg-0.7.8.ebuild 8443 RMD160 b6278d55d1ce6fe1d2b8d06bb5beacd2cc4b4797 SHA1 6181bc9405ed12ac3d514c4d91de5faa38842121 SHA256 da24c6d27450f8185a15570d4b753e60993697aeafdfce51b6ca2ce12a4d1790
 EBUILD ffmpeg-0.8.5.ebuild 8043 RMD160 6d0818622d1b63f56ca61ee97c7e2b1bb797d229 SHA1 7590930cb73be2c4333005f88a6680a23e308da1 SHA256 74aaf70cf001c3a3be73dd7ae2e28ade46f568ed6c795b5a032fda93731a18b0
 EBUILD ffmpeg-0.8.6.ebuild 8042 RMD160 4709694f4d6b3da1c20b6cd0e7f2783e8bcdd6f5 SHA1 170e0f605117aa622c6b42d1f60e252df9092b16 SHA256 ec9f7859106af231a8d8993dbd3ca2ec66b70eddc9761f7b8976f6007f558423
+EBUILD ffmpeg-0.8.7.ebuild 8042 RMD160 667ec1443cb0e6b1aab0b42d03f095212b0e6508 SHA1 c2ab382135b4181358ce29b3c0d2a12183f3b869 SHA256 57efbfd28445bdfa0f84d13a4039a5e86e87a7d5b72812e18dd4e3c9a65a8788
 EBUILD ffmpeg-9999.ebuild 8746 RMD160 e8911f7df8b090b3c60566a77895da2090b22975 SHA1 a506f393a080edd996c140e1e5752b286a6363f5 SHA256 b8a1c288920ddf238efc353d171bae3337dcbcd59aa432ec5516c0f7c290385d
-MISC ChangeLog 70509 RMD160 be3ca53cae948e14ed79e1ce4b491ad16de9cca5 SHA1 cd4f8fa1054a9d12913872381c7ae83f8893bd14 SHA256 5d1e8d9b47307a57fe8c37007465e20e8486d155a2ba08017370ed85789ba0d0
+MISC ChangeLog 70628 RMD160 b8cbb23f27cdb94c11de1a5f55e503474cd1a05f SHA1 7fe4427adf2acfee731fb94a98824f05cfce699a SHA256 f9f7e5ec3e6443cf366b2bfdfe2b044d71bef63e834d088d22be6d342e1fa627
 MISC metadata.xml 3022 RMD160 794769b4ccc4c9348f64b884ec5bdc9e81173994 SHA1 5b0d926db53d9e1314ed0fe2821d7952b5386133 SHA256 7566645dd9bf7db7cf3a7be1cfa3fec5c33f156aa52619a09a4b46f6581086ef
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7NZZEACgkQvFcC4BYPU0pADwCgpmsmPwtqXqopgPZx8B8CVfVz
-hHoAn3hW5v6vavPs3uTA8e3bBO52n6d7
-=HpN4
+iEYEARECAAYFAk7NZr4ACgkQvFcC4BYPU0pWIQCdF4RPlqV+2t7sgJmnylbZ6NXY
+1z0AmwR5ff5mX8F6Rswp73XYsEDNXQaf
+=Fbbn
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-0.8.7.ebuild b/media-video/ffmpeg/ffmpeg-0.8.7.ebuild
new file mode 100644 (file)
index 0000000..41cda0a
--- /dev/null
@@ -0,0 +1,270 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.8.7.ebuild,v 1.1 2011/11/23 21:33:44 aballier Exp $
+
+EAPI="4"
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+       SCM="git-2"
+       EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git"
+fi
+
+inherit eutils flag-o-matic multilib 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 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+fi
+IUSE="
+       aac aacplus alsa amr bindist +bzip2 celt cpudetection debug dirac doc
+       +encode faac frei0r gsm +hardcoded-tables ieee1394 jack jpeg2k mp3 network
+       oss pic qt-faststart rtmp schroedinger sdl speex static-libs test theora
+       threads truetype 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:mmx2 ssse3"
+
+for i in ${CPU_FEATURES}; do
+       IUSE="${IUSE} ${i%:*}"
+done
+
+RDEPEND="
+       alsa? ( media-libs/alsa-lib )
+       amr? ( media-libs/opencore-amr )
+       bzip2? ( app-arch/bzip2 )
+       celt? ( >=media-libs/celt-0.11.1 )
+       dirac? ( media-video/dirac )
+       encode? (
+               aac? ( media-libs/vo-aacenc )
+               aacplus? ( media-libs/libaacplus )
+               amr? ( media-libs/vo-amrwbenc )
+               faac? ( media-libs/faac )
+               mp3? ( >=media-sound/lame-3.98.3 )
+               theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg )
+               vorbis? ( media-libs/libvorbis media-libs/libogg )
+               x264? ( >=media-libs/x264-0.0.20110426 )
+               xvid? ( >=media-libs/xvid-1.1.0 )
+       )
+       frei0r? ( media-plugins/frei0r-plugins )
+       gsm? ( >=media-sound/gsm-1.0.12-r1 )
+       ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
+       jack? ( media-sound/jack-audio-connection-kit )
+       jpeg2k? ( >=media-libs/openjpeg-1.3-r2 )
+       rtmp? ( >=media-video/rtmpdump-2.2f )
+       sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] )
+       schroedinger? ( media-libs/schroedinger )
+       speex? ( >=media-libs/speex-1.2_beta3 )
+       truetype? ( media-libs/freetype:2 )
+       vaapi? ( >=x11-libs/libva-0.32 )
+       vdpau? ( x11-libs/libvdpau )
+       vpx? ( >=media-libs/libvpx-0.9.6 )
+       X? ( x11-libs/libX11 x11-libs/libXext )
+       zlib? ( sys-libs/zlib )
+       !media-video/qt-faststart
+"
+
+DEPEND="${RDEPEND}
+       >=sys-devel/make-3.81
+       dirac? ( dev-util/pkgconfig )
+       doc? ( app-text/texi2html )
+       ieee1394? ( dev-util/pkgconfig )
+       mmx? ( dev-lang/yasm )
+       rtmp? ( dev-util/pkgconfig )
+       schroedinger? ( dev-util/pkgconfig )
+       test? ( net-misc/wget )
+       truetype? ( dev-util/pkgconfig )
+       v4l? ( sys-kernel/linux-headers )
+"
+# faac is license-incompatible with ffmpeg
+REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) )"
+
+S=${WORKDIR}/${P/_/-}
+
+src_prepare() {
+       if [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
+               export revision=git-N-${FFMPEG_REVISION}
+       fi
+}
+
+src_configure() {
+       local myconf="${EXTRA_FFMPEG_CONF}"
+       # Set to --enable-version3 if (L)GPL-3 is required
+       local version3=""
+
+       # enabled by default
+       for i in debug doc network vaapi vdpau zlib; do
+               use ${i} || myconf="${myconf} --disable-${i}"
+       done
+       use bzip2 || myconf="${myconf} --disable-bzlib"
+       use sdl || myconf="${myconf} --disable-ffplay"
+
+       use cpudetection && myconf="${myconf} --enable-runtime-cpudetect"
+
+       # Encoders
+       if use encode
+       then
+               use mp3 && myconf="${myconf} --enable-libmp3lame"
+               use aac && { myconf="${myconf} --enable-libvo-aacenc" ; version3=" --enable-version3" ; }
+               use amr && { myconf="${myconf} --enable-libvo-amrwbenc" ; version3=" --enable-version3" ; }
+               for i in theora vorbis x264 xvid; do
+                       use ${i} && myconf="${myconf} --enable-lib${i}"
+               done
+               use aacplus && myconf="${myconf} --enable-libaacplus --enable-nonfree"
+               use faac && myconf="${myconf} --enable-libfaac --enable-nonfree"
+       else
+               myconf="${myconf} --disable-encoders"
+       fi
+
+       # libavdevice options
+       use ieee1394 && myconf="${myconf} --enable-libdc1394"
+       # Indevs
+       # v4l1 is gone since linux-headers-2.6.38
+       myconf="${myconf} --disable-indev=v4l"
+       use v4l || myconf="${myconf} --disable-indev=v4l2"
+       for i in alsa oss jack ; do
+               use ${i} || myconf="${myconf} --disable-indev=${i}"
+       done
+       use X && myconf="${myconf} --enable-x11grab"
+       # Outdevs
+       for i in alsa oss ; do
+               use ${i} || myconf="${myconf} --disable-outdev=${i}"
+       done
+       # libavfilter options
+       use frei0r && myconf="${myconf} --enable-frei0r"
+       use truetype && myconf="${myconf} --enable-libfreetype"
+
+       # Threads; we only support pthread for now but ffmpeg supports more
+       use threads && myconf="${myconf} --enable-pthreads"
+
+       # Decoders
+       use amr && { myconf="${myconf} --enable-libopencore-amrwb --enable-libopencore-amrnb" ; version3=" --enable-version3" ; }
+       for i in celt gsm dirac rtmp schroedinger speex vpx; do
+               use ${i} && myconf="${myconf} --enable-lib${i}"
+       done
+       use jpeg2k && myconf="${myconf} --enable-libopenjpeg"
+
+       # CPU features
+       for i in ${CPU_FEATURES}; do
+               use ${i%:*} || myconf="${myconf} --disable-${i#*:}"
+       done
+       # disable mmx accelerated code if PIC is required
+       # as the provided asm decidedly is not PIC for x86.
+       if use pic && use x86 ; then
+               myconf="${myconf} --disable-mmx --disable-mmx2"
+       fi
+
+       # Option to force building pic
+       use pic && myconf="${myconf} --enable-pic"
+
+       # 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="${myconf} --cpu=${i}"
+               break
+       done
+
+       # Mandatory configuration
+       myconf="
+               --enable-gpl
+               ${version3}
+               --enable-postproc
+               --enable-avfilter
+               --disable-stripping
+               ${myconf}"
+
+       # cross compile support
+       if tc-is-cross-compiler ; then
+               myconf="${myconf} --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}-"
+               case ${CHOST} in
+                       *freebsd*)
+                               myconf="${myconf} --target-os=freebsd"
+                               ;;
+                       mingw32*)
+                               myconf="${myconf} --target-os=mingw32"
+                               ;;
+                       *linux*)
+                               myconf="${myconf} --target-os=linux"
+                               ;;
+               esac
+       fi
+
+       # Misc stuff
+       use hardcoded-tables && myconf="${myconf} --enable-hardcoded-tables"
+
+       # Specific workarounds for too-few-registers arch...
+       if [[ $(tc-arch) == "x86" ]]; then
+               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
+
+       cd "${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)" \
+               --disable-optimizations \
+               $(use_enable static-libs static) \
+               ${myconf} || die
+}
+
+src_compile() {
+       #252269
+       emake version.h
+       emake
+
+       if use qt-faststart; then
+               tc-export CC
+               emake -C tools qt-faststart
+       fi
+}
+
+src_install() {
+       emake DESTDIR="${D}" install install-man
+
+       dodoc README INSTALL
+       dodoc -r doc/*
+
+       if use qt-faststart; then
+               dobin tools/qt-faststart
+       fi
+}
+
+src_test() {
+       if use encode ; then
+               LD_LIBRARY_PATH="${S}/libpostproc:${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \
+                       emake test
+       else
+               ewarn "Tests fail without USE=encode, skipping"
+       fi
+}