diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-12-12 13:07:14 +0100 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-12-12 13:07:14 +0100 |
| commit | 3516e365b5f29fb1c09e4a7351e92b6ceb250d72 (patch) | |
| tree | 8910657328306284c36dd8ff1dec9d0d24700ffb /recipes/libsdl | |
| parent | 2297bad128f73f878dc28a5c365c4d624e400058 (diff) | |
| parent | 4df23cb65d9d526f3a2dc5df13bddb0a14da1b0c (diff) | |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/libsdl')
| -rw-r--r-- | recipes/libsdl/libsdl-directfb_1.2.11.bb | 2 | ||||
| -rw-r--r-- | recipes/libsdl/libsdl-directfb_1.2.9.bb | 2 | ||||
| -rw-r--r-- | recipes/libsdl/libsdl-qpe_1.2.9.bb | 2 | ||||
| -rw-r--r-- | recipes/libsdl/libsdl-x11_1.2.11.bb | 2 | ||||
| -rw-r--r-- | recipes/libsdl/libsdl-x11_1.2.14.bb | 4 | ||||
| -rw-r--r-- | recipes/libsdl/libsdl.inc | 4 |
6 files changed, 10 insertions, 6 deletions
diff --git a/recipes/libsdl/libsdl-directfb_1.2.11.bb b/recipes/libsdl/libsdl-directfb_1.2.11.bb index 3f44f9df3f..cc5f043142 100644 --- a/recipes/libsdl/libsdl-directfb_1.2.11.bb +++ b/recipes/libsdl/libsdl-directfb_1.2.11.bb @@ -4,7 +4,7 @@ DEPENDS = "alsa-lib directfb" # extra-keys.patch is missing DEFAULT_PREFERENCE = "-1" -PR = "r0" +PR = "${INC_PR}.0" SRC_URI = "\ http://www.libsdl.org/release/SDL-${PV}.tar.gz \ diff --git a/recipes/libsdl/libsdl-directfb_1.2.9.bb b/recipes/libsdl/libsdl-directfb_1.2.9.bb index 7a9bd88ee2..f0d7b9f4a2 100644 --- a/recipes/libsdl/libsdl-directfb_1.2.9.bb +++ b/recipes/libsdl/libsdl-directfb_1.2.9.bb @@ -3,6 +3,8 @@ require libsdl.inc DEPENDS = "alsa-lib directfb" DEFAULT_PREFERENCE = "-1" +PR = "${INC_PR}.0" + SRC_URI += "\ file://explicit-extern-C.patch;patch=1 \ file://acinclude.m4 \ diff --git a/recipes/libsdl/libsdl-qpe_1.2.9.bb b/recipes/libsdl/libsdl-qpe_1.2.9.bb index 711a05d656..4bc985a7c9 100644 --- a/recipes/libsdl/libsdl-qpe_1.2.9.bb +++ b/recipes/libsdl/libsdl-qpe_1.2.9.bb @@ -1,6 +1,6 @@ require libsdl.inc -PR="r1" +PR = "${INC_PR}.0" SECTION = "opie/libs" DEPENDS = "virtual/libqpe1 libopie2" diff --git a/recipes/libsdl/libsdl-x11_1.2.11.bb b/recipes/libsdl/libsdl-x11_1.2.11.bb index 0dffe4ab3f..cf2cf49a56 100644 --- a/recipes/libsdl/libsdl-x11_1.2.11.bb +++ b/recipes/libsdl/libsdl-x11_1.2.11.bb @@ -3,7 +3,7 @@ require libsdl.inc # extra-keys.patch is missing DEFAULT_PREFERENCE = "-1" -PR = "r8" +PR = "${INC_PR}.0" SRC_URI = "\ http://www.libsdl.org/release/SDL-${PV}.tar.gz \ diff --git a/recipes/libsdl/libsdl-x11_1.2.14.bb b/recipes/libsdl/libsdl-x11_1.2.14.bb index 621f7b47c1..b48791f6be 100644 --- a/recipes/libsdl/libsdl-x11_1.2.14.bb +++ b/recipes/libsdl/libsdl-x11_1.2.14.bb @@ -5,10 +5,10 @@ DESCRIPTION = "Simple DirectMedia Layer (X11 and Framebuffer support)" SECTION = "libs" PRIORITY = "optional" LICENSE = "LGPL" -DEPENDS = "alsa-lib mesa virtual/libx11 libxext tslib" +DEPENDS = "alsa-lib virtual/libgl virtual/libx11 libxext tslib" DEPENDS_avr32 = "alsa-lib virtual/libx11 libxext tslib" PROVIDES = "virtual/libsdl" -PR = "r1" +PR = "r2" SRC_URI = " \ http://www.libsdl.org/release/SDL-${PV}.tar.gz \ diff --git a/recipes/libsdl/libsdl.inc b/recipes/libsdl/libsdl.inc index 5653925d68..51a4b22d4f 100644 --- a/recipes/libsdl/libsdl.inc +++ b/recipes/libsdl/libsdl.inc @@ -1,11 +1,13 @@ DESCRIPTION = "Simple DirectMedia Layer - X11 Edition" SECTION = "libs" PRIORITY = "optional" -DEPENDS = "alsa-lib mesa virtual/libx11 libxext" +DEPENDS = "alsa-lib virtual/libgl virtual/libx11 libxext" DEPENDS_avr32 = "alsa-lib virtual/libx11 libxext" PROVIDES = "virtual/libsdl" LICENSE = "LGPL" +INC_PR = "r10" + SRC_URI = "\ http://www.libsdl.org/release/SDL-${PV}.tar.gz \ file://extra-keys.patch;patch=1 \ |