From 1c2ea784f43dba4fd897eaf730933fa916b85c6e Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 17 Oct 2019 23:20:34 +0100 Subject: libx11: upgrade to 1.6.9 (From OE-Core rev: a4834fd1e63b825870b6351bedc203c20abb5ead) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-graphics/xorg-lib/libx11.inc | 42 -------------------- .../xorg-lib/libx11/no-host-libtool.patch | 45 ---------------------- .../xorg-lib/libx11/no-host-x.patch | 40 ------------------- meta/recipes-graphics/xorg-lib/libx11_1.6.8.bb | 7 ---- meta/recipes-graphics/xorg-lib/libx11_1.6.9.bb | 45 ++++++++++++++++++++++ 5 files changed, 45 insertions(+), 134 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-lib/libx11.inc delete mode 100644 meta/recipes-graphics/xorg-lib/libx11/no-host-libtool.patch delete mode 100644 meta/recipes-graphics/xorg-lib/libx11/no-host-x.patch delete mode 100644 meta/recipes-graphics/xorg-lib/libx11_1.6.8.bb create mode 100644 meta/recipes-graphics/xorg-lib/libx11_1.6.9.bb (limited to 'meta') diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc deleted file mode 100644 index cce0cb9929..0000000000 --- a/meta/recipes-graphics/xorg-lib/libx11.inc +++ /dev/null @@ -1,42 +0,0 @@ -SUMMARY = "Xlib: C Language X Interface library" - -DESCRIPTION = "This package provides a client interface to the X Window \ -System, otherwise known as 'Xlib'. It provides a complete API for the \ -basic functions of the window system." - -require xorg-lib-common.inc - -FILESEXTRAPATHS =. "${FILE_DIRNAME}/libx11:" - -PE = "1" - -SRC_URI += "file://Fix-hanging-issue-in-_XReply.patch \ - file://no-host-libtool.patch \ - file://no-host-x.patch" - -SRC_URI[md5sum] = "c5fa5a86a20e3591bed6c046498d4b8f" -SRC_URI[sha256sum] = "b289a845c189e251e0e884cc0f9269bbe97c238df3741e854ec4c17c21e473d5" - -PROVIDES = "virtual/libx11" - -XORG_PN = "libX11" -LICENSE = "MIT & MIT-style & BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" - -DEPENDS += "xorgproto xtrans libxcb" -DEPENDS += "xorgproto-native" - -EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11/ --disable-xf86bigfont" -EXTRA_OEMAKE += 'CWARNFLAGS=""' - -PACKAGECONFIG ??= "xcms" -PACKAGECONFIG[xcms] = "--enable-xcms,--disable-xcms" - -# src/util/makekeys is built natively but needs -D_GNU_SOURCE defined. -CPPFLAGS_FOR_BUILD += "-D_GNU_SOURCE" - -PACKAGES =+ "${PN}-xcb" - -FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${datadir}/X11/Xcms.txt" -FILES_${PN}-xcb += "${libdir}/libX11-xcb.so.*" -FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" diff --git a/meta/recipes-graphics/xorg-lib/libx11/no-host-libtool.patch b/meta/recipes-graphics/xorg-lib/libx11/no-host-libtool.patch deleted file mode 100644 index 56d9983b13..0000000000 --- a/meta/recipes-graphics/xorg-lib/libx11/no-host-libtool.patch +++ /dev/null @@ -1,45 +0,0 @@ -Upstream-Status: Backport [https://gitlab.freedesktop.org/xorg/lib/libx11/merge_requests/22] -Signed-off-by: Ross Burton - -From edc7680ed5a03cedb5facf14693823455e12c29c Mon Sep 17 00:00:00 2001 -From: Ross Burton -Date: Tue, 6 Aug 2019 14:53:43 +0100 -Subject: [PATCH libX11] src/util/Makefile: explicitly reset LINK to not use - libtool - -Simply looking at libtool redefines LINK globally to use libtool, which when -you're trying to cross-compile to Windows can cause complications. - -As in src/util/ we're simply building a small binary for the build host, reset -LINK to the automake default so that the traditional compile/link steps occur -without libtool. - -Also remove -all-static from LDFLAGS as that is a libtool-specific argument -intended to solve this problem. - -Closes: #100 -Signed-off-by: Ross Burton ---- - src/util/Makefile.am | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/util/Makefile.am b/src/util/Makefile.am -index 37314370..b7236530 100644 ---- a/src/util/Makefile.am -+++ b/src/util/Makefile.am -@@ -7,10 +7,11 @@ AM_CFLAGS = \ - AM_CPPFLAGS = \ - -I$(top_srcdir)/include - -+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CC = @CC_FOR_BUILD@ - CPPFLAGS = @CPPFLAGS_FOR_BUILD@ - CFLAGS = @CFLAGS_FOR_BUILD@ --LDFLAGS = @LDFLAGS_FOR_BUILD@ -all-static -+LDFLAGS = @LDFLAGS_FOR_BUILD@ - LIBS = - EXEEXT = @EXEEXT_FOR_BUILD@ - --- -2.20.1 - diff --git a/meta/recipes-graphics/xorg-lib/libx11/no-host-x.patch b/meta/recipes-graphics/xorg-lib/libx11/no-host-x.patch deleted file mode 100644 index 803f8b408c..0000000000 --- a/meta/recipes-graphics/xorg-lib/libx11/no-host-x.patch +++ /dev/null @@ -1,40 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From cf2ef27831173c5ed6f98be3c39caff18fd4e7f1 Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Mon, 17 Jun 2019 13:36:08 -0400 -Subject: [PATCH 1/2] makekeys: Detach ourselves from X headers entirely - -Subsequent to a121b7b0c210efe10bf93453b29050282324c906 we are no longer -building makekeys with enough -I/foo/bar to find the X11 headers, so if -they're not in a system include path, things fail. Since this utility is -only needed at build time, there's no real reason to demand the X -headers be installed for both the build and target machines if cross- -compiling, we can just assume a vaguely ANSI environment instead. - -Tested-by: Niclas Zeising -Reviewed-by: Keith Packard -Reviewed-by: Matt Turner ---- - src/util/makekeys.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/util/makekeys.c b/src/util/makekeys.c -index bcb5b7d5..07563315 100644 ---- a/src/util/makekeys.c -+++ b/src/util/makekeys.c -@@ -35,8 +35,10 @@ from The Open Group. - #include - #include - #include -+#include -+#include - --#include "../Xresinternal.h" -+typedef uint32_t Signature; - - #define KTNUM 4000 - --- -2.20.1 diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.6.8.bb b/meta/recipes-graphics/xorg-lib/libx11_1.6.8.bb deleted file mode 100644 index 0d27bc2bce..0000000000 --- a/meta/recipes-graphics/xorg-lib/libx11_1.6.8.bb +++ /dev/null @@ -1,7 +0,0 @@ -require libx11.inc - -SRC_URI += "file://disable_tests.patch" - -inherit gettext - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.6.9.bb b/meta/recipes-graphics/xorg-lib/libx11_1.6.9.bb new file mode 100644 index 0000000000..8c2a57c674 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11_1.6.9.bb @@ -0,0 +1,45 @@ +SUMMARY = "Xlib: C Language X Interface library" + +DESCRIPTION = "This package provides a client interface to the X Window \ +System, otherwise known as 'Xlib'. It provides a complete API for the \ +basic functions of the window system." + +require xorg-lib-common.inc + +FILESEXTRAPATHS =. "${FILE_DIRNAME}/libx11:" + +PE = "1" + +SRC_URI += "file://Fix-hanging-issue-in-_XReply.patch \ + file://disable_tests.patch" + +SRC_URI[md5sum] = "55adbfb6d4370ecac5e70598c4e7eed2" +SRC_URI[sha256sum] = "9cc7e8d000d6193fa5af580d50d689380b8287052270f5bb26a5fb6b58b2bed1" + +PROVIDES = "virtual/libx11" + +XORG_PN = "libX11" +LICENSE = "MIT & MIT-style & BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" + +DEPENDS += "xorgproto xtrans libxcb" +DEPENDS += "xorgproto-native" + +EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11/ --disable-xf86bigfont" +EXTRA_OEMAKE += 'CWARNFLAGS=""' + +PACKAGECONFIG ??= "xcms" +PACKAGECONFIG[xcms] = "--enable-xcms,--disable-xcms" + +# src/util/makekeys is built natively but needs -D_GNU_SOURCE defined. +CPPFLAGS_FOR_BUILD += "-D_GNU_SOURCE" + +PACKAGES =+ "${PN}-xcb" + +inherit gettext + +FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${datadir}/X11/Xcms.txt" +FILES_${PN}-xcb += "${libdir}/libX11-xcb.so.*" +FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf