[OE-core] [PATCH] libsdl2: PACKAGECONFIGize

[Andreas Müller]

On Fri, Jun 12, 2015 at 10:50 PM, Andreas Müller
<schnitzeltony at 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 at 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