[oe-commits] org.oe.dev libsdl 1.2.x use pkgconfig

[mickeyl commit]

libsdl 1.2.x use pkgconfig

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 19345cff74205f76f6a9f18a8cbd4dd6bb2f4298
ViewMTN: http://monotone.openembedded.org/revision/info/19345cff74205f76f6a9f18a8cbd4dd6bb2f4298
Files:
1
packages/libsdl/libsdl-image_1.2.3.bb
packages/libsdl/libsdl-x11_1.2.11.bb
packages/libsdl/libsdl-x11_1.2.9.bb
packages/libsdl/libsdl.inc
Diffs:

#
# mt diff -r81c8937255d401ebf248e9d95f6f7bac479d15b0 -r19345cff74205f76f6a9f18a8cbd4dd6bb2f4298
#
#
#
# patch "packages/libsdl/libsdl-image_1.2.3.bb"
#  from [f2c1ecbdcbca05fc7787d6e64dbd80e9a29107d0]
#    to [bfaec0d9c2d7fe4fc4907d7ae04554e7c9895004]
# 
# patch "packages/libsdl/libsdl-x11_1.2.11.bb"
#  from [22b2b21fa489b2c8f56b5956e0a7e33eef629415]
#    to [014b8c61a107fc5b83400d5f54a552a13f70e9cf]
# 
# patch "packages/libsdl/libsdl-x11_1.2.9.bb"
#  from [b8fbd61ef90fce1e7962217839c47f784d8f8cc6]
#    to [1185a893a6484d1abc0bd4eb3d7faa09aa149600]
# 
# patch "packages/libsdl/libsdl.inc"
#  from [715891cf3725571a5a2243bac9cb73170dc2ca37]
#    to [a713e3f4058fde4835393971ac28fb209880c323]
#
============================================================
--- packages/libsdl/libsdl-image_1.2.3.bb	f2c1ecbdcbca05fc7787d6e64dbd80e9a29107d0
+++ packages/libsdl/libsdl-image_1.2.3.bb	bfaec0d9c2d7fe4fc4907d7ae04554e7c9895004
@@ -3,12 +3,12 @@ LICENSE = "LGPL"
 PRIORITY = "optional"
 DEPENDS = "zlib libpng jpeg virtual/libsdl"
 LICENSE = "LGPL"
-PR = "r1"
+PR = "r2"
 
-SRC_URI = "http://www.libsdl.org/projects/SDL_image/release/SDL_image-${PV}.tar.gz \
-	   file://autotools.patch;patch=1 \
-	  "
-
+SRC_URI = "\
+  http://www.libsdl.org/projects/SDL_image/release/SDL_image-${PV}.tar.gz \
+  file://autotools.patch;patch=1 \
+"
 S = "${WORKDIR}/SDL_image-${PV}"
 
 export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config"
============================================================
--- packages/libsdl/libsdl-x11_1.2.11.bb	22b2b21fa489b2c8f56b5956e0a7e33eef629415
+++ packages/libsdl/libsdl-x11_1.2.11.bb	014b8c61a107fc5b83400d5f54a552a13f70e9cf
@@ -3,14 +3,16 @@ DEFAULT_PREFERENCE = "-1" 
 # extra-keys.patch is missing
 DEFAULT_PREFERENCE = "-1" 
 
-PR = "r1"
+PR = "r6"
 
-SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
-           file://acinclude.m4 \
-           file://configure_tweak.patch;patch=1 \
-           file://pagesize.patch;patch=1 \
-           file://kernel-asm-page.patch;patch=1 \
-	   file://sdl-cdfix.patch;patch=1 "
+SRC_URI = "\
+  http://www.libsdl.org/release/SDL-${PV}.tar.gz \
+  file://acinclude.m4 \
+  file://configure_tweak.patch;patch=1 \
+  file://pagesize.patch;patch=1 \
+  file://kernel-asm-page.patch;patch=1 \
+  file://sdl-cdfix.patch;patch=1 \
+"
 
 EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \
                 --enable-file --enable-oss --enable-alsa --disable-esd --disable-arts \
============================================================
--- packages/libsdl/libsdl-x11_1.2.9.bb	b8fbd61ef90fce1e7962217839c47f784d8f8cc6
+++ packages/libsdl/libsdl-x11_1.2.9.bb	1185a893a6484d1abc0bd4eb3d7faa09aa149600
@@ -1,4 +1,5 @@ require libsdl.inc
 require libsdl.inc
+PR = "r6"
 
 EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \
                 --enable-file --enable-oss --enable-alsa --disable-esd --disable-arts \
============================================================
--- packages/libsdl/libsdl.inc	715891cf3725571a5a2243bac9cb73170dc2ca37
+++ packages/libsdl/libsdl.inc	a713e3f4058fde4835393971ac28fb209880c323
@@ -5,7 +5,6 @@ LICENSE = "LGPL"
 DEPENDS_avr32 = "alsa-lib virtual/libx11 libxext"
 PROVIDES = "virtual/libsdl"
 LICENSE = "LGPL"
-PR = "r5"
 
 SRC_URI = "\
   http://www.libsdl.org/release/SDL-${PV}.tar.gz \
@@ -15,7 +14,7 @@ S = "${WORKDIR}/SDL-${PV}"
   file://acinclude.m4"
 S = "${WORKDIR}/SDL-${PV}"
 
-inherit autotools binconfig
+inherit autotools binconfig pkgconfig
 
 EXTRA_OECONF = "<overwrite me>"