From: Koen Kooi <koen@openembedded.org>
Date: Thu, 21 Aug 2008 10:01:43 +0000 (+0000)
Subject: ffmpeg: workaround problem with linux-libc-headers and c99
X-Git-Tag: Release-2010-05/1~6305^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2fce39c7c609b5fc22902854420bd2ac2d0a290a;p=openembedded.git

ffmpeg: workaround problem with linux-libc-headers and c99
---

diff --git a/packages/ffmpeg/ffmpeg_git.bb b/packages/ffmpeg/ffmpeg_git.bb
index 965a453aff..76dd833418 100644
--- a/packages/ffmpeg/ffmpeg_git.bb
+++ b/packages/ffmpeg/ffmpeg_git.bb
@@ -3,19 +3,19 @@ require ffmpeg.inc
 DEPENDS += "libgsm"
 
 PV = "0.4.9+${PR}+gitr${SRCREV}" 
-PR = "r26"
+PR = "r27"
 
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_armv5te = "1"
 DEFAULT_PREFERENCE_armv6 = "1"
 DEFAULT_PREFERENCE_armv7a = "1"
 
-FFBRANCH_arm = "arm"
+FFBRANCH_arm = "arm.qpel"
 FFBRANCH ?= "master"
 
 # When bumping SRCREV make sure you bump PR here and in dependant recipes (gst-ffmpeg, gnash, omxil, etc) to account for SOVERSION changes
 SRCREV = "3692b8de9fae73860be636606cb6344f26e28b1a"
-SRCREV_arm = "a1b91f5e7bf5612ea3a5c63579f220b0af8da1f8"
+SRCREV_arm = "7c46803029e74a20ceb1327d1d599ae758aea58c"
 SRC_URI = "git://git.mansr.com/ffmpeg.mru;protocol=git;branch=${FFBRANCH} \
 "
 
@@ -55,7 +55,8 @@ EXTRA_OECONF = " \
 "
 
 do_configure() {
-        cd ${S} ; git clone git://git.mplayerhq.hu/libswscale || true  
+        sed -i -e s:'check_cflags -std=c99'::g ${S}/configure
+	cd ${S} ; git clone git://git.mplayerhq.hu/libswscale || true  
         mkdir -p ${B}
         cd ${B}
         ${S}/configure ${EXTRA_OECONF}