summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2008-08-25 12:34:25 +0000
committerMichael Lauer <mickey@vanille-media.de>2008-08-25 12:34:25 +0000
commit170632400a39c176bb6678cfaa63f12c2b28d9ab (patch)
treee302e6a64985caa3912583ed43013e5ef01bd86a
parent4d1113da44ff5c1087a76eaa7613b530fee37943 (diff)
libsdl 1.2.x use pkgconfig
-rw-r--r--packages/libsdl/libsdl-image_1.2.3.bb10
-rw-r--r--packages/libsdl/libsdl-x11_1.2.11.bb16
-rw-r--r--packages/libsdl/libsdl-x11_1.2.9.bb1
-rw-r--r--packages/libsdl/libsdl.inc3
4 files changed, 16 insertions, 14 deletions
diff --git a/packages/libsdl/libsdl-image_1.2.3.bb b/packages/libsdl/libsdl-image_1.2.3.bb
index 1a911f9f62..7bf24412d2 100644
--- a/packages/libsdl/libsdl-image_1.2.3.bb
+++ b/packages/libsdl/libsdl-image_1.2.3.bb
@@ -3,12 +3,12 @@ SECTION = "libs"
PRIORITY = "optional"
DEPENDS = "zlib libpng jpeg virtual/libsdl"
LICENSE = "LGPL"
-PR = "r1"
-
-SRC_URI = "http://www.libsdl.org/projects/SDL_image/release/SDL_image-${PV}.tar.gz \
- file://autotools.patch;patch=1 \
- "
+PR = "r2"
+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"
diff --git a/packages/libsdl/libsdl-x11_1.2.11.bb b/packages/libsdl/libsdl-x11_1.2.11.bb
index 5a309c57a8..3f9120edb4 100644
--- a/packages/libsdl/libsdl-x11_1.2.11.bb
+++ b/packages/libsdl/libsdl-x11_1.2.11.bb
@@ -3,14 +3,16 @@ require libsdl.inc
# 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 \
diff --git a/packages/libsdl/libsdl-x11_1.2.9.bb b/packages/libsdl/libsdl-x11_1.2.9.bb
index 43148d4b00..637f0ae177 100644
--- a/packages/libsdl/libsdl-x11_1.2.9.bb
+++ b/packages/libsdl/libsdl-x11_1.2.9.bb
@@ -1,4 +1,5 @@
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 \
diff --git a/packages/libsdl/libsdl.inc b/packages/libsdl/libsdl.inc
index 5266c71373..5653925d68 100644
--- a/packages/libsdl/libsdl.inc
+++ b/packages/libsdl/libsdl.inc
@@ -5,7 +5,6 @@ DEPENDS = "alsa-lib mesa virtual/libx11 libxext"
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 @@ SRC_URI = "\
file://acinclude.m4"
S = "${WORKDIR}/SDL-${PV}"
-inherit autotools binconfig
+inherit autotools binconfig pkgconfig
EXTRA_OECONF = "<overwrite me>"