From 9ba61adee76654517502b7113b05ff4637688737 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 18 Nov 2009 12:43:15 +0100 Subject: x11 recipes: use virtual/libgl instead of mesa --- recipes/libsdl/libsdl.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'recipes/libsdl') diff --git a/recipes/libsdl/libsdl.inc b/recipes/libsdl/libsdl.inc index 5653925d68..0db0be8e14 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" +PR = "r1" + SRC_URI = "\ http://www.libsdl.org/release/SDL-${PV}.tar.gz \ file://extra-keys.patch;patch=1 \ -- cgit v1.2.3 From 9086cb424c219691bc3b5f732c216a116b01807a Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 4 Dec 2009 15:12:06 +0100 Subject: libsdl-x11, libglew: use virtual/libgl instead of mesa --- recipes/libsdl/libsdl-x11_1.2.14.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes/libsdl') diff --git a/recipes/libsdl/libsdl-x11_1.2.14.bb b/recipes/libsdl/libsdl-x11_1.2.14.bb index 621f7b47c1..98269c8f2f 100644 --- a/recipes/libsdl/libsdl-x11_1.2.14.bb +++ b/recipes/libsdl/libsdl-x11_1.2.14.bb @@ -5,7 +5,7 @@ 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" -- cgit v1.2.3 From 3d2308b173ecbc9a6713c82e621ec16b35ffa37d Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 10 Dec 2009 10:09:09 +0100 Subject: libsdl: use INC_PR, bump for mesa -> virtual/libgl change --- recipes/libsdl/libsdl-directfb_1.2.11.bb | 2 +- recipes/libsdl/libsdl-directfb_1.2.9.bb | 2 ++ recipes/libsdl/libsdl-qpe_1.2.9.bb | 2 +- recipes/libsdl/libsdl-x11_1.2.11.bb | 2 +- recipes/libsdl/libsdl-x11_1.2.14.bb | 2 +- recipes/libsdl/libsdl.inc | 2 +- 6 files changed, 7 insertions(+), 5 deletions(-) (limited to 'recipes/libsdl') 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 98269c8f2f..67c1fd982e 100644 --- a/recipes/libsdl/libsdl-x11_1.2.14.bb +++ b/recipes/libsdl/libsdl-x11_1.2.14.bb @@ -8,7 +8,7 @@ LICENSE = "LGPL" DEPENDS = "alsa-lib virtual/libgl virtual/libx11 libxext tslib" DEPENDS_avr32 = "alsa-lib virtual/libx11 libxext tslib" PROVIDES = "virtual/libsdl" -PR = "r1" +PR = "${INC_PR}.0" SRC_URI = " \ http://www.libsdl.org/release/SDL-${PV}.tar.gz \ diff --git a/recipes/libsdl/libsdl.inc b/recipes/libsdl/libsdl.inc index 0db0be8e14..51a4b22d4f 100644 --- a/recipes/libsdl/libsdl.inc +++ b/recipes/libsdl/libsdl.inc @@ -6,7 +6,7 @@ DEPENDS_avr32 = "alsa-lib virtual/libx11 libxext" PROVIDES = "virtual/libsdl" LICENSE = "LGPL" -PR = "r1" +INC_PR = "r10" SRC_URI = "\ http://www.libsdl.org/release/SDL-${PV}.tar.gz \ -- cgit v1.2.3 From e3c3b66a4ea5ec0910f3c8a1c3052ce418f6d352 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 10 Dec 2009 11:11:52 +0100 Subject: libsdl-x11_1.2.14: remove INC_PR, didn't notice that require libsdl.inc is actually commented out Signed-off-by: Martin Jansa --- recipes/libsdl/libsdl-x11_1.2.14.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes/libsdl') diff --git a/recipes/libsdl/libsdl-x11_1.2.14.bb b/recipes/libsdl/libsdl-x11_1.2.14.bb index 67c1fd982e..b48791f6be 100644 --- a/recipes/libsdl/libsdl-x11_1.2.14.bb +++ b/recipes/libsdl/libsdl-x11_1.2.14.bb @@ -8,7 +8,7 @@ LICENSE = "LGPL" DEPENDS = "alsa-lib virtual/libgl virtual/libx11 libxext tslib" DEPENDS_avr32 = "alsa-lib virtual/libx11 libxext tslib" PROVIDES = "virtual/libsdl" -PR = "${INC_PR}.0" +PR = "r2" SRC_URI = " \ http://www.libsdl.org/release/SDL-${PV}.tar.gz \ -- cgit v1.2.3