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

Submitted by Ross Burton on Sept. 10, 2012, 5:20 p.m.

Details

Message ID 1347297632-16529-3-git-send-email-ross.burton@intel.com
State New
Headers show

Commit Message

Ross Burton Sept. 10, 2012, 5:20 p.m.
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(-)

Patch hide | download patch | download mbox

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"
 

Comments

Richard Purdie Sept. 10, 2012, 8:36 p.m.
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"
>
Martin Jansa Sept. 11, 2012, 5:47 a.m.
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
Koen Kooi Sept. 11, 2012, 6:22 a.m.
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?
Ross Burton Sept. 11, 2012, 9:24 a.m.
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