libsdl: PACKAGECONFIG conversion

PATCH In review Andre McCurdy 2 participants 3 messages Apr 1, 2014 – Apr 2, 2014

Share & tools

Andre McCurdy

author

2014-04-01 07:11 UTC #0 lore raw

PATCH 1/1 libsdl: PACKAGECONFIG conversion

General cleanup + make it easier for distros / machines which support OpenGL ES only to prevent attempts to build against libgl.

Signed-off-by Andre McCurdy <[email protected]>

---
 meta/recipes-graphics/libsdl/libsdl_1.2.15.bb | 30 ++++++++++++++++++---------
 1 file changed, 20 insertions(+), 10 deletions(-)

meta/recipes-graphics/libsdl/libsdl_1.2.15.bb +20 ~~-10~~

index e19c388..f72f74f 100644
@@ -12,10 +12,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4"
 
 PROVIDES = "virtual/libsdl"
 
-DEPENDS = "${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \
-           ${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl libglu', '', d)} \
-           ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxext libxrandr libxrender', '', d)} \
-           tslib"
 DEPENDS_class-nativesdk = "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/nativesdk-libx11 nativesdk-libxrandr nativesdk-libxrender nativesdk-libxext', '', d)}"
 
 PR = "r3"

@@ -38,17 +34,31 @@ EXTRA_OECONF = "--disable-static --enable-cdrom --enable-threads --enable-timers
                 --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 \
-                ${@base_contains('DISTRO_FEATURES', 'directfb', '--enable-video-directfb', '--disable-video-directfb', d)} \
-                ${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-video-opengl', '--disable-video-opengl', d)} \
-                ${@base_contains('DISTRO_FEATURES', 'x11', '--enable-video-x11', '--disable-video-x11', d)} \
-                --disable-video-svga \
+                --enable-input-events --enable-pthreads --disable-video-svga \
                 --disable-video-picogui --disable-video-qtopia --enable-sdl-dlopen \
                 --disable-rpath \
                 --disable-pulseaudio"
 
-PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}"
+PACKAGECONFIG_ALSA ?= "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}"
+PACKAGECONFIG_DIRECTFB ?= "${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}"
+# Warning: "opengl" in DISTRO_FEATURES implies GL and/or GLES but libsdl supports GL only.
+PACKAGECONFIG_OPENGL ?= "${@base_contains('DISTRO_FEATURES', 'opengl', 'opengl', '', d)}"
+PACKAGECONFIG_TSLIB ?= "tslib"
+PACKAGECONFIG_X11 ?= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
+
+PACKAGECONFIG ?= " \
+    ${PACKAGECONFIG_ALSA} \
+    ${PACKAGECONFIG_DIRECTFB} \
+    ${PACKAGECONFIG_OPENGL} \
+    ${PACKAGECONFIG_TSLIB} \
+    ${PACKAGECONFIG_X11} \
+    "
+
 PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib,"
+PACKAGECONFIG[directfb] = "--enable-video-directfb,--disable-video-directfb,directfb"
+PACKAGECONFIG[opengl] = "--enable-video-opengl,--disable-video-opengl,virtual/libgl libglu"
+PACKAGECONFIG[tslib] = "--enable-input-tslib,--disable-input-tslib,tslib"
+PACKAGECONFIG[x11] = "--enable-video-x11,--disable-video-x11,virtual/libx11 libxext libxrandr libxrender"
 
 PARALLEL_MAKE = ""

Signature · 1 line

1.8.1.2

Richard Purdie

2014-04-01 10:54 UTC #1 lore raw

Quoted 13 lines · Andre McCurdy

General cleanup + make it easier for distros / machines which support OpenGL ES only to prevent attempts to build against libgl.
Signed-off-by Andre McCurdy <[email protected]>
---
 meta/recipes-graphics/libsdl/libsdl_1.2.15.bb | 30 ++++++++++++++++++---------
 1 file changed, 20 insertions(+), 10 deletions(-)
meta/recipes-graphics/libsdl/libsdl_1.2.15.bb +0 -0
index e19c388..f72f74f 100644

meta/recipes-graphics/libsdl/libsdl_1.2.15.bb LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4" · line 15

Quoted 8 lines

meta/recipes-graphics/libsdl/libsdl_1.2.15.bb +0 -4

@@ -12,10 +12,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4"
 
 PROVIDES = "virtual/libsdl"
 
-DEPENDS = "${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \
-           ${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl libglu', '', d)} \
-           ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxext libxrandr libxrender', '', d)} \
-           tslib"
 DEPENDS_class-nativesdk = "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/nativesdk-libx11 nativesdk-libxrandr nativesdk-libxrender nativesdk-libxext', '', d)}"

I have a nasty feeling this will break libsdl-native :(

Cheers,

Richard

Quoted 42 lines

meta/recipes-graphics/libsdl/libsdl_1.2.15.bb +20 -6

 PR = "r3"

@@ -38,17 +34,31 @@ EXTRA_OECONF = "--disable-static --enable-cdrom --enable-threads --enable-timers
                 --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 \
-                ${@base_contains('DISTRO_FEATURES', 'directfb', '--enable-video-directfb', '--disable-video-directfb', d)} \
-                ${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-video-opengl', '--disable-video-opengl', d)} \
-                ${@base_contains('DISTRO_FEATURES', 'x11', '--enable-video-x11', '--disable-video-x11', d)} \
-                --disable-video-svga \
+                --enable-input-events --enable-pthreads --disable-video-svga \
                 --disable-video-picogui --disable-video-qtopia --enable-sdl-dlopen \
                 --disable-rpath \
                 --disable-pulseaudio"
 
-PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}"
+PACKAGECONFIG_ALSA ?= "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}"
+PACKAGECONFIG_DIRECTFB ?= "${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}"
+# Warning: "opengl" in DISTRO_FEATURES implies GL and/or GLES but libsdl supports GL only.
+PACKAGECONFIG_OPENGL ?= "${@base_contains('DISTRO_FEATURES', 'opengl', 'opengl', '', d)}"
+PACKAGECONFIG_TSLIB ?= "tslib"
+PACKAGECONFIG_X11 ?= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
+
+PACKAGECONFIG ?= " \
+    ${PACKAGECONFIG_ALSA} \
+    ${PACKAGECONFIG_DIRECTFB} \
+    ${PACKAGECONFIG_OPENGL} \
+    ${PACKAGECONFIG_TSLIB} \
+    ${PACKAGECONFIG_X11} \
+    "
+
 PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib,"
+PACKAGECONFIG[directfb] = "--enable-video-directfb,--disable-video-directfb,directfb"
+PACKAGECONFIG[opengl] = "--enable-video-opengl,--disable-video-opengl,virtual/libgl libglu"
+PACKAGECONFIG[tslib] = "--enable-input-tslib,--disable-input-tslib,tslib"
+PACKAGECONFIG[x11] = "--enable-video-x11,--disable-video-x11,virtual/libx11 libxext libxrandr libxrender"
 
 PARALLEL_MAKE = ""

Signature · 1 line

1.8.1.2

Andre McCurdy

author

2014-04-02 01:42 UTC #2 lore raw

Quoted 17 lines · Richard Purdie

Quoted 16 lines · Andre McCurdy
General cleanup + make it easier for distros / machines which support OpenGL ES only to prevent attempts to build against libgl.
Signed-off-by Andre McCurdy <[email protected]>
---
  meta/recipes-graphics/libsdl/libsdl_1.2.15.bb | 30 ++++++++++++++++++---------
  1 file changed, 20 insertions(+), 10 deletions(-)
meta/recipes-graphics/libsdl/libsdl_1.2.15.bb +0 -0
index e19c388..f72f74f 100644
@@ -12,10 +12,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4"
 
  PROVIDES = "virtual/libsdl"
 

Quoted 8 lines

meta/recipes-graphics/libsdl/libsdl_1.2.15.bb LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4" · line 15
Quoted 5 lines
meta/recipes-graphics/libsdl/libsdl_1.2.15.bb +0 -4
-DEPENDS = "${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \
-           ${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl libglu', '', d)} \
-           ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxext libxrandr libxrender', '', d)} \
-           tslib"
  DEPENDS_class-nativesdk = "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/nativesdk-libx11 nativesdk-libxrandr nativesdk-libxrender nativesdk-libxext', '', d)}"
I have a nasty feeling this will break libsdl-native :(

Yes, it does :-(

Attempting a v2, but using PACKAGECONFIG to managed DEPENDS for x11 runs into problems. It seems that the nativesdk package renaming mis-renames DEPENDS coming from PACKAGECONFIG which have a virtual/ prefix (the nativesdk- gets added twice):

ERROR: Nothing PROVIDES 'virtual/nativesdk-nativesdk-libx11' (but virtual:nativesdk:/home/andre/oe-master/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

Quoted 45 lines

Quoted 43 lines

meta/recipes-graphics/libsdl/libsdl_1.2.15.bb +20 -7

  PR = "r3"

@@ -38,17 +34,31 @@ EXTRA_OECONF = "--disable-static --enable-cdrom --enable-threads --enable-timers
                  --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 \
-                ${@base_contains('DISTRO_FEATURES', 'directfb', '--enable-video-directfb', '--disable-video-directfb', d)} \
-                ${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-video-opengl', '--disable-video-opengl', d)} \
-                ${@base_contains('DISTRO_FEATURES', 'x11', '--enable-video-x11', '--disable-video-x11', d)} \
-                --disable-video-svga \
+                --enable-input-events --enable-pthreads --disable-video-svga \
                  --disable-video-picogui --disable-video-qtopia --enable-sdl-dlopen \
                  --disable-rpath \
                  --disable-pulseaudio"
 
-PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}"
+PACKAGECONFIG_ALSA ?= "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}"
+PACKAGECONFIG_DIRECTFB ?= "${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}"
+# Warning: "opengl" in DISTRO_FEATURES implies GL and/or GLES but libsdl supports GL only.
+PACKAGECONFIG_OPENGL ?= "${@base_contains('DISTRO_FEATURES', 'opengl', 'opengl', '', d)}"
+PACKAGECONFIG_TSLIB ?= "tslib"
+PACKAGECONFIG_X11 ?= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
+
+PACKAGECONFIG ?= " \
+    ${PACKAGECONFIG_ALSA} \
+    ${PACKAGECONFIG_DIRECTFB} \
+    ${PACKAGECONFIG_OPENGL} \
+    ${PACKAGECONFIG_TSLIB} \
+    ${PACKAGECONFIG_X11} \
+    "
+
  PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib,"
+PACKAGECONFIG[directfb] = "--enable-video-directfb,--disable-video-directfb,directfb"
+PACKAGECONFIG[opengl] = "--enable-video-opengl,--disable-video-opengl,virtual/libgl libglu"
+PACKAGECONFIG[tslib] = "--enable-input-tslib,--disable-input-tslib,tslib"
+PACKAGECONFIG[x11] = "--enable-video-x11,--disable-video-x11,virtual/libx11 libxext libxrandr libxrender"
 
  PARALLEL_MAKE = ""
 
--

1.8.1.2