* [PATCH] libsdl: make x11 conditional, add directfb support
@ 2012-02-24 2:27 Andreas Oberritter
2012-02-24 20:31 ` [PATCH v2] libsdl: add DirectFB support Andreas Oberritter
0 siblings, 1 reply; 5+ messages in thread
From: Andreas Oberritter @ 2012-02-24 2:27 UTC (permalink / raw)
To: openembedded-core
* Use conditional dependencies for X11 and DirectFB, like
it's already done for OpenGL.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
NOTE: I think that nativesdk may already be broken, because tslib gets
enabled without being in DEPENDS. With 'opengl' or 'directfb' set, the
nativesdk build probably won't succeed either, unless --enable-foo
means "autodetect foo".
meta/recipes-graphics/libsdl/libsdl_1.2.14.bb | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
index 5b87f39..94df358 100644
--- a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
+++ b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
@@ -12,10 +12,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4"
PROVIDES = "virtual/libsdl"
-DEPENDS = "${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} virtual/libx11 libxext libxrandr libxrender tslib"
-DEPENDS_virtclass-nativesdk = "libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk"
+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)}"
-PR = "r5"
+PR = "r6"
SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
file://configure_tweak.patch \
@@ -32,11 +35,13 @@ inherit autotools lib_package binconfig pkgconfig
EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \
--enable-file --disable-oss --disable-esd --disable-arts \
--disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \
- --disable-mintaudio --disable-nasm --enable-video-x11 --disable-video-dga \
- --disable-video-fbcon --disable-video-directfb --disable-video-ps2gs --disable-video-ps3 \
+ --disable-mintaudio --disable-nasm --disable-video-dga \
+ --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 \
--disable-video-picogui --disable-video-qtopia --enable-dlopen \
--disable-rpath \
--
1.7.5.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH v2] libsdl: add DirectFB support
2012-02-24 2:27 [PATCH] libsdl: make x11 conditional, add directfb support Andreas Oberritter
@ 2012-02-24 20:31 ` Andreas Oberritter
2012-02-28 4:34 ` Saul Wold
0 siblings, 1 reply; 5+ messages in thread
From: Andreas Oberritter @ 2012-02-24 20:31 UTC (permalink / raw)
To: openembedded-core
* 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(-)
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 \
--
1.7.5.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH v2] libsdl: add DirectFB support
2012-02-24 20:31 ` [PATCH v2] libsdl: add DirectFB support Andreas Oberritter
@ 2012-02-28 4:34 ` Saul Wold
2012-02-28 11:24 ` [PATCH v3] " Andreas Oberritter
0 siblings, 1 reply; 5+ messages in thread
From: Saul Wold @ 2012-02-28 4:34 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
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 \
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH v3] libsdl: add DirectFB support
2012-02-28 4:34 ` Saul Wold
@ 2012-02-28 11:24 ` Andreas Oberritter
2012-03-13 15:53 ` Saul Wold
0 siblings, 1 reply; 5+ messages in thread
From: Andreas Oberritter @ 2012-02-28 11:24 UTC (permalink / raw)
To: openembedded-core
* Use conditional dependencies for DirectFB, like
it's already done for OpenGL and X11.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
* v2: Rebased after X11 was already made conditional.
* v3: Add back PR bump, which was auto-merged during rebase.
meta/recipes-graphics/libsdl/libsdl_1.2.14.bb | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
index 62a2d1f..5c9e645 100644
--- a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
+++ b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
@@ -12,12 +12,13 @@ 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)}"
-PR = "r6"
+PR = "r7"
SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
file://configure_tweak.patch \
@@ -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 \
--
1.7.5.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH v3] libsdl: add DirectFB support
2012-02-28 11:24 ` [PATCH v3] " Andreas Oberritter
@ 2012-03-13 15:53 ` Saul Wold
0 siblings, 0 replies; 5+ messages in thread
From: Saul Wold @ 2012-03-13 15:53 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On 02/28/2012 03:24 AM, 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>
> ---
> * v2: Rebased after X11 was already made conditional.
> * v3: Add back PR bump, which was auto-merged during rebase.
>
> meta/recipes-graphics/libsdl/libsdl_1.2.14.bb | 8 +++++---
> 1 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
> index 62a2d1f..5c9e645 100644
> --- a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
> +++ b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
> @@ -12,12 +12,13 @@ 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)}"
>
> -PR = "r6"
> +PR = "r7"
>
> SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
> file://configure_tweak.patch \
> @@ -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 \
Merged into OE-Core
Thanks
Sau!
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-03-13 16:02 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-24 2:27 [PATCH] libsdl: make x11 conditional, add directfb support Andreas Oberritter
2012-02-24 20:31 ` [PATCH v2] libsdl: add DirectFB support Andreas Oberritter
2012-02-28 4:34 ` Saul Wold
2012-02-28 11:24 ` [PATCH v3] " Andreas Oberritter
2012-03-13 15:53 ` Saul Wold
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox