Patchwork [OE-core,04/10] gtk.inc: add feature based on directfb

login
register
mail settings
Submitter Xiaofeng Yan
Date Dec. 6, 2011, 6:58 a.m.
Message ID <db85bdb92ce1ffd1840f4fb719035d3b5692888e.1323141676.git.xiaofeng.yan@windriver.com>
Download mbox | patch
Permalink /patch/16221/
State Not Applicable
Headers show

Comments

Xiaofeng Yan - Dec. 6, 2011, 6:58 a.m.
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>

gtk run over x11 at current OE-core. If gtk want to run over directfb, then \
the configuration related to x11 should be disabled and directfb should be enabled.

[YOCTO #1674]

Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
 meta/recipes-gnome/gtk+/gtk+.inc |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)
Saul Wold - Dec. 6, 2011, 11:56 p.m.
On 12/05/2011 09:58 PM, Xiaofeng Yan wrote:
> From: Xiaofeng Yan<xiaofeng.yan@windriver.com>
>
> gtk run over x11 at current OE-core. If gtk want to run over directfb, then \
> the configuration related to x11 should be disabled and directfb should be enabled.
>
> [YOCTO #1674]
>
> Signed-off-by: Xiaofeng Yan<xiaofeng.yan@windriver.com>
> ---
>   meta/recipes-gnome/gtk+/gtk+.inc |   16 ++++++++++++++--
>   1 files changed, 14 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-gnome/gtk+/gtk+.inc b/meta/recipes-gnome/gtk+/gtk+.inc
> index 39a4f4a..7fc55e2 100644
> --- a/meta/recipes-gnome/gtk+/gtk+.inc
> +++ b/meta/recipes-gnome/gtk+/gtk+.inc
> @@ -12,11 +12,18 @@ SECTION = "libs"
>
>   X11DEPENDS = "virtual/libx11 libxext libxcursor libxrandr libxdamage libxrender libxcomposite"
>   DEPENDS = "glib-2.0 pango atk jpeg libpng gtk-doc-native gdk-pixbuf-native docbook-utils-native \
> -           libgcrypt cairo gdk-pixbuf ${X11DEPENDS}"
> +           libgcrypt cairo gdk-pixbuf"
> +
> +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
> +            ${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}"
> +
> +PACKAGECONFIG[x11] = "--with-x=yes --with-gdktarget=x11,--with-x=no,${X11DEPENDS}"
> +PACKAGECONFIG[directfb] = "--with-gdktarget=directfb,,directfb"
> +
>
This change with the change prior (Split X11 Dependencies) should be 1 
commit, while below should be a second commit, you are still mixing 
different items together in 1 commit.

>   inherit autotools pkgconfig
>
> -PACKAGES += "libgail"
> +PACKAGES += "libgail gtk-demo"
>
>   FILES_${PN} = "${bindir}/gtk-update-icon-cache \
>   	${bindir}/gtk-query-immodules-2.0 \
> @@ -41,6 +48,11 @@ FILES_${PN}-dbg += " \
>   	${libdir}/gtk-2.0/${LIBV}/engines/.debug/* \
>   	${libdir}/gtk-2.0/${LIBV}/printbackends/.debug/*"
>
> +FILES_gtk-demo = " \
> +         ${datadir}/gtk-2.0/demo/* \
> +         ${bindir}/gtk-demo \
> +         "
> +
This and the above PACKAGES += change should be in a separate commit 
from the PACKAGECONFIG and DEPENDS changes above.

Sau!

>   FILES_libgail = " \
>   	${libdir}/gtk-2.0/modules/libgail.so \
>   	${libdir}/gtk-2.0/modules/libferret.so \
Xiaofeng Yan - Dec. 7, 2011, 1:32 a.m.
On 2011?12?07? 07:56, Saul Wold wrote:
> On 12/05/2011 09:58 PM, Xiaofeng Yan wrote:
>> From: Xiaofeng Yan<xiaofeng.yan@windriver.com>
>>
>> gtk run over x11 at current OE-core. If gtk want to run over 
>> directfb, then \
>> the configuration related to x11 should be disabled and directfb 
>> should be enabled.
>>
>> [YOCTO #1674]
>>
>> Signed-off-by: Xiaofeng Yan<xiaofeng.yan@windriver.com>
>> ---
>> meta/recipes-gnome/gtk+/gtk+.inc | 16 ++++++++++++++--
>> 1 files changed, 14 insertions(+), 2 deletions(-)
>>
>> diff --git a/meta/recipes-gnome/gtk+/gtk+.inc 
>> b/meta/recipes-gnome/gtk+/gtk+.inc
>> index 39a4f4a..7fc55e2 100644
>> --- a/meta/recipes-gnome/gtk+/gtk+.inc
>> +++ b/meta/recipes-gnome/gtk+/gtk+.inc
>> @@ -12,11 +12,18 @@ SECTION = "libs"
>>
>> X11DEPENDS = "virtual/libx11 libxext libxcursor libxrandr libxdamage 
>> libxrender libxcomposite"
>> DEPENDS = "glib-2.0 pango atk jpeg libpng gtk-doc-native 
>> gdk-pixbuf-native docbook-utils-native \
>> - libgcrypt cairo gdk-pixbuf ${X11DEPENDS}"
>> + libgcrypt cairo gdk-pixbuf"
>> +
>> +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', 
>> '', d)} \
>> + ${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}"
>> +
>> +PACKAGECONFIG[x11] = "--with-x=yes 
>> --with-gdktarget=x11,--with-x=no,${X11DEPENDS}"
>> +PACKAGECONFIG[directfb] = "--with-gdktarget=directfb,,directfb"
>> +
>>
> This change with the change prior (Split X11 Dependencies) should be 1 
> commit, while below should be a second commit, you are still mixing 
> different items together in 1 commit.
>
>> inherit autotools pkgconfig
>>
>> -PACKAGES += "libgail"
>> +PACKAGES += "libgail gtk-demo"
>>
>> FILES_${PN} = "${bindir}/gtk-update-icon-cache \
>> ${bindir}/gtk-query-immodules-2.0 \
>> @@ -41,6 +48,11 @@ FILES_${PN}-dbg += " \
>> ${libdir}/gtk-2.0/${LIBV}/engines/.debug/* \
>> ${libdir}/gtk-2.0/${LIBV}/printbackends/.debug/*"
>>
>> +FILES_gtk-demo = " \
>> + ${datadir}/gtk-2.0/demo/* \
>> + ${bindir}/gtk-demo \
>> + "
>> +
> This and the above PACKAGES += change should be in a separate commit 
> from the PACKAGECONFIG and DEPENDS changes above.
>
> Sau!
Yes, it looks better.
Thanks for your suggestion.
I will push it again after fixing.

Thanks
Yan
>
>> FILES_libgail = " \
>> ${libdir}/gtk-2.0/modules/libgail.so \
>> ${libdir}/gtk-2.0/modules/libferret.so \
>

Patch

diff --git a/meta/recipes-gnome/gtk+/gtk+.inc b/meta/recipes-gnome/gtk+/gtk+.inc
index 39a4f4a..7fc55e2 100644
--- a/meta/recipes-gnome/gtk+/gtk+.inc
+++ b/meta/recipes-gnome/gtk+/gtk+.inc
@@ -12,11 +12,18 @@  SECTION = "libs"
 
 X11DEPENDS = "virtual/libx11 libxext libxcursor libxrandr libxdamage libxrender libxcomposite"
 DEPENDS = "glib-2.0 pango atk jpeg libpng gtk-doc-native gdk-pixbuf-native docbook-utils-native \
-           libgcrypt cairo gdk-pixbuf ${X11DEPENDS}"
+           libgcrypt cairo gdk-pixbuf"
+
+PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
+            ${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}"
+ 
+PACKAGECONFIG[x11] = "--with-x=yes --with-gdktarget=x11,--with-x=no,${X11DEPENDS}"
+PACKAGECONFIG[directfb] = "--with-gdktarget=directfb,,directfb"
+
 
 inherit autotools pkgconfig
 
-PACKAGES += "libgail"
+PACKAGES += "libgail gtk-demo"
 
 FILES_${PN} = "${bindir}/gtk-update-icon-cache \
 	${bindir}/gtk-query-immodules-2.0 \
@@ -41,6 +48,11 @@  FILES_${PN}-dbg += " \
 	${libdir}/gtk-2.0/${LIBV}/engines/.debug/* \
 	${libdir}/gtk-2.0/${LIBV}/printbackends/.debug/*"
 
+FILES_gtk-demo = " \
+         ${datadir}/gtk-2.0/demo/* \
+         ${bindir}/gtk-demo \
+         "
+
 FILES_libgail = " \
 	${libdir}/gtk-2.0/modules/libgail.so \
 	${libdir}/gtk-2.0/modules/libferret.so \