Add libSDL.so into Sato image

PATCH In review Jiajun Xu 3 participants 8 messages Aug 5, 2011 – Aug 15, 2011

Share & tools

Jiajun Xu

author

2011-08-05 05:57 UTC #0 lore raw

cover Add libSDL.so into Sato image

Fixing [YOCTO #883], Some graphics 3D game(urbanterror, openarena) tests need libSDL.so. Change libsdl-nativesdk to libsdl and add it into Sato image.

The following changes since commit 8a731122e7811275f20065ba27645b97fadf362d:

eglibc: Fix patch merge breakage (2011-08-04 15:41:08 +0100)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib jxu49/oe-contrib
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jxu49/oe-contrib

Jiajun Xu (1):
libsdl: Add libSDL.so into Sato image

 ...libsdl-nativesdk_1.2.11.bb => libsdl_1.2.11.bb} |   24 ++++++++++++++-----
 meta/recipes-sato/tasks/task-core-x11-sato.bb      |    3 +-
 2 files changed, 19 insertions(+), 8 deletions(-)
 rename meta/recipes-graphics/libsdl/{libsdl-nativesdk_1.2.11.bb => libsdl_1.2.11.bb} (67%)

Jiajun Xu

author

2011-08-05 05:59 UTC #1 lore raw

PATCH 1/1 libsdl: Add libSDL.so into Sato image

[YOCTO #883]
Some graphics 3D game(urbanterror, openarena) tests need libSDL.so. Change libsdl-nativesdk to libsdl and add it into Sato image.

Signed-off-by Jiajun Xu <[email protected]>

---
 ...libsdl-nativesdk_1.2.11.bb => libsdl_1.2.11.bb} |   24 ++++++++++++++-----
 meta/recipes-sato/tasks/task-core-x11-sato.bb      |    3 +-
 2 files changed, 19 insertions(+), 8 deletions(-)
 rename meta/recipes-graphics/libsdl/{libsdl-nativesdk_1.2.11.bb => libsdl_1.2.11.bb} (67%)

meta/recipes-graphics/libsdl/libsdl_1.2.11.bb renamed from meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb +17 -7

similarity index 67%
rename from meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb
rename to meta/recipes-graphics/libsdl/libsdl_1.2.11.bb
index e64a62e..244b0d8 100644
@@ -1,23 +1,31 @@
-DESCRIPTION = "Simple DirectMedia Layer - native Edition"
+SUMMARY = "Simple DirectMedia Layer"
+DESCRIPTION = "Simple DirectMedia Layer is a cross-platform multimedia \
+library designed to provide low level access to audio, keyboard, mouse, \
+joystick, 3D hardware via OpenGL, and 2D video framebuffer."
 HOMEPAGE = "http://www.libsdl.org"
+BUGTRACKER = "http://bugzilla.libsdl.org/"
+
 SECTION = "libs"
-LICENSE = "LGPLv2.1"
-DEPENDS = "libx11-nativesdk libxext-nativesdk libxrandr-nativesdk libxrender-nativesdk"
-RDEPENDS_${PN} = "libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk"
-PR = "r5"
 
+LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4"
 
+DEPENDS = "virtual/libx11 libxext libxrandr libxrender"
+RDEPENDS_virtclass-nativesdk = "libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk"
+
+PR = "r6"
+
 SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
 	   file://acinclude.m4 \
 	   file://configure_tweak.patch;patch=1 \
 	   file://kernel-asm-page.patch;patch=1 "
+
 S = "${WORKDIR}/SDL-${PV}"
 
 SRC_URI[md5sum] = "418b42956b7cd103bfab1b9077ccc149"
 SRC_URI[sha256sum] = "6985823287b224b57390b1c1b6cbc54cc9a7d7757fbf9934ed20754b4cd23730"
 
-inherit autotools binconfig pkgconfig nativesdk
+inherit autotools binconfig pkgconfig
 
 EXTRA_OECONF = "--disable-static --disable-debug --disable-cdrom --enable-threads --enable-timers --enable-endian \
                 --enable-file --disable-oss --disable-alsa --disable-esd --disable-arts \

@@ -25,7 +33,7 @@ EXTRA_OECONF = "--disable-static --disable-debug --disable-cdrom --enable-thread
                 --disable-mintaudio --disable-nasm --enable-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 \
+                --enable-input-events --enable-pthreads \
 		--disable-video-svga \
                 --disable-video-picogui --disable-video-qtopia --enable-dlopen"

@@ -34,3 +42,5 @@ PARALLEL_MAKE = ""
 do_configure_prepend() {
 	cp ${WORKDIR}/acinclude.m4 ${S}/acinclude.m4
 }
+
+BBCLASSEXTEND = "nativesdk"

meta/recipes-sato/tasks/task-core-x11-sato.bb +2 -1

index cd71077..ed43075 100644
@@ -6,7 +6,7 @@ DESCRIPTION = "Sato Tasks for Poky"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PR = "r30"
+PR = "r31"
 
 PACKAGES = "\
     task-core-x11-sato \

@@ -33,4 +33,5 @@ RDEPENDS_task-core-x11-sato = "\
     gtk-sato-engine \
     gthumb \
     x11vnc \
+    libsdl \
     ${NETWORK_MANAGER}"

Signature · 1 line

1.7.1

Phil Blundell

2011-08-05 09:25 UTC #2 lore raw

Re: [PATCH 1/1] libsdl: Add libSDL.so into Sato image

meta/recipes-graphics/libsdl/libsdl_1.2.11.bb EXTRA_OECONF = "--disable-static --disable-debug --disable-cdrom --enable-thread · line 36

Quoted 2 lines · Jiajun Xu

meta/recipes-graphics/libsdl/libsdl_1.2.11.bb renamed from meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb +1 -1
-                --disable-video-opengl --enable-input-events --enable-pthreads \
+                --enable-input-events --enable-pthreads \

If you're enabling OpenGL, doesn't it need to DEPEND on the GL/GLES libraries? Also, if this is going to break for folks who don't have/want GL then it probably needs to be a DISTRO_FEATURE or something.

Richard Purdie

2011-08-10 12:42 UTC #3 lore raw

Re: [PATCH 1/1] libsdl: Add libSDL.so into Sato image

In reply to Jiajun Xu

Hi Jiajun,

Quoted 31 lines · Jiajun Xu

[YOCTO #883]
Some graphics 3D game(urbanterror, openarena) tests need libSDL.so. Change libsdl-nativesdk to libsdl and add it into Sato image.

Signed-off-by Jiajun Xu <[email protected]>

---
 ...libsdl-nativesdk_1.2.11.bb => libsdl_1.2.11.bb} |   24 ++++++++++++++-----
 meta/recipes-sato/tasks/task-core-x11-sato.bb      |    3 +-
 2 files changed, 19 insertions(+), 8 deletions(-)
 rename meta/recipes-graphics/libsdl/{libsdl-nativesdk_1.2.11.bb => libsdl_1.2.11.bb} (67%)

meta/recipes-graphics/libsdl/libsdl_1.2.11.bb renamed from meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb +6 -4

similarity index 67%
rename from meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb
rename to meta/recipes-graphics/libsdl/libsdl_1.2.11.bb
index e64a62e..244b0d8 100644
@@ -1,23 +1,31 @@
-DESCRIPTION = "Simple DirectMedia Layer - native Edition"
+SUMMARY = "Simple DirectMedia Layer"
+DESCRIPTION = "Simple DirectMedia Layer is a cross-platform multimedia \
+library designed to provide low level access to audio, keyboard, mouse, \
+joystick, 3D hardware via OpenGL, and 2D video framebuffer."
 HOMEPAGE = "http://www.libsdl.org"
+BUGTRACKER = "http://bugzilla.libsdl.org/"
+
 SECTION = "libs"
-LICENSE = "LGPLv2.1"
-DEPENDS = "libx11-nativesdk libxext-nativesdk libxrandr-nativesdk libxrender-nativesdk"
-RDEPENDS_${PN} = "libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk"

meta/recipes-graphics/libsdl/libsdl_1.2.11.bb line 17

Quoted 10 lines

meta/recipes-graphics/libsdl/libsdl_1.2.11.bb renamed from meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb +6 -1

-PR = "r5"
 
+LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4"
 
+DEPENDS = "virtual/libx11 libxext libxrandr libxrender"
+RDEPENDS_virtclass-nativesdk = "libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk"
+
+PR = "r6"
+

As Phil mentioned, we need to ensure we depend on GL here (and only if GL is enabled in distro features). The patch is otherwise good.

Perhaps resubmit this without the enabling GL but adding the nativesdk version, then we can enable GL in a follow up patch?

Cheers,

Richard

Quoted 57 lines

meta/recipes-graphics/libsdl/libsdl_1.2.11.bb renamed from meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb +5 -2

 SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
 	   file://acinclude.m4 \
 	   file://configure_tweak.patch;patch=1 \
 	   file://kernel-asm-page.patch;patch=1 "
+
 S = "${WORKDIR}/SDL-${PV}"
 
 SRC_URI[md5sum] = "418b42956b7cd103bfab1b9077ccc149"
 SRC_URI[sha256sum] = "6985823287b224b57390b1c1b6cbc54cc9a7d7757fbf9934ed20754b4cd23730"
 
-inherit autotools binconfig pkgconfig nativesdk
+inherit autotools binconfig pkgconfig
 
 EXTRA_OECONF = "--disable-static --disable-debug --disable-cdrom --enable-threads --enable-timers --enable-endian \
                 --enable-file --disable-oss --disable-alsa --disable-esd --disable-arts \

@@ -25,7 +33,7 @@ EXTRA_OECONF = "--disable-static --disable-debug --disable-cdrom --enable-thread
                 --disable-mintaudio --disable-nasm --enable-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 \
+                --enable-input-events --enable-pthreads \
 		--disable-video-svga \
                 --disable-video-picogui --disable-video-qtopia --enable-dlopen"

@@ -34,3 +42,5 @@ PARALLEL_MAKE = ""
 do_configure_prepend() {
 	cp ${WORKDIR}/acinclude.m4 ${S}/acinclude.m4
 }
+
+BBCLASSEXTEND = "nativesdk"

meta/recipes-sato/tasks/task-core-x11-sato.bb +2 -1

index cd71077..ed43075 100644
@@ -6,7 +6,7 @@ DESCRIPTION = "Sato Tasks for Poky"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PR = "r30"
+PR = "r31"
 
 PACKAGES = "\
     task-core-x11-sato \

@@ -33,4 +33,5 @@ RDEPENDS_task-core-x11-sato = "\
     gtk-sato-engine \
     gthumb \
     x11vnc \
+    libsdl \
     ${NETWORK_MANAGER}"

Signature · 7 lines

1.7.1


_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Xu, Jiajun

author

2011-08-11 07:37 UTC #4 lore raw

Re: [PATCH 1/1] libsdl: Add libSDL.so into Sato image

Thanks for your suggestions, Richard, Phil.
Just want to double confirm, is it OK if I add a check for "opengl" in DISTRO_FEATURES in libsdl.bb? If it's set, we could add virtual/libgl into DEPENDS and RDEPENDS_virtclass-nativesdk, and enable opengl in EXTRA_OECONF.

Quoted 115 lines

Hi Jiajun,
Quoted 21 lines · Jiajun Xu
[YOCTO #883]
Some graphics 3D game(urbanterror, openarena) tests need libSDL.so. Change libsdl-nativesdk to libsdl and add it into Sato image.
Signed-off-by Jiajun Xu <[email protected]>
---
 ...libsdl-nativesdk_1.2.11.bb => libsdl_1.2.11.bb} |   24
++++++++++++++----- meta/recipes-sato/tasks/task-core-x11-sato.bb
| 3 +- 2 files changed, 19 insertions(+), 8 deletions(-) rename
meta/recipes-graphics/libsdl/{libsdl-nativesdk_1.2.11.bb => libsdl_1.2.11.bb} (67%)
meta/recipes-graphics/libsdl/libsdl_1.2.11.bb renamed from meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb +0 -0
similarity index 67%
rename from meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb
rename to meta/recipes-graphics/libsdl/libsdl_1.2.11.bb
index e64a62e..244b0d8 100644
meta/recipes-graphics/libsdl/libsdl_1.2.11.bb line 4
Quoted 5 lines
meta/recipes-graphics/libsdl/libsdl_1.2.11.bb renamed from meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb +4 -1
@@ -1,23 +1,31 @@
-DESCRIPTION = "Simple DirectMedia Layer - native Edition"
+SUMMARY = "Simple DirectMedia Layer"
+DESCRIPTION = "Simple DirectMedia Layer is a cross-platform
+multimedia \ library designed to provide low level access to audio,
+keyboard, mouse, \ joystick, 3D hardware via OpenGL, and 2D video
framebuffer."
Quoted 11 lines
meta/recipes-graphics/libsdl/libsdl_1.2.11.bb renamed from meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb +2 -1
 HOMEPAGE = "http://www.libsdl.org"
+BUGTRACKER = "http://bugzilla.libsdl.org/"
+
 SECTION = "libs"
-LICENSE = "LGPLv2.1" -DEPENDS = "libx11-nativesdk libxext-nativesdk
libxrandr-nativesdk libxrender-nativesdk" -RDEPENDS_${PN} = "libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk" -PR = "r5"
+LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM =
"file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4"
Quoted 4 lines
meta/recipes-graphics/libsdl/libsdl_1.2.11.bb renamed from meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb +2 -0
+DEPENDS = "virtual/libx11 libxext libxrandr libxrender"
+RDEPENDS_virtclass-nativesdk = "libx11-nativesdk +libxrandr-nativesdk
libxrender-nativesdk libxext-nativesdk" + +PR = "r6" +
As Phil mentioned, we need to ensure we depend on GL here (and only if GL is enabled in distro features). The patch is otherwise good.
Perhaps resubmit this without the enabling GL but adding the nativesdk version, then we can enable GL in a follow up patch?
Cheers,
Richard
Quoted 6 lines
SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
file://acinclude.m4 \ file://configure_tweak.patch;patch=1 \
file://kernel-asm-page.patch;patch=1 " + S = "${WORKDIR}/SDL-${PV}"
SRC_URI[md5sum] = "418b42956b7cd103bfab1b9077ccc149" SRC_URI[sha256sum] =
"6985823287b224b57390b1c1b6cbc54cc9a7d7757fbf9934ed20754b4cd23730"
meta/recipes-graphics/libsdl/libsdl_1.2.11.bb
Quoted 5 lines
meta/recipes-graphics/libsdl/libsdl_1.2.11.bb renamed from meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb +1 -1
-inherit autotools binconfig pkgconfig nativesdk
+inherit autotools binconfig pkgconfig
 
 EXTRA_OECONF = "--disable-static --disable-debug --disable-cdrom
--enable-threads --enable-timers --enable-endian \
Quoted 2 lines
                 --enable-file --disable-oss --disable-alsa
--disable-esd --disable-arts \ @@ -25,7 +33,7 @@ EXTRA_OECONF =
"--disable-static --disable-debug --disable-cdrom --enable-thread
Quoted 2 lines
                 --disable-mintaudio --disable-nasm
--enable-video-x11
--disable-video-dga \
Quoted 3 lines
                 --disable-video-fbcon --disable-video-directfb
                 --disable-video-ps2gs \ --disable-video-xbios
                 --disable-video-gem
--disable-video-dummy \
meta/recipes-graphics/libsdl/libsdl_1.2.11.bb
Quoted 5 lines
meta/recipes-graphics/libsdl/libsdl_1.2.11.bb renamed from meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb +0 -3
-                --disable-video-opengl --enable-input-events
--enable-pthreads \ +                --enable-input-events
--enable-pthreads \
 		--disable-video-svga \
                 --disable-video-picogui --disable-video-qtopia
--enable-dlopen"
Quoted 12 lines
meta/recipes-graphics/libsdl/libsdl_1.2.11.bb renamed from meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb +2 -0
@@ -34,3 +42,5 @@ PARALLEL_MAKE = ""
 do_configure_prepend() {
 	cp ${WORKDIR}/acinclude.m4 ${S}/acinclude.m4  }
+
+BBCLASSEXTEND = "nativesdk"
meta/recipes-sato/tasks/task-core-x11-sato.bb +0 -0
index cd71077..ed43075 100644
meta/recipes-sato/tasks/task-core-x11-sato.bb DESCRIPTION = "Sato Tasks for Poky" · line 7
Quoted 2 lines
meta/recipes-sato/tasks/task-core-x11-sato.bb +0 -0
@@ -6,7 +6,7 @@ DESCRIPTION = "Sato Tasks for Poky"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM =
"file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
Quoted 1 line
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de 20420"
Quoted 11 lines
meta/recipes-sato/tasks/task-core-x11-sato.bb +1 -2
-PR = "r30"
+PR = "r31"
 
 PACKAGES = "\
     task-core-x11-sato \ @@ -33,4 +33,5 @@ RDEPENDS_task-core-x11-sato
     = "\ gtk-sato-engine \ gthumb \ x11vnc \ +    libsdl \
     ${NETWORK_MANAGER}"
--
1.7.1

Quoted 11 lines

Quoted 5 lines
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-cor
e
_______________________________________________ Openembedded-core mailing list [email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Best Regards,
Jiajun

Phil Blundell

2011-08-11 09:30 UTC #5 lore raw

Re: [PATCH 1/1] libsdl: Add libSDL.so into Sato image

Something like that, yeah. I don't think you want/need to do anything with RDEPENDS since that should all be automatic.

If SDL can use GLES as well as GL then it might be worth adding support for both. They should probably be separate DISTRO_FEATUREs (and possibly we should have separate features again for GLES1.1 versus GLES2.0).

Quoted 138 lines · Jiajun

Thanks for your suggestions, Richard, Phil.
Just want to double confirm, is it OK if I add a check for "opengl" in DISTRO_FEATURES in libsdl.bb? If it's set, we could add virtual/libgl into DEPENDS and RDEPENDS_virtclass-nativesdk, and enable opengl in EXTRA_OECONF.
Quoted 115 lines
Hi Jiajun,
Quoted 21 lines · Jiajun Xu
[YOCTO #883]
Some graphics 3D game(urbanterror, openarena) tests need libSDL.so. Change libsdl-nativesdk to libsdl and add it into Sato image.
Signed-off-by Jiajun Xu <[email protected]>
---
 ...libsdl-nativesdk_1.2.11.bb => libsdl_1.2.11.bb} |   24
++++++++++++++----- meta/recipes-sato/tasks/task-core-x11-sato.bb
| 3 +- 2 files changed, 19 insertions(+), 8 deletions(-) rename
meta/recipes-graphics/libsdl/{libsdl-nativesdk_1.2.11.bb => libsdl_1.2.11.bb} (67%)
meta/recipes-graphics/libsdl/libsdl_1.2.11.bb renamed from meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb +0 -0
similarity index 67%
rename from meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb
rename to meta/recipes-graphics/libsdl/libsdl_1.2.11.bb
index e64a62e..244b0d8 100644
meta/recipes-graphics/libsdl/libsdl_1.2.11.bb line 4
Quoted 5 lines
meta/recipes-graphics/libsdl/libsdl_1.2.11.bb renamed from meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb +4 -1
@@ -1,23 +1,31 @@
-DESCRIPTION = "Simple DirectMedia Layer - native Edition"
+SUMMARY = "Simple DirectMedia Layer"
+DESCRIPTION = "Simple DirectMedia Layer is a cross-platform
+multimedia \ library designed to provide low level access to audio,
+keyboard, mouse, \ joystick, 3D hardware via OpenGL, and 2D video
framebuffer."
Quoted 11 lines
meta/recipes-graphics/libsdl/libsdl_1.2.11.bb renamed from meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb +2 -1
 HOMEPAGE = "http://www.libsdl.org"
+BUGTRACKER = "http://bugzilla.libsdl.org/"
+
 SECTION = "libs"
-LICENSE = "LGPLv2.1" -DEPENDS = "libx11-nativesdk libxext-nativesdk
libxrandr-nativesdk libxrender-nativesdk" -RDEPENDS_${PN} = "libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk" -PR = "r5"
+LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM =
"file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4"
Quoted 4 lines
meta/recipes-graphics/libsdl/libsdl_1.2.11.bb renamed from meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb +2 -0
+DEPENDS = "virtual/libx11 libxext libxrandr libxrender"
+RDEPENDS_virtclass-nativesdk = "libx11-nativesdk +libxrandr-nativesdk
libxrender-nativesdk libxext-nativesdk" + +PR = "r6" +
As Phil mentioned, we need to ensure we depend on GL here (and only if GL is enabled in distro features). The patch is otherwise good.
Perhaps resubmit this without the enabling GL but adding the nativesdk version, then we can enable GL in a follow up patch?
Cheers,
Richard
Quoted 6 lines
SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
file://acinclude.m4 \ file://configure_tweak.patch;patch=1 \
file://kernel-asm-page.patch;patch=1 " + S = "${WORKDIR}/SDL-${PV}"
SRC_URI[md5sum] = "418b42956b7cd103bfab1b9077ccc149" SRC_URI[sha256sum] =
"6985823287b224b57390b1c1b6cbc54cc9a7d7757fbf9934ed20754b4cd23730"
meta/recipes-graphics/libsdl/libsdl_1.2.11.bb
Quoted 5 lines
meta/recipes-graphics/libsdl/libsdl_1.2.11.bb renamed from meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb +1 -1
-inherit autotools binconfig pkgconfig nativesdk
+inherit autotools binconfig pkgconfig
 
 EXTRA_OECONF = "--disable-static --disable-debug --disable-cdrom
--enable-threads --enable-timers --enable-endian \
Quoted 2 lines
                 --enable-file --disable-oss --disable-alsa
--disable-esd --disable-arts \ @@ -25,7 +33,7 @@ EXTRA_OECONF =
"--disable-static --disable-debug --disable-cdrom --enable-thread
Quoted 2 lines
                 --disable-mintaudio --disable-nasm
--enable-video-x11
--disable-video-dga \
Quoted 3 lines
                 --disable-video-fbcon --disable-video-directfb
                 --disable-video-ps2gs \ --disable-video-xbios
                 --disable-video-gem
--disable-video-dummy \
meta/recipes-graphics/libsdl/libsdl_1.2.11.bb
Quoted 5 lines
meta/recipes-graphics/libsdl/libsdl_1.2.11.bb renamed from meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb +0 -3
-                --disable-video-opengl --enable-input-events
--enable-pthreads \ +                --enable-input-events
--enable-pthreads \
 		--disable-video-svga \
                 --disable-video-picogui --disable-video-qtopia
--enable-dlopen"
Quoted 12 lines
meta/recipes-graphics/libsdl/libsdl_1.2.11.bb renamed from meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb +2 -0
@@ -34,3 +42,5 @@ PARALLEL_MAKE = ""
 do_configure_prepend() {
 	cp ${WORKDIR}/acinclude.m4 ${S}/acinclude.m4  }
+
+BBCLASSEXTEND = "nativesdk"
meta/recipes-sato/tasks/task-core-x11-sato.bb +0 -0
index cd71077..ed43075 100644
meta/recipes-sato/tasks/task-core-x11-sato.bb DESCRIPTION = "Sato Tasks for Poky" · line 7
Quoted 2 lines
meta/recipes-sato/tasks/task-core-x11-sato.bb +0 -0
@@ -6,7 +6,7 @@ DESCRIPTION = "Sato Tasks for Poky"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM =
"file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
Quoted 1 line
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de 20420"
Quoted 11 lines
meta/recipes-sato/tasks/task-core-x11-sato.bb +1 -2
-PR = "r30"
+PR = "r31"
 
 PACKAGES = "\
     task-core-x11-sato \ @@ -33,4 +33,5 @@ RDEPENDS_task-core-x11-sato
     = "\ gtk-sato-engine \ gthumb \ x11vnc \ +    libsdl \
     ${NETWORK_MANAGER}"
--
1.7.1
Quoted 11 lines
Quoted 5 lines
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-cor
e
_______________________________________________ Openembedded-core mailing list [email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Best Regards,
Jiajun
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Xu, Jiajun

author

2011-08-15 07:15 UTC #6 lore raw

Re: [PATCH 1/1] libsdl: Add libSDL.so into Sato image

Quoted 3 lines

Something like that, yeah. I don't think you want/need to do anything with RDEPENDS since that should all be automatic.

Thanks for your suggestion, Phil. I have modified my patches as below. Could you help to review it?

Quoted 4 lines

If SDL can use GLES as well as GL then it might be worth adding support for both. They should probably be separate DISTRO_FEATUREs (and possibly we should have separate features again for GLES1.1 versus GLES2.0).

It seems libsdl 1.2 could not support GLES. Libsdl 1.3 supports GLES but it is still under construction.

Patch 1
Libsdl: add target version
http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/commit/?h=jxu49/oe-contrib&id=e141a00db49c6c2aa631b065b4a1391c9abe0277

meta/recipes-graphics/libsdl/libsdl_1.2.11.bb renamed from meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb +15 -5

similarity index 73%
rename from meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb
rename to meta/recipes-graphics/libsdl/libsdl_1.2.11.bb
index e64a62e..7c1c507 100644
@@ -1,17 +1,25 @@
-DESCRIPTION = "Simple DirectMedia Layer - native Edition"
+SUMMARY = "Simple DirectMedia Layer"
+DESCRIPTION = "Simple DirectMedia Layer is a cross-platform multimedia \
+library designed to provide low level access to audio, keyboard, mouse, \
+joystick, 3D hardware via OpenGL, and 2D video framebuffer."
 HOMEPAGE = "http://www.libsdl.org"
+BUGTRACKER = "http://bugzilla.libsdl.org/"
+
 SECTION = "libs"
-LICENSE = "LGPLv2.1"
-DEPENDS = "libx11-nativesdk libxext-nativesdk libxrandr-nativesdk libxrender-nativesdk"
-RDEPENDS_${PN} = "libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk"
-PR = "r5"
 
+LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4"
 
+DEPENDS = "virtual/libx11 libxext libxrandr libxrender"
+DEPENDS_virtclass-nativesdk = "libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk"
+
+PR = "r6"
+
 SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
           file://acinclude.m4 \
           file://configure_tweak.patch;patch=1 \
           file://kernel-asm-page.patch;patch=1 "
+
 S = "${WORKDIR}/SDL-${PV}"
 
 SRC_URI[md5sum] = "418b42956b7cd103bfab1b9077ccc149"

@@ -34,3 +42,5 @@ PARALLEL_MAKE = ""
 do_configure_prepend() {
        cp ${WORKDIR}/acinclude.m4 ${S}/acinclude.m4
 }
+
+BBCLASSEXTEND = "nativesdk"

Patch 2
Libsdl: enable opengl for libsdl
http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/commit/?h=jxu49/oe-contrib&id=a6139bd9b26c792ab0c00b57c374e9ac8dade33d

meta/recipes-graphics/libsdl/libsdl_1.2.11.bb +4 -3

index 7c1c507..f08077d 100644
@@ -10,10 +10,10 @@ SECTION = "libs"
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4"
 
-DEPENDS = "virtual/libx11 libxext libxrandr libxrender"
+DEPENDS = "${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} virtual/libx11 libxext libxrandr libxrender"
 DEPENDS_virtclass-nativesdk = "libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk"
 
-PR = "r6"
+PR = "r7"
 
 SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
           file://acinclude.m4 \

@@ -33,7 +33,8 @@ EXTRA_OECONF = "--disable-static --disable-debug --disable-cdrom --enable-thread
                 --disable-mintaudio --disable-nasm --enable-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 \
+                --enable-input-events --enable-pthreads \
+               ${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-video-opengl', '--disable-video-opengl', d)} \
                --disable-video-svga \
                 --disable-video-picogui --disable-video-qtopia --enable-dlopen"

Quoted 1 line

p.

Best Regards,
Jiajun

Phil Blundell

2011-08-15 09:21 UTC #7 lore raw

Re: [PATCH 1/1] libsdl: Add libSDL.so into Sato image

Quoted 5 lines · Jiajun

Quoted 3 lines
Something like that, yeah. I don't think you want/need to do anything with RDEPENDS since that should all be automatic.
Thanks for your suggestion, Phil. I have modified my patches as below. Could you help to review it?

Looks good to me. Thanks.