[PATCH 1/4] libx11-diet: you can't disable XCB anymore, so don't try

[PATCH 1/4] libx11-diet: you can't disable XCB anymore, so don't try

[Ross Burton]

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
index 7d4facd..6a898b5 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
@@ -1,11 +1,11 @@
 require libx11.inc
 
-DESCRIPTION += " Support for XCB, UDC, XCMS and XLOCALE is disabled in \
+DESCRIPTION += " Support for UDC, XCMS and XLOCALE is disabled in \
 this version."
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI += "file://x11_disable_makekeys.patch \
             file://X18NCMSstubs.diff \
@@ -20,11 +20,11 @@ RPROVIDES_${PN}-locale = "libx11-locale"
 SRC_URI[md5sum] = "78b4b3bab4acbdf0abcfca30a8c70cc6"
 SRC_URI[sha256sum] = "c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86"
 
-DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
+DEPENDS += "libxcb bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
             libxdmcp xf86bigfontproto kbproto inputproto xproto-native"
 
 FILESDIR = "${@os.path.dirname(d.getVar('FILE', True))}/libx11"
 
-EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale --with-keysymdefdir=${STAGING_INCDIR}/X11"
+EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --with-keysymdefdir=${STAGING_INCDIR}/X11"
 CFLAGS += "-D_GNU_SOURCE"
 
-- 
1.7.10

[PATCH 2/4] libx11-diet: you can't disable UDC, because it's always disabled

[Ross Burton]

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
index 6a898b5..4440a80 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
@@ -1,11 +1,11 @@
 require libx11.inc
 
-DESCRIPTION += " Support for UDC, XCMS and XLOCALE is disabled in \
+DESCRIPTION += " Support for XCMS and XLOCALE is disabled in \
 this version."
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI += "file://x11_disable_makekeys.patch \
             file://X18NCMSstubs.diff \
@@ -25,6 +25,6 @@ DEPENDS += "libxcb bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
 
 FILESDIR = "${@os.path.dirname(d.getVar('FILE', True))}/libx11"
 
-EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --with-keysymdefdir=${STAGING_INCDIR}/X11"
+EXTRA_OECONF += "--disable-xcms --disable-xlocale --with-keysymdefdir=${STAGING_INCDIR}/X11"
 CFLAGS += "-D_GNU_SOURCE"
 
-- 
1.7.10

[PATCH 3/4] libx11: don't split libX11-xcb out into a libx11-xcb package

[Ross Burton]

As XCB is a hard requirement for libX11, and libX11-xcb.so is a deprecated 3KB
.so, it's not worth splitting it into a separate package.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb |    2 +-
 meta/recipes-graphics/xorg-lib/libx11.inc           |    3 ---
 meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb      |    2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb
index 3d5a306..c39b859 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb
@@ -5,7 +5,7 @@ DESCRIPTION += " Support for XCMS is disabled in this version."
 LICENSE = "MIT & MIT-style & BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
 
-PR = "r1"
+PR = "r2"
 
 DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native"
 
diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc
index 592f116..bbbb29c 100644
--- a/meta/recipes-graphics/xorg-lib/libx11.inc
+++ b/meta/recipes-graphics/xorg-lib/libx11.inc
@@ -18,10 +18,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
 
 EXTRA_OECONF += "--with-groff=no --with-ps2pdf=no --with-fop=no --disable-specs"
 
-PACKAGES =+ "${PN}-xcb"
-
 FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
-FILES_${PN}-xcb += "${libdir}/libX11-xcb.so.*"
 FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
 
 do_compile_prepend() {
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
index a65ab1f..e78d707 100644
--- a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
@@ -1,7 +1,7 @@
 require libx11.inc
 inherit gettext
 
-PR = "r1"
+PR = "r2"
 
 BBCLASSEXTEND = "native nativesdk"
 
-- 
1.7.10

[PATCH 4/4] libx11: re-arrange recipies to make comparisons easier

[Ross Burton]

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb |    9 +++------
 meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb |    3 ---
 meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb      |    4 ++--
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
index 4440a80..5b1e367 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
@@ -3,10 +3,11 @@ require libx11.inc
 DESCRIPTION += " Support for XCMS and XLOCALE is disabled in \
 this version."
 
-LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
-
 PR = "r3"
 
+DEPENDS += "libxcb bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
+            libxdmcp xf86bigfontproto kbproto inputproto xproto-native"
+
 SRC_URI += "file://x11_disable_makekeys.patch \
             file://X18NCMSstubs.diff \
             file://keysymdef_include.patch \
@@ -20,11 +21,7 @@ RPROVIDES_${PN}-locale = "libx11-locale"
 SRC_URI[md5sum] = "78b4b3bab4acbdf0abcfca30a8c70cc6"
 SRC_URI[sha256sum] = "c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86"
 
-DEPENDS += "libxcb bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
-            libxdmcp xf86bigfontproto kbproto inputproto xproto-native"
-
 FILESDIR = "${@os.path.dirname(d.getVar('FILE', True))}/libx11"
 
 EXTRA_OECONF += "--disable-xcms --disable-xlocale --with-keysymdefdir=${STAGING_INCDIR}/X11"
 CFLAGS += "-D_GNU_SOURCE"
-
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb
index c39b859..697fe66 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb
@@ -2,9 +2,6 @@ require libx11.inc
 
 DESCRIPTION += " Support for XCMS is disabled in this version."
 
-LICENSE = "MIT & MIT-style & BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
-
 PR = "r2"
 
 DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native"
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
index e78d707..dca220b 100644
--- a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
@@ -5,8 +5,6 @@ PR = "r2"
 
 BBCLASSEXTEND = "native nativesdk"
 
-EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11"
-
 DEPENDS += "util-macros xtrans libxdmcp libxau \
             bigreqsproto xproto xextproto xcmiscproto \
             xf86bigfontproto kbproto inputproto libxcb \
@@ -19,3 +17,5 @@ SRC_URI += " file://keysymdef_include.patch \
 
 SRC_URI[md5sum] = "78b4b3bab4acbdf0abcfca30a8c70cc6"
 SRC_URI[sha256sum] = "c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86"
+
+EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11"
-- 
1.7.10

Re: [PATCH 3/4] libx11: don't split libX11-xcb out into a libx11-xcb package

[Richard Purdie]

On Mon, 2012-09-10 at 18:20 +0100, Ross Burton wrote:
> As XCB is a hard requirement for libX11, and libX11-xcb.so is a deprecated 3KB
> .so, it's not worth splitting it into a separate package.

3kb is 3kb. If its deprecated, things will stop linking with it and
nothing will depend on it and everyone will be happy as it fades into
history.

What am I missing?

Cheers,

Richard



> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>  meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb |    2 +-
>  meta/recipes-graphics/xorg-lib/libx11.inc           |    3 ---
>  meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb      |    2 +-
>  3 files changed, 2 insertions(+), 5 deletions(-)
> 
> diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb
> index 3d5a306..c39b859 100644
> --- a/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb
> +++ b/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb
> @@ -5,7 +5,7 @@ DESCRIPTION += " Support for XCMS is disabled in this version."
>  LICENSE = "MIT & MIT-style & BSD"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
>  
> -PR = "r1"
> +PR = "r2"
>  
>  DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native"
>  
> diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc
> index 592f116..bbbb29c 100644
> --- a/meta/recipes-graphics/xorg-lib/libx11.inc
> +++ b/meta/recipes-graphics/xorg-lib/libx11.inc
> @@ -18,10 +18,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
>  
>  EXTRA_OECONF += "--with-groff=no --with-ps2pdf=no --with-fop=no --disable-specs"
>  
> -PACKAGES =+ "${PN}-xcb"
> -
>  FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
> -FILES_${PN}-xcb += "${libdir}/libX11-xcb.so.*"
>  FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
>  
>  do_compile_prepend() {
> diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
> index a65ab1f..e78d707 100644
> --- a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
> +++ b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
> @@ -1,7 +1,7 @@
>  require libx11.inc
>  inherit gettext
>  
> -PR = "r1"
> +PR = "r2"
>  
>  BBCLASSEXTEND = "native nativesdk"
>  

Re: [PATCH 3/4] libx11: don't split libX11-xcb out into a libx11-xcb package

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 3346 bytes --]

On Mon, Sep 10, 2012 at 09:36:13PM +0100, Richard Purdie wrote:
> On Mon, 2012-09-10 at 18:20 +0100, Ross Burton wrote:
> > As XCB is a hard requirement for libX11, and libX11-xcb.so is a deprecated 3KB
> > .so, it's not worth splitting it into a separate package.
> 
> 3kb is 3kb. If its deprecated, things will stop linking with it and
> nothing will depend on it and everyone will be happy as it fades into
> history.

And there is quite a few packages with libx11-xcb* in depends:
Package: pulseaudio*
Package: xdpyinfo
Package: gst-plugins-good-pulse
Package: libgnome-desktop-2-17
Package: libpulse-mainloop-glib0
Package: libpulse-simple0
Package: libpulse0
Package: libpulsecore
Package: libstartup-notification-1-0
Package: libx11-dev
Package: libx11-xcb1
Package: matchbox-panel-2

So if you really decide to merge it with libx11 then bump PR in all
those recipes too.

Cheers,

> 
> 
> > Signed-off-by: Ross Burton <ross.burton@intel.com>
> > ---
> >  meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb |    2 +-
> >  meta/recipes-graphics/xorg-lib/libx11.inc           |    3 ---
> >  meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb      |    2 +-
> >  3 files changed, 2 insertions(+), 5 deletions(-)
> > 
> > diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb
> > index 3d5a306..c39b859 100644
> > --- a/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb
> > +++ b/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb
> > @@ -5,7 +5,7 @@ DESCRIPTION += " Support for XCMS is disabled in this version."
> >  LICENSE = "MIT & MIT-style & BSD"
> >  LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
> >  
> > -PR = "r1"
> > +PR = "r2"
> >  
> >  DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native"
> >  
> > diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc
> > index 592f116..bbbb29c 100644
> > --- a/meta/recipes-graphics/xorg-lib/libx11.inc
> > +++ b/meta/recipes-graphics/xorg-lib/libx11.inc
> > @@ -18,10 +18,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
> >  
> >  EXTRA_OECONF += "--with-groff=no --with-ps2pdf=no --with-fop=no --disable-specs"
> >  
> > -PACKAGES =+ "${PN}-xcb"
> > -
> >  FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
> > -FILES_${PN}-xcb += "${libdir}/libX11-xcb.so.*"
> >  FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
> >  
> >  do_compile_prepend() {
> > diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
> > index a65ab1f..e78d707 100644
> > --- a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
> > +++ b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
> > @@ -1,7 +1,7 @@
> >  require libx11.inc
> >  inherit gettext
> >  
> > -PR = "r1"
> > +PR = "r2"
> >  
> >  BBCLASSEXTEND = "native nativesdk"
> >  
> 
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH 3/4] libx11: don't split libX11-xcb out into a libx11-xcb package

[Koen Kooi]

Op 10 sep. 2012, om 19:20 heeft Ross Burton <ross.burton@intel.com> het volgende geschreven:

> As XCB is a hard requirement for libX11, and libX11-xcb.so is a deprecated 3KB
> .so, it's not worth splitting it into a separate package.

What's the upgrade path? This commit will create a clash because now 2 packages will provide the same file. Is that pain really worth it?

Re: [PATCH 3/4] libx11: don't split libX11-xcb out into a libx11-xcb package

[Burton, Ross]

On 11 September 2012 07:22, Koen Kooi <koen@dominion.thruhere.net> wrote:
> What's the upgrade path? This commit will create a clash because now 2 packages will provide the same file. Is that pain really worth it?

The pain is "just" a matter of some dependencies I - again :(  -
forgot to add.  The library disappearing entirely at some glorious
point in the future (from the list Martin provided, it looks like
libstartup-notification and libpulse are the main offenders) is a good
reason to ditch this patch.

Ross