diff options
author | 2015-07-21 09:22:27 +0000 | |
---|---|---|
committer | 2015-07-21 09:22:27 +0000 | |
commit | 6aa984e1acc3c957d36efd383be6f62821d9052b (patch) | |
tree | 379ea99a265899e8901563d9163fb75b5ecbd512 /media-video | |
parent | version bump (diff) | |
download | gentoo-2-6aa984e1acc3c957d36efd383be6f62821d9052b.tar.gz gentoo-2-6aa984e1acc3c957d36efd383be6f62821d9052b.tar.bz2 gentoo-2-6aa984e1acc3c957d36efd383be6f62821d9052b.zip |
remove versions upstream dropped maintainance
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'media-video')
-rw-r--r-- | media-video/ffmpeg/ChangeLog | 8 | ||||
-rw-r--r-- | media-video/ffmpeg/ffmpeg-0.10.16.ebuild | 274 | ||||
-rw-r--r-- | media-video/ffmpeg/ffmpeg-1.0.10.ebuild | 310 | ||||
-rw-r--r-- | media-video/ffmpeg/ffmpeg-1.2.12.ebuild | 338 | ||||
-rw-r--r-- | media-video/ffmpeg/files/ffmpeg-1.0.8-freetype251.patch | 51 | ||||
-rw-r--r-- | media-video/ffmpeg/files/flashtest.patch | 47 | ||||
-rw-r--r-- | media-video/ffmpeg/files/freiordl.patch | 20 |
7 files changed, 7 insertions, 1041 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index 50870e9f46d3..a7d32bcbe024 100644 --- a/media-video/ffmpeg/ChangeLog +++ b/media-video/ffmpeg/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-video/ffmpeg # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.876 2015/07/21 09:19:54 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.877 2015/07/21 09:22:27 aballier Exp $ + + 21 Jul 2015; Alexis Ballier <aballier@gentoo.org> -ffmpeg-0.10.16.ebuild, + -ffmpeg-1.0.10.ebuild, -ffmpeg-1.2.12.ebuild, + -files/ffmpeg-1.0.8-freetype251.patch, -files/flashtest.patch, + -files/freiordl.patch: + remove versions upstream dropped maintainance *ffmpeg-2.7.2 (21 Jul 2015) diff --git a/media-video/ffmpeg/ffmpeg-0.10.16.ebuild b/media-video/ffmpeg/ffmpeg-0.10.16.ebuild deleted file mode 100644 index 77ce4576deca..000000000000 --- a/media-video/ffmpeg/ffmpeg-0.10.16.ebuild +++ /dev/null @@ -1,274 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.10.16.ebuild,v 1.1 2015/03/12 22:08:11 aballier Exp $ - -EAPI="5" - -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} multilib-minimal - -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.10" -if [ "${PV#9999}" = "${PV}" ] ; then - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" -fi -IUSE=" - aac aacplus alsa amr +bzip2 cdio celt cpudetection debug - dirac doc +encode faac frei0r gnutls gsm +hardcoded-tables ieee1394 jack - jpeg2k libass libv4l modplug mp3 +network openal openssl oss pic pulseaudio - 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="cpu_flags_x86_3dnow:amd3dnow cpu_flags_x86_3dnowext:amd3dnowext altivec cpu_flags_x86_avx:avx cpu_flags_x86_mmx:mmx cpu_flags_x86_mmxext:mmx2 cpu_flags_x86_ssse3:ssse3 vis neon" - -for i in ${CPU_FEATURES}; do - IUSE="${IUSE} ${i%:*}" -done - -DOCS="" - -RDEPEND=" - 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}] ) - celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] ) - dirac? ( >=media-video/dirac-1.0.2-r1[${MULTILIB_USEDEP}] ) - encode? ( - aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] ) - aacplus? ( >=media-libs/libaacplus-2.0.2-r1[${MULTILIB_USEDEP}] ) - amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] ) - faac? ( >=media-libs/faac-1.28-r3[${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}] ) - x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] ) - xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] ) - ) - frei0r? ( media-plugins/frei0r-plugins[${MULTILIB_USEDEP}] ) - gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] ) - 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}] ) - libass? ( >=media-libs/libass-0.10.2[${MULTILIB_USEDEP}] ) - libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] ) - modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] ) - openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] ) - openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) - pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) - rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] ) - schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] ) - sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] ) - speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] ) - truetype? ( >=media-libs/freetype-2.5.0.1:2[${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}] ) - !<media-video/ffmpeg-1.2 - !<media-video/libav-9 - abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r11 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" -# !media-libs/libpostproc - -DEPEND="${RDEPEND} - >=sys-devel/make-3.81 - dirac? ( virtual/pkgconfig ) - doc? ( app-text/texi2html ) - gnutls? ( virtual/pkgconfig ) - ieee1394? ( virtual/pkgconfig ) - libv4l? ( virtual/pkgconfig ) - cpu_flags_x86_mmx? ( dev-lang/yasm ) - rtmp? ( virtual/pkgconfig ) - schroedinger? ( virtual/pkgconfig ) - test? ( net-misc/wget ) - truetype? ( virtual/pkgconfig ) - v4l? ( sys-kernel/linux-headers ) -" -# faac is license-incompatible with ffmpeg -REQUIRED_USE=" - libv4l? ( v4l ) - test? ( encode zlib )" -RESTRICT="encode? ( faac? ( bindist ) aacplus? ( bindist ) ) openssl? ( bindist )" - -S=${WORKDIR}/${P/_/-} - -pkg_setup() { - ewarn "This version is _terribly_ outdated with known security issues and" - ewarn "bugs. It is provided only for binary compatibility." - ewarn "Use at your own risks." -} - -src_prepare() { - if [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot - export revision=git-N-${FFMPEG_REVISION} - fi - epatch "${FILESDIR}/freiordl.patch" - epatch "${FILESDIR}/flashtest.patch" - - if has_version dev-libs/libcdio-paranoia; then - sed -i \ - -e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \ - -e 's:cdio/paranoia.h:cdio/paranoia/paranoia.h:' \ - configure libavdevice/libcdio.c || die - fi -} - -multilib_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 cpudetection && myconf="${myconf} --enable-runtime-cpudetect" - use openssl && myconf="${myconf} --enable-openssl --enable-nonfree" - for i in gnutls ; do - use $i && myconf="${myconf} --enable-$i" - done - - # 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 cdio && myconf="${myconf} --enable-libcdio" - use ieee1394 && myconf="${myconf} --enable-libdc1394" - use openal && myconf="${myconf} --enable-openal" - # 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" - use pulseaudio && myconf="${myconf} --enable-libpulse" - use libv4l && myconf="${myconf} --enable-libv4l2" - # Outdevs - for i in alsa oss sdl ; do - use ${i} || myconf="${myconf} --disable-outdev=${i}" - done - # libavfilter options - use frei0r && myconf="${myconf} --enable-frei0r" - use truetype && myconf="${myconf} --enable-libfreetype" - use libass && myconf="${myconf} --enable-libass" - - # 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 modplug 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 - if use pic ; then - myconf="${myconf} --enable-pic" - # disable asm code if PIC is required - # as the provided asm decidedly is not PIC for x86. - [[ ${ABI} == x86* ]] && myconf="${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="${myconf} --cpu=${i}" - break - done - - # Mandatory configuration - myconf=" - --enable-gpl - ${version3} - --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" - - "${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}" \ - --disable-static \ - --disable-{ffplay,ffmpeg,ffprobe,ffserver} \ - --disable-{swresample,postproc,swscale,avdevice} \ - ${myconf} || die -} - -multilib_src_install() { - emake DESTDIR="${D}" install-libs - rm -f "${ED}"/usr/$(get_libdir)/*.so -} diff --git a/media-video/ffmpeg/ffmpeg-1.0.10.ebuild b/media-video/ffmpeg/ffmpeg-1.0.10.ebuild deleted file mode 100644 index 5369f2803180..000000000000 --- a/media-video/ffmpeg/ffmpeg-1.0.10.ebuild +++ /dev/null @@ -1,310 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.0.10.ebuild,v 1.5 2015/03/05 14:00:41 aballier 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 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 bluray +bzip2 cdio celt - cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r - gnutls gsm +hardcoded-tables iec61883 ieee1394 jack jpeg2k libass libcaca - 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="cpu_flags_x86_3dnow:amd3dnow cpu_flags_x86_3dnowext:amd3dnowext altivec cpu_flags_x86_avx:avx cpu_flags_x86_mmx:mmx cpu_flags_x86_mmxext:mmxext cpu_flags_x86_ssse3:ssse3 vis neon" - -for i in ${CPU_FEATURES}; do - IUSE="${IUSE} ${i%:*}" -done - -FFTOOLS="aviocat cws2fws ffeval fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart trasher" - -for i in ${FFTOOLS}; do - IUSE="${IUSE} +fftools_$i" -done - -RDEPEND=" - alsa? ( media-libs/alsa-lib ) - amr? ( media-libs/opencore-amr ) - bluray? ( media-libs/libbluray ) - bzip2? ( app-arch/bzip2 ) - cdio? ( dev-libs/libcdio-paranoia ) - celt? ( >=media-libs/celt-0.11.1 ) - encode? ( - aac? ( media-libs/vo-aacenc ) - aacplus? ( media-libs/libaacplus ) - amr? ( media-libs/vo-amrwbenc ) - faac? ( media-libs/faac ) - fdk? ( media-libs/fdk-aac ) - mp3? ( >=media-sound/lame-3.98.3 ) - theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg ) - twolame? ( media-sound/twolame ) - x264? ( >=media-libs/x264-0.0.20111017 ) - xvid? ( >=media-libs/xvid-1.1.0 ) - ) - flite? ( app-accessibility/flite ) - fontconfig? ( media-libs/fontconfig ) - frei0r? ( media-plugins/frei0r-plugins ) - gnutls? ( >=net-libs/gnutls-2.12.16 ) - gsm? ( >=media-sound/gsm-1.0.12-r1 ) - iec61883? ( media-libs/libiec61883 sys-libs/libraw1394 sys-libs/libavc1394 ) - ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) - jack? ( media-sound/jack-audio-connection-kit ) - jpeg2k? ( >=media-libs/openjpeg-1.3-r2:0 ) - libass? ( media-libs/libass ) - libcaca? ( media-libs/libcaca ) - libv4l? ( media-libs/libv4l ) - modplug? ( media-libs/libmodplug ) - openal? ( >=media-libs/openal-1.1 ) - openssl? ( dev-libs/openssl ) - opus? ( media-libs/opus ) - pulseaudio? ( media-sound/pulseaudio ) - rtmp? ( >=media-video/rtmpdump-2.2f ) - sdl? ( >=media-libs/libsdl-1.2.13-r1[sound,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 ) - vorbis? ( media-libs/libvorbis media-libs/libogg ) - vpx? ( >=media-libs/libvpx-0.9.6 ) - X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) - zlib? ( sys-libs/zlib ) - !media-video/qt-faststart - !media-libs/libpostproc -" - -DEPEND="${RDEPEND} - >=sys-devel/make-3.81 - doc? ( app-text/texi2html ) - fontconfig? ( virtual/pkgconfig ) - gnutls? ( virtual/pkgconfig ) - ieee1394? ( virtual/pkgconfig ) - libv4l? ( virtual/pkgconfig ) - cpu_flags_x86_mmx? ( dev-lang/yasm ) - rtmp? ( virtual/pkgconfig ) - schroedinger? ( virtual/pkgconfig ) - test? ( net-misc/wget ) - truetype? ( virtual/pkgconfig ) - v4l? ( sys-kernel/linux-headers ) -" -REQUIRED_USE=" - libv4l? ( v4l ) - fftools_cws2fws? ( zlib ) - test? ( encode )" -# faac is license-incompatible with ffmpeg -RESTRICT="encode? ( faac? ( bindist ) aacplus? ( bindist ) ) openssl? ( bindist )" - -S=${WORKDIR}/${P/_/-} - -src_prepare() { - if [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot - export revision=git-N-${FFMPEG_REVISION} - fi - - sed -i \ - -e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \ - -e 's:cdio/paranoia.h:cdio/paranoia/paranoia.h:' \ - configure libavdevice/libcdio.c || die - - epatch "${FILESDIR}"/${PN}-1.0.8-freetype251.patch -} - -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} --disable-runtime-cpudetect" - use openssl && myconf="${myconf} --enable-openssl --enable-nonfree" - for i in gnutls ; do - use $i && myconf="${myconf} --enable-$i" - done - - # 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 twolame 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" - use fdk && myconf="${myconf} --enable-libfdk-aac --enable-nonfree" - else - myconf="${myconf} --disable-encoders" - fi - - # libavdevice options - for i in cdio iec61883 ; do - use ${i} && myconf="${myconf} --enable-lib${i}" - done - use ieee1394 && myconf="${myconf} --enable-libdc1394" - use libcaca && myconf="${myconf} --enable-libcaca" - use openal && myconf="${myconf} --enable-openal" - # Indevs - 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" - use pulseaudio && myconf="${myconf} --enable-libpulse" - use libv4l && myconf="${myconf} --enable-libv4l2" - # Outdevs - for i in alsa oss sdl ; do - use ${i} || myconf="${myconf} --disable-outdev=${i}" - done - # libavfilter options - for i in frei0r fontconfig libass ; do - use ${i} && myconf="${myconf} --enable-${i}" - done - use truetype && myconf="${myconf} --enable-libfreetype" - use flite && myconf="${myconf} --enable-libflite" - - # 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 bluray celt gsm modplug opus rtmp schroedinger speex vorbis 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 - if use pic ; then - myconf="${myconf} --enable-pic" - # disable asm code if PIC is required - # as the provided asm decidedly is not PIC for x86. - use x86 && myconf="${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="${myconf} --cpu=${i}" - break - done - - # Mandatory configuration - myconf=" - --enable-gpl - ${version3} - --enable-postproc - --enable-avfilter - --enable-avresample - --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" - - 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)" \ - --cxx="$(tc-getCXX)" \ - --ar="$(tc-getAR)" \ - --optflags="${CFLAGS}" \ - --extra-cflags="${CFLAGS}" \ - --extra-cxxflags="${CXXFLAGS}" \ - $(use_enable static-libs static) \ - ${myconf} || die -} - -src_compile() { - emake V=1 - - for i in ${FFTOOLS} ; do - if use fftools_$i ; then - emake V=1 tools/$i - fi - done -} - -src_install() { - emake V=1 DESTDIR="${D}" install install-man - - dodoc Changelog README CREDITS doc/*.txt doc/APIchanges doc/RELEASE_NOTES - use doc && dohtml -r doc/* - if use examples ; then - insinto "/usr/share/doc/${PF}/examples" - doins -r doc/examples/* - fi - - for i in ${FFTOOLS} ; do - if use fftools_$i ; then - dobin tools/$i - fi - done -} - -src_test() { - LD_LIBRARY_PATH="${S}/libpostproc:${S}/libswscale:${S}/libswresample:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil:${S}/libavresample" \ - emake V=1 fate -} diff --git a/media-video/ffmpeg/ffmpeg-1.2.12.ebuild b/media-video/ffmpeg/ffmpeg-1.2.12.ebuild deleted file mode 100644 index 3267e703107a..000000000000 --- a/media-video/ffmpeg/ffmpeg-1.2.12.ebuild +++ /dev/null @@ -1,338 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.12.ebuild,v 1.3 2015/03/05 14:00:41 aballier 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 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="cpu_flags_x86_3dnow:amd3dnow cpu_flags_x86_3dnowext:amd3dnowext altivec cpu_flags_x86_avx:avx cpu_flags_x86_mmx:mmx cpu_flags_x86_mmxext:mmxext cpu_flags_x86_ssse3: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-1.0.27.2[${MULTILIB_USEDEP}] ) - amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] ) - bluray? ( >=media-libs/libbluray-0.3.0-r1[${MULTILIB_USEDEP}] ) - bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) - cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] ) - celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] ) - encode? ( - aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] ) - aacplus? ( >=media-libs/libaacplus-2.0.2-r1[${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[${MULTILIB_USEDEP},encode] - >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] - ) - twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] ) - x264? ( >=media-libs/x264-0.0.20130506[${MULTILIB_USEDEP}] ) - xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] ) - ) - flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] ) - fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] ) - frei0r? ( media-plugins/frei0r-plugins ) - gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] ) - gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] ) - iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] ) - iec61883? ( - >=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}] - >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}] - >=sys-libs/libavc1394-0.5.4-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}] ) - libass? ( >=media-libs/libass-0.10.2[${MULTILIB_USEDEP}] ) - libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] ) - libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] ) - libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] ) - modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] ) - openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] ) - openssl? ( >=dev-libs/openssl-1.0.1h-r2[${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}] ) - 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}] ) - vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] ) - vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] ) - vorbis? ( - >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] - >=media-libs/libogg-1.3.0[${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}] ) - !media-video/qt-faststart - !media-libs/libpostproc -" - -DEPEND="${RDEPEND} - >=sys-devel/make-3.81 - doc? ( app-text/texi2html ) - fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) - gnutls? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) - ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) - libv4l? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) - cpu_flags_x86_mmx? ( dev-lang/yasm ) - rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) - schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) - test? ( net-misc/wget ) - truetype? ( >=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(-)] )" - -REQUIRED_USE=" - libv4l? ( v4l ) - fftools_cws2fws? ( zlib ) - test? ( encode )" -# faac is license-incompatible with ffmpeg -RESTRICT="encode? ( faac? ( bindist ) aacplus? ( bindist ) ) openssl? ( bindist )" - -S=${WORKDIR}/${P/_/-} - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/libavutil/avconfig.h -) - -src_prepare() { - if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot - export revision=git-N-${FFMPEG_REVISION} - fi - - 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 - - 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)" \ - --cxx="$(tc-getCXX)" \ - --ar="$(tc-getAR)" \ - --optflags="${CFLAGS}" \ - --extra-cflags="${CFLAGS}" \ - --extra-cxxflags="${CXXFLAGS}" \ - $(use_enable static-libs static) \ - "${myconf[@]}" - echo "${@}" - "${@}" || 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 -} diff --git a/media-video/ffmpeg/files/ffmpeg-1.0.8-freetype251.patch b/media-video/ffmpeg/files/ffmpeg-1.0.8-freetype251.patch deleted file mode 100644 index cb7cc0d59c03..000000000000 --- a/media-video/ffmpeg/files/ffmpeg-1.0.8-freetype251.patch +++ /dev/null @@ -1,51 +0,0 @@ -Patch based on -http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=cea5812fa723c08b89d929eeba73462e05de2973 - ---- ffmpeg-1.0.8/configure -+++ ffmpeg-1.0.8/configure -@@ -1025,6 +1025,26 @@ - add_extralibs $(get_safe ${pkg}_libs) - } - -+require_libfreetype(){ -+ log require_libfreetype "$@" -+ pkg="freetype2" -+ check_cmd $pkg_config --exists --print-errors $pkg \ -+ || die "ERROR: $pkg not found" -+ pkg_cflags=$($pkg_config --cflags $pkg) -+ pkg_libs=$($pkg_config --libs $pkg) -+ { -+ echo "#include <ft2build.h>" -+ echo "#include FT_FREETYPE_H" -+ echo "long check_func(void) { return (long) FT_Init_FreeType; }" -+ echo "int main(void) { return 0; }" -+ } | check_ld "cc" $pkg_cflags $pkg_libs \ -+ && set_safe ${pkg}_cflags $pkg_cflags \ -+ && set_safe ${pkg}_libs $pkg_libs \ -+ || die "ERROR: $pkg not found" -+ add_cflags $(get_safe ${pkg}_cflags) -+ add_extralibs $(get_safe ${pkg}_libs) -+} -+ - hostcc_o(){ - eval printf '%s\\n' $HOSTCC_O - } -@@ -3646,7 +3666,7 @@ - enabled libfdk_aac && require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac - flite_libs="-lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal -lflite_cmu_us_kal16 -lflite_cmu_us_rms -lflite_cmu_us_slt -lflite_usenglish -lflite_cmulex -lflite" - enabled libflite && require2 libflite "flite/flite.h" flite_init $flite_libs --enabled libfreetype && require_pkg_config freetype2 "ft2build.h freetype/freetype.h" FT_Init_FreeType -+enabled libfreetype && require_libfreetype - enabled libgsm && require libgsm gsm/gsm.h gsm_create -lgsm - enabled libilbc && require libilbc ilbc.h WebRtcIlbcfix_InitDecode -lilbc - enabled libmodplug && require libmodplug libmodplug/modplug.h ModPlug_Load -lmodplug ---- ffmpeg-1.0.8/libavfilter/vf_drawtext.c -+++ ffmpeg-1.0.8/libavfilter/vf_drawtext.c -@@ -49,7 +49,6 @@ - #undef time - - #include <ft2build.h> --#include <freetype/config/ftheader.h> - #include FT_FREETYPE_H - #include FT_GLYPH_H - #if CONFIG_FONTCONFIG diff --git a/media-video/ffmpeg/files/flashtest.patch b/media-video/ffmpeg/files/flashtest.patch deleted file mode 100644 index b15e799df396..000000000000 --- a/media-video/ffmpeg/files/flashtest.patch +++ /dev/null @@ -1,47 +0,0 @@ -commit 785d8a3868fdd965299cd6e230803906b047eee0 -Author: Clément Bœsch <ubitux@gmail.com> -Date: Fri Feb 3 20:28:32 2012 +0100 - - fate: use compression level 0 for flashsv2 tests. - - Output sizes mismatch (and thus MD5) between zlib version 1.2.5 and - 1.2.6 if compression level > 0. The issue doesn't affect the intra-only - tests. - -diff --git a/tests/codec-regression.sh b/tests/codec-regression.sh -index b8d27cb..87db24f 100755 ---- a/tests/codec-regression.sh -+++ b/tests/codec-regression.sh -@@ -294,7 +294,7 @@ do_video_decoding "" "-pix_fmt yuv420p -sws_flags area+accurate_rnd+bitexact" - fi - - if [ -n "$do_flashsv2" ] ; then --do_video_encoding flashsv2.flv "-an -vcodec flashsv2 -sws_flags neighbor+full_chroma_int+accurate_rnd+bitexact -strict experimental" -+do_video_encoding flashsv2.flv "-an -vcodec flashsv2 -sws_flags neighbor+full_chroma_int+accurate_rnd+bitexact -strict experimental -compression_level 0" - do_video_encoding flashsv2I.flv "-an -vcodec flashsv2 -sws_flags neighbor+full_chroma_int+accurate_rnd+bitexact -strict experimental -g 1" - do_video_decoding "" "-pix_fmt yuv420p -sws_flags area+accurate_rnd+bitexact" - fi -diff --git a/tests/ref/vsynth1/flashsv2 b/tests/ref/vsynth1/flashsv2 -index 6c43bda..58e2e8f 100644 ---- a/tests/ref/vsynth1/flashsv2 -+++ b/tests/ref/vsynth1/flashsv2 -@@ -1,5 +1,5 @@ --ec13d68cbce263f589fe79bcd2e98364 *./tests/data/vsynth1/flashsv2.flv --8406137 ./tests/data/vsynth1/flashsv2.flv -+8d105780bb79915bc36f96f7a754f289 *./tests/data/vsynth1/flashsv2.flv -+9371095 ./tests/data/vsynth1/flashsv2.flv - ed28c0021768629b2675e72bf1632426 *./tests/data/vsynth1/flashsv2I.flv - 8755723 ./tests/data/vsynth1/flashsv2I.flv - efa88d09115a2e947eff00ee435ba3f3 *./tests/data/flashsv2.vsynth1.out.yuv -diff --git a/tests/ref/vsynth2/flashsv2 b/tests/ref/vsynth2/flashsv2 -index b40988a..7102308 100644 ---- a/tests/ref/vsynth2/flashsv2 -+++ b/tests/ref/vsynth2/flashsv2 -@@ -1,5 +1,5 @@ --6fbb1cf84d473a93035047c3a3e344ff *./tests/data/vsynth2/flashsv2.flv --4814443 ./tests/data/vsynth2/flashsv2.flv -+3f4a7454fa664896ac7532e3551c4071 *./tests/data/vsynth2/flashsv2.flv -+9293862 ./tests/data/vsynth2/flashsv2.flv - d5a22183d9fe670174340a8a1847e52a *./tests/data/vsynth2/flashsv2I.flv - 5037122 ./tests/data/vsynth2/flashsv2I.flv - 8f63e24049ba1789a7f8353c695a3d99 *./tests/data/flashsv2.vsynth2.out.yuv diff --git a/media-video/ffmpeg/files/freiordl.patch b/media-video/ffmpeg/files/freiordl.patch deleted file mode 100644 index 1b89ef24dab1..000000000000 --- a/media-video/ffmpeg/files/freiordl.patch +++ /dev/null @@ -1,20 +0,0 @@ -commit cfec77aaf8186f556e1201be13ce487b99b3b831 -Author: Anton Khirnov <anton@khirnov.net> -Date: Sun Apr 1 18:56:26 2012 +0200 - - configure: add dl to frei0r extralibs. - -diff --git a/configure b/configure -index 4606b23..e207ed8 100755 ---- a/configure -+++ b/configure -@@ -1526,7 +1526,9 @@ cropdetect_filter_deps="gpl" - delogo_filter_deps="gpl" - drawtext_filter_deps="libfreetype" - frei0r_filter_deps="frei0r dlopen" -+frei0r_filter_extralibs='$ldl' - frei0r_src_filter_deps="frei0r dlopen" -+frei0r_src_filter_extralibs='$ldl' - hqdn3d_filter_deps="gpl" - ocv_filter_deps="libopencv" - scale_filter_deps="swscale" |