aboutsummaryrefslogtreecommitdiffstats
path: root/packages/ffmpeg
diff options
context:
space:
mode:
authorStelios Koroneos <skoroneos@digital-opsis.com>2008-08-24 10:15:33 +0000
committerStelios Koroneos <skoroneos@digital-opsis.com>2008-08-24 10:15:33 +0000
commitc4e8f04b905425b714041149e74fb7d3492e41a3 (patch)
tree85c2bac6533d80b3443709ee8a8960a18b51bfd0 /packages/ffmpeg
parent5f33e9306c4812d1c98921be591f8c3a6ded8e7e (diff)
downloadopenembedded-c4e8f04b905425b714041149e74fb7d3492e41a3.tar.gz
packages/ffmpeg/ffmpeg_0.4.9-pre1.bb : Disable mmx for x86
Add core-utils to the depends list as build fails during ffmpeg's install/stip stage
Diffstat (limited to 'packages/ffmpeg')
-rw-r--r--packages/ffmpeg/ffmpeg.inc2
-rw-r--r--packages/ffmpeg/ffmpeg_0.4.9-pre1.bb11
2 files changed, 10 insertions, 3 deletions
diff --git a/packages/ffmpeg/ffmpeg.inc b/packages/ffmpeg/ffmpeg.inc
index aab2c62fa9..6316b4e26e 100644
--- a/packages/ffmpeg/ffmpeg.inc
+++ b/packages/ffmpeg/ffmpeg.inc
@@ -5,7 +5,7 @@ SECTION = "libs"
PRIORITY = "optional"
LICENSE = "LGPL"
-DEPENDS = "zlib libogg libvorbis faac faad2 liba52 lame"
+DEPENDS = "coreutils-native zlib libogg libvorbis faac faad2 liba52 lame"
RSUGGESTS = "mplayer"
inherit autotools pkgconfig
diff --git a/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb b/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb
index 6df6d89ca0..f2d5a928aa 100644
--- a/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb
+++ b/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb
@@ -1,11 +1,13 @@
require ffmpeg.inc
-PR = "r3"
+PR = "r5"
SRC_URI = "${SOURCEFORGE_MIRROR}/ffmpeg/ffmpeg-${PV}.tar.gz \
file://configure.patch;patch=0 \
file://gcc4.patch;patch=1 \
file://soname.patch;patch=1 \
+ file://libavformat-makefile.patch;patch=1 \
+ file://Makefile-lame.patch;patch=1 \
"
EXTRA_OECONF += " \
@@ -27,13 +29,18 @@ EXTRA_OECONF += " \
\
--cpu=${TARGET_ARCH} \
--tune=${PACKAGE_ARCH} \
- --extra-ldflags="-la52" \
+ --extra-libs="-la52" \
+ --extra-ldflags="-L${STAGING_LIBDIR}" \
\
--disable-audio-beos \
--disable-v4l \
--disable-dv1394 \
"
+EXTRA_OECONF_append_x86 += " \
+ --disable-mmx \
+"
+
do_stage() {
oe_libinstall -a -so -C libavcodec libavcodec ${STAGING_LIBDIR}
oe_libinstall -a -so -C libavformat libavformat ${STAGING_LIBDIR}