From 5273c70df2269ba14caa64db80d5d75b6005a21d Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 29 Oct 2021 15:14:55 +0200 Subject: [PATCH 1/6] 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 " +maintainer="Leah Neukirchen " 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 56a6659dc2b46955e8c2cf5943221a8a2614e431 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 29 Oct 2021 15:23:11 +0200 Subject: [PATCH 2/6] New package: libxcvt-0.1.1 --- common/shlibs | 2 ++ srcpkgs/libxcvt-devel | 1 + srcpkgs/libxcvt/template | 26 ++++++++++++++++++++++++++ 3 files changed, 29 insertions(+) create mode 120000 srcpkgs/libxcvt-devel create mode 100644 srcpkgs/libxcvt/template diff --git a/common/shlibs b/common/shlibs index 86b3a4f42422..13412e5580bb 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4095,3 +4095,5 @@ libkaddressbookmergelibprivate.so.5 kdepim-addons-21.08.3_1 libkmailconfirmbeforedeleting.so.5 kdepim-addons-21.08.3_1 libkaddressbookprivate.so.5 kaddressbook-21.08.3_1 libcodec2.so.1.0 codec2-1.0.1_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 " +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 ebfc0d5acc28cb078d4f48c354e8e5270fb2466b Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 29 Oct 2021 15:28:39 +0200 Subject: [PATCH 3/6] xorg-server: update to 21.1.2 --- 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 | 28 ++++-------- 7 files changed, 8 insertions(+), 155 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 -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 ---- - 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 e48d679b0360..a8196e0c82af 100644 --- a/srcpkgs/xorg-server/template +++ b/srcpkgs/xorg-server/template @@ -1,22 +1,21 @@ # Template file for 'xorg-server' pkgname=xorg-server -version=1.20.14 +version=21.1.2 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 + -Dxkb_output_dir=/var/lib/xkb -Ddefault_font_path=/usr/share/fonts/X11 + -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" + -Dglamor=true -Ddri2=true -Ddri3=true -Dglx=true" hostmakedepends="pkg-config xkbcomp flex" 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 libxshmfence-devel pixman-devel xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel xcb-util-wm-devel xkbcomp - nettle-devel $(vopt_if elogind 'dbus-devel')" + 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" checkdepends="xkeyboard-config" @@ -25,7 +24,7 @@ maintainer="Leah Neukirchen " license="MIT, BSD-3-Clause" homepage="https://xorg.freedesktop.org" distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.xz" -checksum=5cc5b70b9be89443e2594b93656c60bd5e82cd7f01deb4ce4faf81dcf546a16b +checksum=c20bf46a9fe8e74bf4e75430637e58d49a02d806609dc161462bceb1ef7e8db0 lib32disabled=yes provides="xserver-abi-extension-10_1 xserver-abi-input-24_1 xserver-abi-video-24_1 xf86-video-modesetting-1_1" @@ -37,8 +36,8 @@ desc_option_elogind="Rootless Xorg support with elogind" # disable VBE on non-x86 systems case "$XBPS_TARGET_MACHINE" in - x86_64*|i686*) configure_args+=" -Dint10=x86emu -Dvbe=true" ;; - *) configure_args+=" -Dint10=false -Dvbe=false" ;; + x86_64*|i686*) configure_args+=" -Dint10=x86emu" ;; + *) configure_args+=" -Dint10=false" ;; esac # gcc10 needs to be hinted when symbols have multiple definitions @@ -64,17 +63,6 @@ post_install() { chmod 4755 ${DESTDIR}/usr/libexec/Xorg.wrap find "${DESTDIR}"/usr/share/man -type f -iname '*[1-5].gz' -exec gunzip '{}' \; - - # Readd old symlink - 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() { From ee8ad022d99edf65f9e2434f6bcb8fdd2d3af63b Mon Sep 17 00:00:00 2001 From: dkwo Date: Fri, 17 Dec 2021 18:36:34 +0100 Subject: [PATCH 4/6] libX11: revbump for protocols --- srcpkgs/libX11/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template index 260b42da9770..83d21c86ad17 100644 --- a/srcpkgs/libX11/template +++ b/srcpkgs/libX11/template @@ -1,7 +1,7 @@ # Template file for 'libX11' pkgname=libX11 version=1.7.3.1 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto --enable-static --enable-malloc0returnsnull" From f499ee5e0b7b7dc7e501786731c4d1fcf95ecd2b Mon Sep 17 00:00:00 2001 From: dkwo Date: Thu, 23 Dec 2021 19:17:10 +0100 Subject: [PATCH 5/6] xf86-input-libinput: update to 1.2.0 --- srcpkgs/xf86-input-libinput/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xf86-input-libinput/template b/srcpkgs/xf86-input-libinput/template index 6ec539d4050b..6fbb6ea2d575 100644 --- a/srcpkgs/xf86-input-libinput/template +++ b/srcpkgs/xf86-input-libinput/template @@ -1,6 +1,6 @@ # Template file for 'xf86-input-libinput' pkgname=xf86-input-libinput -version=1.1.0 +version=1.2.0 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -13,7 +13,7 @@ homepage="https://xorg.freedesktop.org/" # no official changelog #changelog="https://gitlab.freedesktop.org/xorg/driver/xf86-input-libinput/-/commits/master/" distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2" -checksum=e11d2a41419124a6e9b148f1df181bf7819fc7398c8ee9a1b6390b0742c68d16 +checksum=f80da3c514fe1cbf57fa1b1bd6ff97f6b0a1f87466ad89247bac59cd0a5869f6 lib32disabled=yes post_install() { From 9f7c6e8942ce96db8d598cc6439d3649c47c4aa3 Mon Sep 17 00:00:00 2001 From: dkwo Date: Thu, 23 Dec 2021 19:19:16 +0100 Subject: [PATCH 6/6] libXi: update to 1.8 --- srcpkgs/libXi/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libXi/template b/srcpkgs/libXi/template index b9c21d38f27b..d1781a394bd3 100644 --- a/srcpkgs/libXi/template +++ b/srcpkgs/libXi/template @@ -1,6 +1,6 @@ # Template file for 'libXi' pkgname=libXi -version=1.7.10 +version=1.8 revision=1 build_style=gnu-configure configure_args="--enable-malloc0returnsnull" @@ -9,9 +9,9 @@ makedepends="xorgproto libXfixes-devel libXext-devel" short_desc="X Input extension library" maintainer="Orphaned " license="MIT" -homepage="${XORG_SITE}" +homepage="https://gitlab.freedesktop.org/xorg/lib/libxi" distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2" -checksum=36a30d8f6383a72e7ce060298b4b181fd298bc3a135c8e201b7ca847f5f81061 +checksum=2ed181446a61c7337576467870bc5336fc9e222a281122d96c4d39a3298bba00 post_install() { vlicense COPYING