From: Denys Dmytriyenko <denys@ti.com>
Date: Fri, 25 Feb 2011 07:39:17 +0000 (+0000)
Subject: ffmpeg: pass --sysroot to configure script directly
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93bb226b98706b22c952a1a49981d5066abbf3c1;p=openembedded.git

ffmpeg: pass --sysroot to configure script directly

ffmpeg's custom configure script fails some checks for specific headers, even
though we pass --sysroot through CFLAGS. Use configure's specific --sysroot
option to fix that.

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Acked-by: Tom Rini <tom_rini@mentor.com>
---

diff --git a/recipes/ffmpeg/ffmpeg_0.5.bb b/recipes/ffmpeg/ffmpeg_0.5.bb
index f3a6d219ca..623c369a6d 100644
--- a/recipes/ffmpeg/ffmpeg_0.5.bb
+++ b/recipes/ffmpeg/ffmpeg_0.5.bb
@@ -2,7 +2,7 @@ require ffmpeg.inc
 
 DEPENDS += "schroedinger libgsm"
 
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
 
 DEFAULT_PREFERENCE = "1"
 
@@ -47,6 +47,7 @@ EXTRA_OECONF = " \
         --enable-cross-compile \
         --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \
         --extra-ldflags="${TARGET_LDFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \
+        --sysroot="${STAGING_DIR_TARGET}" \
         --enable-hardcoded-tables \
         ${EXTRA_FFCONF} \
 "
diff --git a/recipes/ffmpeg/ffmpeg_0.6.1.bb b/recipes/ffmpeg/ffmpeg_0.6.1.bb
index fb941a5262..74a1161df4 100644
--- a/recipes/ffmpeg/ffmpeg_0.6.1.bb
+++ b/recipes/ffmpeg/ffmpeg_0.6.1.bb
@@ -2,7 +2,7 @@ require ffmpeg.inc
 
 LICENSE = "LGPLv2.1+"
 DEPENDS += "schroedinger libgsm"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 SRC_URI = "http://ffmpeg.org/releases/ffmpeg-${PV}.tar.bz2"
 SRC_URI[md5sum] = "4f5d732d25eedfb072251b5314ba2093"
@@ -26,6 +26,7 @@ EXTRA_OECONF = " \
         --enable-swscale \
         --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \
         --extra-ldflags="${TARGET_LDFLAGS}" \
+        --sysroot="${STAGING_DIR_TARGET}" \
         --prefix=${prefix}/ \
         --target-os=linux \
         ${EXTRA_FFCONF} \
diff --git a/recipes/ffmpeg/ffmpeg_git.bb b/recipes/ffmpeg/ffmpeg_git.bb
index 27e88ea7b2..24c81ea24e 100644
--- a/recipes/ffmpeg/ffmpeg_git.bb
+++ b/recipes/ffmpeg/ffmpeg_git.bb
@@ -6,7 +6,7 @@ DEPENDS += "virtual/libsdl schroedinger libgsm libvpx"
 SRCREV = "a4f5af13fb00d7f55946470bb0f52e1dbf5f3c6a"
 
 PV = "0.6.1+${PR}+gitr${SRCPV}"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_angstrom = "1"
@@ -47,6 +47,7 @@ EXTRA_OECONF = " \
         --enable-cross-compile \
         --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \
         --extra-ldflags="${TARGET_LDFLAGS}" \
+        --sysroot="${STAGING_DIR_TARGET}" \
         --enable-hardcoded-tables \
         ${EXTRA_FFCONF} \
 "