Remove gtk-directfb

PATCH In review Constantin Musca 3 participants 8 messages Jan 18, 2013

Share & tools

Constantin Musca

author

2013-01-18 12:03 UTC #0 lore raw

cover Remove gtk-directfb

DirectFB is no longer supported by GTK 3 and even in 2 the backend hasn't worked since 2.18. This patchset removes gtk-directfb and it creates a simple directfb packagegroup/image. The following changes since commit 3db277b18b8923daca545aa53bcfbbe9d43d3baa:

update-rc.d: fix failure on target (2013-01-17 20:16:46 +0000)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib cmuscax/gtk-directfb
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=cmuscax/gtk-directfb

Constantin Musca (4):
packagegroup-core-gtk-directfb: rename to packagegroup-core-directfb
core-image-gtk-directfb: rename to core-image-directfb gtk+: remove directfb support
cairo: use directfb instead of gtk-directfb

 meta/recipes-gnome/gtk+/gtk+.inc                              |  7 +------
 meta/recipes-gnome/gtk+/gtk+_2.24.14.bb                       |  2 +-
 meta/recipes-graphics/cairo/cairo.inc                         |  4 ++--
 meta/recipes-graphics/cairo/cairo_1.12.8.bb                   |  2 +-
 .../{core-image-gtk-directfb.bb => core-image-directfb.bb}    |  7 +++----
 ...oup-core-gtk-directfb.bb => packagegroup-core-directfb.bb} | 11 ++---------
 6 files changed, 10 insertions(+), 23 deletions(-)
 rename meta/recipes-graphics/images/{core-image-gtk-directfb.bb => core-image-directfb.bb} (78%)
 rename meta/recipes-graphics/packagegroups/{packagegroup-core-gtk-directfb.bb => packagegroup-core-directfb.bb} (49%)

Signature · 1 line

1.7.11.7

Constantin Musca

author

2013-01-18 12:03 UTC #1 lore raw

PATCH 1/4 packagegroup-core-gtk-directfb: rename to packagegroup-core-directfb

- DirectFB is not supported by gtk versions >= 2.18
- remove the backwards compatibility statements (packagegroup-core-directfb is an independent packagegroup)
- remove all gtk dependencies

[YOCTO #3642]

Signed-off-by Constantin Musca <[email protected]>

---
 ...oup-core-gtk-directfb.bb => packagegroup-core-directfb.bb} | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)
 rename meta/recipes-graphics/packagegroups/{packagegroup-core-gtk-directfb.bb => packagegroup-core-directfb.bb} (49%)

meta/recipes-graphics/packagegroups/packagegroup-core-directfb.bb renamed from meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb +2 -9

similarity index 49%
rename from meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb
rename to meta/recipes-graphics/packagegroups/packagegroup-core-directfb.bb
index 55b0b9d..aca3a67 100644
@@ -1,14 +1,9 @@
-SUMMARY = "GTK+ over DirectFB without X11"
-PR = "r1"
+SUMMARY = "DirectFB without X11"
+PR = "r0"
 LICENSE = "MIT"
 
 inherit packagegroup
 
-# For backwards compatibility after rename
-RPROVIDES_${PN} = "task-core-gtk-directfb-base"
-RREPLACES_${PN} = "task-core-gtk-directfb-base"
-RCONFLICTS_${PN} = "task-core-gtk-directfb-base"
-
 TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}'
 
 RDEPENDS_${PN} = " \

@@ -17,7 +12,5 @@ RDEPENDS_${PN} = " \
 		pango \
 		pango-modules \
 		fontconfig \
-		gtk+ \
-		gtk-demo \
 		${TOUCH} \
 "

Signature · 1 line

1.7.11.7

Martin Jansa

2013-01-18 12:38 UTC #2 lore raw

Re: [PATCH 1/4] packagegroup-core-gtk-directfb: rename to packagegroup-core-directfb

Quoted 3 lines · Constantin Musca

- DirectFB is not supported by gtk versions >= 2.18
- remove the backwards compatibility statements (packagegroup-core-directfb is an independent packagegroup)

And what will happen with task-core-gtk-directfb-base/ packagegroup-core-gtk-directfb packages already installed on targets?

It's also possible that someone still with task-core-gtk-directfb-base will decide that now it's right time to do upgrade..

Cheers,

Quoted 50 lines

- remove all gtk dependencies

[YOCTO #3642]

Signed-off-by Constantin Musca <[email protected]>

---
 ...oup-core-gtk-directfb.bb => packagegroup-core-directfb.bb} | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)
 rename meta/recipes-graphics/packagegroups/{packagegroup-core-gtk-directfb.bb => packagegroup-core-directfb.bb} (49%)

meta/recipes-graphics/packagegroups/packagegroup-core-directfb.bb renamed from meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb +2 -9

similarity index 49%
rename from meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb
rename to meta/recipes-graphics/packagegroups/packagegroup-core-directfb.bb
index 55b0b9d..aca3a67 100644
@@ -1,14 +1,9 @@
-SUMMARY = "GTK+ over DirectFB without X11"
-PR = "r1"
+SUMMARY = "DirectFB without X11"
+PR = "r0"
 LICENSE = "MIT"
 
 inherit packagegroup
 
-# For backwards compatibility after rename
-RPROVIDES_${PN} = "task-core-gtk-directfb-base"
-RREPLACES_${PN} = "task-core-gtk-directfb-base"
-RCONFLICTS_${PN} = "task-core-gtk-directfb-base"
-
 TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}'
 
 RDEPENDS_${PN} = " \

@@ -17,7 +12,5 @@ RDEPENDS_${PN} = " \
 		pango \
 		pango-modules \
 		fontconfig \
-		gtk+ \
-		gtk-demo \
 		${TOUCH} \
 "

Signature · 7 lines

1.7.11.7


_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Burton, Ross

2013-01-18 12:44 UTC #3 lore raw

Re: [PATCH 1/4] packagegroup-core-gtk-directfb: rename to packagegroup-core-directfb

Quoted 2 lines · Martin Jansa

It's also possible that someone still with task-core-gtk-directfb-base will decide that now it's right time to do upgrade..

And if they get a seamless upgrade to packagegroup-core-directfb which doesn't have GTK+, they'll be quite surprised. The contents of the group changed, and not in a trivial manner.

Ross

Constantin Musca

author

2013-01-18 13:01 UTC #4 lore raw

Re: [PATCH 1/4] packagegroup-core-gtk-directfb: rename to packagegroup-core-directfb

In reply to Martin Jansa

Quoted 11 lines · Martin Jansa

Quoted 3 lines · Constantin Musca
- DirectFB is not supported by gtk versions >= 2.18
- remove the backwards compatibility statements (packagegroup-core-directfb is an independent packagegroup)
And what will happen with task-core-gtk-directfb-base/ packagegroup-core-gtk-directfb packages already installed on targets?
It's also possible that someone still with task-core-gtk-directfb-base will decide that now it's right time to do upgrade..
Cheers,

We decided to remove the backwards compatibility statements because the patch adds basically a new packagegroup (different from task-core-gtk-directfb-base/packagegroup-core-gtk-directfb).

Cheers,
Constantin

Quoted 50 lines

- remove all gtk dependencies

[YOCTO #3642]

Signed-off-by Constantin Musca <[email protected]>

---
  ...oup-core-gtk-directfb.bb => packagegroup-core-directfb.bb} | 11 ++---------
  1 file changed, 2 insertions(+), 9 deletions(-)

rename meta/recipes-graphics/packagegroups/{packagegroup-core-gtk-directfb.bb => packagegroup-core-directfb.bb} (49%)

meta/recipes-graphics/packagegroups/packagegroup-core-directfb.bb renamed from meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb +2 -9

similarity index 49%
rename from meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb
rename to meta/recipes-graphics/packagegroups/packagegroup-core-directfb.bb
index 55b0b9d..aca3a67 100644
@@ -1,14 +1,9 @@
-SUMMARY = "GTK+ over DirectFB without X11"
-PR = "r1"
+SUMMARY = "DirectFB without X11"
+PR = "r0"
  LICENSE = "MIT"
 
  inherit packagegroup
 
-# For backwards compatibility after rename
-RPROVIDES_${PN} = "task-core-gtk-directfb-base"
-RREPLACES_${PN} = "task-core-gtk-directfb-base"
-RCONFLICTS_${PN} = "task-core-gtk-directfb-base"
-
  TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}'
 
  RDEPENDS_${PN} = " \

@@ -17,7 +12,5 @@ RDEPENDS_${PN} = " \
  		pango \
  		pango-modules \
  		fontconfig \
-		gtk+ \
-		gtk-demo \
  		${TOUCH} \
  "

Signature · 7 lines

1.7.11.7


_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Constantin Musca

author

2013-01-18 12:03 UTC #5 lore raw

PATCH 2/4 core-image-gtk-directfb: rename to core-image-directfb

In reply to Constantin Musca

- DirectFB is not supported by gtk versions >= 2.18
- use packagegroup-core-directfb instead of packagegroup-core-gtk-directfb

[YOCTO #3642]

Signed-off-by Constantin Musca <[email protected]>

---
 .../images/{core-image-gtk-directfb.bb => core-image-directfb.bb}  | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
 rename meta/recipes-graphics/images/{core-image-gtk-directfb.bb => core-image-directfb.bb} (78%)

meta/recipes-graphics/images/core-image-directfb.bb renamed from meta/recipes-graphics/images/core-image-gtk-directfb.bb +3 -4

similarity index 78%
rename from meta/recipes-graphics/images/core-image-gtk-directfb.bb
rename to meta/recipes-graphics/images/core-image-directfb.bb
index 05f03cd..4f47185 100644
@@ -1,21 +1,20 @@
 LICENSE = "MIT"
-PR="r1"
+PR="r0"
 
 
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
-
 inherit core-image
 
 IMAGE_INSTALL += "\
 	${CORE_IMAGE_BASE_INSTALL} \
 	packagegroup-core-basic \
-	packagegroup-core-gtk-directfb \
+	packagegroup-core-directfb \
 "
 
 python __anonymous () {
 	packages = d.getVar('DISTRO_FEATURES', True).split()
 	if "x11" in packages:
-		raise bb.parse.SkipPackage("FEATURE \"x11\" is in DISTRO_FEATURES, Please remove \"x11\" from DISTRO_FEATURES, use \"gtk-directfb\" instead of it\n")
+		raise bb.parse.SkipPackage("FEATURE \"x11\" is in DISTRO_FEATURES, Please remove \"x11\" from DISTRO_FEATURES, use \"directfb\" instead of it\n")
 }

Signature · 1 line

1.7.11.7

Constantin Musca

author

2013-01-18 12:03 UTC #6 lore raw

PATCH 3/4 gtk+: remove directfb support

In reply to Constantin Musca

- DirectFB is not supported by gtk versions >= 2.18

[YOCTO #3642]

Signed-off-by Constantin Musca <[email protected]>

---
 meta/recipes-gnome/gtk+/gtk+.inc        | 7 +------
 meta/recipes-gnome/gtk+/gtk+_2.24.14.bb | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

meta/recipes-gnome/gtk+/gtk+.inc +1 -6

index 97d3650..3a40409 100644
@@ -14,14 +14,9 @@ X11DEPENDS = "virtual/libx11 libxext libxcursor libxrandr libxdamage libxrender
 DEPENDS = "glib-2.0 pango atk jpeg libpng gdk-pixbuf-native docbook-utils-native \
  libgcrypt cairo gdk-pixbuf"
 
-PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
- ${@base_contains('DISTRO_FEATURES', 'gtk-directfb', 'gtk-directfb', '', d)}"
+PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
 
-# for gtk+ 2.x, have to pick either x11 or directfb not both
-# for gtk+ 3.x, PACKAGECONFIG[gtk-directfb] should be removed because directfb will not be support as
-# a backend.
 PACKAGECONFIG[x11] = "--with-x=yes --with-gdktarget=x11,--with-x=no,${X11DEPENDS}"
-PACKAGECONFIG[gtk-directfb] = "--with-gdktarget=directfb,,directfb"
 
 inherit autotools gtk-doc pkgconfig update-alternatives

meta/recipes-gnome/gtk+/gtk+_2.24.14.bb +1 -1

index d794840..fab360d 100644
@@ -29,7 +29,7 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.24/gtk+-${PV}.tar.xz \
 #        file://combo-arrow-size.patch;striplevel=0
 #            file://configurefix.patch
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI[md5sum] = "e2c16f119ed624893ecfc3775930ae4c"
 SRC_URI[sha256sum] = "8bd1b8b511a3004e8972badf467ce829e6855cdff15540b9344dc934c68008ac"

Signature · 1 line

1.7.11.7

Constantin Musca

author

2013-01-18 12:03 UTC #7 lore raw

PATCH 4/4 cairo: use directfb instead of gtk-directfb

In reply to Constantin Musca

- we now have directfb as DISTRO_FEATURE
- DirectFB is not supported by gtk versions >= 2.18

Signed-off-by Constantin Musca <[email protected]>

---
 meta/recipes-graphics/cairo/cairo.inc       | 4 ++--
 meta/recipes-graphics/cairo/cairo_1.12.8.bb | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

meta/recipes-graphics/cairo/cairo.inc +2 -2

index 217e297..9bec6c2 100644
@@ -13,9 +13,9 @@ LICENSE = "MPL-1 & LGPLv2.1"
 X11DEPENDS = "virtual/libx11 libsm libxrender libxext"
 DEPENDS = "libpng fontconfig pixman glib-2.0"
 PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
-           ${@base_contains('DISTRO_FEATURES', 'gtk-directfb', 'gtk-directfb', '', d)}"
+           ${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}"
 PACKAGECONFIG[x11] = "--with-x=yes,--without-x,${X11DEPENDS}"
-PACKAGECONFIG[gtk-directfb] = "--enable-directfb=yes,,directfb"
+PACKAGECONFIG[directfb] = "--enable-directfb=yes,,directfb"
 BBCLASSEXTEND = "native"
 
 #check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points

meta/recipes-graphics/cairo/cairo_1.12.8.bb +1 -1

index 567a17f..49b1786 100644
@@ -2,7 +2,7 @@ require cairo.inc
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz"

Signature · 1 line

1.7.11.7