[oe-commits] org.oe.dev fffmpeg svn: fix build

[koen commit]

fffmpeg svn: fix build

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 9337a5ff3440772705d464c123d99b9bcbe72cd0
ViewMTN: http://monotone.openembedded.org/revision.psp?id=9337a5ff3440772705d464c123d99b9bcbe72cd0
Files:
1
packages/ffmpeg/ffmpeg_svn.bb
Diffs:

#
# mt diff -r76d3b20f964cec7e37a6e3a20c6298ed35aee629 -r9337a5ff3440772705d464c123d99b9bcbe72cd0
#
# 
# 
# patch "packages/ffmpeg/ffmpeg_svn.bb"
#  from [e5db09eed83175a9b1c99d707f1bcd2c565e0e15]
#    to [1099166a95deeab073e0b8b841b47e4b1f534cd0]
# 
============================================================
--- packages/ffmpeg/ffmpeg_svn.bb	e5db09eed83175a9b1c99d707f1bcd2c565e0e15
+++ packages/ffmpeg/ffmpeg_svn.bb	1099166a95deeab073e0b8b841b47e4b1f534cd0
@@ -1,8 +1,8 @@ LICENSE = "GPL"
 DESCRIPTION = "ffmpeg"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPL"
-DEPENDS = "zlib libvorbis faac liba52 lame"
+DEPENDS = "libogg zlib libvorbis faac liba52 lame"
 PV = "0.4.9+svn${SRCDATE}"
 
 DEFAULT_PREFERENCE = "-1"
@@ -11,17 +11,18 @@ S = "${WORKDIR}/trunk"
 
 S = "${WORKDIR}/trunk"
 
-inherit autotools
+inherit autotools pkgconfig
 
 TARGET_LDFLAGS_append = " -lm -la52 "
 
 EXTRA_OECONF = " \
-	--enable-mp3lame \
-        --enable-vorbis \
-        --enable-faad \
-        --enable-a52 \
-        --enable-a52bin \
-        --enable-pp \
+	--enable-libmp3lame \
+        --enable-libvorbis \
+        --disable-libfaad \
+        --enable-liba52 \
+        --enable-liba52bin \
+        --enable-libogg \
+	--enable-pp \
         --enable-shared \
         --enable-pthreads \
         --enable-gpl \
@@ -32,10 +33,12 @@ EXTRA_OECONF = " \
         --disable-debug \
         --disable-ffserver \
         --disable-ffplay \
+	--disable-strip \
         \
         --cross-prefix=${TARGET_PREFIX} \
         \
         --cpu=${PACKAGE_ARCH} \
+	--arch=${PACKAGE_ARCH} \
 "
 
 
@@ -48,6 +51,8 @@ oe_runconf () {
 }
 
 oe_runconf () {
+        # make ffmpeg detect arm targets that don't end in 'l'
+        sed -i -e s:'armv\[4567\]\*l':'armv\[4567\]\*':g ${S}/configure
         if [ -x ${S}/configure ] ; then
                 cfgcmd="${S}/configure \
                         --prefix=${prefix} \