* [Buildroot] [PATCH/next 1/5] package/x11r7/xorgproto: bump version to 2021.5
@ 2021-11-13 12:56 Bernd Kuhls
2021-11-13 12:56 ` [Buildroot] [PATCH/next 2/5] package/x11r7/xlib_libXi: bump version to 1.8 Bernd Kuhls
` (4 more replies)
0 siblings, 5 replies; 8+ messages in thread
From: Bernd Kuhls @ 2021-11-13 12:56 UTC (permalink / raw)
To: buildroot; +Cc: Eric Le Bihan
Release notes:
https://lists.x.org/archives/xorg-announce/2021-September/003108.html
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/x11r7/xorgproto/xorgproto.hash | 6 +++---
package/x11r7/xorgproto/xorgproto.mk | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/package/x11r7/xorgproto/xorgproto.hash b/package/x11r7/xorgproto/xorgproto.hash
index a88c129dd0..802217ce77 100644
--- a/package/x11r7/xorgproto/xorgproto.hash
+++ b/package/x11r7/xorgproto/xorgproto.hash
@@ -1,6 +1,6 @@
-# From https://lists.x.org/archives/xorg-announce/2021-April/003085.html
-sha256 0f5157030162844b398e7ce69b8bb967c2edb8064b0a9c9bb5517eb621459fbf xorgproto-2021.4.tar.bz2
-sha512 0d905e5f135daf7005e23371cbdc41a62d99567e0a20784e71ead0092ffd1e7582733819f7198add1d97edcc9aa80012ae01d2be8367280d69b41d0c25349367 xorgproto-2021.4.tar.bz2
+# From https://lists.x.org/archives/xorg-announce/2021-September/date.html
+sha256 aa2f663b8dbd632960b24f7477aa07d901210057f6ab1a1db5158732569ca015 xorgproto-2021.5.tar.bz2
+sha512 0f5c4ee4fd56cd46f4d5850bcf3e04c92d2e98de54d0113987cb49fc83cf1f4d0e50e976333179c72fe2178cfa15ec6c1bfc4e76fc3bc2a4be80616ce079da87 xorgproto-2021.5.tar.bz2
# Locally computed
sha256 aacd931f191b610902aee1e526090c2858aabc07969441fa2537ffd3e7049555 COPYING-applewmproto
diff --git a/package/x11r7/xorgproto/xorgproto.mk b/package/x11r7/xorgproto/xorgproto.mk
index 59f0640241..1d5cd4caa8 100644
--- a/package/x11r7/xorgproto/xorgproto.mk
+++ b/package/x11r7/xorgproto/xorgproto.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XORGPROTO_VERSION = 2021.4
+XORGPROTO_VERSION = 2021.5
XORGPROTO_SOURCE = xorgproto-$(XORGPROTO_VERSION).tar.bz2
XORGPROTO_SITE = https://xorg.freedesktop.org/archive/individual/proto
XORGPROTO_LICENSE = MIT
--
2.30.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH/next 2/5] package/x11r7/xlib_libXi: bump version to 1.8
2021-11-13 12:56 [Buildroot] [PATCH/next 1/5] package/x11r7/xorgproto: bump version to 2021.5 Bernd Kuhls
@ 2021-11-13 12:56 ` Bernd Kuhls
2021-11-13 12:56 ` [Buildroot] [PATCH/next 3/5] package/x11r7/xdriver_xf86-input-libinput: bump version to 1.2.0 Bernd Kuhls
` (3 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Bernd Kuhls @ 2021-11-13 12:56 UTC (permalink / raw)
To: buildroot; +Cc: Eric Le Bihan
Reformatted hashes, removed md5 and sha1 hashes.
Release notes:
https://lists.x.org/archives/xorg-announce/2021-September/003109.html
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/x11r7/xlib_libXi/xlib_libXi.hash | 10 ++++------
package/x11r7/xlib_libXi/xlib_libXi.mk | 2 +-
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/package/x11r7/xlib_libXi/xlib_libXi.hash b/package/x11r7/xlib_libXi/xlib_libXi.hash
index 1235631321..a86ef13225 100644
--- a/package/x11r7/xlib_libXi/xlib_libXi.hash
+++ b/package/x11r7/xlib_libXi/xlib_libXi.hash
@@ -1,7 +1,5 @@
-# From https://lists.x.org/archives/xorg-announce/2019-June/002999.html
-md5 62c4af0839072024b4b1c8cbe84216c7 libXi-1.7.10.tar.bz2
-sha1 79052e50ea07ce2431f8988a60553d9091d46207 libXi-1.7.10.tar.bz2
-sha256 36a30d8f6383a72e7ce060298b4b181fd298bc3a135c8e201b7ca847f5f81061 libXi-1.7.10.tar.bz2
-sha512 591f0860bf5904897587c4990d6c852f3729a212d1ef390362d41242440e078221877c31db2232d5cc81727fe97f4e194b077f7de917e251e60641bbd06ee218 libXi-1.7.10.tar.bz2
+# From https://lists.x.org/archives/xorg-announce/2021-September/003109.html
+sha256 2ed181446a61c7337576467870bc5336fc9e222a281122d96c4d39a3298bba00 libXi-1.8.tar.bz2
+sha512 4b2c667a8466eb389f253d77285c3f506c4a2b6c75054c722974a864565d565cc0c5701f8ea773eb929ceb94adfeb737ecd7a0bfc2c240157416a5f343c07aba libXi-1.8.tar.bz2
# Locally computed
-sha256 9392174bc86e291369fd2f61f3ed325962735a5f5c585ce8d7ebd365e2a5639f COPYING
+sha256 9392174bc86e291369fd2f61f3ed325962735a5f5c585ce8d7ebd365e2a5639f COPYING
diff --git a/package/x11r7/xlib_libXi/xlib_libXi.mk b/package/x11r7/xlib_libXi/xlib_libXi.mk
index ad4cf5f96f..b4802cf018 100644
--- a/package/x11r7/xlib_libXi/xlib_libXi.mk
+++ b/package/x11r7/xlib_libXi/xlib_libXi.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XLIB_LIBXI_VERSION = 1.7.10
+XLIB_LIBXI_VERSION = 1.8
XLIB_LIBXI_SOURCE = libXi-$(XLIB_LIBXI_VERSION).tar.bz2
XLIB_LIBXI_SITE = https://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXI_LICENSE = MIT
--
2.30.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH/next 3/5] package/x11r7/xdriver_xf86-input-libinput: bump version to 1.2.0
2021-11-13 12:56 [Buildroot] [PATCH/next 1/5] package/x11r7/xorgproto: bump version to 2021.5 Bernd Kuhls
2021-11-13 12:56 ` [Buildroot] [PATCH/next 2/5] package/x11r7/xlib_libXi: bump version to 1.8 Bernd Kuhls
@ 2021-11-13 12:56 ` Bernd Kuhls
2021-11-13 12:56 ` [Buildroot] [PATCH/next 4/5] package/x11r7/xlib_libxcvt: new package Bernd Kuhls
` (2 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Bernd Kuhls @ 2021-11-13 12:56 UTC (permalink / raw)
To: buildroot; +Cc: Eric Le Bihan
Switched _SITE to https.
Release notes:
https://lists.x.org/archives/xorg-announce/2021-September/003110.html
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
.../xdriver_xf86-input-libinput.hash | 6 +++---
.../xdriver_xf86-input-libinput.mk | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash b/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash
index 3ee726bfdc..a2f295d6b5 100644
--- a/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash
+++ b/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash
@@ -1,6 +1,6 @@
-# From https://lists.x.org/archives/xorg-announce/2021-June/003094.html
-sha256 e11d2a41419124a6e9b148f1df181bf7819fc7398c8ee9a1b6390b0742c68d16 xf86-input-libinput-1.1.0.tar.bz2
-sha512 7def9a4834a9203d1672613b1a4b384a0eb3d664818865b375969bf9ca96c512b752859acc8916de9224f7e488f8d59953308e53b983dfa8031ca01fd707fa2b xf86-input-libinput-1.1.0.tar.bz2
+# From https://lists.x.org/archives/xorg-announce/2021-September/003110.html
+sha256 f80da3c514fe1cbf57fa1b1bd6ff97f6b0a1f87466ad89247bac59cd0a5869f6 xf86-input-libinput-1.2.0.tar.bz2
+sha512 ebff9490d33fd7495df2e03203060a76b3274f0e638bc92f3d95257fac57cdb9dac308e90e54006fe9522b6de3b1f1c38fd5f0b0b75b7051e5422290f43de52d xf86-input-libinput-1.2.0.tar.bz2
# Locally computed
sha256 4114220b281561e80f3422f0e7ae8d3e1fc85131ffc2e3b6265119e66f1adb27 COPYING
diff --git a/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk b/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk
index 73cdad9b85..21d962aa52 100644
--- a/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk
+++ b/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk
@@ -4,9 +4,9 @@
#
################################################################################
-XDRIVER_XF86_INPUT_LIBINPUT_VERSION = 1.1.0
+XDRIVER_XF86_INPUT_LIBINPUT_VERSION = 1.2.0
XDRIVER_XF86_INPUT_LIBINPUT_SOURCE = xf86-input-libinput-$(XDRIVER_XF86_INPUT_LIBINPUT_VERSION).tar.bz2
-XDRIVER_XF86_INPUT_LIBINPUT_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_INPUT_LIBINPUT_SITE = https://xorg.freedesktop.org/releases/individual/driver
XDRIVER_XF86_INPUT_LIBINPUT_LICENSE = MIT
XDRIVER_XF86_INPUT_LIBINPUT_LICENSE_FILES = COPYING
XDRIVER_XF86_INPUT_LIBINPUT_DEPENDENCIES = libinput xserver_xorg-server xorgproto
--
2.30.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH/next 4/5] package/x11r7/xlib_libxcvt: new package
2021-11-13 12:56 [Buildroot] [PATCH/next 1/5] package/x11r7/xorgproto: bump version to 2021.5 Bernd Kuhls
2021-11-13 12:56 ` [Buildroot] [PATCH/next 2/5] package/x11r7/xlib_libXi: bump version to 1.8 Bernd Kuhls
2021-11-13 12:56 ` [Buildroot] [PATCH/next 3/5] package/x11r7/xdriver_xf86-input-libinput: bump version to 1.2.0 Bernd Kuhls
@ 2021-11-13 12:56 ` Bernd Kuhls
2021-11-13 17:01 ` Thomas Petazzoni
2021-11-13 12:56 ` [Buildroot] [PATCH/next 5/5] package/x11r7/xserver_xorg-server: bump version to 21.1.1 Bernd Kuhls
2021-11-13 17:00 ` [Buildroot] [PATCH/next 1/5] package/x11r7/xorgproto: bump version to 2021.5 Thomas Petazzoni
4 siblings, 1 reply; 8+ messages in thread
From: Bernd Kuhls @ 2021-11-13 12:56 UTC (permalink / raw)
To: buildroot; +Cc: Eric Le Bihan
Needed for X.org xserver 21.1
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/x11r7/Config.in | 1 +
package/x11r7/xlib_libxcvt/Config.in | 6 ++++++
package/x11r7/xlib_libxcvt/xlib_libxcvt.hash | 5 +++++
package/x11r7/xlib_libxcvt/xlib_libxcvt.mk | 14 ++++++++++++++
4 files changed, 26 insertions(+)
create mode 100644 package/x11r7/xlib_libxcvt/Config.in
create mode 100644 package/x11r7/xlib_libxcvt/xlib_libxcvt.hash
create mode 100644 package/x11r7/xlib_libxcvt/xlib_libxcvt.mk
diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index b891fb42ce..63259e88da 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -52,6 +52,7 @@ if BR2_PACKAGE_XORG7
source package/x11r7/xlib_libXxf86vm/Config.in
source package/x11r7/xlib_libdmx/Config.in
source package/x11r7/xlib_libfontenc/Config.in
+ source package/x11r7/xlib_libxcvt/Config.in
source package/x11r7/xlib_libxkbfile/Config.in
source package/x11r7/xlib_libxshmfence/Config.in
source package/x11r7/xlib_xtrans/Config.in
diff --git a/package/x11r7/xlib_libxcvt/Config.in b/package/x11r7/xlib_libxcvt/Config.in
new file mode 100644
index 0000000000..b8ff361713
--- /dev/null
+++ b/package/x11r7/xlib_libxcvt/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_XLIB_LIBXCVT
+ bool "libxcvt"
+ help
+ libxcvt is a library providing a standalone version of the X
+ server implementation of the VESA CVT standard timing mode-
+ lines generator.
diff --git a/package/x11r7/xlib_libxcvt/xlib_libxcvt.hash b/package/x11r7/xlib_libxcvt/xlib_libxcvt.hash
new file mode 100644
index 0000000000..71ae9170ac
--- /dev/null
+++ b/package/x11r7/xlib_libxcvt/xlib_libxcvt.hash
@@ -0,0 +1,5 @@
+# From https://lists.x.org/archives/xorg-announce/2021-October/003114.html
+sha256 27ebce180d355f94c1992930bedb40a36f6d7312ee50bf7f0acbcd22f33e8c29 libxcvt-0.1.1.tar.xz
+sha512 50e9cd0283858823d4cfde75f06e23ffc42983272cb1f75408052fb5b76a4bb6f9de7d42d8ff9ec0dae6e95eefebc6273e03c919a92f237585db55eaf1a57005 libxcvt-0.1.1.tar.xz
+# Locally calculated
+sha256 4849851554bdeda9a2a85ce93946b786605e009685941b8b907a9a36b02ae068 COPYING
diff --git a/package/x11r7/xlib_libxcvt/xlib_libxcvt.mk b/package/x11r7/xlib_libxcvt/xlib_libxcvt.mk
new file mode 100644
index 0000000000..33a55dfa20
--- /dev/null
+++ b/package/x11r7/xlib_libxcvt/xlib_libxcvt.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# xlib_libxcvt
+#
+################################################################################
+
+XLIB_LIBXCVT_VERSION = 0.1.1
+XLIB_LIBXCVT_SOURCE = libxcvt-$(XLIB_LIBXCVT_VERSION).tar.xz
+XLIB_LIBXCVT_SITE = https://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXCVT_LICENSE = MIT
+XLIB_LIBXCVT_LICENSE_FILES = COPYING
+XLIB_LIBXCVT_INSTALL_STAGING = YES
+
+$(eval $(meson-package))
--
2.30.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH/next 5/5] package/x11r7/xserver_xorg-server: bump version to 21.1.1
2021-11-13 12:56 [Buildroot] [PATCH/next 1/5] package/x11r7/xorgproto: bump version to 2021.5 Bernd Kuhls
` (2 preceding siblings ...)
2021-11-13 12:56 ` [Buildroot] [PATCH/next 4/5] package/x11r7/xlib_libxcvt: new package Bernd Kuhls
@ 2021-11-13 12:56 ` Bernd Kuhls
2021-11-13 17:01 ` Thomas Petazzoni
2021-11-13 17:00 ` [Buildroot] [PATCH/next 1/5] package/x11r7/xorgproto: bump version to 2021.5 Thomas Petazzoni
4 siblings, 1 reply; 8+ messages in thread
From: Bernd Kuhls @ 2021-11-13 12:56 UTC (permalink / raw)
To: buildroot; +Cc: Eric Le Bihan
Removed patches which were applied upstream:
0001-modesettings-needs-dri2.patch
https://gitlab.freedesktop.org/xorg/xserver/-/commit/9c81b8f5b5d7bc987f73e8ef01a81e61205e58ee
0003-hw-xwayland-Makefile.am-fix-build-without-glx.patch
https://gitlab.freedesktop.org/xorg/xserver/-/commit/836f93de99b35050d78d61d3654f7c5655184144
0004-hw-xfree86-common-xf86Init.c-fix-build-without-glx.patch
https://gitlab.freedesktop.org/xorg/xserver/-/commit/49456e0a37fac7bc9d1f01bc1519fb0d699956db
0005-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch
https://gitlab.freedesktop.org/xorg/xserver/-/commit/e50c85f4ebf559a3bac4817b41074c43d4691779
0006-compiler.h-don-t-define-inb-outb-and-friends-on-mips.patch
https://gitlab.freedesktop.org/xorg/xserver/-/commit/0148a15da1616a868d71abe1b56e3f28cc79533c
Renumbered remaining patch.
Removed xwayland options:
https://gitlab.freedesktop.org/xorg/xserver/-/commit/4ee66f574a70948ca90a5db94dd666a389a5ff3e
Added dependency to xlib_libxcvt:
https://gitlab.freedesktop.org/xorg/xserver/-/commit/a4ab57cb748674823744a8ef5a0b416ee553efe8
Release notes:
https://lists.x.org/archives/xorg-announce/2021-October/003115.html
https://lists.x.org/archives/xorg-announce/2021-November/003116.html
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
...001-include-misc.h-fix-uClibc-build.patch} | 0
.../0001-modesettings-needs-dri2.patch | 20 -----
...nd-Makefile.am-fix-build-without-glx.patch | 45 ------------
...mon-xf86Init.c-fix-build-without-glx.patch | 45 ------------
...probing-a-non-PCI-platform-device-on.patch | 33 ---------
...-define-inb-outb-and-friends-on-mips.patch | 73 -------------------
package/x11r7/xserver_xorg-server/Config.in | 1 +
.../xserver_xorg-server.hash | 6 +-
.../xserver_xorg-server.mk | 14 +---
9 files changed, 6 insertions(+), 231 deletions(-)
rename package/x11r7/xserver_xorg-server/{0002-include-misc.h-fix-uClibc-build.patch => 0001-include-misc.h-fix-uClibc-build.patch} (100%)
delete mode 100644 package/x11r7/xserver_xorg-server/0001-modesettings-needs-dri2.patch
delete mode 100644 package/x11r7/xserver_xorg-server/0003-hw-xwayland-Makefile.am-fix-build-without-glx.patch
delete mode 100644 package/x11r7/xserver_xorg-server/0004-hw-xfree86-common-xf86Init.c-fix-build-without-glx.patch
delete mode 100644 package/x11r7/xserver_xorg-server/0005-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch
delete mode 100644 package/x11r7/xserver_xorg-server/0006-compiler.h-don-t-define-inb-outb-and-friends-on-mips.patch
diff --git a/package/x11r7/xserver_xorg-server/0002-include-misc.h-fix-uClibc-build.patch b/package/x11r7/xserver_xorg-server/0001-include-misc.h-fix-uClibc-build.patch
similarity index 100%
rename from package/x11r7/xserver_xorg-server/0002-include-misc.h-fix-uClibc-build.patch
rename to package/x11r7/xserver_xorg-server/0001-include-misc.h-fix-uClibc-build.patch
diff --git a/package/x11r7/xserver_xorg-server/0001-modesettings-needs-dri2.patch b/package/x11r7/xserver_xorg-server/0001-modesettings-needs-dri2.patch
deleted file mode 100644
index 74917720cb..0000000000
--- a/package/x11r7/xserver_xorg-server/0001-modesettings-needs-dri2.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Kernel modesettings support also depends on dri2, see
-http://cgit.freedesktop.org/xorg/xserver/tree/hw/xfree86/drivers/modesetting/Makefile.am#n46
-
-Patch sent upstream: https://gitlab.freedesktop.org/xorg/xserver/issues/479
-
-[rebased for version 1.20.0]
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-
-diff -uNr xorg-server-1.17.2.org/configure.ac xorg-server-1.17.2/configure.ac
---- xorg-server-1.17.2.org/configure.ac 2015-06-16 17:42:40.000000000 +0200
-+++ xorg-server-1.17.2/configure.ac 2015-08-08 10:44:59.702382624 +0200
-@@ -1962,7 +1962,7 @@
- XORG_SYS_LIBS="$XORG_SYS_LIBS $XORG_MODULES_LIBS"
- fi
-
-- if test "x$DRM" = xyes; then
-+ if test "x$DRM" = xyes -a "x$DRI2" = xyes; then
- XORG_DRIVER_MODESETTING=yes
- fi
-
diff --git a/package/x11r7/xserver_xorg-server/0003-hw-xwayland-Makefile.am-fix-build-without-glx.patch b/package/x11r7/xserver_xorg-server/0003-hw-xwayland-Makefile.am-fix-build-without-glx.patch
deleted file mode 100644
index 5f19a26d14..0000000000
--- a/package/x11r7/xserver_xorg-server/0003-hw-xwayland-Makefile.am-fix-build-without-glx.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From b1d2a82d644518c1a75775244ac63be738aaf062 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Fri, 19 Apr 2019 10:19:50 +0200
-Subject: [PATCH] hw/xwayland/Makefile.am: fix build without glx
-
-Commit d8ec33fe0542141aed1d9016d2ecaf52da944b4b added libglxvnd.la to
-Xwayland_LDFLAGS but GLX can be disabled through --disable-glx.
-In this case, build fails on:
-
-make[3]: *** No rule to make target '../../glx/libglxvnd.la', needed by 'Xwayland'. Stop.
-make[3]: *** Waiting for unfinished jobs....
-
-Fixes:
- - http://autobuild.buildroot.org/results/397f8098c57fc6c88aa12dc8d35ebb1b933d52ef
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Upstream status:
-https://gitlab.freedesktop.org/xorg/xserver/merge_requests/173]
----
- hw/xwayland/Makefile.am | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/hw/xwayland/Makefile.am b/hw/xwayland/Makefile.am
-index bc1cb8506..502879e2a 100644
---- a/hw/xwayland/Makefile.am
-+++ b/hw/xwayland/Makefile.am
-@@ -21,10 +21,14 @@ Xwayland_SOURCES = \
- $(top_srcdir)/Xi/stubs.c \
- $(top_srcdir)/mi/miinitext.c
-
-+if GLX
-+GLXVND_LIB = $(top_builddir)/glx/libglxvnd.la
-+endif
-+
- Xwayland_LDADD = \
- $(glamor_lib) \
- $(XWAYLAND_LIBS) \
-- $(top_builddir)/glx/libglxvnd.la \
-+ $(GLXVND_LIB) \
- $(XWAYLAND_SYS_LIBS) \
- $(top_builddir)/Xext/libXvidmode.la \
- $(XSERVER_SYS_LIBS)
---
-2.20.1
-
diff --git a/package/x11r7/xserver_xorg-server/0004-hw-xfree86-common-xf86Init.c-fix-build-without-glx.patch b/package/x11r7/xserver_xorg-server/0004-hw-xfree86-common-xf86Init.c-fix-build-without-glx.patch
deleted file mode 100644
index de086fb665..0000000000
--- a/package/x11r7/xserver_xorg-server/0004-hw-xfree86-common-xf86Init.c-fix-build-without-glx.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 49456e0a37fac7bc9d1f01bc1519fb0d699956db Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Fri, 27 Dec 2019 23:33:37 +0100
-Subject: [PATCH] hw/xfree86/common/xf86Init.c: fix build without glx
-
-Since commit d8ec33fe0542141aed1d9016d2ecaf52da944b4b, an include on
-glxvndabi.h has been added to hw/xfree86/common/xf86Init.c
-
-However, if glx is disabled through --disable-glx and GLX headers are
-not installed in the build's environment, build fails on:
-
-In file included from xf86Init.c:81:
-../../../include/glxvndabi.h:64:10: fatal error: GL/glxproto.h: No such file or directory
- 64 | #include <GL/glxproto.h>
- | ^~~~~~~~~~~~~~~
-
-Fix this failure by removing this include which does not seem to be
-needed (an other option would have been to keep it under an ifdef GLXEXT
-block)
-
-Fixes:
- - http://autobuild.buildroot.org/results/de838a843f97673d1381a55fd4e9b07164693913
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Retrieved from:
-https://gitlab.freedesktop.org/xorg/xserver/commit/49456e0a37fac7bc9d1f01bc1519fb0d699956db]
----
- hw/xfree86/common/xf86Init.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
-index 0631c7237..e6fb11398 100644
---- a/hw/xfree86/common/xf86Init.c
-+++ b/hw/xfree86/common/xf86Init.c
-@@ -78,7 +78,6 @@
- #include "xf86InPriv.h"
- #include "picturestr.h"
- #include "randrstr.h"
--#include "glxvndabi.h"
- #include "xf86Bus.h"
- #ifdef XSERVER_LIBPCIACCESS
- #include "xf86VGAarbiter.h"
---
-2.24.1
-
diff --git a/package/x11r7/xserver_xorg-server/0005-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch b/package/x11r7/xserver_xorg-server/0005-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch
deleted file mode 100644
index 7802fd96c9..0000000000
--- a/package/x11r7/xserver_xorg-server/0005-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From e50c85f4ebf559a3bac4817b41074c43d4691779 Mon Sep 17 00:00:00 2001
-From: Eric Anholt <eric@anholt.net>
-Date: Fri, 26 Oct 2018 17:47:30 -0700
-Subject: [PATCH] Fix segfault on probing a non-PCI platform device on a system
- with PCI.
-
-Some Broadcom set-top-box boards have PCI busses, but the GPU is still
-probed through DT. We would dereference a null busid here in that
-case.
-
-Signed-off-by: Eric Anholt <eric@anholt.net>
-Backported from: e50c85f4ebf559a3bac4817b41074c43d4691779
-Signed-off-by: Joseph Kogut <joseph.kogut@gmail.com>
----
- hw/xfree86/common/xf86platformBus.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
-index cef47da03..dadbac6c8 100644
---- a/hw/xfree86/common/xf86platformBus.c
-+++ b/hw/xfree86/common/xf86platformBus.c
-@@ -289,7 +289,7 @@ xf86platformProbe(void)
- for (i = 0; i < xf86_num_platform_devices; i++) {
- char *busid = xf86_platform_odev_attributes(i)->busid;
-
-- if (pci && (strncmp(busid, "pci:", 4) == 0)) {
-+ if (pci && busid && (strncmp(busid, "pci:", 4) == 0)) {
- platform_find_pci_info(&xf86_platform_devices[i], busid);
- }
-
---
-2.24.1
-
diff --git a/package/x11r7/xserver_xorg-server/0006-compiler.h-don-t-define-inb-outb-and-friends-on-mips.patch b/package/x11r7/xserver_xorg-server/0006-compiler.h-don-t-define-inb-outb-and-friends-on-mips.patch
deleted file mode 100644
index 469ca7e3fc..0000000000
--- a/package/x11r7/xserver_xorg-server/0006-compiler.h-don-t-define-inb-outb-and-friends-on-mips.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From de5e24b5036a1a5a877f8f30169e3497d0e296d6 Mon Sep 17 00:00:00 2001
-From: Julien Cristau <jcristau@debian.org>
-Date: Wed, 6 Jan 2021 10:20:53 +0100
-Subject: [PATCH] compiler.h: don't define inb/outb and friends on mips
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The definition relies on IOPortBase, which is only ever set in
-hw/xfree86/os-support/bsd/arm_video.c
-
-This caused build failures on linux/mips with GCC 10, due to this
-change (from https://gcc.gnu.org/gcc-10/changes.html#c):
-
-"GCC now defaults to -fno-common. As a result, global variable accesses
-are more efficient on various targets. In C, global variables with
-multiple tentative definitions now result in linker errors. With
--fcommon such definitions are silently merged during linking."
-
-As a result anything including compiler.h would get its own definition
-of IOPortBase and the linker would error out.
-
-Signed-off-by: Raphaël Mélotte <raphael.melotte@mind.be>
----
- hw/xfree86/common/compiler.h | 8 ++------
- hw/xfree86/os-support/bsd/arm_video.c | 3 +++
- 2 files changed, 5 insertions(+), 6 deletions(-)
-
-diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
-index 2b2008b3f..eb788d3fd 100644
---- a/hw/xfree86/common/compiler.h
-+++ b/hw/xfree86/common/compiler.h
-@@ -518,14 +518,10 @@ xf86WriteMmio32Le(__volatile__ void *base, const unsigned long offset,
- barrier();
- }
-
--#elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__))
--#if defined(__arm32__) || defined(__mips64)
-+#elif defined(__arm32__) && !defined(__linux__)
- #define PORT_SIZE long
--#else
--#define PORT_SIZE short
--#endif
-
--_X_EXPORT unsigned int IOPortBase; /* Memory mapped I/O port area */
-+extern _X_EXPORT unsigned int IOPortBase; /* Memory mapped I/O port area */
-
- static __inline__ void
- outb(unsigned PORT_SIZE port, unsigned char val)
-diff --git a/hw/xfree86/os-support/bsd/arm_video.c b/hw/xfree86/os-support/bsd/arm_video.c
-index dd1020e33..180d70543 100644
---- a/hw/xfree86/os-support/bsd/arm_video.c
-+++ b/hw/xfree86/os-support/bsd/arm_video.c
-@@ -65,6 +65,7 @@
- #include "xf86Priv.h"
- #include "xf86_OSlib.h"
- #include "xf86OSpriv.h"
-+#include "compiler.h"
-
- #if defined(__NetBSD__) && !defined(MAP_FILE)
- #define MAP_FLAGS MAP_SHARED
-@@ -162,6 +163,8 @@ xf86DisableIO()
-
- #if defined(USE_ARC_MMAP) || defined(__arm32__)
-
-+unsigned int IOPortBase;
-+
- Bool
- xf86EnableIO()
- {
---
-2.32.0
-
diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in
index 7f37f2f1ac..4fb03051dd 100644
--- a/package/x11r7/xserver_xorg-server/Config.in
+++ b/package/x11r7/xserver_xorg-server/Config.in
@@ -18,6 +18,7 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER
select BR2_PACKAGE_XLIB_LIBX11
select BR2_PACKAGE_XLIB_LIBXAU
select BR2_PACKAGE_XLIB_LIBXCURSOR
+ select BR2_PACKAGE_XLIB_LIBXCVT
select BR2_PACKAGE_XLIB_LIBXDAMAGE
select BR2_PACKAGE_XLIB_LIBXDMCP
select BR2_PACKAGE_XLIB_LIBXEXT
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash
index 8eb56ba027..d389e6713a 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash
@@ -1,6 +1,6 @@
-# From https://lists.x.org/archives/xorg-announce/2021-July/003100.html
-sha256 40aa4e96a56a81a301f15a9b10e06a22700f12b42d9e0e453c7f11d354386300 xorg-server-1.20.13.tar.xz
-sha512 4e0b7bd4e070dc52cb2c51c2056feb133de2c0487d359392ed63abba9702910cd2e2983e9415973d8d6e9672eac78be6f39202687fc56610877914ce722554b3 xorg-server-1.20.13.tar.xz
+# From https://lists.x.org/archives/xorg-announce/2021-November/003116.html
+sha256 782e7fef2ca0c7cbe60a937b8bf42dac69c904fb841950fd0363e1c2346ea755 xorg-server-21.1.1.tar.xz
+sha512 8608ed9c1537c95e8a3adea5e3e372a3c5eb841f8e27c84283093f22fb1909e16a800006510da684b13f8f237f33b8a4be3e2537f5f9ab9af4c5ad12770eef0d xorg-server-21.1.1.tar.xz
# Locally calculated
sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index 6d0876f1fd..bedf05c8fa 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -4,17 +4,14 @@
#
################################################################################
-XSERVER_XORG_SERVER_VERSION = 1.20.13
+XSERVER_XORG_SERVER_VERSION = 21.1.1
XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.xz
XSERVER_XORG_SERVER_SITE = https://xorg.freedesktop.org/archive/individual/xserver
XSERVER_XORG_SERVER_LICENSE = MIT
XSERVER_XORG_SERVER_LICENSE_FILES = COPYING
XSERVER_XORG_SERVER_SELINUX_MODULES = xserver
XSERVER_XORG_SERVER_INSTALL_STAGING = YES
-# xfont_font-util is needed only for autoreconf
-XSERVER_XORG_SERVER_AUTORECONF = YES
XSERVER_XORG_SERVER_DEPENDENCIES = \
- xfont_font-util \
xutil_util-macros \
xlib_libX11 \
xlib_libXau \
@@ -32,6 +29,7 @@ XSERVER_XORG_SERVER_DEPENDENCIES = \
xlib_libXdamage \
xlib_libXxf86vm \
xlib_libxkbfile \
+ xlib_libxcvt \
xlib_xtrans \
xdata_xbitmaps \
xorgproto \
@@ -67,14 +65,6 @@ XSERVER_XORG_SERVER_CONF_OPTS += \
--disable-systemd-logind
endif
-# Xwayland support needs libdrm, libepoxy, wayland and libxcomposite
-ifeq ($(BR2_PACKAGE_LIBDRM)$(BR2_PACKAGE_LIBEPOXY)$(BR2_PACKAGE_WAYLAND)$(BR2_PACKAGE_WAYLAND_PROTOCOLS)$(BR2_PACKAGE_XLIB_LIBXCOMPOSITE),yyyyy)
-XSERVER_XORG_SERVER_CONF_OPTS += --enable-xwayland
-XSERVER_XORG_SERVER_DEPENDENCIES += libdrm libepoxy wayland wayland-protocols xlib_libXcomposite
-else
-XSERVER_XORG_SERVER_CONF_OPTS += --disable-xwayland
-endif
-
ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR),y)
XSERVER_XORG_SERVER_CONF_OPTS += --enable-xorg
XSERVER_XORG_SERVER_DEPENDENCIES += libpciaccess
--
2.30.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [Buildroot] [PATCH/next 1/5] package/x11r7/xorgproto: bump version to 2021.5
2021-11-13 12:56 [Buildroot] [PATCH/next 1/5] package/x11r7/xorgproto: bump version to 2021.5 Bernd Kuhls
` (3 preceding siblings ...)
2021-11-13 12:56 ` [Buildroot] [PATCH/next 5/5] package/x11r7/xserver_xorg-server: bump version to 21.1.1 Bernd Kuhls
@ 2021-11-13 17:00 ` Thomas Petazzoni
4 siblings, 0 replies; 8+ messages in thread
From: Thomas Petazzoni @ 2021-11-13 17:00 UTC (permalink / raw)
To: Bernd Kuhls; +Cc: Eric Le Bihan, buildroot
On Sat, 13 Nov 2021 13:56:16 +0100
Bernd Kuhls <bernd.kuhls@t-online.de> wrote:
> Release notes:
> https://lists.x.org/archives/xorg-announce/2021-September/003108.html
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> package/x11r7/xorgproto/xorgproto.hash | 6 +++---
> package/x11r7/xorgproto/xorgproto.mk | 2 +-
> 2 files changed, 4 insertions(+), 4 deletions(-)
Entire series applied to next. Thanks!
I'll reply to PATCH 4 and 5 separately, where I have some minor
comments.
Thanks,
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Buildroot] [PATCH/next 4/5] package/x11r7/xlib_libxcvt: new package
2021-11-13 12:56 ` [Buildroot] [PATCH/next 4/5] package/x11r7/xlib_libxcvt: new package Bernd Kuhls
@ 2021-11-13 17:01 ` Thomas Petazzoni
0 siblings, 0 replies; 8+ messages in thread
From: Thomas Petazzoni @ 2021-11-13 17:01 UTC (permalink / raw)
To: Bernd Kuhls; +Cc: Eric Le Bihan, buildroot
Hello,
On Sat, 13 Nov 2021 13:56:19 +0100
Bernd Kuhls <bernd.kuhls@t-online.de> wrote:
> diff --git a/package/x11r7/xlib_libxcvt/Config.in b/package/x11r7/xlib_libxcvt/Config.in
> new file mode 100644
> index 0000000000..b8ff361713
> --- /dev/null
> +++ b/package/x11r7/xlib_libxcvt/Config.in
> @@ -0,0 +1,6 @@
> +config BR2_PACKAGE_XLIB_LIBXCVT
> + bool "libxcvt"
> + help
> + libxcvt is a library providing a standalone version of the X
> + server implementation of the VESA CVT standard timing mode-
> + lines generator.
Even though we don't have it for a lot of X.org packages, having an
upstream URL at the end of the help text is a good idea. I've added a
link to the Gitlab repo for this project, which looks like a reasonable
homepage for the project.
Thanks!
Thomas
--
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Buildroot] [PATCH/next 5/5] package/x11r7/xserver_xorg-server: bump version to 21.1.1
2021-11-13 12:56 ` [Buildroot] [PATCH/next 5/5] package/x11r7/xserver_xorg-server: bump version to 21.1.1 Bernd Kuhls
@ 2021-11-13 17:01 ` Thomas Petazzoni
0 siblings, 0 replies; 8+ messages in thread
From: Thomas Petazzoni @ 2021-11-13 17:01 UTC (permalink / raw)
To: Bernd Kuhls; +Cc: Eric Le Bihan, buildroot
Hello Bernd,
On Sat, 13 Nov 2021 13:56:20 +0100
Bernd Kuhls <bernd.kuhls@t-online.de> wrote:
> Removed xwayland options:
> https://gitlab.freedesktop.org/xorg/xserver/-/commit/4ee66f574a70948ca90a5db94dd666a389a5ff3e
XWayland is now apparently available as a separate component/package,
so I guess it would be good to add a Buildroot package for it to keep
this functionality available.
Thanks!
Thomas
--
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2021-11-13 17:02 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-13 12:56 [Buildroot] [PATCH/next 1/5] package/x11r7/xorgproto: bump version to 2021.5 Bernd Kuhls
2021-11-13 12:56 ` [Buildroot] [PATCH/next 2/5] package/x11r7/xlib_libXi: bump version to 1.8 Bernd Kuhls
2021-11-13 12:56 ` [Buildroot] [PATCH/next 3/5] package/x11r7/xdriver_xf86-input-libinput: bump version to 1.2.0 Bernd Kuhls
2021-11-13 12:56 ` [Buildroot] [PATCH/next 4/5] package/x11r7/xlib_libxcvt: new package Bernd Kuhls
2021-11-13 17:01 ` Thomas Petazzoni
2021-11-13 12:56 ` [Buildroot] [PATCH/next 5/5] package/x11r7/xserver_xorg-server: bump version to 21.1.1 Bernd Kuhls
2021-11-13 17:01 ` Thomas Petazzoni
2021-11-13 17:00 ` [Buildroot] [PATCH/next 1/5] package/x11r7/xorgproto: bump version to 2021.5 Thomas Petazzoni
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.