libsdl-native: Create libsdl-native.inc

* Create a libsdl-native.inc and make 1.2.11 and 1.2.14 use it
* Convert to INC_PR scheme as well

3 files changed, 43 insertions, 69 deletions

diff --git a/recipes/libsdl/libsdl-native.inc b/recipes/libsdl/libsdl-native.inc
new file mode 100644
index 0000000000..783797a6eb
--- /dev/null
+++ b/recipes/libsdl/libsdl-native.inc
@@ -0,0 +1,37 @@
+DESCRIPTION = "Simple DirectMedia Layer - native Edition"
+HOMEPAGE = "http://www.libsdl.org"
+SECTION = "libs"
+LICENSE = "LGPL"
+INC_PR = "r2"
+
+SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
+"
+
+S = "${WORKDIR}/SDL-${PV}"
+
+inherit autotools binconfig pkgconfig native
+
+PARALLEL_MAKE = ""
+
+EXTRA_OECONF = "--disable-debug --disable-cdrom --enable-threads --enable-timers --enable-endian \
+                --enable-file --disable-oss --disable-alsa --disable-esd --disable-arts \
+                --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \
+                --disable-mintaudio --disable-nasm --disable-video-x11 --disable-video-dga \
+                --disable-video-fbcon --disable-video-directfb --disable-video-ps2gs \
+                --disable-video-xbios --disable-video-gem --disable-video-dummy \
+                --disable-video-opengl --enable-input-events --enable-pthreads \
+                --disable-video-picogui --disable-video-qtopia --enable-dlopen"
+
+do_configure() {
+	gnu-configize
+	oe_runconf
+	cd ${S}
+	# prevent libtool from linking libs against libstdc++, libgcc, ...
+	cat ${TARGET_PREFIX}libtool | sed -e 's/postdeps=".*"/postdeps=""/' > ${TARGET_PREFIX}libtool.tmp
+	mv ${TARGET_PREFIX}libtool.tmp ${TARGET_PREFIX}libtool
+}
+
+do_stage() {
+	autotools_stage_all
+	install -m 0644 build/libSDLmain.a ${STAGING_LIBDIR}
+}
diff --git a/recipes/libsdl/libsdl-native_1.2.11.bb b/recipes/libsdl/libsdl-native_1.2.11.bb
index fb8e12a4c9..86d3a452cf 100644
--- a/recipes/libsdl/libsdl-native_1.2.11.bb
+++ b/recipes/libsdl/libsdl-native_1.2.11.bb
@@ -1,39 +1,11 @@
-DESCRIPTION = "Simple DirectMedia Layer - native Edition"
-HOMEPAGE = "http://www.libsdl.org"
-SECTION = "libs"
-LICENSE = "LGPL"
-PR = "r2"
+require ${PN}.inc
+PR = "${INC_PR}.1"
 
-SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
+SRC_URI_append = "\
 	   file://acinclude.m4 \
 	   file://kernel-asm-page.patch;patch=1 "
-S = "${WORKDIR}/SDL-${PV}"
 
-inherit autotools binconfig pkgconfig native
-
-PARALLEL_MAKE = ""
-
-EXTRA_OECONF = "--disable-debug --disable-cdrom --enable-threads --enable-timers --enable-endian \
-                --enable-file --disable-oss --disable-alsa --disable-esd --disable-arts \
-                --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \
-                --disable-mintaudio --disable-nasm --disable-video-x11 --disable-video-dga \
-                --disable-video-fbcon --disable-video-directfb --disable-video-ps2gs \
-                --disable-video-xbios --disable-video-gem --disable-video-dummy \
-                --disable-video-opengl --enable-input-events --enable-pthreads \
-                --disable-video-picogui --disable-video-qtopia --enable-dlopen"
-
-do_configure() {
+do_configure_prepend() {
 	rm -f ${S}/acinclude.m4
 	cp ${WORKDIR}/acinclude.m4 ${S}/
-	gnu-configize
-	oe_runconf
-	cd ${S}
-	# prevent libtool from linking libs against libstdc++, libgcc, ...
-	cat ${TARGET_PREFIX}libtool | sed -e 's/postdeps=".*"/postdeps=""/' > ${TARGET_PREFIX}libtool.tmp
-	mv ${TARGET_PREFIX}libtool.tmp ${TARGET_PREFIX}libtool
-}
-
-do_stage() {
-	autotools_stage_all
-	install -m 0644 build/libSDLmain.a ${STAGING_LIBDIR}
 }
diff --git a/recipes/libsdl/libsdl-native_1.2.14.bb b/recipes/libsdl/libsdl-native_1.2.14.bb
index 35a73a6d18..1edce29da4 100644
--- a/recipes/libsdl/libsdl-native_1.2.14.bb
+++ b/recipes/libsdl/libsdl-native_1.2.14.bb
@@ -1,37 +1,2 @@
-DESCRIPTION = "Simple DirectMedia Layer - native Edition"
-HOMEPAGE = "http://www.libsdl.org"
-SECTION = "libs"
-LICENSE = "LGPL"
-PR = "r0"
-
-SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
-"
-
-S = "${WORKDIR}/SDL-${PV}"
-
-inherit autotools binconfig pkgconfig native
-
-PARALLEL_MAKE = ""
-
-EXTRA_OECONF = "--disable-debug --disable-cdrom --enable-threads --enable-timers --enable-endian \
-                --enable-file --disable-oss --disable-alsa --disable-esd --disable-arts \
-                --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \
-                --disable-mintaudio --disable-nasm --disable-video-x11 --disable-video-dga \
-                --disable-video-fbcon --disable-video-directfb --disable-video-ps2gs \
-                --disable-video-xbios --disable-video-gem --disable-video-dummy \
-                --disable-video-opengl --enable-input-events --enable-pthreads \
-                --disable-video-picogui --disable-video-qtopia --enable-dlopen"
-
-do_configure() {
-	gnu-configize
-	oe_runconf
-	cd ${S}
-	# prevent libtool from linking libs against libstdc++, libgcc, ...
-	cat ${TARGET_PREFIX}libtool | sed -e 's/postdeps=".*"/postdeps=""/' > ${TARGET_PREFIX}libtool.tmp
-	mv ${TARGET_PREFIX}libtool.tmp ${TARGET_PREFIX}libtool
-}
-
-do_stage() {
-	autotools_stage_all
-	install -m 0644 build/libSDLmain.a ${STAGING_LIBDIR}
-}
+require libsdl-native.inc
+PR = "${INC_PR}.1"