From c01211a6ce5ef0f62e2683ab22d6eba729910ab5 Mon Sep 17 00:00:00 2001 From: CvH Date: Fri, 5 Jul 2019 19:48:12 +0200 Subject: [PATCH 1/2] libX11: update to 1.6.8 --- packages/x11/lib/libX11/package.mk | 6 +- ...keys-build-tool-when-cross-compiling.patch | 64 ------------------- 2 files changed, 3 insertions(+), 67 deletions(-) delete mode 100644 packages/x11/lib/libX11/patches/libX11-building-makekeys-build-tool-when-cross-compiling.patch diff --git a/packages/x11/lib/libX11/package.mk b/packages/x11/lib/libX11/package.mk index 2eefa8d7f1..11971ab90e 100644 --- a/packages/x11/lib/libX11/package.mk +++ b/packages/x11/lib/libX11/package.mk @@ -3,12 +3,12 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libX11" -PKG_VERSION="1.6.7" -PKG_SHA256="910e9e30efba4ad3672ca277741c2728aebffa7bc526f04dcfa74df2e52a1348" +PKG_VERSION="1.6.8" +PKG_SHA256="b289a845c189e251e0e884cc0f9269bbe97c238df3741e854ec4c17c21e473d5" PKG_LICENSE="OSS" PKG_SITE="http://www.x.org/" PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS_TARGET="toolchain util-macros xtrans libXau libxcb" +PKG_DEPENDS_TARGET="toolchain util-macros xtrans libXau libxcb xorgproto" PKG_LONGDESC="LibX11 is the main X11 library containing all the client-side code to access the X11 windowing system." PKG_TOOLCHAIN="autotools" diff --git a/packages/x11/lib/libX11/patches/libX11-building-makekeys-build-tool-when-cross-compiling.patch b/packages/x11/lib/libX11/patches/libX11-building-makekeys-build-tool-when-cross-compiling.patch deleted file mode 100644 index 4f3da3879e..0000000000 --- a/packages/x11/lib/libX11/patches/libX11-building-makekeys-build-tool-when-cross-compiling.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 0141737e9d649c1d48f93ee8d56379f87c1dc0ea Mon Sep 17 00:00:00 2001 -From: Jon Turney -Date: Tue, 30 Apr 2019 14:30:41 +0100 -Subject: [PATCH lib/libX11] Ease building makekeys build tool when - cross-compiling - -Remove makekeys dependency on X headers - -This is the patch from https://bugs.freedesktop.org/show_bug.cgi?id=6669 -by Pierre Ossman, reworked for master. - -Avoid using LIBS (which are for host, but we don't need) and rewrite -makekeys slightly to avoid needing to include any X headers, which -avoids potentially having -I with host paths in CFLAGS, which can cause -standard headers e.g. stdio.h for the host to also be used, which can -break things... - ---- - src/util/Makefile.am | 5 +++-- - src/util/makekeys.c | 9 +++++---- - 2 files changed, 8 insertions(+), 6 deletions(-) - -diff --git a/src/util/Makefile.am b/src/util/Makefile.am -index 79962d47..37314370 100644 ---- a/src/util/Makefile.am -+++ b/src/util/Makefile.am -@@ -2,7 +2,6 @@ - noinst_PROGRAMS=makekeys - - AM_CFLAGS = \ -- $(X11_CFLAGS) \ - $(CWARNFLAGS) - - AM_CPPFLAGS = \ - -diff --git a/src/util/makekeys.c b/src/util/makekeys.c -index 5613e42f..17cfa2b2 100644 ---- a/src/util/makekeys.c -+++ b/src/util/makekeys.c -@@ -28,17 +28,18 @@ from The Open Group. - - /* Constructs hash tables for XStringToKeysym and XKeysymToString. */ - --#include --#include --#include --#include - #include - #include -+#include - - #include "../Xresinternal.h" - - #define KTNUM 4000 - -+#define XK_VoidSymbol 0xffffff /* Void symbol */ -+ -+typedef unsigned long KeySym; -+ - static struct info { - char *name; - KeySym val; --- -2.17.0 From 392ccf5531f8985b800b1a9f3a85fb932abf88c1 Mon Sep 17 00:00:00 2001 From: CvH Date: Fri, 5 Jul 2019 19:48:31 +0200 Subject: [PATCH 2/2] libX11: fix cross-compiling --- .../libX11-makekeys-remove-X11-headers.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 packages/x11/lib/libX11/patches/libX11-makekeys-remove-X11-headers.patch diff --git a/packages/x11/lib/libX11/patches/libX11-makekeys-remove-X11-headers.patch b/packages/x11/lib/libX11/patches/libX11-makekeys-remove-X11-headers.patch new file mode 100644 index 0000000000..f96acea1f4 --- /dev/null +++ b/packages/x11/lib/libX11/patches/libX11-makekeys-remove-X11-headers.patch @@ -0,0 +1,37 @@ +https://github.com/mirror/libX11/commit/0327c427d62f671eced067c6d9b69f4e216a8cac +upstream in > 1.6.8 + +From: Adam Jackson +Date: Mon, 17 Jun 2019 13:36:08 -0400 +Subject: [PATCH] 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 +