aboutsummaryrefslogtreecommitdiff
path: root/package/x11r7
diff options
context:
space:
mode:
Diffstat (limited to 'package/x11r7')
-rw-r--r--package/x11r7/libxcb/libxcb.mk10
-rw-r--r--package/x11r7/xcb-proto/xcb-proto.mk8
-rw-r--r--package/x11r7/xlib_libX11/xlib_libX11.mk2
-rw-r--r--package/x11r7/xlib_libXi/xlib_libXi.mk2
-rw-r--r--package/x11r7/xlib_libXrandr/xlib_libXrandr.mk2
-rw-r--r--package/x11r7/xlib_libXrender/xlib_libXrender.mk2
-rw-r--r--package/x11r7/xlib_libXt/xlib_libXt.hash11
-rw-r--r--package/x11r7/xlib_libXt/xlib_libXt.mk2
-rw-r--r--package/x11r7/xlib_libXv/xlib_libXv.mk2
-rw-r--r--package/x11r7/xlib_libXvMC/xlib_libXvMC.mk2
-rw-r--r--package/x11r7/xserver_xorg-server/xserver_xorg-server.mk3
11 files changed, 31 insertions, 15 deletions
diff --git a/package/x11r7/libxcb/libxcb.mk b/package/x11r7/libxcb/libxcb.mk
index fb691c2422..9a35a72995 100644
--- a/package/x11r7/libxcb/libxcb.mk
+++ b/package/x11r7/libxcb/libxcb.mk
@@ -14,17 +14,17 @@ LIBXCB_INSTALL_STAGING = YES
LIBXCB_DEPENDENCIES = \
host-libxslt xcb-proto xlib_libXdmcp xlib_libXau \
- host-xcb-proto host-python host-pkgconf
+ host-xcb-proto host-python3 host-pkgconf
HOST_LIBXCB_DEPENDENCIES = \
host-libxslt host-xcb-proto host-xlib_libXdmcp \
- host-xlib_libXau host-python host-pkgconf
+ host-xlib_libXau host-python3 host-pkgconf
LIBXCB_CONF_OPTS = --with-doxygen=no
HOST_LIBXCB_CONF_OPTS = --with-doxygen=no
-# libxcb is not python3 friendly, so force the python interpreter
-HOST_LIBXCB_CONF_OPTS += ac_cv_path_PYTHON=$(HOST_DIR)/bin/python2
-LIBXCB_CONF_OPTS += ac_cv_path_PYTHON=$(HOST_DIR)/bin/python2
+# Force detection of Buildroot host-python3 over system python
+LIBXCB_CONF_OPTS += ac_cv_path_PYTHON=$(HOST_DIR)/bin/python3
+HOST_LIBXCB_CONF_OPTS += ac_cv_path_PYTHON=$(HOST_DIR)/bin/python3
$(eval $(autotools-package))
$(eval $(host-autotools-package))
diff --git a/package/x11r7/xcb-proto/xcb-proto.mk b/package/x11r7/xcb-proto/xcb-proto.mk
index 8bfe24f848..64190c817f 100644
--- a/package/x11r7/xcb-proto/xcb-proto.mk
+++ b/package/x11r7/xcb-proto/xcb-proto.mk
@@ -12,8 +12,12 @@ XCB_PROTO_LICENSE_FILES = COPYING
XCB_PROTO_INSTALL_STAGING = YES
-XCB_PROTO_DEPENDENCIES = host-python
-HOST_XCB_PROTO_DEPENDENCIES = host-python
+XCB_PROTO_DEPENDENCIES = host-python3
+HOST_XCB_PROTO_DEPENDENCIES = host-python3
+
+# Force detection of Buildroot host-python3 over system python
+XCB_PROTO_CONF_OPTS += ac_cv_path_PYTHON=$(HOST_DIR)/bin/python3
+HOST_XCB_PROTO_CONF_OPTS += ac_cv_path_PYTHON=$(HOST_DIR)/bin/python3
$(eval $(autotools-package))
$(eval $(host-autotools-package))
diff --git a/package/x11r7/xlib_libX11/xlib_libX11.mk b/package/x11r7/xlib_libX11/xlib_libX11.mk
index f36b5e6ffa..8fefbc492a 100644
--- a/package/x11r7/xlib_libX11/xlib_libX11.mk
+++ b/package/x11r7/xlib_libX11/xlib_libX11.mk
@@ -9,6 +9,8 @@ XLIB_LIBX11_SOURCE = libX11-$(XLIB_LIBX11_VERSION).tar.bz2
XLIB_LIBX11_SITE = https://xorg.freedesktop.org/archive/individual/lib
XLIB_LIBX11_LICENSE = MIT
XLIB_LIBX11_LICENSE_FILES = COPYING
+XLIB_LIBX11_CPE_ID_VENDOR = x.org
+XLIB_LIBX11_CPE_ID_PRODUCT = libx11
XLIB_LIBX11_INSTALL_STAGING = YES
XLIB_LIBX11_DEPENDENCIES = \
libxcb \
diff --git a/package/x11r7/xlib_libXi/xlib_libXi.mk b/package/x11r7/xlib_libXi/xlib_libXi.mk
index de7f3a7d3c..ad4cf5f96f 100644
--- a/package/x11r7/xlib_libXi/xlib_libXi.mk
+++ b/package/x11r7/xlib_libXi/xlib_libXi.mk
@@ -9,6 +9,8 @@ XLIB_LIBXI_SOURCE = libXi-$(XLIB_LIBXI_VERSION).tar.bz2
XLIB_LIBXI_SITE = https://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXI_LICENSE = MIT
XLIB_LIBXI_LICENSE_FILES = COPYING
+XLIB_LIBXI_CPE_ID_VENDOR = x.org
+XLIB_LIBXI_CPE_ID_PRODUCT = libxi
XLIB_LIBXI_INSTALL_STAGING = YES
XLIB_LIBXI_DEPENDENCIES = \
host-pkgconf \
diff --git a/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk b/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk
index 23a0d974d0..aa2761330a 100644
--- a/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk
+++ b/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk
@@ -9,6 +9,8 @@ XLIB_LIBXRANDR_SOURCE = libXrandr-$(XLIB_LIBXRANDR_VERSION).tar.bz2
XLIB_LIBXRANDR_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXRANDR_LICENSE = MIT
XLIB_LIBXRANDR_LICENSE_FILES = COPYING
+XLIB_LIBXRANDR_CPE_ID_VENDOR = x.org
+XLIB_LIBXRANDR_CPE_ID_PRODUCT = libxrandr
XLIB_LIBXRANDR_INSTALL_STAGING = YES
XLIB_LIBXRANDR_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXrender xorgproto
XLIB_LIBXRANDR_CONF_OPTS = --disable-malloc0returnsnull
diff --git a/package/x11r7/xlib_libXrender/xlib_libXrender.mk b/package/x11r7/xlib_libXrender/xlib_libXrender.mk
index 870f94386e..0ef0ec48d9 100644
--- a/package/x11r7/xlib_libXrender/xlib_libXrender.mk
+++ b/package/x11r7/xlib_libXrender/xlib_libXrender.mk
@@ -9,6 +9,8 @@ XLIB_LIBXRENDER_SOURCE = libXrender-$(XLIB_LIBXRENDER_VERSION).tar.bz2
XLIB_LIBXRENDER_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXRENDER_LICENSE = MIT
XLIB_LIBXRENDER_LICENSE_FILES = COPYING
+XLIB_LIBXRENDER_CPE_ID_VENDOR = x.org
+XLIB_LIBXRENDER_CPE_ID_PRODUCT = libxrender
XLIB_LIBXRENDER_INSTALL_STAGING = YES
XLIB_LIBXRENDER_DEPENDENCIES = xlib_libX11 xorgproto
HOST_XLIB_LIBXRENDER_DEPENDENCIES = \
diff --git a/package/x11r7/xlib_libXt/xlib_libXt.hash b/package/x11r7/xlib_libXt/xlib_libXt.hash
index 7f457fb9bc..dcd4853d76 100644
--- a/package/x11r7/xlib_libXt/xlib_libXt.hash
+++ b/package/x11r7/xlib_libXt/xlib_libXt.hash
@@ -1,8 +1,5 @@
-# From https://lists.x.org/archives/xorg/2019-June/059825.html
-md5 a9019421d3ee8b4937b6afd9025f018a libXt-1.2.0.tar.bz2
-sha1 f6b5ed799bc2e8d721e5407a09c2a8f570963f1b libXt-1.2.0.tar.bz2
-sha256 b31df531dabed9f4611fc8980bc51d7782967e2aff44c4105251a1acb5a77831 libXt-1.2.0.tar.bz2
-sha512 06248508b6fe5dfba8ceb4518475f656162351d78136eeb5d65086d680dabe9aca7bba3c94347f9c13ef03f82dab3ac19d0952ee610bc8c51c14cee7cf65f0b1 libXt-1.2.0.tar.bz2
-
+# From https://lists.x.org/archives/xorg-announce/2021-January/003070.html
+sha256 679cc08f1646dbd27f5e48ffe8dd49406102937109130caab02ca32c083a3d60 libXt-1.2.1.tar.bz2
+sha512 6877af61ba91eeed6b6f80471b84f354ad0ec0827249c7ee0a00c13508063fe8d2696dd400a4bdbc6ca2ff67cbe1317ad5ac24522fd96099dc56535e33ca052c libXt-1.2.1.tar.bz2
# Locally calculated
-sha256 a2866ccc0b1745149e4a2258d934314d40cbb43bd8318c6fa597f233995b0a81 COPYING
+sha256 a2866ccc0b1745149e4a2258d934314d40cbb43bd8318c6fa597f233995b0a81 COPYING
diff --git a/package/x11r7/xlib_libXt/xlib_libXt.mk b/package/x11r7/xlib_libXt/xlib_libXt.mk
index 01251c091b..289cb5ac54 100644
--- a/package/x11r7/xlib_libXt/xlib_libXt.mk
+++ b/package/x11r7/xlib_libXt/xlib_libXt.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XLIB_LIBXT_VERSION = 1.2.0
+XLIB_LIBXT_VERSION = 1.2.1
XLIB_LIBXT_SOURCE = libXt-$(XLIB_LIBXT_VERSION).tar.bz2
XLIB_LIBXT_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXT_LICENSE = MIT
diff --git a/package/x11r7/xlib_libXv/xlib_libXv.mk b/package/x11r7/xlib_libXv/xlib_libXv.mk
index 0ff99b9380..1105b5925d 100644
--- a/package/x11r7/xlib_libXv/xlib_libXv.mk
+++ b/package/x11r7/xlib_libXv/xlib_libXv.mk
@@ -9,6 +9,8 @@ XLIB_LIBXV_SOURCE = libXv-$(XLIB_LIBXV_VERSION).tar.bz2
XLIB_LIBXV_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXV_LICENSE = ISC-like
XLIB_LIBXV_LICENSE_FILES = COPYING
+XLIB_LIBXV_CPE_ID_VENDOR = x.org
+XLIB_LIBXV_CPE_ID_PRODUCT = libxv
XLIB_LIBXV_INSTALL_STAGING = YES
XLIB_LIBXV_DEPENDENCIES = xlib_libX11 xlib_libXext xorgproto
XLIB_LIBXV_CONF_OPTS = --disable-malloc0returnsnull
diff --git a/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk b/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk
index 02959c2305..7980f17493 100644
--- a/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk
+++ b/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk
@@ -9,6 +9,8 @@ XLIB_LIBXVMC_SOURCE = libXvMC-$(XLIB_LIBXVMC_VERSION).tar.bz2
XLIB_LIBXVMC_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXVMC_LICENSE = MIT
XLIB_LIBXVMC_LICENSE_FILES = COPYING
+XLIB_LIBXVMC_CPE_ID_VENDOR = x.org
+XLIB_LIBXVMC_CPE_ID_PRODUCT = libxvmc
XLIB_LIBXVMC_INSTALL_STAGING = YES
XLIB_LIBXVMC_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXv xorgproto
XLIB_LIBXVMC_CONF_OPTS = --disable-malloc0returnsnull
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index 8ac2d17b24..fa8ae13b8c 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -216,9 +216,12 @@ define XSERVER_XORG_SERVER_INSTALL_INIT_SYSTEMD
$(TARGET_DIR)/usr/lib/systemd/system/xorg.service
endef
+# init script conflicts with S90nodm
+ifneq ($(BR2_PACKAGE_NODM),y)
define XSERVER_XORG_SERVER_INSTALL_INIT_SYSV
$(INSTALL) -D -m 755 package/x11r7/xserver_xorg-server/S40xorg \
$(TARGET_DIR)/etc/init.d/S40xorg
endef
+endif
$(eval $(autotools-package))