[oe-commits] woglinde : libsdl-x11: fix sdl.m4 for sdl-config

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 8b5e3f5fce5605e2bd0fc8b36b85809c65764acd
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=8b5e3f5fce5605e2bd0fc8b36b85809c65764acd

Author: woglinde <heinold at inf.fu-berlin.de>
Date:   Sat Oct 18 21:59:01 2008 +0200

libsdl-x11: fix sdl.m4 for sdl-config
* there is a stupid PATH setting which is using the host
  stuff, just removed it and our staging sdl-config is found
* bump PR

---

 packages/libsdl/files/fixmfour.patch |   14 ++++++++++++++
 packages/libsdl/libsdl-x11_1.2.11.bb |    3 ++-
 2 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/packages/libsdl/files/fixmfour.patch b/packages/libsdl/files/fixmfour.patch
new file mode 100644
index 0000000..0d534bd
--- /dev/null
+++ b/packages/libsdl/files/fixmfour.patch
@@ -0,0 +1,14 @@
+Index: SDL-1.2.11/sdl.m4
+===================================================================
+--- SDL-1.2.11.orig/sdl.m4	2008-10-18 21:20:13.482478928 +0200
++++ SDL-1.2.11/sdl.m4	2008-10-18 21:20:28.979441480 +0200
+@@ -32,9 +32,6 @@
+     fi
+   fi
+ 
+-  if test "x$prefix" != xNONE; then
+-    PATH="$prefix/bin:$prefix/usr/bin:$PATH"
+-  fi
+   AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
+   min_sdl_version=ifelse([$1], ,0.11.0,$1)
+   AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
diff --git a/packages/libsdl/libsdl-x11_1.2.11.bb b/packages/libsdl/libsdl-x11_1.2.11.bb
index 809c985..e9628d9 100644
--- a/packages/libsdl/libsdl-x11_1.2.11.bb
+++ b/packages/libsdl/libsdl-x11_1.2.11.bb
@@ -3,7 +3,7 @@ require libsdl.inc
 # extra-keys.patch is missing
 DEFAULT_PREFERENCE = "-1" 
 
-FILE_PR = "r6"
+FILE_PR = "r7"
 
 SRC_URI = "\
   http://www.libsdl.org/release/SDL-${PV}.tar.gz \
@@ -12,6 +12,7 @@ SRC_URI = "\
   file://pagesize.patch;patch=1 \
   file://kernel-asm-page.patch;patch=1 \
   file://sdl-cdfix.patch;patch=1 \
+  file://fixmfour.patch;patch=1 \
 "
 
 EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \