mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-08-02 07:27:49 +00:00
libX11: update to 1.6.8
This commit is contained in:
parent
027def8c89
commit
c01211a6ce
@ -3,12 +3,12 @@
|
|||||||
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
|
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
|
||||||
|
|
||||||
PKG_NAME="libX11"
|
PKG_NAME="libX11"
|
||||||
PKG_VERSION="1.6.7"
|
PKG_VERSION="1.6.8"
|
||||||
PKG_SHA256="910e9e30efba4ad3672ca277741c2728aebffa7bc526f04dcfa74df2e52a1348"
|
PKG_SHA256="b289a845c189e251e0e884cc0f9269bbe97c238df3741e854ec4c17c21e473d5"
|
||||||
PKG_LICENSE="OSS"
|
PKG_LICENSE="OSS"
|
||||||
PKG_SITE="http://www.x.org/"
|
PKG_SITE="http://www.x.org/"
|
||||||
PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
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_LONGDESC="LibX11 is the main X11 library containing all the client-side code to access the X11 windowing system."
|
||||||
PKG_TOOLCHAIN="autotools"
|
PKG_TOOLCHAIN="autotools"
|
||||||
|
|
||||||
|
@ -1,64 +0,0 @@
|
|||||||
From 0141737e9d649c1d48f93ee8d56379f87c1dc0ea Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jon Turney <jon.turney@dronecode.org.uk>
|
|
||||||
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 <X11/X.h>
|
|
||||||
-#include <X11/Xos.h>
|
|
||||||
-#include <X11/Xresource.h>
|
|
||||||
-#include <X11/keysymdef.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
+#include <string.h>
|
|
||||||
|
|
||||||
#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
|
|
Loading…
x
Reference in New Issue
Block a user