libsdl-image: Moved common parts into libsdl-image.inc, added version 1.2.6

diff --git a/packages/libsdl/libsdl-image.inc b/packages/libsdl/libsdl-image.inc
new file mode 100644 (file)
index 0000000..1212e9c
--- /dev/null
+++ b/packages/libsdl/libsdl-image.inc
@@ -0,0 +1,18 @@
+DESCRIPTION = "Simple DirectMedia Layer image library."
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "zlib libpng jpeg virtual/libsdl"
+LICENSE = "LGPL"
+
+SRC_URI = "http://www.libsdl.org/projects/SDL_image/release/SDL_image-${PV}.tar.gz"
+
+S = "${WORKDIR}/SDL_image-${PV}"
+
+inherit autotools
+
+do_stage() {
+       oe_libinstall -so libSDL_image ${STAGING_LIBDIR}
+       ln -sf libSDL_image.so ${STAGING_LIBDIR}/libSDL_image-1.2.so
+       install -m 0644 SDL_image.h ${STAGING_INCDIR}/SDL/SDL_image.h
+}
+

diff --git a/packages/libsdl/libsdl-image_1.2.3.bb b/packages/libsdl/libsdl-image_1.2.3.bb
index 7bf2441..0c83158 100644 (file)
--- a/packages/libsdl/libsdl-image_1.2.3.bb
+++ b/packages/libsdl/libsdl-image_1.2.3.bb
@@ -1,15 +1,10 @@
-DESCRIPTION = "Simple DirectMedia Layer image library."
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "zlib libpng jpeg virtual/libsdl"
-LICENSE = "LGPL"
+require libsdl-image.inc
+
 PR = "r2"
 
-SRC_URI = "\
-  http://www.libsdl.org/projects/SDL_image/release/SDL_image-${PV}.tar.gz \
+SRC_URI += "\
   file://autotools.patch;patch=1 \
 "
-S = "${WORKDIR}/SDL_image-${PV}"
 
 export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config"
 

diff --git a/packages/libsdl/libsdl-image_1.2.6.bb b/packages/libsdl/libsdl-image_1.2.6.bb
new file mode 100644 (file)
index 0000000..27b5aa7
--- /dev/null
+++ b/packages/libsdl/libsdl-image_1.2.6.bb
@@ -0,0 +1,8 @@
+require libsdl-image.inc
+
+do_unpackpost() {
+       # Removing this file fixes a libtool version mismatch.
+       rm acinclude/libtool.m4
+}
+
+addtask unpackpost after do_unpack before do_patch