[oe-commits] Martin Jansa : Revert "libsdl-image: use pkg-config for libSDL detection"

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: 376a8831b7eddaa67a199c513f5a202498191fd5
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=376a8831b7eddaa67a199c513f5a202498191fd5

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Sat Jun 21 11:30:12 2014 +0200

Revert "libsdl-image: use pkg-config for libSDL detection"

This reverts commit 926f810d72c6956bd06d1cf35feedf2562c62cb6.

---

 ...igure-use-pkg-config-for-libSDL-detection.patch | 38 ----------------------
 .../libsdl-image/libsdl-image_1.2.12.bb            |  6 ++--
 2 files changed, 3 insertions(+), 41 deletions(-)

diff --git a/meta-oe/recipes-multimedia/libsdl-image/libsdl-image/0001-configure-use-pkg-config-for-libSDL-detection.patch b/meta-oe/recipes-multimedia/libsdl-image/libsdl-image/0001-configure-use-pkg-config-for-libSDL-detection.patch
deleted file mode 100644
index 192ee16..0000000
--- a/meta-oe/recipes-multimedia/libsdl-image/libsdl-image/0001-configure-use-pkg-config-for-libSDL-detection.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 644ec4d18eb83a0ca826001ebfb7f4782cb8db0f Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen.kooi at linaro.org>
-Date: Thu, 19 Jun 2014 13:16:21 +0200
-Subject: [PATCH] configure: use pkg-config for libSDL detection
-
-Signed-off-by: Koen Kooi <koen.kooi at linaro.org>
----
- configure.in | 14 ++++++--------
- 1 file changed, 6 insertions(+), 8 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index e7010e9..cbb536d 100644
---- a/configure.in
-+++ b/configure.in
-@@ -113,14 +113,12 @@ find_lib()
- }
- 
- dnl Check for SDL
--SDL_VERSION=1.2.10
--AC_SUBST(SDL_VERSION)
--AM_PATH_SDL($SDL_VERSION,
--            :,
--           AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!])
--)
--CFLAGS="$CFLAGS $SDL_CFLAGS"
--LIBS="$LIBS $SDL_LIBS"
-+PKG_CHECK_MODULES([LIBSDL], [sdl > 1.2.10], [
-+  CFLAGS="$CFLAGS $LIBSDL_CFLAGS"
-+  LIBS="$LIBS $LIBSDL_LIBS"
-+], [
-+  AC_MSG_ERROR([$LIBXML_PKG_ERRORS])
-+])
- saved_LIBS="$LIBS"
- 
- dnl Check command-line options
--- 
-1.9.3
-
diff --git a/meta-oe/recipes-multimedia/libsdl-image/libsdl-image_1.2.12.bb b/meta-oe/recipes-multimedia/libsdl-image/libsdl-image_1.2.12.bb
index 95dbff8..d8c56fb 100644
--- a/meta-oe/recipes-multimedia/libsdl-image/libsdl-image_1.2.12.bb
+++ b/meta-oe/recipes-multimedia/libsdl-image/libsdl-image_1.2.12.bb
@@ -6,9 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=613734b7586e1580ef944961c6d62227"
 
 DEPENDS = "tiff zlib libpng jpeg virtual/libsdl"
 
-SRC_URI = "http://www.libsdl.org/projects/SDL_image/release/SDL_image-${PV}.tar.gz \
-           file://0001-configure-use-pkg-config-for-libSDL-detection.patch \
-          "
+SRC_URI = "http://www.libsdl.org/projects/SDL_image/release/SDL_image-${PV}.tar.gz"
 SRC_URI[md5sum] = "a0f9098ebe5400f0bdc9b62e60797ecb"
 SRC_URI[sha256sum] = "0b90722984561004de84847744d566809dbb9daf732a9e503b91a1b5a84e5699"
 
@@ -16,6 +14,8 @@ S = "${WORKDIR}/SDL_image-${PV}"
 
 inherit autotools
 
+export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config"
+
 # Disable the run-time loading of the libs and bring back the soname dependencies.
 EXTRA_OECONF += "--disable-jpg-shared --disable-png-shared -disable-tif-shared"