libsdl: Remove PATH setting from sdl.m4, it breaks things

diff --git a/packages/libsdl/files/remove_path.patch b/packages/libsdl/files/remove_path.patch
new file mode 100644 (file)
index 0000000..f5bee40
--- /dev/null
+++ b/packages/libsdl/files/remove_path.patch
@@ -0,0 +1,18 @@
+OE goes to great lengths to set PATH correctly and this just breaks
+things since local sdl-config binaries will suddenly be preferred
+rather than those in staging.
+
+RP - 27/02/2008
+
+Index: SDL-1.2.9/sdl.m4
+===================================================================
+--- SDL-1.2.9.orig/sdl.m4      2008-02-27 10:08:38.000000000 +0000
++++ SDL-1.2.9/sdl.m4   2008-02-27 10:08:51.000000000 +0000
+@@ -33,7 +33,6 @@
+   fi
+ 
+   AC_REQUIRE([AC_CANONICAL_TARGET])
+-  PATH="$prefix/bin:$prefix/usr/bin:$PATH"
+   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.inc b/packages/libsdl/libsdl.inc
index a65efb5..ad74ecc 100644 (file)
--- a/packages/libsdl/libsdl.inc
+++ b/packages/libsdl/libsdl.inc
@@ -4,12 +4,13 @@ PRIORITY = "optional"
 DEPENDS = "alsa-lib mesa virtual/libx11 libxext"
 PROVIDES = "virtual/libsdl"
 LICENSE = "LGPL"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "\
   http://www.libsdl.org/release/SDL-${PV}.tar.gz \
   file://extra-keys.patch;patch=1 \
   file://pagesize.patch;patch=1 \
+  file://remove_path.patch;patch=1 \
   file://acinclude.m4"
 S = "${WORKDIR}/SDL-${PV}"