Patchwork [v2] libsdl: add DirectFB support

login
register
mail settings
Submitter Andreas Oberritter
Date Feb. 24, 2012, 8:31 p.m.
Message ID <1330115481-11625-1-git-send-email-obi@opendreambox.org>
Download mbox | patch
Permalink /patch/21967/
State New
Headers show

Comments

Andreas Oberritter - Feb. 24, 2012, 8:31 p.m.
* Use conditional dependencies for DirectFB, like
  it's already done for OpenGL and X11.

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
* Rebased after X11 was already made conditional.

 meta/recipes-graphics/libsdl/libsdl_1.2.14.bb |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
Saul Wold - Feb. 28, 2012, 4:34 a.m.
On 02/24/2012 12:31 PM, Andreas Oberritter wrote:
> * Use conditional dependencies for DirectFB, like
>    it's already done for OpenGL and X11.
>
> Signed-off-by: Andreas Oberritter<obi@opendreambox.org>
> ---
> * Rebased after X11 was already made conditional.
>
>   meta/recipes-graphics/libsdl/libsdl_1.2.14.bb |    6 ++++--
>   1 files changed, 4 insertions(+), 2 deletions(-)
>
No PR Bump!

Sau!

> diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
> index 62a2d1f..94df358 100644
> --- a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
> +++ b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
> @@ -12,7 +12,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4"
>
>   PROVIDES = "virtual/libsdl"
>
> -DEPENDS = "${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} \
> +DEPENDS = "${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \
> +           ${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} \
>              ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxext libxrandr libxrender', '', d)} \
>              tslib"
>   DEPENDS_virtclass-nativesdk = "${@base_contains('DISTRO_FEATURES', 'x11', 'libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk', '', d)}"
> @@ -35,9 +36,10 @@ EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads
>                   --enable-file --disable-oss --disable-esd --disable-arts \
>                   --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \
>                   --disable-mintaudio --disable-nasm --disable-video-dga \
> -                --disable-video-fbcon --disable-video-directfb --disable-video-ps2gs --disable-video-ps3 \
> +                --disable-video-fbcon --disable-video-ps2gs --disable-video-ps3 \
>                   --disable-video-xbios --disable-video-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 \

Patch

diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
index 62a2d1f..94df358 100644
--- a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
+++ b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
@@ -12,7 +12,8 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4"
 
 PROVIDES = "virtual/libsdl"
 
-DEPENDS = "${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} \
+DEPENDS = "${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \
+           ${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} \
            ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxext libxrandr libxrender', '', d)} \
            tslib"
 DEPENDS_virtclass-nativesdk = "${@base_contains('DISTRO_FEATURES', 'x11', 'libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk', '', d)}"
@@ -35,9 +36,10 @@  EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads
                 --enable-file --disable-oss --disable-esd --disable-arts \
                 --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \
                 --disable-mintaudio --disable-nasm --disable-video-dga \
-                --disable-video-fbcon --disable-video-directfb --disable-video-ps2gs --disable-video-ps3 \
+                --disable-video-fbcon --disable-video-ps2gs --disable-video-ps3 \
                 --disable-video-xbios --disable-video-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 \