From: leahneukirchen <leahneukirchen@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] xorg-server: update to 21.1.0.
Date: Fri, 29 Oct 2021 15:41:55 +0200 [thread overview]
Message-ID: <20211029134155.xq-DyviEIK_SmTSlAgDCRir-0VrzMEf31rCjFXyCxhE@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-33812@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 538 bytes --]
There is an updated pull request by leahneukirchen against master on the void-packages repository
https://github.com/leahneukirchen/void-packages xorg-server21
https://github.com/void-linux/void-packages/pull/33812
xorg-server: update to 21.1.0.
In WIP because upstream tarballs are botched: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1240 , waiting for 21.1.1.
Added new dependency libxcvt.
xorg-server-xdmx is gone upstream.
A patch file from https://github.com/void-linux/void-packages/pull/33812.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xorg-server21-33812.patch --]
[-- Type: text/x-diff, Size: 13452 bytes --]
From aba63d619acc85f83bf4933aff1c31a2b72c4d4a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 29 Oct 2021 15:14:55 +0200
Subject: [PATCH 1/3] xorgproto: update to 2021.5.
Adopted.
---
srcpkgs/xorgproto/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xorgproto/template b/srcpkgs/xorgproto/template
index 2014581a3825..e5a9b43ba341 100644
--- a/srcpkgs/xorgproto/template
+++ b/srcpkgs/xorgproto/template
@@ -1,16 +1,16 @@
# Template file for 'xorgproto'
pkgname=xorgproto
-version=2021.4
+version=2021.5
revision=1
build_style=gnu-configure
configure_args="--enable-legacy"
hostmakedepends="xorg-util-macros"
short_desc="Combined X.Org X11 Protocol headers"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
license="MIT"
homepage="https://xorg.freedesktop.org"
distfiles="${XORG_SITE}/proto/xorgproto-${version}.tar.gz"
-checksum=9de0babd3d8cb16b0c1c47b8389a52f3e1326bb0bc9a9ab34a9500778448a2bd
+checksum=be6ddd6590881452fdfa170c1c9ff87209a98d36155332cbf2ccbc431add86ff
replaces="bigreqsproto>=0 compositeproto>=0 damageproto>=0 dmxproto>=0 dri2proto>=0
dri3proto>=0 fixesproto>=0 fontsproto>=0 glproto>=0 inputproto>=0 kbproto>=0 presentproto>=0
printproto>=0 randrproto>=0 recordproto>=0 renderproto>=0 resourceproto>=0 scrnsaverproto>=0
From 096d43e52d0fb8c3521a41bae5def978d58a2353 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 29 Oct 2021 15:23:11 +0200
Subject: [PATCH 2/3] New package: libxcvt-0.1.1
---
common/shlibs | 1 +
srcpkgs/libxcvt-devel | 1 +
srcpkgs/libxcvt/template | 26 ++++++++++++++++++++++++++
3 files changed, 28 insertions(+)
create mode 120000 srcpkgs/libxcvt-devel
create mode 100644 srcpkgs/libxcvt/template
diff --git a/common/shlibs b/common/shlibs
index 8e5cf6f4a2f0..41b7c4a30169 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4032,3 +4032,4 @@ libstemmer.so.2 libstemmer-2.1.0_1
libdecor-0.so.0 libdecor-0.1.0_1
libavif.so.13 libavif-0.9.3_1
libkdumpfile.so.8 libkdumpfile-0.4.0_1
+libxcvt.so.0 libxcvt-0.1.1_1
diff --git a/srcpkgs/libxcvt-devel b/srcpkgs/libxcvt-devel
new file mode 120000
index 000000000000..d9ec4fc36191
--- /dev/null
+++ b/srcpkgs/libxcvt-devel
@@ -0,0 +1 @@
+libxcvt
\ No newline at end of file
diff --git a/srcpkgs/libxcvt/template b/srcpkgs/libxcvt/template
new file mode 100644
index 000000000000..6c0f0e5d0384
--- /dev/null
+++ b/srcpkgs/libxcvt/template
@@ -0,0 +1,26 @@
+# Template file for 'libxcvt'
+pkgname=libxcvt
+version=0.1.1
+revision=1
+wrksrc="${pkgname}-${pkgname}-${version}"
+build_style=meson
+short_desc="VESA CVT standard timing modelines generator"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="MIT"
+homepage="https://gitlab.freedesktop.org/xorg/lib/libxcvt/"
+distfiles="https://gitlab.freedesktop.org/xorg/lib/libxcvt/-/archive/libxcvt-${version}/libxcvt-libxcvt-${version}.tar.gz"
+checksum=2dc651a0944d1f0b95747a095e0ea16f870f12168d09d5200dac518d02273224
+
+post_install() {
+ vlicense COPYING
+}
+
+libxcvt-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/*.so
+ vmove usr/lib/pkgconfig
+ }
+}
From 5518046691058ceb20a5a1c7d5173255694ab47c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 29 Oct 2021 15:28:39 +0200
Subject: [PATCH 3/3] xorg-server: update to 21.1.0.
---
srcpkgs/xorg-server-xdmx | 1 -
.../patches/fix-musl-input_event.patch | 43 -------------------
...t-on-probing-non-pci-platform-device.patch | 31 -------------
.../fix-serverconfigdir-location.patch | 11 -----
.../patches/meson-fontrootdir.patch | 26 -----------
.../meson-install-xorg-wrap-script.patch | 23 ----------
srcpkgs/xorg-server/template | 16 ++-----
7 files changed, 4 insertions(+), 147 deletions(-)
delete mode 120000 srcpkgs/xorg-server-xdmx
delete mode 100644 srcpkgs/xorg-server/patches/fix-musl-input_event.patch
delete mode 100644 srcpkgs/xorg-server/patches/fix-segfault-on-probing-non-pci-platform-device.patch
delete mode 100644 srcpkgs/xorg-server/patches/fix-serverconfigdir-location.patch
delete mode 100644 srcpkgs/xorg-server/patches/meson-fontrootdir.patch
delete mode 100644 srcpkgs/xorg-server/patches/meson-install-xorg-wrap-script.patch
diff --git a/srcpkgs/xorg-server-xdmx b/srcpkgs/xorg-server-xdmx
deleted file mode 120000
index 0e680f217e7c..000000000000
--- a/srcpkgs/xorg-server-xdmx
+++ /dev/null
@@ -1 +0,0 @@
-xorg-server
\ No newline at end of file
diff --git a/srcpkgs/xorg-server/patches/fix-musl-input_event.patch b/srcpkgs/xorg-server/patches/fix-musl-input_event.patch
deleted file mode 100644
index 04e7c1332495..000000000000
--- a/srcpkgs/xorg-server/patches/fix-musl-input_event.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: Gracefully handle transition to 64 bit time with musl-1.2.1
-
---- a/hw/dmx/input/usb-keyboard.c 2020-12-01 17:32:25.000000000 +0100
-+++ b/hw/dmx/input/usb-keyboard.c 2020-12-01 20:28:02.489695853 +0100
-@@ -278,8 +278,8 @@
-
- gettimeofday(&tv, NULL);
- for (i = 0; i < 5; i++) {
-- event.time.tv_sec = tv.tv_sec;
-- event.time.tv_usec = tv.tv_usec;
-+ event.input_event_sec = tv.tv_sec;
-+ event.input_event_usec = tv.tv_usec;
- event.type = EV_LED;
- if (i == 0)
- led = 1; /* LED_CAPSL == 0x01 */
---- a/hw/dmx/examples/ev.c 2020-12-01 17:32:25.000000000 +0100
-+++ b/hw/dmx/examples/ev.c 2020-12-01 20:31:24.585605950 +0100
-@@ -114,8 +114,8 @@
- if ((fd = open(name, O_RDWR, 0)) >= 0) {
- printf("%s: open, fd = %d\n", name, fd);
- for (i = 0; i < LED_MAX; i++) {
-- event.time.tv_sec = time(0);
-- event.time.tv_usec = 0;
-+ event.input_event_sec = time(0);
-+ event.input_event_usec = 0;
- event.type = EV_LED;
- event.code = i;
- event.value = 0;
-@@ -123,9 +123,10 @@
- }
-
- while ((rc = read(fd, &event, sizeof(event))) > 0) {
-+ struct timeval t = {event.input_event_sec, event.input_event_usec};
- printf("%-24.24s.%06lu type 0x%04x; code 0x%04x;"
- " value 0x%08x; ",
-- ctime(&event.time.tv_sec),
-- event.time.tv_usec, event.type, event.code, event.value);
-+ ctime(&t.tv_sec),
-+ t.tv_usec, event.type, event.code, event.value);
- switch (event.type) {
- case EV_KEY:
diff --git a/srcpkgs/xorg-server/patches/fix-segfault-on-probing-non-pci-platform-device.patch b/srcpkgs/xorg-server/patches/fix-segfault-on-probing-non-pci-platform-device.patch
deleted file mode 100644
index 167e7781cf09..000000000000
--- a/srcpkgs/xorg-server/patches/fix-segfault-on-probing-non-pci-platform-device.patch
+++ /dev/null
@@ -1,31 +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>
----
- hw/xfree86/common/xf86platformBus.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git hw/xfree86/common/xf86platformBus.c hw/xfree86/common/xf86platformBus.c
-index cef47da03d..dadbac6c8f 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);
- }
-
---
-GitLab
-
diff --git a/srcpkgs/xorg-server/patches/fix-serverconfigdir-location.patch b/srcpkgs/xorg-server/patches/fix-serverconfigdir-location.patch
deleted file mode 100644
index 707150956a0b..000000000000
--- a/srcpkgs/xorg-server/patches/fix-serverconfigdir-location.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -507,7 +507,7 @@ glx_inc = include_directories('glx')
-
- top_srcdir_inc = include_directories('.')
-
--serverconfigdir = join_paths(get_option('libdir'), 'xorg')
-+serverconfigdir = join_paths(get_option('prefix'), get_option('libdir'), 'xorg')
-
- manpage_config = configuration_data()
- manpage_config.set('vendorversion', '"xorg-server @0@" "X Version 11"'.format(meson.project_version()))
diff --git a/srcpkgs/xorg-server/patches/meson-fontrootdir.patch b/srcpkgs/xorg-server/patches/meson-fontrootdir.patch
deleted file mode 100644
index 8f86d6cf428d..000000000000
--- a/srcpkgs/xorg-server/patches/meson-fontrootdir.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -122,8 +122,11 @@
-
- dfp = get_option('default_font_path')
- if dfp == ''
-- fontutil_dep = dependency('fontutil')
-- fontrootdir = fontutil_dep.get_pkgconfig_variable('fontrootdir')
-+ fontrootdir = get_option('font_root_dir')
-+ if fontrootdir == ''
-+ fontutil_dep = dependency('fontutil')
-+ fontrootdir = fontutil_dep.get_pkgconfig_variable('fontrootdir')
-+ endif
- default_font_path = ','.join([
- join_paths(fontrootdir, 'misc'),
- join_paths(fontrootdir, 'TTF'),
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -24,6 +24,7 @@
- option('module_dir', type: 'string', value: 'xorg/modules',
- description: 'X.Org modules directory (absolute or relative to the directory specified by the libdir option)')
- option('default_font_path', type: 'string')
-+option('font_root_dir', type: 'string')
-
- option('glx', type: 'boolean', value: true)
- option('xdmcp', type: 'boolean', value: true)
diff --git a/srcpkgs/xorg-server/patches/meson-install-xorg-wrap-script.patch b/srcpkgs/xorg-server/patches/meson-install-xorg-wrap-script.patch
deleted file mode 100644
index deb0fcb844cd..000000000000
--- a/srcpkgs/xorg-server/patches/meson-install-xorg-wrap-script.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/hw/xfree86/meson.build
-+++ b/hw/xfree86/meson.build
-@@ -145,12 +145,15 @@
- install_dir: get_option('libexecdir'),
- # install_mode: ['r-sr-xr-x', 0, 0],
- )
-- configure_file(
-- input: 'Xorg.sh.in',
-- output: 'Xorg',
-- configuration: conf_data,
-+ install_data(configure_file(
-+ input: 'Xorg.sh.in',
-+ output: 'Xorg.sh',
-+ configuration: conf_data,
-+ ),
-+ rename: 'Xorg',
-+ install_mode: 'rwxr-xr-x',
- install_dir: join_paths(get_option('prefix'), get_option('bindir')),
-- )
-+ )
- endif
-
- executable('cvt',
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 761989ce69a7..c8cf9cd42b94 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,12 +1,12 @@
# Template file for 'xorg-server'
pkgname=xorg-server
-version=1.20.13
+version=21.1.0
revision=1
build_style=meson
configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
-Dxvfb=true -Dhal=false -Dudev=true -Dxkb_dir=/usr/share/X11/xkb
-Dxkb_output_dir=/var/lib/xkb -Dfont_root_dir=/usr/share/fonts/X11
- -Ddmx=true -Dlinux_acpi=true -Dlinux_apm=false -Dsuid_wrapper=true
+ -Dlinux_acpi=true -Dlinux_apm=false -Dsuid_wrapper=true
-Dxcsecurity=true -Dsystemd_logind=$(vopt_if elogind true false)
-Dos_vendor=Void -Dglamor=true -Ddri2=true -Ddri3=true -Dglx=true
-Dxwayland=false"
@@ -15,7 +15,7 @@ makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
libdmx-devel libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel
libxkbui-devel pixman-devel xcb-util-image-devel xcb-util-keysyms-devel
- xcb-util-renderutil-devel xcb-util-wm-devel xkbcomp nettle-devel
+ xcb-util-renderutil-devel xcb-util-wm-devel xkbcomp nettle-devel libxcvt-devel
$(vopt_if elogind 'dbus-devel')"
# See hw/xfree86/common/xf86Module.h. Only care for the major version.
depends="xkeyboard-config $(vopt_if elogind 'elogind') xorg-server-common"
@@ -25,7 +25,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="MIT, BSD-3-Clause"
homepage="https://xorg.freedesktop.org"
distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.xz"
-checksum=40aa4e96a56a81a301f15a9b10e06a22700f12b42d9e0e453c7f11d354386300
+checksum=50c316dd8f4472cb60dfb285aa46ca6855d7626cecfd8330f6c51da743c1fe42
lib32disabled=yes
provides="xserver-abi-extension-10_1 xserver-abi-input-24_1
xserver-abi-video-24_1 xf86-video-modesetting-1_1"
@@ -69,14 +69,6 @@ post_install() {
ln -s Xorg ${DESTDIR}/usr/bin/X
}
-xorg-server-xdmx_package() {
- short_desc="Distributed multihead X server and utilities"
- pkg_install() {
- vmove usr/bin/*dmx*
- vmove usr/share/man/man1/*dmx*
- }
-}
-
xorg-server-xnest_package() {
short_desc="Nested X server that runs as an X application"
pkg_install() {
next prev parent reply other threads:[~2021-10-29 13:41 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-29 13:30 [PR PATCH] " leahneukirchen
2021-10-29 13:41 ` leahneukirchen [this message]
2021-10-29 15:06 ` dkwo
2021-10-29 17:31 ` ericonr
2021-10-30 18:11 ` Animeshz
2021-11-12 13:20 ` [WIP] Tracking: " leahneukirchen
2021-12-15 21:37 ` curiousjunior
2021-12-15 23:03 ` leahneukirchen
2021-12-17 18:33 ` dkwo
2022-03-03 19:11 ` Chocimier
2022-03-03 19:11 ` [PR PATCH] [Closed]: " Chocimier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211029134155.xq-DyviEIK_SmTSlAgDCRir-0VrzMEf31rCjFXyCxhE@z \
--to=leahneukirchen@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).