* [PATCH 0/1] Add libSDL.so into Sato image
@ 2011-08-05 6:11 Jiajun Xu
2011-08-05 6:11 ` [PATCH 1/1] libsdl: " Jiajun Xu
0 siblings, 1 reply; 8+ messages in thread
From: Jiajun Xu @ 2011-08-05 6:11 UTC (permalink / raw)
To: openembedded-core
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%)
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH 1/1] libsdl: Add libSDL.so into Sato image 2011-08-05 6:11 [PATCH 0/1] Add libSDL.so into Sato image Jiajun Xu @ 2011-08-05 6:11 ` Jiajun Xu 2011-08-05 9:21 ` Phil Blundell 2011-08-10 12:37 ` Richard Purdie 0 siblings, 2 replies; 8+ messages in thread From: Jiajun Xu @ 2011-08-05 6:11 UTC (permalink / raw) To: openembedded-core [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 <jiajun.xu@intel.com> --- ...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%) diff --git a/meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.11.bb 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 --- a/meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb +++ b/meta/recipes-graphics/libsdl/libsdl_1.2.11.bb @@ -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" diff --git a/meta/recipes-sato/tasks/task-core-x11-sato.bb b/meta/recipes-sato/tasks/task-core-x11-sato.bb index cd71077..ed43075 100644 --- a/meta/recipes-sato/tasks/task-core-x11-sato.bb +++ b/meta/recipes-sato/tasks/task-core-x11-sato.bb @@ -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}" -- 1.7.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 1/1] libsdl: Add libSDL.so into Sato image 2011-08-05 6:11 ` [PATCH 1/1] libsdl: " Jiajun Xu @ 2011-08-05 9:21 ` Phil Blundell 2011-08-10 12:37 ` Richard Purdie 1 sibling, 0 replies; 8+ messages in thread From: Phil Blundell @ 2011-08-05 9:21 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On Fri, 2011-08-05 at 14:11 +0800, Jiajun Xu wrote: > - --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. p. ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/1] libsdl: Add libSDL.so into Sato image 2011-08-05 6:11 ` [PATCH 1/1] libsdl: " Jiajun Xu 2011-08-05 9:21 ` Phil Blundell @ 2011-08-10 12:37 ` Richard Purdie 2011-08-11 7:31 ` Xu, Jiajun 1 sibling, 1 reply; 8+ messages in thread From: Richard Purdie @ 2011-08-10 12:37 UTC (permalink / raw) To: Patches and discussions about the oe-core layer Hi Jiajun, On Fri, 2011-08-05 at 14:11 +0800, Jiajun Xu wrote: > [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 <jiajun.xu@intel.com> > --- > ...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%) > > diff --git a/meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.11.bb > 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 > --- a/meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb > +++ b/meta/recipes-graphics/libsdl/libsdl_1.2.11.bb > @@ -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" > + 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 > 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" > diff --git a/meta/recipes-sato/tasks/task-core-x11-sato.bb b/meta/recipes-sato/tasks/task-core-x11-sato.bb > index cd71077..ed43075 100644 > --- a/meta/recipes-sato/tasks/task-core-x11-sato.bb > +++ b/meta/recipes-sato/tasks/task-core-x11-sato.bb > @@ -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}" > -- > 1.7.1 > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/1] libsdl: Add libSDL.so into Sato image 2011-08-10 12:37 ` Richard Purdie @ 2011-08-11 7:31 ` Xu, Jiajun 2011-08-11 9:25 ` Phil Blundell 0 siblings, 1 reply; 8+ messages in thread From: Xu, Jiajun @ 2011-08-11 7:31 UTC (permalink / raw) To: Patches and discussions about the oe-core layer 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. > Hi Jiajun, > > On Fri, 2011-08-05 at 14:11 +0800, Jiajun Xu wrote: >> [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 <jiajun.xu@intel.com> >> --- >> ...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%) >> >> diff --git a/meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb >> b/meta/recipes-graphics/libsdl/libsdl_1.2.11.bb >> 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 >> --- a/meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb >> +++ b/meta/recipes-graphics/libsdl/libsdl_1.2.11.bb >> @@ -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" + > > 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 > >> 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" >> diff --git a/meta/recipes-sato/tasks/task-core-x11-sato.bb >> b/meta/recipes-sato/tasks/task-core-x11-sato.bb >> index cd71077..ed43075 100644 >> --- a/meta/recipes-sato/tasks/task-core-x11-sato.bb >> +++ b/meta/recipes-sato/tasks/task-core-x11-sato.bb >> @@ -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=3da9cfbcb788c80a0384361b4de > 20420" >> -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 >> >> >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core@lists.openembedded.org >> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-cor >> e > > > > _______________________________________________ Openembedded-core > mailing list Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core Best Regards, Jiajun ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/1] libsdl: Add libSDL.so into Sato image 2011-08-11 7:31 ` Xu, Jiajun @ 2011-08-11 9:25 ` Phil Blundell 2011-08-15 7:09 ` Xu, Jiajun 0 siblings, 1 reply; 8+ messages in thread From: Phil Blundell @ 2011-08-11 9:25 UTC (permalink / raw) To: Patches and discussions about the oe-core layer 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). p. On Thu, 2011-08-11 at 15:31 +0800, Xu, Jiajun wrote: > 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. > > > Hi Jiajun, > > > > On Fri, 2011-08-05 at 14:11 +0800, Jiajun Xu wrote: > >> [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 <jiajun.xu@intel.com> > >> --- > >> ...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%) > >> > >> diff --git a/meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb > >> b/meta/recipes-graphics/libsdl/libsdl_1.2.11.bb > >> 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 > >> --- a/meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb > >> +++ b/meta/recipes-graphics/libsdl/libsdl_1.2.11.bb > >> @@ -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" + > > > > 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 > > > >> 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" > >> diff --git a/meta/recipes-sato/tasks/task-core-x11-sato.bb > >> b/meta/recipes-sato/tasks/task-core-x11-sato.bb > >> index cd71077..ed43075 100644 > >> --- a/meta/recipes-sato/tasks/task-core-x11-sato.bb > >> +++ b/meta/recipes-sato/tasks/task-core-x11-sato.bb > >> @@ -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=3da9cfbcb788c80a0384361b4de > > 20420" > >> -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 > >> > >> > >> _______________________________________________ > >> Openembedded-core mailing list > >> Openembedded-core@lists.openembedded.org > >> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-cor > >> e > > > > > > > > _______________________________________________ Openembedded-core > > mailing list Openembedded-core@lists.openembedded.org > > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core > > Best Regards, > Jiajun > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/1] libsdl: Add libSDL.so into Sato image 2011-08-11 9:25 ` Phil Blundell @ 2011-08-15 7:09 ` Xu, Jiajun 2011-08-15 9:17 ` Phil Blundell 0 siblings, 1 reply; 8+ messages in thread From: Xu, Jiajun @ 2011-08-15 7:09 UTC (permalink / raw) To: Patches and discussions about the oe-core layer > 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? > 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 diff --git a/meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.11.bb 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 --- a/meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb +++ b/meta/recipes-graphics/libsdl/libsdl_1.2.11.bb @@ -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 diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.11.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.11.bb index 7c1c507..f08077d 100644 --- a/meta/recipes-graphics/libsdl/libsdl_1.2.11.bb +++ b/meta/recipes-graphics/libsdl/libsdl_1.2.11.bb @@ -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" > p. Best Regards, Jiajun ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 1/1] libsdl: Add libSDL.so into Sato image 2011-08-15 7:09 ` Xu, Jiajun @ 2011-08-15 9:17 ` Phil Blundell 0 siblings, 0 replies; 8+ messages in thread From: Phil Blundell @ 2011-08-15 9:17 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On Mon, 2011-08-15 at 15:09 +0800, Xu, Jiajun wrote: > > 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. p. ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2011-08-15 9:21 UTC | newest] Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2011-08-05 6:11 [PATCH 0/1] Add libSDL.so into Sato image Jiajun Xu 2011-08-05 6:11 ` [PATCH 1/1] libsdl: " Jiajun Xu 2011-08-05 9:21 ` Phil Blundell 2011-08-10 12:37 ` Richard Purdie 2011-08-11 7:31 ` Xu, Jiajun 2011-08-11 9:25 ` Phil Blundell 2011-08-15 7:09 ` Xu, Jiajun 2011-08-15 9:17 ` Phil Blundell
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.