* [PATCH] libsdl2: PACKAGECONFIGize
@ 2015-06-12 20:50 Andreas Müller
2015-06-23 8:39 ` Andreas Müller
0 siblings, 1 reply; 3+ messages in thread
From: Andreas Müller @ 2015-06-12 20:50 UTC (permalink / raw)
To: openembedded-core
* DEPENDS + EXTRA_OECONF -> PACKAGECONFIG for directfb / opengl / x11
* added PACKAGECONFIG for gles2 / pulseaudio / tslib / wayland
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
meta/recipes-graphics/libsdl2/libsdl2_2.0.3.bb | 39 ++++++++++++++++----------
1 file changed, 24 insertions(+), 15 deletions(-)
diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.3.bb b/meta/recipes-graphics/libsdl2/libsdl2_2.0.3.bb
index 197f962..97f64f3 100644
--- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.3.bb
+++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.3.bb
@@ -12,14 +12,9 @@ LIC_FILES_CHKSUM = "file://COPYING.txt;md5=67dcb7fae16952557bc5f96e9eb5d188"
PROVIDES = "virtual/libsdl2"
-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)} \
- tslib"
DEPENDS_class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/nativesdk-libx11 nativesdk-libxrandr nativesdk-libxrender nativesdk-libxext', '', d)}"
-SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz \
- "
+SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz"
S = "${WORKDIR}/SDL2-${PV}"
@@ -31,16 +26,30 @@ inherit autotools lib_package binconfig pkgconfig
EXTRA_OECONF = "--disable-oss --disable-esd --disable-arts \
--disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \
--disable-video-dummy \
- --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-pthreads \
--enable-sdl-dlopen \
- --disable-rpath \
- --disable-pulseaudio"
-
-PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}"
-PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib,"
+ --disable-rpath"
+
+# opengl packageconfig factored out to make it easy for distros
+# and BSP layers to pick either (desktop) opengl, gles2, or no GL
+PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl', '', d)}"
+
+PACKAGECONFIG ??= " \
+ ${PACKAGECONFIG_GL} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
+"
+PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib,"
+PACKAGECONFIG[directfb] = "--enable-video-directfb --disable-video-directfb,directfb"
+PACKAGECONFIG[gles2] = "--enable-video-opengles,--disable-video-opengles,virtual/libgles2"
+PACKAGECONFIG[opengl] = "--enable-video-opengl,--disable-video-opengl,virtual/libgl"
+PACKAGECONFIG[pulseaudio] = "--enable-pulseaudio,--disable-pulseaudio,pulseaudio"
+PACKAGECONFIG[tslib] = "--enable-input-tslib,--disable-input-tslib,tslib"
+PACKAGECONFIG[wayland] = "--enable-video-wayland,--disable-video-wayland,wayland"
+PACKAGECONFIG[x11] = "--enable-video-x11,--disable-video-x11,virtual/libx11 libxext libxrandr libxrender"
EXTRA_AUTORECONF += "--include=acinclude --exclude=autoheader"
--
1.9.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] libsdl2: PACKAGECONFIGize
2015-06-12 20:50 [PATCH] libsdl2: PACKAGECONFIGize Andreas Müller
@ 2015-06-23 8:39 ` Andreas Müller
2015-06-23 11:53 ` Andreas Müller
0 siblings, 1 reply; 3+ messages in thread
From: Andreas Müller @ 2015-06-23 8:39 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Fri, Jun 12, 2015 at 10:50 PM, Andreas Müller
<schnitzeltony@googlemail.com> wrote:
> * DEPENDS + EXTRA_OECONF -> PACKAGECONFIG for directfb / opengl / x11
> * added PACKAGECONFIG for gles2 / pulseaudio / tslib / wayland
>
> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> ---
> meta/recipes-graphics/libsdl2/libsdl2_2.0.3.bb | 39 ++++++++++++++++----------
> 1 file changed, 24 insertions(+), 15 deletions(-)
>
> diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.3.bb b/meta/recipes-graphics/libsdl2/libsdl2_2.0.3.bb
> index 197f962..97f64f3 100644
> --- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.3.bb
> +++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.3.bb
> @@ -12,14 +12,9 @@ LIC_FILES_CHKSUM = "file://COPYING.txt;md5=67dcb7fae16952557bc5f96e9eb5d188"
>
> PROVIDES = "virtual/libsdl2"
>
> -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)} \
> - tslib"
> DEPENDS_class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/nativesdk-libx11 nativesdk-libxrandr nativesdk-libxrender nativesdk-libxext', '', d)}"
>
> -SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz \
> - "
> +SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz"
>
> S = "${WORKDIR}/SDL2-${PV}"
>
> @@ -31,16 +26,30 @@ inherit autotools lib_package binconfig pkgconfig
> EXTRA_OECONF = "--disable-oss --disable-esd --disable-arts \
> --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \
> --disable-video-dummy \
> - --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-pthreads \
> --enable-sdl-dlopen \
> - --disable-rpath \
> - --disable-pulseaudio"
> -
> -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}"
> -PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib,"
> + --disable-rpath"
> +
> +# opengl packageconfig factored out to make it easy for distros
> +# and BSP layers to pick either (desktop) opengl, gles2, or no GL
> +PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl', '', d)}"
> +
> +PACKAGECONFIG ??= " \
> + ${PACKAGECONFIG_GL} \
> + ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \
> + ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \
> + ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \
> + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \
> + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
> +"
> +PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib,"
> +PACKAGECONFIG[directfb] = "--enable-video-directfb --disable-video-directfb,directfb"
> +PACKAGECONFIG[gles2] = "--enable-video-opengles,--disable-video-opengles,virtual/libgles2"
> +PACKAGECONFIG[opengl] = "--enable-video-opengl,--disable-video-opengl,virtual/libgl"
> +PACKAGECONFIG[pulseaudio] = "--enable-pulseaudio,--disable-pulseaudio,pulseaudio"
> +PACKAGECONFIG[tslib] = "--enable-input-tslib,--disable-input-tslib,tslib"
> +PACKAGECONFIG[wayland] = "--enable-video-wayland,--disable-video-wayland,wayland"
> +PACKAGECONFIG[x11] = "--enable-video-x11,--disable-video-x11,virtual/libx11 libxext libxrandr libxrender"
>
> EXTRA_AUTORECONF += "--include=acinclude --exclude=autoheader"
>
> --
> 1.9.3
>
ping
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] libsdl2: PACKAGECONFIGize
2015-06-23 8:39 ` Andreas Müller
@ 2015-06-23 11:53 ` Andreas Müller
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Müller @ 2015-06-23 11:53 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Tue, Jun 23, 2015 at 10:39 AM, Andreas Müller
<schnitzeltony@googlemail.com> wrote:
> ping
thanks - had not the correct timing
Andreas
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-06-23 11:53 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-06-12 20:50 [PATCH] libsdl2: PACKAGECONFIGize Andreas Müller
2015-06-23 8:39 ` Andreas Müller
2015-06-23 11:53 ` Andreas Müller
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.