commit: 47b93769612a49ea09cdae728b2489eeb0114862
Author: Felix Janda <felix.janda <AT> posteo <DOT> de>
AuthorDate: Sat Jun 14 05:37:08 2014 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Jun 14 18:05:41 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=47b93769
media-video/ffmpeg: add patch to expose strerror_r()
---
media-video/ffmpeg/ffmpeg-1.2.6-r99.ebuild | 305 +++++++++++++++++++++
.../ffmpeg/files/dirac_arith_hardened.patch | 36 +++
.../ffmpeg/files/ffmpeg-1.2.6-strerror_r.patch | 10 +
media-video/ffmpeg/metadata.xml | 64 +++++
4 files changed, 415 insertions(+)
diff --git a/media-video/ffmpeg/ffmpeg-1.2.6-r99.ebuild
b/media-video/ffmpeg/ffmpeg-1.2.6-r99.ebuild
new file mode 100644
index 0000000..fcd255e
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-1.2.6-r99.ebuild
@@ -0,0 +1,305 @@
+# 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.ebuild,v
1.12 2014/06/08 13:01:45 ago 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="amd64 arm ~mips x86"
+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 )
+ amr? ( media-libs/opencore-amr )
+ bluray? ( media-libs/libbluray )
+ bzip2? ( app-arch/bzip2 )
+ cdio? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal]
) )
+ 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 )
+ iconv? ( virtual/libiconv )
+ 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 )
+ libsoxr? ( media-libs/soxr )
+ 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 )
+ 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="bindist? ( encode? ( !faac !aacplus ) !openssl )
+ libv4l? ( v4l )
+ fftools_cws2fws? ( zlib )
+ test? ( encode )"
+
+S=${WORKDIR}/${P/_/-}
+BUILD_DIR=${S}_build
+
+src_prepare() {
+ if [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
+ export revision=git-N-${FFMPEG_REVISION}
+ fi
+
+ epatch "${FILESDIR}/dirac_arith_hardened.patch"
+ epatch "${FILESDIR}/${P}-strerror_r.patch" # for musl
+ epatch_user
+}
+
+src_configure() {
+ mkdir -p "${BUILD_DIR}"
+ cd "${BUILD_DIR}"
+
+ 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="${myconf} --enable-nonfree"
+
+ # Encoders
+ if use encode
+ then
+ ffuse="${ffuse} aac:libvo-aacenc amr:libvo-amrwbenc
mp3:libmp3lame fdk:libfdk-aac"
+ for i in aacplus faac theora twolame x264 xvid; do
+ ffuse="${ffuse} ${i}:lib${i}"
+ done
+
+ # Licensing.
+ if use aac || use amr ; then
+ myconf="${myconf} --enable-version3"
+ fi
+ if use aacplus || use faac || use fdk ; then
+ myconf="${myconf} --enable-nonfree"
+ fi
+ else
+ myconf="${myconf} --disable-encoders"
+ fi
+
+ # libavdevice options
+ ffuse="${ffuse} cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394
libcaca openal"
+
+ # Indevs
+ use v4l || myconf="${myconf} --disable-indev=v4l2"
+ for i in alsa oss jack ; do
+ use ${i} || myconf="${myconf} --disable-indev=${i}"
+ done
+ ffuse="${ffuse} libv4l:libv4l2 pulseaudio:libpulse X:x11grab"
+
+ # Outdevs
+ for i in alsa oss sdl ; do
+ use ${i} || myconf="${myconf} --disable-outdev=${i}"
+ done
+
+ # libavfilter options
+ ffuse="${ffuse} flite:libflite frei0r fontconfig libass
truetype:libfreetype"
+
+ # libswresample options
+ ffuse="${ffuse} libsoxr"
+
+ # Threads; we only support pthread for now but ffmpeg supports more
+ ffuse="${ffuse} threads:pthreads"
+
+ # Decoders
+ ffuse="${ffuse} amr:libopencore-amrwb amr:libopencore-amrnb
jpeg2k:libopenjpeg"
+ use amr && myconf="${myconf} --enable-version3"
+ for i in bluray celt gsm modplug opus rtmp schroedinger speex vorbis
vpx; do
+ ffuse="${ffuse} ${i}:lib${i}"
+ done
+
+ for i in ${ffuse} ; do
+ myconf="${myconf} $(use_enable ${i%:*} ${i#*:})"
+ done
+
+ # 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
+ --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
+
+ "${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() {
+ cd "${BUILD_DIR}"
+ emake V=1
+
+ for i in ${FFTOOLS} ; do
+ if use fftools_$i ; then
+ emake V=1 tools/$i
+ fi
+ done
+}
+
+src_install() {
+ cd "${BUILD_DIR}"
+ emake V=1 DESTDIR="${D}" install install-man
+
+ for i in ${FFTOOLS} ; do
+ if use fftools_$i ; then
+ dobin tools/$i
+ fi
+ done
+
+ cd "${S}"
+ 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
+}
+
+src_test() {
+ cd "${BUILD_DIR}"
+
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/dirac_arith_hardened.patch
b/media-video/ffmpeg/files/dirac_arith_hardened.patch
new file mode 100644
index 0000000..2661423
--- /dev/null
+++ b/media-video/ffmpeg/files/dirac_arith_hardened.patch
@@ -0,0 +1,36 @@
+commit d8ab7f31dd819f7b3e0d460a2fa4261aaae87b98
+Author: Anthoine Bourgeois <[email protected]>
+Date: Wed Apr 9 12:18:32 2014 +0200
+
+ avcodec/dirac_arith: Fix build with PIC and stack-check options
+
+ Fixes Ticket3540
+
+ The function dirac_get_arith_bit in libavcodec/dirac_arith.h can't be
+ built with PIC and check-stack because the asm code needs 6 registers
+ and PIC and check-stack options take 1 each and x86 is quite limited
+ in this area.
+
+ Signed-off-by: Michael Niedermayer <[email protected]>
+
+diff --git a/libavcodec/dirac_arith.h b/libavcodec/dirac_arith.h
+index f9a8bba..089c71a 100644
+--- a/libavcodec/dirac_arith.h
++++ b/libavcodec/dirac_arith.h
+@@ -28,6 +28,7 @@
+ #ifndef AVCODEC_DIRAC_ARITH_H
+ #define AVCODEC_DIRAC_ARITH_H
+
++#include "libavutil/x86/asm.h"
+ #include "bytestream.h"
+ #include "get_bits.h"
+
+@@ -134,7 +135,7 @@ static inline int dirac_get_arith_bit(DiracArith *c, int
ctx)
+
+ range_times_prob = (c->range * prob_zero) >> 16;
+
+-#if HAVE_FAST_CMOV && HAVE_INLINE_ASM
++#if HAVE_FAST_CMOV && HAVE_INLINE_ASM && HAVE_6REGS
+ low -= range_times_prob << 16;
+ range -= range_times_prob;
+ bit = 0;
diff --git a/media-video/ffmpeg/files/ffmpeg-1.2.6-strerror_r.patch
b/media-video/ffmpeg/files/ffmpeg-1.2.6-strerror_r.patch
new file mode 100644
index 0000000..bf0c8a5
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg-1.2.6-strerror_r.patch
@@ -0,0 +1,10 @@
+--- a/ffmpeg-1.2.6/libavutil/error.c
++++ b/ffmpeg-1.2.6/libavutil/error.c
+@@ -17,6 +17,7 @@
+ */
+
+ #undef _GNU_SOURCE
++#define _POSIX_SOURCE
+ #include "avutil.h"
+ #include "avstring.h"
+ #include "common.h"
diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
new file mode 100644
index 0000000..7406009
--- /dev/null
+++ b/media-video/ffmpeg/metadata.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
+<pkgmetadata>
+ <herd>video</herd>
+ <maintainer>
+ <email>[email protected]</email>
+ </maintainer>
+ <use>
+ <flag name="3dnowext">
+ Enable manually-optimised routines using the AMD 3DNow!Ex SIMD
+ instruction set, present in modern AMD CPUs. (Check for
+ 3dnowext in /proc/cpuinfo to know whether your CPU supports it).
+ </flag>
+ <flag name="aacplus">AAC+ encoding via
<pkg>media-libs/libaacplus</pkg>.</flag>
+ <flag name="amr">Enables Adaptive Multi-Rate Audio support</flag>
+ <flag name="amrenc">Enables Adaptive Multi-Rate Audio encoding support
with <pkg>media-libs/vo-amrwbenc</pkg>.</flag>
+ <flag name="armv5te">Enables optimizations for armv5te
processors.</flag>
+ <flag name="armv6">Enables optimizations for armv6 processors.</flag>
+ <flag name="armv6t2">Enables optimizations for armv6t2
processors.</flag>
+ <flag name="armvfp">Enables VFP optimizations for ARM processors.</flag>
+ <flag name="avx">Adds support for Advanced Vector Extensions instructions
(Intel Sandy Bridge, AMD Bulldozer and later chips)</flag>
+ <flag name="avx2">Adds support for Advanced Vector Extensions 2
instructions (Intel Haswell and later chips)</flag>
+ <flag name="bindist">Enforces license compatibility constraints via
REQUIRED_USE.</flag>
+ <flag name="bluray">Enable playback of Blu-ray filesystems</flag>
+ <flag name="cdio">Enables audio CD grabbing with
<pkg>dev-libs/libcdio</pkg>.</flag>
+ <flag name="celt">Adds Xiph CELT audio decoding support via
<pkg>media-libs/celt</pkg></flag>
+ <flag name="cpudetection">Enables runtime CPU detection (useful for
bindist, compatibility on other CPUs)</flag>
+ <flag name="dirac">Enable Dirac video support (an advanced royalty-free
video compression format) via the reference library: dirac.</flag>
+ <flag name="faac">Use external faac library for AAC encoding</flag>
+ <flag name="fdk">Use external fdk-aac library for AAC encoding</flag>
+ <flag name="flite">Adds a text-to-speech filter based on
<pkg>app-accessibility/flite</pkg>.</flag>
+ <flag name="fma3">Enables FMA3 optimizations: AMD processors starting
with Piledriver architecture and Intel Haswell based processors or later.</flag>
+ <flag name="fma4">Enables FMA4 optimizations: AMD processors starting
with Bulldozer architecture.</flag>
+ <flag name="frei0r">Enable frei0r wrapping in libavfilter</flag>
+ <flag name="gme">Enables support for <pkg>media-libs/game-music-emu</pkg>
for playing various video game music formats.</flag>
+ <flag name="hardcoded-tables">Use pre-calculated tables rather than
calculating them on the fly.</flag>
+ <flag name="iec61883"> Support for FireWire DV/HDV input device using
<pkg>media-libs/libiec61883</pkg>.</flag>
+ <flag name="libsoxr">Enables audio resampling through
<pkg>media-libs/soxr</pkg>.</flag>
+ <flag name="libv4l">Uses <pkg>media-libs/libv4l</pkg> for video4linux
instead of direct calls. Adds support for more devices via the userspace
library.</flag>
+ <flag name="mips32r2">Enables MIPS32R2 optimizations.</flag>
+ <flag name="mipsdspr1">Enables MIPS DSP ASE R1 optimizations.</flag>
+ <flag name="mipsdspr2">Enables MIPS DSP ASE R2 optimizations.</flag>
+ <flag name="mipsfpu">Enables floating point MIPS optimizations.</flag>
+ <flag name="mmxext">Enables mmx2 support</flag>
+ <flag name="network">Enables network streaming support</flag>
+ <flag name="openssl">Enables <pkg>dev-libs/openssl</pkg> support. Adds
support for encrypted network protocols (TLS/HTTPS).</flag>
+ <flag name="opus">Adds (decoding) support for the Opus codec via
<pkg>media-libs/opus</pkg>.</flag>
+ <flag name="pic">Force shared libraries to be built as PIC (this is
slower)</flag>
+ <flag name="quvi">Adds support for playing media from Internet services
using the quvi project.</flag>
+ <flag name="rtmp">Enable Real Time Messaging Protocol using librtmp</flag>
+ <flag name="schroedinger">Enable Dirac video support (an advanced
royalty-free video compression format) via libschroedinger (high-speed
implementation in C of the Dirac codec).</flag>
+ <flag name="ssh">Enable SSH/sftp support via
<pkg>net-libs/libssh</pkg>.</flag>
+ <flag name="sse4">Enables SSE4 optimizations: Intel Core
microarchitecture and AMD K10 or later.</flag>
+ <flag name="sse4_2">Enables SSE4.2 optimizations: Nehalem-based Intel
Core i7 or later.</flag>
+ <flag name="ssse3">Faster floating point optimization for SSSE3 capable
chips (Intel Core 2 and later chips)</flag>
+ <flag name="twolame">Enables MP2 encoding via
<pkg>media-sound/twolame</pkg> as an alternative to the internal encoder.</flag>
+ <flag name="vaapi">Enables VAAPI (Video Acceleration API) for hardware
decoding</flag>
+ <flag name="vis"> Adds support for SIMD optimizations for UltraSPARC
processors.</flag>
+ <flag name="vpx">Enables vp8 codec support using libvpx: Decoding vp8
does not require this to be enabled but libvpx can also be used for decoding;
encoding vp8 requires this useflag to be enabled though.</flag>
+ <flag name="webp">Enables WebP encoding with
<pkg>media-libs/libwebp</pkg>.</flag>
+ <flag name="x265">Enables HEVC encoding with
<pkg>media-libs/x265</pkg>.</flag>
+ <flag name="zvbi">Enables <pkg>media-libs/zvbi</pkg> based teletext
decoder.</flag>
+ </use>
+</pkgmetadata>
