From: Alexis Ballier Date: Sat, 30 Jul 2011 18:46:28 +0000 (+0000) Subject: version bump X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=25f475c0c137ccae64880940d661f8a1b98fa64c;p=gentoo.git version bump Package-Manager: portage-2.2.0_alpha49/cvs/Linux x86_64 --- diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index 661c13570590..30546f74c3bc 100644 --- a/media-video/ffmpeg/ChangeLog +++ b/media-video/ffmpeg/ChangeLog @@ -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.433 2011/07/10 19:24:56 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.434 2011/07/30 18:46:28 aballier Exp $ + +*ffmpeg-0.7.2 (30 Jul 2011) + + 30 Jul 2011; Alexis Ballier +ffmpeg-0.7.2.ebuild: + version bump 10 Jul 2011; Alexis Ballier -ffmpeg-0.6.ebuild, -ffmpeg-0.6_p25767.ebuild, -ffmpeg-0.6.90_rc0-r2.ebuild, diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index df19345e954a..18127f7eeed4 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -3,17 +3,19 @@ Hash: SHA1 DIST ffmpeg-0.7-rc1.tar.bz2 4782516 RMD160 26bad1c174e7b58a3bc207c6327d052670b53203 SHA1 d15c005f46483fbfc3b678cb1c89123762b56b82 SHA256 55703829d2bef30c5f294aee9a3a62beb772ca443fbbd688e79c6a0bd012aa1e DIST ffmpeg-0.7.1.tar.bz2 4555714 RMD160 6539f725d869b97a1821636bd1416312970a6457 SHA1 d006cf0fb61d654c0845240da868ecf3a94c043f SHA256 243a770661b52cfa57bd59ab20b417f13bf8d076887f3c32bce533cbf92dea03 +DIST ffmpeg-0.7.2.tar.bz2 4520731 RMD160 2dc4f1d087241e1d3e1cba85977fc9960e33e809 SHA1 1952e2fc30a55a1cfff0075aab5c527311f5c731 SHA256 657a1699f6bc4bf37f0c6bcd6068df95a709014e149b08c5bae228881e1aa8f0 DIST ffmpeg-0.8.tar.bz2 4551071 RMD160 766f6b8ccc556b0c76e1a238d63131dbe74537ab SHA1 461f87c4fc080e10ac0acc48287aaa706021bbc4 SHA256 3e26fdc317970386f96b27c9821890832ad2970b07e434a5bb27048d03e3fc0f EBUILD ffmpeg-0.7.1.ebuild 8228 RMD160 d2ed15125e1209a2e9b30238ed0f46933ddfc179 SHA1 c1a6310a25732312757d9bac4b270163767a7330 SHA256 36b56006fcb498c6c477d37bc78b80b374dd3c4676cf8170d2e3e1c32380f9fb +EBUILD ffmpeg-0.7.2.ebuild 8228 RMD160 9b54865a44cb3416bb35563deec2629f18877116 SHA1 9a333b9d4fa3fd29024c6eb5cd258907338f3322 SHA256 12ed87b67a319d6ab125d609306e566bf7b1d3054d02802185cc33330e232bb5 EBUILD ffmpeg-0.7_rc1.ebuild 8231 RMD160 b25976076ec15e196ce5d3decbe32e2e32bdc167 SHA1 0f36eff5f4523cace149e30c617f7b69b5376437 SHA256 bf591ef1bd97fbbb0679049b994258d4421f37988beb3908fb843ff189ab0d66 EBUILD ffmpeg-0.8.ebuild 8226 RMD160 6349d529b58cf1f697b9642341ebc8080f628e98 SHA1 cec32221f09a4d8bc8db7cef94584d1f6d2ba692 SHA256 8c21c8eca12256222db7fd95023ada817c48ba9759f98172a2f8530eae42f9a2 EBUILD ffmpeg-9999.ebuild 7866 RMD160 642380fe3c344ae4d68cccf0a94515f71bbd1a3b SHA1 9735b1a7d292a41b5a866f1964157b0586c3c653 SHA256 64799f19c14a07d4dd806103a7b7edff86caa453ee8be5b7c0c1008798d4b29b -MISC ChangeLog 63668 RMD160 f98b0bb36be3900ff9ebbdbb0506a74f8e616e5f SHA1 e67b97c0331c4f76b29fee62b11aa3f066955f00 SHA256 cb4eed137f93d50959d0b62e80dc0f9f3ba75d1705f7e41d92bc1b52ae686992 +MISC ChangeLog 63787 RMD160 c3e61f8d20c81a31809a92203a49e7ac807917c4 SHA1 063ca235030794c7e4c38e8e26a1449f1f3bb3da SHA256 5aaef4245301effaaed222761f2968441d22ded21600055db036847a78cc1094 MISC metadata.xml 2392 RMD160 d6b9637517d92d0e5cf3cfbaae03e8943ec18b5a SHA1 be7d39f5b5b055d55402001be15fdb62ac7cc7bc SHA256 1aaf56f994f078d196f64233f1fba25c5736ad4ab4459a38eb39c77c7b7c9575 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk4aJwUACgkQvFcC4BYPU0p6yACePvmtrSXlDooH6dQgtE3Giivc -kF4An0PoUElG5Oixr/HKOrK2vXYeK4Gd -=h1YF +iEYEARECAAYFAk40UYkACgkQvFcC4BYPU0qfBwCfWSy8FE2Q7WHSt0GWul2V6C5f +irgAnREFn+6RwXDCc5BfvBCBROJc6/k/ +=ZkrN -----END PGP SIGNATURE----- diff --git a/media-video/ffmpeg/ffmpeg-0.7.2.ebuild b/media-video/ffmpeg/ffmpeg-0.7.2.ebuild new file mode 100644 index 000000000000..c989257151c6 --- /dev/null +++ b/media-video/ffmpeg/ffmpeg-0.7.2.ebuild @@ -0,0 +1,276 @@ +# 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.7.2.ebuild,v 1.1 2011/07/30 18:46:28 aballier Exp $ + +EAPI="2" + +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 ~sparc ~x86 ~x86-fbsd" +fi +IUSE=" + +3dnow +3dnowext aac alsa altivec amr avx bindist +bzip2 celt cpudetection + custom-cflags debug dirac doc +encode faac frei0r gsm +hardcoded-tables + ieee1394 jack jpeg2k +mmx +mmxext mp3 network oss pic qt-faststart rtmp + schroedinger sdl speex +ssse3 static-libs test theora threads truetype v4l + v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib + " + +VIDEO_CARDS="nvidia" + +for x in ${VIDEO_CARDS}; do + IUSE="${IUSE} video_cards_${x}" +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 ) + 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 ) + video_cards_nvidia? ( 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 ) + mmx? ( dev-lang/yasm ) + rtmp? ( dev-util/pkgconfig ) + schroedinger? ( dev-util/pkgconfig ) + test? ( net-misc/wget ) + v4l? ( sys-kernel/linux-headers ) + v4l2? ( sys-kernel/linux-headers ) +" + +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 zlib; do + use ${i} || myconf="${myconf} --disable-${i}" + done + use bzip2 || myconf="${myconf} --disable-bzlib" + use sdl || myconf="${myconf} --disable-ffplay" + + use custom-cflags && myconf="${myconf} --disable-optimizations" + use cpudetection && myconf="${myconf} --enable-runtime-cpudetect" + + #for i in h264_vdpau mpeg1_vdpau mpeg_vdpau vc1_vdpau wmv3_vdpau; do + # use video_cards_nvidia || myconf="${myconf} --disable-decoder=${i}" + # use vdpau || myconf="${myconf} --disable-decoder=${i}" + #done + use video_cards_nvidia && use vdpau || myconf="${myconf} --disable-vdpau" + + # 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 + if use bindist + then + use faac && ewarn "faac is nonfree and cannot be distributed; + disabling faac support." + else + use faac && myconf="${myconf} --enable-libfaac --enable-nonfree" + fi + else + myconf="${myconf} --disable-encoders" + fi + + # libavdevice options + use ieee1394 && myconf="${myconf} --enable-libdc1394" + # Indevs + for i in v4l v4l2 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 mmx ssse3 altivec avx ; do + use ${i} || myconf="${myconf} --disable-${i}" + done + use mmxext || myconf="${myconf} --disable-mmx2" + use 3dnow || myconf="${myconf} --disable-amd3dnow" + use 3dnowext || myconf="${myconf} --disable-amd3dnowext" + # 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 + [[ ${i} = *-sse3 ]] && i="${i%-sse3}" # bug 283968 + 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=/usr \ + --libdir=/usr/$(get_libdir) \ + --shlibdir=/usr/$(get_libdir) \ + --mandir=/usr/share/man \ + --enable-shared \ + --cc="$(tc-getCC)" \ + $(use_enable static-libs static) \ + ${myconf} || die +} + +src_compile() { + emake version.h || die #252269 + emake || die + + if use qt-faststart; then + tc-export CC + emake -C tools qt-faststart || die + fi +} + +src_install() { + emake DESTDIR="${D}" install install-man || die + + dodoc Changelog README INSTALL + dodoc doc/* + + if use qt-faststart; then + dobin tools/qt-faststart || die + 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 || die "Some tests failed" + else + ewarn "Tests fail without USE=encode, skipping" + fi +}