| Message ID | 1346791451-23638-1-git-send-email-ross.burton@intel.com |
|---|---|
| State | New |
| Headers | show |
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc index b588c11..b4a348c 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc @@ -8,5 +8,4 @@ SRC_URI += "file://crosscompile.patch \ SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24" SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2" -PR = "r5" - +PR = "r6" diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc index 404c488..94e83ea 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc @@ -119,8 +119,11 @@ EXTRA_OECONF += "--with-fop=no \ ac_cv_file__usr_share_sgml_X11_defs_ent=no \ " -PACKAGECONFIG ??= "udev" +PACKAGECONFIG ??= "udev ${@base_contains('DISTRO_FEATURES', 'opengl', 'glx', '', d)}" PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev" +PACKAGECONFIG[glx] = "--enable-dri --enable-dri2 --enable-glx --enable-glx-tls,\ + --disable-dri --disable-glx,\ + xf86driproto dri2proto mesa-dri" do_install_append () { # Its assumed base-files creates this for us diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index ca7d33a..1322cfc 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc @@ -1,12 +1,6 @@ require xserver-xorg-common.inc -PROTO_DEPS += "xf86driproto dri2proto" -LIB_DEPS += "mesa-dri" - EXTRA_OECONF += "\ - --enable-dri \ - --enable-dri2 \ - --enable-glx-tls \ --with-pic \ --with-int10=x86emu \ --without-xmlto \
On 09/04/2012 01:44 PM, Ross Burton wrote: > If the distro doesn't have the opengl feature there's no point building the DRI > or GLX support, making the mesa-dri build dependency optional. > > Signed-off-by: Ross Burton <ross.burton@intel.com> > --- > meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc | 3 +-- > meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc | 5 ++++- > meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 6 ------ > 3 files changed, 5 insertions(+), 9 deletions(-) > > diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc > index b588c11..b4a348c 100644 > --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc > +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc > @@ -8,5 +8,4 @@ SRC_URI += "file://crosscompile.patch \ > SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24" > SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2" > > -PR = "r5" > - > +PR = "r6" > diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc > index 404c488..94e83ea 100644 > --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc > +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc > @@ -119,8 +119,11 @@ EXTRA_OECONF += "--with-fop=no \ > ac_cv_file__usr_share_sgml_X11_defs_ent=no \ > " > > -PACKAGECONFIG ??= "udev" > +PACKAGECONFIG ??= "udev ${@base_contains('DISTRO_FEATURES', 'opengl', 'glx', '', d)}" > PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev" > +PACKAGECONFIG[glx] = "--enable-dri --enable-dri2 --enable-glx --enable-glx-tls,\ > + --disable-dri --disable-glx,\ > + xf86driproto dri2proto mesa-dri" > > do_install_append () { > # Its assumed base-files creates this for us > diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc > index ca7d33a..1322cfc 100644 > --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc > +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc > @@ -1,12 +1,6 @@ > require xserver-xorg-common.inc > > -PROTO_DEPS += "xf86driproto dri2proto" > -LIB_DEPS += "mesa-dri" > - > EXTRA_OECONF += "\ > - --enable-dri \ > - --enable-dri2 \ > - --enable-glx-tls \ > --with-pic \ > --with-int10=x86emu \ > --without-xmlto \ > Merged into OE-Core Thanks Sau!
If the distro doesn't have the opengl feature there's no point building the DRI or GLX support, making the mesa-dri build dependency optional. Signed-off-by: Ross Burton <ross.burton@intel.com> --- meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc | 3 +-- meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc | 5 ++++- meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 6 ------ 3 files changed, 5 insertions(+), 9 deletions(-)