* Remove glibc-guard patch: xserver no longer uses termio.h on linux in any case. * Remove "--enable-glx-tls": this hasn't done anything since glapi was separated from glx * Note that xserver no longer installs evdev configuration (evdev and/or libinput should do it instead)
Signed-off-by: Jussi Kukkonen <[email protected]> --- .../recipes-graphics/xorg-xserver/xserver-xorg.inc | 2 +- ...e-__GLIBC__-guard-for-glibc-specific-code.patch | 31 ---------------------- ...erver-xorg_1.17.2.bb => xserver-xorg_1.18.0.bb} | 6 ++--- 3 files changed, 3 insertions(+), 36 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-use-__GLIBC__-guard-for-glibc-specific-code.patch rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_1.17.2.bb => xserver-xorg_1.18.0.bb} (78%) diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index 9881c94..c1d87a7 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc @@ -133,7 +133,7 @@ PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,glproto virtual/mesa xf86dripro PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2,dri2proto" # DRI3 requires xshmfence to also be enabled PACKAGECONFIG[dri3] = "--enable-dri3,--disable-dri3,dri3proto" -PACKAGECONFIG[glx] = "--enable-glx --enable-glx-tls,--disable-glx,glproto virtual/libgl virtual/libx11" +PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,glproto virtual/libgl virtual/libx11" PACKAGECONFIG[unwind] = "--enable-libunwind,--disable-libunwind,libunwind" PACKAGECONFIG[xshmfence] = "--enable-xshmfence,--disable-xshmfence,libxshmfence" PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-use-__GLIBC__-guard-for-glibc-specific-code.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-use-__GLIBC__-guard-for-glibc-specific-code.patch deleted file mode 100644 index 21e4ed4..0000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-use-__GLIBC__-guard-for-glibc-specific-code.patch +++ /dev/null @@ -1,31 +0,0 @@ -From f242740f6488a25e6ca84968b0e2319a9a3975b4 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Mon, 6 Apr 2015 20:52:50 -0700 -Subject: [PATCH] use __GLIBC__ guard for glibc specific code - -Using __linux__ is a tad bit wrong assumption since -linux != glibc - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <[email protected]> ---- - hw/xfree86/os-support/xf86_OSlib.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h -index eb0a338..c366ffc 100644 ---- a/hw/xfree86/os-support/xf86_OSlib.h -+++ b/hw/xfree86/os-support/xf86_OSlib.h -@@ -178,7 +178,7 @@ - #include <sys/types.h> - #include <assert.h> - --#ifdef __linux__ -+#ifdef __GLIBC__ - #include <termio.h> - #else /* __GLIBC__ */ - #include <termios.h> --- -2.1.4 - diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.17.2.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.0.bb similarity index 78% rename from meta/recipes-graphics/xorg-xserver/xserver-xorg_1.17.2.bb rename to meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.0.bb index 3039d30..6c48bb9 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.17.2.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.0.bb @@ -1,9 +1,7 @@ require xserver-xorg.inc -SRC_URI += "file://0001-use-__GLIBC__-guard-for-glibc-specific-code.patch \ - " -SRC_URI[md5sum] = "397e405566651150490ff493e463f1ad" -SRC_URI[sha256sum] = "f61120612728f2c5034671d0ca3e2273438c60aba93b3dda4a8aa40e6a257993" +SRC_URI[md5sum] = "3c1c1057d3ad27380d8dd87ffcc182cd" +SRC_URI[sha256sum] = "195670819695d9cedd8dde95fbe069be0d0f488a77797a2d409f9f702daf312e" # These extensions are now integrated into the server, so declare the migration # path for in-place upgrades. -- 2.1.4 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
