summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-video/ffmpeg/ffmpeg-9999.ebuild')
-rw-r--r--media-video/ffmpeg/ffmpeg-9999.ebuild17
1 files changed, 11 insertions, 6 deletions
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 109b6f6..e99b9bc 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -8,7 +8,7 @@ ESVN_PROJECT="ffmpeg"
ESVN_REPO_URI="svn://svn.mplayerhq.hu/ffmpeg/trunk"
DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec."
-HOMEPAGE="http://ffmpeg.sourceforge.net/"
+HOMEPAGE="http://ffmpeg.org/"
MY_P=${P/_/-}
S=${WORKDIR}/ffmpeg
@@ -45,6 +45,7 @@ src_unpack() {
unpack ${A}
subversion_src_unpack
+ # amr (float) support
if use amr; then
einfo "Including amr wide and narrow band (float) support ... "
@@ -68,6 +69,10 @@ src_unpack() {
# for some reason it tries to #include <X11/Xlib.h>, but doesn't use it
sed -i s:\#define\ HAVE_X11:\#define\ HAVE_LINUX: ffplay.c
+ # .pc files contain wrong libdir path
+ epatch "${FILESDIR}"/${PN}-libdir-2007.patch
+ sed -i -e "s:GENTOOLIBDIR:$(get_libdir):" configure
+
# Make it use pic always since we don't need textrels
sed -i -e "s:LIBOBJFLAGS=\"\":LIBOBJFLAGS=\'\$\(PIC\)\':" configure
@@ -75,7 +80,7 @@ src_unpack() {
sed -i -e "s:-e debug=off::" tests/server-regression.sh
# CC is not always gcc
- sed -i -e "s:cc=\"gcc\":cc=\"$(tc-getCC)\":" configure
+# sed -i -e "s:cc=\"gcc\":cc=\"$(tc-getCC)\":" configure
epatch "${FILESDIR}/${PN}-shared-gcc4.1.patch"
}
@@ -88,7 +93,7 @@ src_compile() {
#disable mmx accelerated code if not requested, or if PIC is required
# as the provided asm decidedly is not PIC.
- if ( gcc-specs-pie || ! use mmx ) && ( ! use amd64 ); then
+ if ( gcc-specs-pie || ! use mmx ) ; then
myconf="${myconf} --disable-mmx"
fi
@@ -105,20 +110,20 @@ src_compile() {
myconf="${myconf} --disable-opts"
# disabled by default
- use encode && myconf="${myconf} --enable-mp3lame"
+ use encode && myconf="${myconf} --enable-libmp3lame"
use a52 && myconf="${myconf} --enable-a52"
use ieee1394 && myconf="${myconf} --enable-dc1394"
use threads && myconf="${myconf} --enable-pthreads"
use xvid && myconf="${myconf} --enable-xvid"
if use vorbis
then
- myconf="${myconf} --enable-vorbis --enable-libogg"
+ myconf="${myconf} --enable-libvorbis --enable-libogg"
else
use ogg && myconf="${myconf} --enable-libogg"
fi
use dts && myconf="${myconf} --enable-dts"
use x264 && myconf="${myconf} --enable-x264"
- use aac && myconf="${myconf} --enable-faad --enable-faac"
+ use aac && myconf="${myconf} --enable-libfaad --enable-libfaac"
use amr && myconf="${myconf} --enable-amr_nb --enable-amr_wb"
myconf="${myconf} --enable-gpl --enable-pp --disable-strip"