From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from 93-97-173-237.zone5.bethere.co.uk ([93.97.173.237] helo=tim.rpsys.net) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1Qr87H-0008TV-6s for openembedded-core@lists.openembedded.org; Wed, 10 Aug 2011 14:42:36 +0200 Received: from localhost (localhost [127.0.0.1]) by tim.rpsys.net (8.13.6/8.13.8) with ESMTP id p7ACc5XX021551 for ; Wed, 10 Aug 2011 13:38:05 +0100 Received: from tim.rpsys.net ([127.0.0.1]) by localhost (tim.rpsys.net [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 20866-06 for ; Wed, 10 Aug 2011 13:38:01 +0100 (BST) Received: from [192.168.3.10] ([192.168.3.10]) (authenticated bits=0) by tim.rpsys.net (8.13.6/8.13.8) with ESMTP id p7ACbuQ2021545 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 10 Aug 2011 13:37:57 +0100 From: Richard Purdie To: Patches and discussions about the oe-core layer In-Reply-To: References: Date: Wed, 10 Aug 2011 13:37:22 +0100 Message-ID: <1312979842.14274.370.camel@rex> Mime-Version: 1.0 X-Mailer: Evolution 2.32.2 X-Virus-Scanned: amavisd-new at rpsys.net Subject: Re: [PATCH 1/1] libsdl: Add libSDL.so into Sato image X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Patches and discussions about the oe-core layer List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Aug 2011 12:42:36 -0000 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit 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 > --- > ...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