[PATCH][jethro][RFC 1/2] libsdl: expand PACKAGECONFIG and enable native builds

[PATCH][jethro][RFC 1/2] libsdl: expand PACKAGECONFIG and enable native builds

[Ross Burton]

Use PACKAGECONFIG instead of using logic in DEPENDS and EXTRA_OECONF, adding new
options for PulseAudio, tslib, DirectFB, OpenGL and X11.  Pass
--disable-x11-shared so that it links to the X libraries instead of using
dlopen().

Disable tslib by default as the kernel event input subsystem is generally used.

SDL's OpenGL support requires X11 so check for both x11 and opengl, and merge
the dependencies.

Finally enable native builds, with a minimal PACKAGECONFIG that will build from
oe-core for native and nativesdk.

(From OE-Core rev: 3d6c31c3a4ff34376e17005a981bb55fc6f7a38f)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-graphics/libsdl/libsdl_1.2.15.bb | 35 ++++++++++++++-------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
index c0d5c6a..1cf3c39 100644
--- a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
+++ b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
@@ -12,13 +12,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4"
 
 PROVIDES = "virtual/libsdl"
 
-DEPENDS = "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \
-           ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} \
-           ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxext libxrandr libxrender', '', d)} \
-           ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'libglu', '', d)} \
-           tslib"
-DEPENDS_class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/nativesdk-libx11 nativesdk-libxrandr nativesdk-libxrender nativesdk-libxext', '', d)}"
-
 PR = "r3"
 
 SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
@@ -38,21 +31,29 @@ inherit autotools lib_package binconfig-disabled pkgconfig
 
 EXTRA_OECONF = "--disable-static --enable-cdrom --enable-threads --enable-timers \
                 --enable-file --disable-oss --disable-esd --disable-arts \
-                --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \
+                --disable-diskaudio --disable-nas \
                 --disable-mintaudio --disable-nasm --disable-video-dga \
                 --disable-video-fbcon --disable-video-ps2gs --disable-video-ps3 \
                 --disable-xbios --disable-gem --disable-video-dummy \
-                --enable-input-events --enable-input-tslib --enable-pthreads \
-                ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', '--enable-video-directfb', '--disable-video-directfb', d)} \
-                ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '--enable-video-opengl', '--disable-video-opengl', d)} \
-                ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '--enable-video-x11', '--disable-video-x11', d)} \
+                --enable-input-events --enable-pthreads \
                 --disable-video-svga \
                 --disable-video-picogui --disable-video-qtopia --enable-sdl-dlopen \
-                --disable-rpath \
-                --disable-pulseaudio"
+                --disable-rpath"
+
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \
+                   ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \
+                   ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \
+                   ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'opengl', '', d)} \
+                   ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
+PACKAGECONFIG_class-native = "x11"
+PACKAGECONFIG_class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
 
-PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}"
-PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib,"
+PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib"
+PACKAGECONFIG[pulseaudio] = "--enable-pulseaudio,--disable-pulseaudio,pulseaudio"
+PACKAGECONFIG[tslib] = "--enable-input-tslib, --disable-input-tslib, tslib"
+PACKAGECONFIG[directfb] = "--enable-video-directfb, --disable-video-directfb, directfb"
+PACKAGECONFIG[opengl] = "--enable-video-opengl, --disable-video-opengl, virtual/libgl libglu"
+PACKAGECONFIG[x11] = "--enable-video-x11 --disable-x11-shared, --disable-video-x11, virtual/libx11 libxext libxrandr libxrender"
 
 EXTRA_AUTORECONF += "--include=acinclude --exclude=autoheader"
 
@@ -65,4 +66,4 @@ do_configure_prepend() {
         export SYSROOT=$PKG_CONFIG_SYSROOT_DIR
 }
 
-BBCLASSEXTEND = "nativesdk"
+BBCLASSEXTEND = "native nativesdk"
-- 
2.7.0

[PATCH][jethro][RFC 2/2] conf/local.conf.sample: comment out ASSUME_PROVIDED=libsdl-native

[Ross Burton]

Ubuntu 15.10 and Debian testing can't build qemu-native against the host libsdl.
Now that libsdl-native is buildable, comment out the ASSUME_PROVIDED which meant
it wouldn't be used.

[ YOCTO #8553 ]

(From meta-yocto rev: 759accbfca46de058ce402938713189dab22a70c)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta-yocto/conf/local.conf.sample | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/meta-yocto/conf/local.conf.sample b/meta-yocto/conf/local.conf.sample
index bf6dd90..72c16b25d 100644
--- a/meta-yocto/conf/local.conf.sample
+++ b/meta-yocto/conf/local.conf.sample
@@ -225,11 +225,12 @@ BB_DISKMON_DIRS = "\
 # Qemu configuration
 #
 # By default qemu will build with a builtin VNC server where graphical output can be
-# seen. The two lines below enable the SDL backend too. This assumes there is a
-# libsdl library available on your build system.
+# seen. The two lines below enable the SDL backend too. By default libsdl-native will
+# be built, if you want to use your host's libSDL instead of the minimal libsdl built
+# by libsdl-native then uncomment the ASSUME_PROVIDED line below.
 PACKAGECONFIG_append_pn-qemu-native = " sdl"
 PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl"
-ASSUME_PROVIDED += "libsdl-native"
+#ASSUME_PROVIDED += "libsdl-native"
 
 
 # CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to
-- 
2.7.0

Re: [PATCH][jethro][RFC 1/2] libsdl: expand PACKAGECONFIG and enable native builds

[Trevor Woerner]

This patch causes my jethro build to now fail with:

ERROR: Nothing PROVIDES 'virtual/nativesdk-nativesdk-libx11' (but 
virtual:nativesdk:/z/dragon410c-repo/dragon410c-tw-jethro/layers/openembedded-core/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb 
DEPENDS on or otherwise requires it). Close matches:
   virtual/nativesdk-libx11
   virtual/nativesdk-libc
   virtual/nativesdk-db



On 02/29/16 11:02, Ross Burton wrote:
> Use PACKAGECONFIG instead of using logic in DEPENDS and EXTRA_OECONF, adding new
> options for PulseAudio, tslib, DirectFB, OpenGL and X11.  Pass
> --disable-x11-shared so that it links to the X libraries instead of using
> dlopen().
>
> Disable tslib by default as the kernel event input subsystem is generally used.
>
> SDL's OpenGL support requires X11 so check for both x11 and opengl, and merge
> the dependencies.
>
> Finally enable native builds, with a minimal PACKAGECONFIG that will build from
> oe-core for native and nativesdk.
>
> (From OE-Core rev: 3d6c31c3a4ff34376e17005a981bb55fc6f7a38f)
>
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
>   meta/recipes-graphics/libsdl/libsdl_1.2.15.bb | 35 ++++++++++++++-------------
>   1 file changed, 18 insertions(+), 17 deletions(-)
>
> diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
> index c0d5c6a..1cf3c39 100644
> --- a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
> +++ b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
> @@ -12,13 +12,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4"
>   
>   PROVIDES = "virtual/libsdl"
>   
> -DEPENDS = "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \
> -           ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} \
> -           ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxext libxrandr libxrender', '', d)} \
> -           ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'libglu', '', d)} \
> -           tslib"
> -DEPENDS_class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/nativesdk-libx11 nativesdk-libxrandr nativesdk-libxrender nativesdk-libxext', '', d)}"
> -
>   PR = "r3"
>   
>   SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
> @@ -38,21 +31,29 @@ inherit autotools lib_package binconfig-disabled pkgconfig
>   
>   EXTRA_OECONF = "--disable-static --enable-cdrom --enable-threads --enable-timers \
>                   --enable-file --disable-oss --disable-esd --disable-arts \
> -                --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \
> +                --disable-diskaudio --disable-nas \
>                   --disable-mintaudio --disable-nasm --disable-video-dga \
>                   --disable-video-fbcon --disable-video-ps2gs --disable-video-ps3 \
>                   --disable-xbios --disable-gem --disable-video-dummy \
> -                --enable-input-events --enable-input-tslib --enable-pthreads \
> -                ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', '--enable-video-directfb', '--disable-video-directfb', d)} \
> -                ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '--enable-video-opengl', '--disable-video-opengl', d)} \
> -                ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '--enable-video-x11', '--disable-video-x11', d)} \
> +                --enable-input-events --enable-pthreads \
>                   --disable-video-svga \
>                   --disable-video-picogui --disable-video-qtopia --enable-sdl-dlopen \
> -                --disable-rpath \
> -                --disable-pulseaudio"
> +                --disable-rpath"
> +
> +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \
> +                   ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \
> +                   ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \
> +                   ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'opengl', '', d)} \
> +                   ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
> +PACKAGECONFIG_class-native = "x11"
> +PACKAGECONFIG_class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
>   
> -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}"
> -PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib,"
> +PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib"
> +PACKAGECONFIG[pulseaudio] = "--enable-pulseaudio,--disable-pulseaudio,pulseaudio"
> +PACKAGECONFIG[tslib] = "--enable-input-tslib, --disable-input-tslib, tslib"
> +PACKAGECONFIG[directfb] = "--enable-video-directfb, --disable-video-directfb, directfb"
> +PACKAGECONFIG[opengl] = "--enable-video-opengl, --disable-video-opengl, virtual/libgl libglu"
> +PACKAGECONFIG[x11] = "--enable-video-x11 --disable-x11-shared, --disable-video-x11, virtual/libx11 libxext libxrandr libxrender"
>   
>   EXTRA_AUTORECONF += "--include=acinclude --exclude=autoheader"
>   
> @@ -65,4 +66,4 @@ do_configure_prepend() {
>           export SYSROOT=$PKG_CONFIG_SYSROOT_DIR
>   }
>   
> -BBCLASSEXTEND = "nativesdk"
> +BBCLASSEXTEND = "native nativesdk"

Re: [PATCH][jethro][RFC 1/2] libsdl: expand PACKAGECONFIG and enable native builds

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 534 bytes --]

On 11 March 2016 at 20:20, Trevor Woerner <twoerner@gmail.com> wrote:

> ERROR: Nothing PROVIDES 'virtual/nativesdk-nativesdk-libx11' (but
> virtual:nativesdk:/z/dragon410c-repo/dragon410c-tw-jethro/layers/openembedded-core/meta/recipes-graphics/libsdl/
> libsdl_1.2.15.bb DEPENDS on or otherwise requires it). Close matches:
>

That's an awesome comment.  Clearly my testing wasn't optimal, there's
another patch required.

Can you verify that cherry-picking 55ca1fb8f0e81ff739b3c46897e43356d1f760c3
solves this?

Ross

[-- Attachment #2: Type: text/html, Size: 1143 bytes --]

Re: [PATCH][jethro][RFC 1/2] libsdl: expand PACKAGECONFIG and enable native builds

[Trevor Woerner]

Hi Ross,

On 03/11/16 15:49, Burton, Ross wrote:
>
> On 11 March 2016 at 20:20, Trevor Woerner <twoerner@gmail.com 
> <mailto:twoerner@gmail.com>> wrote:
>
>     ERROR: Nothing PROVIDES 'virtual/nativesdk-nativesdk-libx11' (but
>     virtual:nativesdk:/z/dragon410c-repo/dragon410c-tw-jethro/layers/openembedded-core/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
>     <http://libsdl_1.2.15.bb> DEPENDS on or otherwise requires it).
>     Close matches:
>
>
> That's an awesome comment.  Clearly my testing wasn't optimal, there's 
> another patch required.
>
> Can you verify that 
> cherry-picking 55ca1fb8f0e81ff739b3c46897e43356d1f760c3 solves this?

Yes, verified. Cherry-picking 55ca1fb8 solves the problem.

Thanks! :-)

Re: [PATCH][jethro][RFC 1/2] libsdl: expand PACKAGECONFIG and enable native builds

[Richard Purdie]

On Fri, 2016-03-11 at 16:36 -0500, Trevor Woerner wrote:
> Hi Ross,
> 
> On 03/11/16 15:49, Burton, Ross wrote:
> > 
> > On 11 March 2016 at 20:20, Trevor Woerner <twoerner@gmail.com 
> > <mailto:twoerner@gmail.com>> wrote:
> > 
> >     ERROR: Nothing PROVIDES 'virtual/nativesdk-nativesdk-libx11'
> > (but
> >     virtual:nativesdk:/z/dragon410c-repo/dragon410c-tw
> > -jethro/layers/openembedded-core/meta/recipes
> > -graphics/libsdl/libsdl_1.2.15.bb
> >     <http://libsdl_1.2.15.bb> DEPENDS on or otherwise requires it).
> >     Close matches:
> > 
> > 
> > That's an awesome comment.  Clearly my testing wasn't optimal,
> > there's 
> > another patch required.
> > 
> > Can you verify that 
> > cherry-picking 55ca1fb8f0e81ff739b3c46897e43356d1f760c3 solves
> > this?
> 
> Yes, verified. Cherry-picking 55ca1fb8 solves the problem.
> 
> Thanks! :-)

I just merged the fix to the branch, thanks for testing.

Cheers,

Richard

Re: [PATCH][jethro][RFC 1/2] libsdl: expand PACKAGECONFIG and enable native builds

[Trevor Woerner]

On 03/11/16 18:16, Richard Purdie wrote:
> On Fri, 2016-03-11 at 16:36 -0500, Trevor Woerner wrote:
>> Hi Ross,
>>
>> On 03/11/16 15:49, Burton, Ross wrote:
>>> On 11 March 2016 at 20:20, Trevor Woerner <twoerner@gmail.com
>>> <mailto:twoerner@gmail.com>> wrote:
>>>
>>>      ERROR: Nothing PROVIDES 'virtual/nativesdk-nativesdk-libx11'
>>> (but
>>>      virtual:nativesdk:/z/dragon410c-repo/dragon410c-tw
>>> -jethro/layers/openembedded-core/meta/recipes
>>> -graphics/libsdl/libsdl_1.2.15.bb
>>>      <http://libsdl_1.2.15.bb> DEPENDS on or otherwise requires it).
>>>      Close matches:
>>>
>>>
>>> That's an awesome comment.  Clearly my testing wasn't optimal,
>>> there's
>>> another patch required.
>>>
>>> Can you verify that
>>> cherry-picking 55ca1fb8f0e81ff739b3c46897e43356d1f760c3 solves
>>> this?
>> Yes, verified. Cherry-picking 55ca1fb8 solves the problem.
>>
>> Thanks! :-)
> I just merged the fix to the branch, thanks for testing.
>

Thank _you_ people for being so fast to respond to the issues your users 
find!

Re: [PATCH][jethro][RFC 1/2] libsdl: expand PACKAGECONFIG and enable native builds

[Otavio Salvador]

Hello folks,

On Fri, Mar 11, 2016 at 11:58 PM, Trevor Woerner <twoerner@gmail.com> wrote:
> On 03/11/16 18:16, Richard Purdie wrote:
>> On Fri, 2016-03-11 at 16:36 -0500, Trevor Woerner wrote:
>>> On 03/11/16 15:49, Burton, Ross wrote:
>>>> Can you verify that
>>>> cherry-picking 55ca1fb8f0e81ff739b3c46897e43356d1f760c3 solves
>>>> this?
>>>
>>> Yes, verified. Cherry-picking 55ca1fb8 solves the problem.
>>>
>>> Thanks! :-)
>>
>> I just merged the fix to the branch, thanks for testing.
>>
>
> Thank _you_ people for being so fast to respond to the issues your users
> find!

This did not fix the issue when the distro does not have X11. For
framebuffer based distros it is failing badly.

See:

http://ci.ossystems.com.br/view/FSL%20Community%20BSP%20-%20jethro/job/fsl-community-bsp-jethro_framebuffer-imx28evk/77/console

The native flavour ought to enable X11 ONLY if it is in DISTRO_FEATURES.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [PATCH][jethro][RFC 1/2] libsdl: expand PACKAGECONFIG and enable native builds

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 239 bytes --]

On 14 March 2016 at 18:40, Otavio Salvador <otavio.salvador@ossystems.com.br
> wrote:

> The native flavour ought to enable X11 ONLY if it is in DISTRO_FEATURES.
>

Backport of the relevant fix - not workaround - submitted.

Ross

[-- Attachment #2: Type: text/html, Size: 636 bytes --]