[oe-commits] org.oe.dev packages/ffmpeg/ffmpeg_0.4.9-pre1.bb : Disable mmx for x86

[ifaistos commit]

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

Author: ifaistos at openembedded.org
Branch: org.openembedded.dev
Revision: f58f178ad8f753d2c8dc35c965a08168bf39c743
ViewMTN: http://monotone.openembedded.org/revision/info/f58f178ad8f753d2c8dc35c965a08168bf39c743
Files:
1
packages/ffmpeg/ffmpeg.inc
packages/ffmpeg/ffmpeg_0.4.9-pre1.bb
Diffs:

#
# mt diff -rad0617768a5d0f977c83a8f5195eb465c1198eba -rf58f178ad8f753d2c8dc35c965a08168bf39c743
#
#
#
# patch "packages/ffmpeg/ffmpeg.inc"
#  from [84044f7d06812f97708d5aaf10e1e260f0a1dda0]
#    to [c6e3badee49ab92a1ac83c026a501bacadd0f110]
# 
# patch "packages/ffmpeg/ffmpeg_0.4.9-pre1.bb"
#  from [c3572c18ab65a446d322a3902f88912447563717]
#    to [40b96d52de26942502cc371e72ef50a37e82c8e5]
#
============================================================
--- packages/ffmpeg/ffmpeg.inc	84044f7d06812f97708d5aaf10e1e260f0a1dda0
+++ packages/ffmpeg/ffmpeg.inc	c6e3badee49ab92a1ac83c026a501bacadd0f110
@@ -5,7 +5,7 @@ LICENSE = "LGPL"
 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
============================================================
--- packages/ffmpeg/ffmpeg_0.4.9-pre1.bb	c3572c18ab65a446d322a3902f88912447563717
+++ packages/ffmpeg/ffmpeg_0.4.9-pre1.bb	40b96d52de26942502cc371e72ef50a37e82c8e5
@@ -1,11 +1,13 @@ require ffmpeg.inc
 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}