[OE-core] [PATCH 1/1] libsdl: Add libSDL.so into Sato image

[Xu, 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.

> 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 at 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 at lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-cor
>> e
> 
> 
> 
> _______________________________________________ Openembedded-core
> mailing list Openembedded-core at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Best Regards,
Jiajun