git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@2897 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one
2011-04-21 15:50:49 +00:00
parent c209e291b5
commit cd98434459
33 changed files with 4324 additions and 7 deletions

View File

@@ -1,6 +1,9 @@
AUX avparser.patch 624 RMD160 87f9bd13d87e5560a36fe316e70e02fc0fa3a2c1 SHA1 3490a9f3553f6119eb1d16019f44c6ef36227453 SHA256 f5b1d3da4b007d28b6feca549260d82b0def7502353b7f7932d37852e64a37b3
AUX avutil_aes_sha_h.patch 1299 RMD160 fe7e1d94adb228d9d64f40c499db9f9382154515 SHA1 d5da6c76515782244bd3791194e0ac73d922d390 SHA256 e8c4f3701f6ff00a29c672594d3397507be81186a08862e11d4c976ebda3db93
DIST ffmpeg-0.6.90-rc0.tar.bz2 4531418 RMD160 5be99cc0242a3d7bf64622c082f0896460e90c66 SHA1 a5c898a220a7f2220a49a37c44d273d1775d081c SHA256 2e11fecba789fb2ee52e6fefbad07a026087b4b27df517fa0a6e31816f75c9f6
DIST ffmpeg-0.6_p25767.tar.bz2 4000052 RMD160 1463e744ca5f6e5535571efe19296f055ba870fb SHA1 219ecd5007eb030945556a7f279beae980a96543 SHA256 a6773c54b528d967f56811866b149ac980ad96f6c06a00e56987f7a48b4d9ff2
DIST ffmpeg-0.6_p28715.tar.bz2 4342986 RMD160 cd8a43d0337a3d66d7ca55682e3dab5a9537c302 SHA1 036afb71ce287d00d687f4935d898da9481f0933 SHA256 d664d4feb8e86da234721c0d509acfdb20a335716ea157904a898bb3e82cb56f
EBUILD ffmpeg-0.6.90_rc0-r2.ebuild 8077 RMD160 b9767aa9a8f493a93377d177d6f5ac240447bcb8 SHA1 031c07b7ec9fe2e4d0ce3369456c37b32b484605 SHA256 216412a2e36d8f756d121ea17395abd1ee21e6c621a3c1e50409238698038312
EBUILD ffmpeg-0.6.90_rc0.ebuild 7997 RMD160 fb37bb687fc1bdcea4f6b0f58da519a6c20d8f57 SHA1 ab46e6c81b81898d1fd2a2f8289f23105f936bd3 SHA256 8282fd65545920dc2a180a9e508ca76e71d932566978c987b6aa9b23eae5c13b
EBUILD ffmpeg-0.6_p25767.ebuild 8035 RMD160 176ad09a076b26b01c022e63a1a7d49f51af367e SHA1 c98efe3bd7b54eb16417845d293782f9c1f22e42 SHA256 cdebee41e6c51b89a58b8ec3d2a07a2f8b0798bdcbf903aa5c0d825904e179a2
EBUILD ffmpeg-0.6_p28715.ebuild 7947 RMD160 99997b2240874bb972357d50a454280a7e5f9f54 SHA1 f03e469cdaafa3fa34b0311ef75c92234e9ff0b9 SHA256 a3abb5c3177cc2480504d35c5652c75ec05561ed6d8d9a02be195f17bc04866e

View File

@@ -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.6.90_rc0-r2.ebuild,v 1.1 2011/04/13 12:48:00 aballier Exp $
EAPI="2"
SCM=""
if [ "${PV#9999}" != "${PV}" ] ; then
SCM="git"
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-3"
SLOT="0"
if [ "${PV#9999}" = "${PV}" ] ; then
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
fi
IUSE="
+3dnow +3dnowext alsa altivec amr avx bindist +bzip2 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 )
dirac? ( media-video/dirac )
encode? (
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.20101029 )
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 )
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
epatch "${FILESDIR}/avparser.patch" \
"${FILESDIR}/avutil_aes_sha_h.patch"
}
src_configure() {
local myconf="${EXTRA_FFMPEG_CONF}"
# 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"
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"
for i in 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
--enable-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)" \
--host-cc="$(tc-getCC)" \
--host-cflags="${CFLAGS}" \
--host-ldflags="${LDFLAGS}" \
$(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
for t in codectest lavftest seektest ; do
LD_LIBRARY_PATH="${S}/libavcore:${S}/libpostproc:${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \
emake ${t} || die "Some tests in ${t} failed"
done
else
ewarn "Tests fail without USE=encode, skipping"
fi
}

View File

@@ -0,0 +1,21 @@
commit 1f6265e011f6e56562b2f58c182bc0261062b3c4
Author: Brad <brad@comstyle.com>
Date: Wed Apr 6 17:41:12 2011 -0400
Fix parser: mark av_parser_parse() for removal on next major bump
Fix the breakage introduced with 9073ca6c6ebb9e3e9b60d968b7aa16cc8b6d558d
diff --git a/libavcodec/parser.c b/libavcodec/parser.c
index 0c69b91..3ba3e9c 100644
--- a/libavcodec/parser.c
+++ b/libavcodec/parser.c
@@ -105,7 +105,7 @@ void ff_fetch_timestamp(AVCodecParserContext *s, int off, int remove){
}
}
-#if LIBAVCODEC_VERSION_MINOR < 53
+#if LIBAVCODEC_VERSION_MAJOR < 53
/**
*
* @param buf input

View File

@@ -0,0 +1,28 @@
commit dc4103610520ae70d4989ffe3850dcf4deed54a9
Author: Alexis Ballier <aballier@gentoo.org>
Date: Thu Apr 7 10:19:23 2011 -0300
Install libavutil/{aes,sha}.h
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
diff --git a/libavutil/Makefile b/libavutil/Makefile
index 300acb1..baee496 100644
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -3,6 +3,7 @@ include $(SUBDIR)../config.mak
NAME = avutil
HEADERS = adler32.h \
+ aes.h \
attributes.h \
audioconvert.h \
avassert.h \
@@ -33,6 +34,7 @@ HEADERS = adler32.h \
random_seed.h \
rational.h \
samplefmt.h \
+ sha.h \
sha1.h \
BUILT_HEADERS = avconfig.h