From e3d033d67f540c7e788fe8f69d9844541c435ebc Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 29 Oct 2021 15:14:55 +0200 Subject: [PATCH 01/30] 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 3348e70e6dec7f4b60057073af91c63d6e894066 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 29 Oct 2021 15:23:11 +0200 Subject: [PATCH 02/30] 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 e1a175684656..66e09d7d760c 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4022,6 +4022,7 @@ libpari-gmp-tls.so.7 pari-2.13.2_1 libtree-sitter.so.0 tree-sitter-0.19.0_1 libplanarity.so.0 planarity-3.0.1.1_1 libgtkdatabox.so.1 gtkdatabox3-1.0.0_1 +libxcvt.so.0 libxcvt-0.1.1_1 libgf2x.so.3 gf2x-1.3.0_1 libntl.so.44 ntl-11.5.1_1 libflint.so.16 flintlib-2.8.0_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 0e2cbbac915cb94a42712641c9590f347b8d16d1 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 29 Oct 2021 15:28:39 +0200 Subject: [PATCH 03/30] 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 df8c3c401bff16276e7593dd4958430c574335cc Mon Sep 17 00:00:00 2001 From: dkwo Date: Fri, 17 Dec 2021 18:36:34 +0100 Subject: [PATCH 04/30] 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 4b789b321d6d1104a0f733c48c08538935c8227d Mon Sep 17 00:00:00 2001 From: dkwo Date: Thu, 23 Dec 2021 19:17:10 +0100 Subject: [PATCH 05/30] 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 61d9a4122a075fbfc76972545c41a9fa9900dfec Mon Sep 17 00:00:00 2001 From: dkwo Date: Thu, 23 Dec 2021 19:19:16 +0100 Subject: [PATCH 06/30] 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 From 4fe22423e9a4fd1682cc36064a679bf78a5e1b03 Mon Sep 17 00:00:00 2001 From: dkwo Date: Sat, 25 Dec 2021 09:11:29 +0100 Subject: [PATCH 07/30] libXfont2: update to 2.0.5 --- srcpkgs/libXfont2/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/libXfont2/template b/srcpkgs/libXfont2/template index 8164b2b239b5..b93f0b17b865 100644 --- a/srcpkgs/libXfont2/template +++ b/srcpkgs/libXfont2/template @@ -1,16 +1,16 @@ # Template file for 'libXfont2' pkgname=libXfont2 -version=2.0.4 +version=2.0.5 revision=1 +build_style=gnu-configure hostmakedepends="pkg-config" makedepends="xorgproto xtrans freetype-devel libfontenc-devel" -build_style=gnu-configure short_desc="X font 2 Library" maintainer="Orphaned " -homepage="http://xorg.freedesktop.org/" license="MIT" +homepage="http://xorg.freedesktop.org/" distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2" -checksum=6d151b3368e5035efede4b6264c0fdc6662c1c99dbc2de425e3480cababc69e6 +checksum=aa7c6f211cf7215c0ab4819ed893dc98034363d7b930b844bb43603c2e10b53e post_install() { vlicense COPYING From 2a60b72a736a6eca998690a92439d059a12a5de1 Mon Sep 17 00:00:00 2001 From: dkwo Date: Mon, 27 Dec 2021 17:45:51 +0100 Subject: [PATCH 08/30] xf86-input-evdev: rebuild against xorg and fix lint --- srcpkgs/xf86-input-evdev/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xf86-input-evdev/template b/srcpkgs/xf86-input-evdev/template index d2d22723169d..71be2676f3b7 100644 --- a/srcpkgs/xf86-input-evdev/template +++ b/srcpkgs/xf86-input-evdev/template @@ -1,8 +1,7 @@ # Template file for 'xf86-input-evdev' pkgname=xf86-input-evdev version=2.10.6 -revision=1 -lib32disabled=yes +revision=2 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="xorg-server-devel mtdev-devel libevdev-devel" @@ -13,6 +12,7 @@ license="MIT" homepage="http://xorg.freedesktop.org/" distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2" checksum=8726073e81861bc7b2321e76272cbdbd33c7e1a121535a9827977265b9033ec0 +lib32disabled=yes post_install() { vlicense COPYING From 6a80f90bf432e8d4b30aabceb2a90e276f0a8428 Mon Sep 17 00:00:00 2001 From: dkwo Date: Mon, 27 Dec 2021 17:45:52 +0100 Subject: [PATCH 09/30] xf86-input-joystick: rebuild against xorg and fix lint --- srcpkgs/xf86-input-joystick/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/xf86-input-joystick/template b/srcpkgs/xf86-input-joystick/template index 4880dfada4df..ac5f66d63120 100644 --- a/srcpkgs/xf86-input-joystick/template +++ b/srcpkgs/xf86-input-joystick/template @@ -1,18 +1,18 @@ -# Template build file for 'xf86-input-joystick'. +# Template file for 'xf86-input-joystick' pkgname=xf86-input-joystick version=1.6.3 -revision=2 -lib32disabled=yes +revision=3 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="xorg-server-devel" depends="virtual?xserver-abi-input-24_1" short_desc="Joystick Input driver for Xorg" maintainer="Orphaned " -homepage="http://xorg.freedesktop.org/" license="MIT" +homepage="http://xorg.freedesktop.org/" distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2" checksum=9e7669ecf0f23b8e5dc39d5397cf28296f692aa4c0e4255f5e02816612c18eab +lib32disabled=yes post_install() { vlicense COPYING From 1d5d92e9b5e2fb6839370ecd5ffba78ebc71dbf7 Mon Sep 17 00:00:00 2001 From: dkwo Date: Mon, 27 Dec 2021 17:45:52 +0100 Subject: [PATCH 10/30] xf86-input-mtrack: rebuild against xorg --- srcpkgs/xf86-input-mtrack/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/xf86-input-mtrack/template b/srcpkgs/xf86-input-mtrack/template index 0f78142030d3..e04040307f42 100644 --- a/srcpkgs/xf86-input-mtrack/template +++ b/srcpkgs/xf86-input-mtrack/template @@ -1,7 +1,7 @@ # Template file for 'xf86-input-mtrack' pkgname=xf86-input-mtrack version=0.5.0 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config xorg-util-macros" makedepends="xorg-server-devel mtdev-devel" From 0368a27f283873d25c3efe773dccb54d9f3b939f Mon Sep 17 00:00:00 2001 From: dkwo Date: Mon, 27 Dec 2021 17:45:52 +0100 Subject: [PATCH 11/30] xf86-input-synaptics: rebuild against xorg --- srcpkgs/xf86-input-synaptics/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/xf86-input-synaptics/template b/srcpkgs/xf86-input-synaptics/template index 1c9f2be0a939..d39dcdc98aeb 100644 --- a/srcpkgs/xf86-input-synaptics/template +++ b/srcpkgs/xf86-input-synaptics/template @@ -1,7 +1,7 @@ # Template file for 'xf86-input-synaptics' pkgname=xf86-input-synaptics version=1.9.1 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="libX11-devel libXtst-devel libevdev-devel From a6bf098ac5855e1c7cb8ec3fbfadc16b0a1db72b Mon Sep 17 00:00:00 2001 From: dkwo Date: Mon, 27 Dec 2021 17:45:53 +0100 Subject: [PATCH 12/30] xf86-input-vmmouse: rebuild against xorg and fix lint --- srcpkgs/xf86-input-vmmouse/template | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/srcpkgs/xf86-input-vmmouse/template b/srcpkgs/xf86-input-vmmouse/template index 411bf4bfad81..5b3cfd435bf5 100644 --- a/srcpkgs/xf86-input-vmmouse/template +++ b/srcpkgs/xf86-input-vmmouse/template @@ -1,20 +1,19 @@ -# Template build file for 'xf86-input-vmmouse'. +# Template file for 'xf86-input-vmmouse' pkgname=xf86-input-vmmouse version=13.1.0 -revision=3 -lib32disabled=yes +revision=4 +archs="i686* x86_64*" build_style=gnu-configure hostmakedepends="pkg-config" makedepends="xorg-server-devel" depends="virtual?xserver-abi-input-24_1" short_desc="Xorg VMware virtual mouse input driver" maintainer="Orphaned " -homepage="http://xorg.freedesktop.org" license="MIT" +homepage="http://xorg.freedesktop.org" distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2" checksum=0af558957ac1be1b2863712c2475de8f4d7f14921fd01ded2e2fde4921b19319 - -archs="i686* x86_64*" +lib32disabled=yes post_install() { vlicense COPYING From b785e49752f1812d56c3474de8a3198fad667c54 Mon Sep 17 00:00:00 2001 From: dkwo Date: Mon, 27 Dec 2021 17:45:53 +0100 Subject: [PATCH 13/30] xf86-input-wacom: rebuild against xorg --- srcpkgs/xf86-input-wacom/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/xf86-input-wacom/template b/srcpkgs/xf86-input-wacom/template index 2dafa7ed001b..f65f8f8858fd 100644 --- a/srcpkgs/xf86-input-wacom/template +++ b/srcpkgs/xf86-input-wacom/template @@ -1,7 +1,7 @@ # Template file for 'xf86-input-wacom' pkgname=xf86-input-wacom version=0.40.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--without-systemd-unit-dir" hostmakedepends="pkg-config" From 21b6ce54863a8d752e3141516c0e0647e8eacc73 Mon Sep 17 00:00:00 2001 From: dkwo Date: Mon, 27 Dec 2021 17:47:06 +0100 Subject: [PATCH 14/30] xf86-video-mga: rebuild against xorg --- srcpkgs/xf86-video-mga/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/xf86-video-mga/template b/srcpkgs/xf86-video-mga/template index 39edac52798d..5bf8d029789f 100644 --- a/srcpkgs/xf86-video-mga/template +++ b/srcpkgs/xf86-video-mga/template @@ -1,7 +1,7 @@ # Template file for 'xf86-video-mga' pkgname=xf86-video-mga version=2.0.0 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="automake libtool pkg-config xorg-util-macros" makedepends="xorg-server-devel" From 63eb3702526bb4546daf4c079415d152124c8aac Mon Sep 17 00:00:00 2001 From: dkwo Date: Mon, 27 Dec 2021 17:47:06 +0100 Subject: [PATCH 15/30] xf86-video-openchrome: rebuild against xorg and fix lint --- srcpkgs/xf86-video-openchrome/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/xf86-video-openchrome/template b/srcpkgs/xf86-video-openchrome/template index ec99ee3d0662..161ab90beb15 100644 --- a/srcpkgs/xf86-video-openchrome/template +++ b/srcpkgs/xf86-video-openchrome/template @@ -1,18 +1,18 @@ -# Template build file for 'xf86-video-openchrome'. +# Template file for 'xf86-video-openchrome' pkgname=xf86-video-openchrome version=0.6.0 -revision=2 -lib32disabled=yes +revision=3 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="xorg-server-devel libXvMC-devel" depends="virtual?xserver-abi-video-24_1" short_desc="Xorg driver for VIA IGPs" -homepage="http://xorg.freedesktop.org" -license="MIT" maintainer="Duncaen " +license="MIT" +homepage="http://xorg.freedesktop.org" distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2" checksum=da2975c6379358de52c1257710c67eb59139a7f0a1cd28d00cc64cc3e1c02f75 +lib32disabled=yes CFLAGS="-I$XBPS_CROSS_BASE/usr/include/xorg -fcommon" LDFLAGS="-Wl,-z,lazy" From 1aa1cce242480c2fcfa3e6318a0ca11d0e1665a4 Mon Sep 17 00:00:00 2001 From: dkwo Date: Mon, 27 Dec 2021 17:47:06 +0100 Subject: [PATCH 16/30] xf86-video-qxl: rebuild against xorg and add patch --- srcpkgs/xf86-video-qxl/patches/buildfix.patch | 100 ++++++++++++++++++ srcpkgs/xf86-video-qxl/template | 2 +- 2 files changed, 101 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/xf86-video-qxl/patches/buildfix.patch diff --git a/srcpkgs/xf86-video-qxl/patches/buildfix.patch b/srcpkgs/xf86-video-qxl/patches/buildfix.patch new file mode 100644 index 000000000000..e9e87f14085b --- /dev/null +++ b/srcpkgs/xf86-video-qxl/patches/buildfix.patch @@ -0,0 +1,100 @@ +From 4b083ede3c4a827a84295ff223e34ee3c2e581b2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zolt=C3=A1n=20B=C3=B6sz=C3=B6rm=C3=A9nyi?= + +Date: Sat, 28 Aug 2021 15:38:40 +0200 +Subject: [PATCH] Fix a build error with Xorg master +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Use xf86ReturnOptValBool() in get_bool_option() instead of +options[option_index].value.bool to fix a compiler error with +current Xorg xserver master branch. + +Also use xf86GetOptValInteger() in get_int_option() and +xf86GetOptValString() in get_str_option() for consistency. + +The change causes a slight performance drop during option parsing +because the passed-in index_value is no longer used as an index +into the options array. + +Instead, it's used as a token now for the standard option getter +functions which works since the index_value to the get_*_option() +functions are identical to the value of options[n].token in the +passed-in OptionInfoRec array. + +Also rename "int option_index" to "int token" for clarity in all +three functions. + +Signed-off-by: Zoltán Böszörményi +--- + src/qxl_option_helpers.c | 13 +++++++------ + src/qxl_option_helpers.h | 6 +++--- + 2 files changed, 10 insertions(+), 9 deletions(-) + +diff --git a/src/qxl_option_helpers.c b/src/qxl_option_helpers.c +index 2aba677..7707b7c 100644 +--- a/src/qxl_option_helpers.c ++++ b/src/qxl_option_helpers.c +@@ -10,31 +10,32 @@ + + #include "qxl_option_helpers.h" + +-int get_int_option(OptionInfoPtr options, int option_index, ++int get_int_option(OptionInfoPtr options, int token, + const char *env_name) + { ++ int value; + if (env_name && getenv(env_name)) { + return atoi(getenv(env_name)); + } +- return options[option_index].value.num; ++ return xf86GetOptValInteger(options, token, &value) ? value : 0; + } + +-const char *get_str_option(OptionInfoPtr options, int option_index, ++const char *get_str_option(OptionInfoPtr options, int token, + const char *env_name) + { + if (getenv(env_name)) { + return getenv(env_name); + } +- return options[option_index].value.str; ++ return xf86GetOptValString(options, token); + } + +-int get_bool_option(OptionInfoPtr options, int option_index, ++int get_bool_option(OptionInfoPtr options, int token, + const char *env_name) + { + const char* value = getenv(env_name); + + if (!value) { +- return options[option_index].value.bool; ++ return xf86ReturnOptValBool(options, token, FALSE); + } + if (strcmp(value, "0") == 0 || + strcasecmp(value, "off") == 0 || +diff --git a/src/qxl_option_helpers.h b/src/qxl_option_helpers.h +index 7c54c72..66d0a17 100644 +--- a/src/qxl_option_helpers.h ++++ b/src/qxl_option_helpers.h +@@ -4,13 +4,13 @@ + #include + #include + +-int get_int_option(OptionInfoPtr options, int option_index, ++int get_int_option(OptionInfoPtr options, int token, + const char *env_name); + +-const char *get_str_option(OptionInfoPtr options, int option_index, ++const char *get_str_option(OptionInfoPtr options, int token, + const char *env_name); + +-int get_bool_option(OptionInfoPtr options, int option_index, ++int get_bool_option(OptionInfoPtr options, int token, + const char *env_name); + + #endif // OPTION_HELPERS_H +-- +GitLab diff --git a/srcpkgs/xf86-video-qxl/template b/srcpkgs/xf86-video-qxl/template index 2a56bcc2cb88..32e933d88e30 100644 --- a/srcpkgs/xf86-video-qxl/template +++ b/srcpkgs/xf86-video-qxl/template @@ -1,7 +1,7 @@ # Template file for 'xf86-video-qxl' pkgname=xf86-video-qxl version=0.1.5 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="automake m4 xorg-util-macros libtool pkg-config" makedepends="xorg-server-devel spice-protocol xorgproto" From f7c0dae842ff1eedd455814e46a7d3c695dda703 Mon Sep 17 00:00:00 2001 From: dkwo Date: Mon, 27 Dec 2021 17:47:07 +0100 Subject: [PATCH 17/30] xf86-video-r128: rebuild against xorg --- srcpkgs/xf86-video-r128/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/xf86-video-r128/template b/srcpkgs/xf86-video-r128/template index 4dbe1529aa5c..efc7dacd4581 100644 --- a/srcpkgs/xf86-video-r128/template +++ b/srcpkgs/xf86-video-r128/template @@ -1,7 +1,7 @@ # Template file for 'xf86-video-r128' pkgname=xf86-video-r128 version=6.12.0 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="xorgproto xorg-server-devel" From 55a7f5de54339ae6e8902afda463746245618252 Mon Sep 17 00:00:00 2001 From: dkwo Date: Mon, 27 Dec 2021 17:47:07 +0100 Subject: [PATCH 18/30] xf86-video-sisusb: rebuild against xorg and fix lint --- srcpkgs/xf86-video-sisusb/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/xf86-video-sisusb/template b/srcpkgs/xf86-video-sisusb/template index 2fa9efb4a1ff..1571ddc1acb2 100644 --- a/srcpkgs/xf86-video-sisusb/template +++ b/srcpkgs/xf86-video-sisusb/template @@ -1,18 +1,18 @@ -# Template build file for 'xf86-video-sisusb'. +# Template file for 'xf86-video-sisusb' pkgname=xf86-video-sisusb version=0.9.7 -revision=2 -lib32disabled=yes +revision=3 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="xorg-server-devel" depends="virtual?xserver-abi-video-24_1" short_desc="Xorg SiS USB video driver" -homepage="http://xorg.freedesktop.org/" -license="MIT" maintainer="Orphaned " +license="MIT" +homepage="http://xorg.freedesktop.org/" distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2" checksum=f4400416b920cd1136d60d36b99d33f245cdeaf2ad6c1340936c7c0987761424 +lib32disabled=yes LDFLAGS="-Wl,-z,lazy" From 57aa7f680c6ce9ba3349e1833130ae10668cbb3b Mon Sep 17 00:00:00 2001 From: dkwo Date: Mon, 27 Dec 2021 17:47:07 +0100 Subject: [PATCH 19/30] xf86-video-vesa: rebuild against xorg --- srcpkgs/xf86-video-vesa/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/xf86-video-vesa/template b/srcpkgs/xf86-video-vesa/template index e557522b41a1..53f83d34dd72 100644 --- a/srcpkgs/xf86-video-vesa/template +++ b/srcpkgs/xf86-video-vesa/template @@ -1,7 +1,7 @@ # Template file for 'xf86-video-vesa' pkgname=xf86-video-vesa version=2.5.0 -revision=1 +revision=2 archs="x86_64* i686*" build_style=gnu-configure hostmakedepends="pkg-config" From d5aaec7b96b64a5d3811bc4667baffcae10a21d3 Mon Sep 17 00:00:00 2001 From: dkwo Date: Mon, 27 Dec 2021 17:47:07 +0100 Subject: [PATCH 20/30] xf86-video-vmware: rebuild against xorg --- srcpkgs/xf86-video-vmware/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/xf86-video-vmware/template b/srcpkgs/xf86-video-vmware/template index 1da7f33d8ef1..ae10393a9e9a 100644 --- a/srcpkgs/xf86-video-vmware/template +++ b/srcpkgs/xf86-video-vmware/template @@ -1,7 +1,7 @@ # Template file for 'xf86-video-vmware' pkgname=xf86-video-vmware version=13.3.0 -revision=2 +revision=3 archs="i686* x86_64*" build_style=gnu-configure configure_args="--enable-vmwarectrl-client" From 51117831a3fee88da0902896bde02f471bd7b863 Mon Sep 17 00:00:00 2001 From: dkwo Date: Mon, 27 Dec 2021 17:47:08 +0100 Subject: [PATCH 21/30] xf86-video-amdgpu: rebuild against xorg --- srcpkgs/xf86-video-amdgpu/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/xf86-video-amdgpu/template b/srcpkgs/xf86-video-amdgpu/template index 8c3d0d56f820..dc3ed6292eaa 100644 --- a/srcpkgs/xf86-video-amdgpu/template +++ b/srcpkgs/xf86-video-amdgpu/template @@ -1,7 +1,7 @@ # Template file for 'xf86-video-amdgpu' pkgname=xf86-video-amdgpu version=21.0.0 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="xorgproto eudev-libudev-devel libpciaccess-devel libdrm-devel From 632294bb443fd25ecae8362c1e98205fa5cd322e Mon Sep 17 00:00:00 2001 From: dkwo Date: Mon, 27 Dec 2021 17:47:08 +0100 Subject: [PATCH 22/30] xf86-video-ati: rebuild against xorg --- srcpkgs/xf86-video-ati/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/xf86-video-ati/template b/srcpkgs/xf86-video-ati/template index fe251dff4b37..0d4e35cdfc8f 100644 --- a/srcpkgs/xf86-video-ati/template +++ b/srcpkgs/xf86-video-ati/template @@ -1,7 +1,7 @@ # Template file for 'xf86-video-ati' pkgname=xf86-video-ati version=19.1.0 -revision=3 +revision=4 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="xorgproto eudev-libudev-devel libpciaccess-devel From b265b18522038a802438b830415ed017c5fa8592 Mon Sep 17 00:00:00 2001 From: dkwo Date: Mon, 27 Dec 2021 17:47:08 +0100 Subject: [PATCH 23/30] xf86-video-cirrus: rebuild against xorg and fix lint --- srcpkgs/xf86-video-cirrus/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/xf86-video-cirrus/template b/srcpkgs/xf86-video-cirrus/template index f4f7c3a2f0a1..e3c00a97216a 100644 --- a/srcpkgs/xf86-video-cirrus/template +++ b/srcpkgs/xf86-video-cirrus/template @@ -1,18 +1,18 @@ -# Template build file for 'xf86-video-cirrus'. +# Template file for 'xf86-video-cirrus' pkgname=xf86-video-cirrus version=1.5.3 -revision=7 -lib32disabled=yes +revision=8 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="xorg-server-devel" depends="virtual?xserver-abi-video-24_1" short_desc="Xorg Cirrus Logic video driver" -homepage="http://xorg.freedesktop.org" -license="MIT" maintainer="Orphaned " +license="MIT" +homepage="http://xorg.freedesktop.org" distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2" checksum=edc87b20a55259126b5239b5c1ef913419eab7ded0ed12ae9ae989460d7351ab +lib32disabled=yes LDFLAGS="-Wl,-z,lazy" CFLAGS="-fcommon -Wno-pointer-arith -Wno-discarded-qualifiers -Wno-unused-label" From 46ce5d35bb1a6523dc37bc91144fcc584c625fc8 Mon Sep 17 00:00:00 2001 From: dkwo Date: Mon, 27 Dec 2021 17:47:08 +0100 Subject: [PATCH 24/30] xf86-video-dummy: rebuild against xorg and fix lint --- srcpkgs/xf86-video-dummy/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/xf86-video-dummy/template b/srcpkgs/xf86-video-dummy/template index 4b9c208251b9..c123da327ac2 100644 --- a/srcpkgs/xf86-video-dummy/template +++ b/srcpkgs/xf86-video-dummy/template @@ -1,18 +1,18 @@ -# Template build file for 'xf86-video-dummy'. +# Template file for 'xf86-video-dummy' pkgname=xf86-video-dummy version=0.3.8 -revision=3 -lib32disabled=yes +revision=4 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="xorg-server-devel" depends="virtual?xserver-abi-video-24_1" short_desc="Xorg dummy video driver" -homepage="http://xorg.freedesktop.org" -license="MIT" maintainer="Orphaned " +license="MIT" +homepage="http://xorg.freedesktop.org" distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2" checksum=3712bb869307233491e4c570732d6073c0dc3d99adfdb9977396a3fdf84e95b9 +lib32disabled=yes LDFLAGS="-Wl,-z,lazy" From b3bccecc5a257d6e38ff96504059f900184fc830 Mon Sep 17 00:00:00 2001 From: dkwo Date: Mon, 27 Dec 2021 17:47:09 +0100 Subject: [PATCH 25/30] xf86-video-fbdev: rebuild against xorg --- srcpkgs/xf86-video-fbdev/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/xf86-video-fbdev/template b/srcpkgs/xf86-video-fbdev/template index eafde10f3eab..6ffa3fcfafa5 100644 --- a/srcpkgs/xf86-video-fbdev/template +++ b/srcpkgs/xf86-video-fbdev/template @@ -1,7 +1,7 @@ # Template file for 'xf86-video-fbdev' pkgname=xf86-video-fbdev version=0.5.0 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="xorg-server-devel" From 8e019b2742aac6e13fa163ddb2a6f819db687977 Mon Sep 17 00:00:00 2001 From: dkwo Date: Mon, 27 Dec 2021 17:47:09 +0100 Subject: [PATCH 26/30] xf86-video-fbturbo-sunxi: rebuild against xorg and fix lint --- srcpkgs/xf86-video-fbturbo-sunxi/template | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/srcpkgs/xf86-video-fbturbo-sunxi/template b/srcpkgs/xf86-video-fbturbo-sunxi/template index 3da5f84a572c..4e9f63e01774 100644 --- a/srcpkgs/xf86-video-fbturbo-sunxi/template +++ b/srcpkgs/xf86-video-fbturbo-sunxi/template @@ -1,20 +1,19 @@ # Template file for 'xf86-video-fbturbo-sunxi' pkgname=xf86-video-fbturbo-sunxi version=0.4.0 -revision=5 +revision=6 +archs="armv7l" wrksrc="${pkgname%-sunxi}-${version}" build_style=gnu-configure hostmakedepends="pkg-config xorg-server-devel" makedepends="libXrandr-devel libump-git-devel xorg-server-devel xorg-util-macros" depends="virtual?xserver-abi-video-24_1 sunxi-mali" short_desc="Xorg DDX driver for Allwinner SoC (A10/A13/A20)" -license="MIT, GPL-2.0-or-later" maintainer="Orphaned " +license="MIT, GPL-2.0-or-later" homepage="http://github.com/ssvb/xf86-video-fbturbo" distfiles="https://github.com/ssvb/xf86-video-fbturbo/archive/${version}.tar.gz" checksum=10411686de0a9d8b2cde300b0d68e9f1d22e3611470d357ef3afc337f123ca0f - -archs="armv7l" conflicts="xf86-video-fbturbo>=0" LDFLAGS="-Wl,-z,lazy" From 89b03bc083a3192979965c252c46f566e0f6bb78 Mon Sep 17 00:00:00 2001 From: dkwo Date: Mon, 27 Dec 2021 17:47:09 +0100 Subject: [PATCH 27/30] xf86-video-fbturbo: rebuild against xorg --- srcpkgs/xf86-video-fbturbo/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/xf86-video-fbturbo/template b/srcpkgs/xf86-video-fbturbo/template index acfbff8c05d3..a65263eb897c 100644 --- a/srcpkgs/xf86-video-fbturbo/template +++ b/srcpkgs/xf86-video-fbturbo/template @@ -1,7 +1,7 @@ # Template file for 'xf86-video-fbturbo' pkgname=xf86-video-fbturbo version=0.4.0 -revision=17 +revision=18 build_style=gnu-configure short_desc="Xorg DDX driver for ARM devices (RaspberryPi/Allwinner)" maintainer="Orphaned " From 78968c8f619989fa74cf2d60ac603bc135748c6c Mon Sep 17 00:00:00 2001 From: dkwo Date: Mon, 27 Dec 2021 17:47:09 +0100 Subject: [PATCH 28/30] xf86-video-intel: rebuild against xorg --- srcpkgs/xf86-video-intel/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/xf86-video-intel/template b/srcpkgs/xf86-video-intel/template index 2b589d009897..53e847593e87 100644 --- a/srcpkgs/xf86-video-intel/template +++ b/srcpkgs/xf86-video-intel/template @@ -1,7 +1,7 @@ # Template file for 'xf86-video-intel' pkgname=xf86-video-intel version=2.99.917.20210115 -revision=1 +revision=2 _commit=31486f40f8e8f8923ca0799aea84b58799754564 archs="i686* x86_64*" wrksrc="xf86-video-intel-master-${_commit}" From a7a3472d7c69e92f5012bf0209e78a7612327250 Mon Sep 17 00:00:00 2001 From: dkwo Date: Mon, 27 Dec 2021 17:47:10 +0100 Subject: [PATCH 29/30] xf86-video-mach64: rebuild against xorg and add patch --- .../patches/0005-Fix-build-with-xorg-21.patch | 78 +++++++++++++++++++ srcpkgs/xf86-video-mach64/template | 2 +- 2 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/xf86-video-mach64/patches/0005-Fix-build-with-xorg-21.patch diff --git a/srcpkgs/xf86-video-mach64/patches/0005-Fix-build-with-xorg-21.patch b/srcpkgs/xf86-video-mach64/patches/0005-Fix-build-with-xorg-21.patch new file mode 100644 index 000000000000..d511d2b13154 --- /dev/null +++ b/srcpkgs/xf86-video-mach64/patches/0005-Fix-build-with-xorg-21.patch @@ -0,0 +1,78 @@ +From 04b7261734aeee7160dc4454440d20c19ef2d6dc Mon Sep 17 00:00:00 2001 +From: Josselin Poiret +Date: Thu, 18 Nov 2021 13:18:25 +0000 +Subject: [PATCH] Rename bool to boolean for OptionInfoRec. + +* src/aticonfig.c: Change uses of .value.bool to .value.boolean +--- + src/aticonfig.c | 38 +++++++++++++++++++------------------- + 1 file changed, 19 insertions(+), 19 deletions(-) + +diff --git a/src/aticonfig.c b/src/aticonfig.c +index 621e79e..8ea0c6e 100644 +--- a/src/aticonfig.c ++++ b/src/aticonfig.c +@@ -311,42 +311,42 @@ ATIProcessOptions + + (void)memcpy(PublicOption, ATIPublicOptions, ATIPublicOptionSize); + +-# define ProbeSparse PublicOption[ATI_OPTION_PROBE_SPARSE].value.bool +-# define Accel PublicOption[ATI_OPTION_ACCEL].value.bool +-# define BIOSDisplay PrivateOption[ATI_OPTION_BIOS_DISPLAY].value.bool +-# define Blend PrivateOption[ATI_OPTION_BLEND].value.bool +-# define CRTDisplay PublicOption[ATI_OPTION_CRT_DISPLAY].value.bool +-# define CRTScreen PrivateOption[ATI_OPTION_CRT_SCREEN].value.bool +-# define CSync PublicOption[ATI_OPTION_CSYNC].value.bool +-# define Devel PrivateOption[ATI_OPTION_DEVEL].value.bool +-# define HWCursor PublicOption[ATI_OPTION_HWCURSOR].value.bool ++# define ProbeSparse PublicOption[ATI_OPTION_PROBE_SPARSE].value.boolean ++# define Accel PublicOption[ATI_OPTION_ACCEL].value.boolean ++# define BIOSDisplay PrivateOption[ATI_OPTION_BIOS_DISPLAY].value.boolean ++# define Blend PrivateOption[ATI_OPTION_BLEND].value.boolean ++# define CRTDisplay PublicOption[ATI_OPTION_CRT_DISPLAY].value.boolean ++# define CRTScreen PrivateOption[ATI_OPTION_CRT_SCREEN].value.boolean ++# define CSync PublicOption[ATI_OPTION_CSYNC].value.boolean ++# define Devel PrivateOption[ATI_OPTION_DEVEL].value.boolean ++# define HWCursor PublicOption[ATI_OPTION_HWCURSOR].value.boolean + + #ifdef XF86DRI_DEVEL + +-# define IsPCI PublicOption[ATI_OPTION_IS_PCI].value.bool ++# define IsPCI PublicOption[ATI_OPTION_IS_PCI].value.boolean + # define DMAMode PublicOption[ATI_OPTION_DMA_MODE].value.str + # define AGPMode PublicOption[ATI_OPTION_AGP_MODE].value.num + # define AGPSize PublicOption[ATI_OPTION_AGP_SIZE].value.num +-# define LocalTex PublicOption[ATI_OPTION_LOCAL_TEXTURES].value.bool ++# define LocalTex PublicOption[ATI_OPTION_LOCAL_TEXTURES].value.boolean + # define BufferSize PublicOption[ATI_OPTION_BUFFER_SIZE].value.num + + #endif /* XF86DRI_DEVEL */ + + #ifdef TV_OUT + +-# define TvOut PublicOption[ATI_OPTION_TV_OUT].value.bool ++# define TvOut PublicOption[ATI_OPTION_TV_OUT].value.boolean + # define TvStd PublicOption[ATI_OPTION_TV_STD].value.str + + #endif /* TV_OUT */ + +-# define CacheMMIO PublicOption[ATI_OPTION_MMIO_CACHE].value.bool +-# define TestCacheMMIO PublicOption[ATI_OPTION_TEST_MMIO_CACHE].value.bool +-# define PanelDisplay PublicOption[ATI_OPTION_PANEL_DISPLAY].value.bool +-# define ShadowFB PublicOption[ATI_OPTION_SHADOW_FB].value.bool +-# define SWCursor PublicOption[ATI_OPTION_SWCURSOR].value.bool ++# define CacheMMIO PublicOption[ATI_OPTION_MMIO_CACHE].value.boolean ++# define TestCacheMMIO PublicOption[ATI_OPTION_TEST_MMIO_CACHE].value.boolean ++# define PanelDisplay PublicOption[ATI_OPTION_PANEL_DISPLAY].value.boolean ++# define ShadowFB PublicOption[ATI_OPTION_SHADOW_FB].value.boolean ++# define SWCursor PublicOption[ATI_OPTION_SWCURSOR].value.boolean + # define AccelMethod PublicOption[ATI_OPTION_ACCELMETHOD].value.str +-# define RenderAccel PublicOption[ATI_OPTION_RENDER_ACCEL].value.bool +-# define LCDSync PrivateOption[ATI_OPTION_LCDSYNC].value.bool ++# define RenderAccel PublicOption[ATI_OPTION_RENDER_ACCEL].value.boolean ++# define LCDSync PrivateOption[ATI_OPTION_LCDSYNC].value.boolean + + # define ReferenceClock \ + PublicOption[ATI_OPTION_REFERENCE_CLOCK].value.freq.freq +-- +GitLab diff --git a/srcpkgs/xf86-video-mach64/template b/srcpkgs/xf86-video-mach64/template index 51fb61f466c1..f2257348f214 100644 --- a/srcpkgs/xf86-video-mach64/template +++ b/srcpkgs/xf86-video-mach64/template @@ -1,7 +1,7 @@ # Template file for 'xf86-video-mach64' pkgname=xf86-video-mach64 version=6.9.6 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="automake libtool pkg-config xorg-util-macros" makedepends="xorgproto xorg-server-devel" From e2ca64045453b93f6a0a5f2f9a3c3bbe67c1d024 Mon Sep 17 00:00:00 2001 From: dkwo Date: Mon, 27 Dec 2021 19:42:34 +0100 Subject: [PATCH 30/30] xf86-video-nouveau: rebuild against xorg and add patch --- .../patches/xorg-server-21.1.patch | 50 +++++++++++++++++++ srcpkgs/xf86-video-nouveau/template | 2 +- 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/xf86-video-nouveau/patches/xorg-server-21.1.patch diff --git a/srcpkgs/xf86-video-nouveau/patches/xorg-server-21.1.patch b/srcpkgs/xf86-video-nouveau/patches/xorg-server-21.1.patch new file mode 100644 index 000000000000..4476f71dfe59 --- /dev/null +++ b/srcpkgs/xf86-video-nouveau/patches/xorg-server-21.1.patch @@ -0,0 +1,50 @@ +diff --git a/src/compat-api.h b/src/compat-api.h +index fde2f4b1cfde75875c07bfe13524dc6ba2661382..8a1fcf9be1c5d1ceb48a50f2ed533d93ec7ff4c7 100644 +--- a/src/compat-api.h ++++ b/src/compat-api.h +@@ -102,4 +102,8 @@ + + #endif + ++#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(25, 2) ++#define secondary_dst slave_dst ++#endif ++ + #endif +diff --git a/src/nouveau_exa.c b/src/nouveau_exa.c +index 55df6f8f11c9e14b1891e5c841faef10c17f0a35..db3b112a2db70f8e902e54aa3af99e51e7d0c6f7 100644 +--- a/src/nouveau_exa.c ++++ b/src/nouveau_exa.c +@@ -157,7 +157,7 @@ nouveau_exa_destroy_pixmap(ScreenPtr pScreen, void *priv) + + #ifdef NOUVEAU_PIXMAP_SHARING + static Bool +-nouveau_exa_share_pixmap_backing(PixmapPtr ppix, ScreenPtr slave, void **handle_p) ++nouveau_exa_share_pixmap_backing(PixmapPtr ppix, ScreenPtr secondary, void **handle_p) + { + struct nouveau_bo *bo = nouveau_pixmap_bo(ppix); + struct nouveau_pixmap *nvpix = nouveau_pixmap(ppix); +diff --git a/src/nv_driver.c b/src/nv_driver.c +index e72a6b65a81119f12f3608295a4547762a866ad7..f9ab4af19361d99d74f580d1ff3f28d49843e8b0 100644 +--- a/src/nv_driver.c ++++ b/src/nv_driver.c +@@ -559,16 +559,16 @@ redisplay_dirty(ScreenPtr screen, PixmapDirtyUpdatePtr dirty) + { + RegionRec pixregion; + +- PixmapRegionInit(&pixregion, dirty->slave_dst); ++ PixmapRegionInit(&pixregion, dirty->secondary_dst); + +- DamageRegionAppend(&dirty->slave_dst->drawable, &pixregion); ++ DamageRegionAppend(&dirty->secondary_dst->drawable, &pixregion); + #ifdef HAS_DIRTYTRACKING_ROTATION + PixmapSyncDirtyHelper(dirty); + #else + PixmapSyncDirtyHelper(dirty, &pixregion); + #endif + +- DamageRegionProcessPending(&dirty->slave_dst->drawable); ++ DamageRegionProcessPending(&dirty->secondary_dst->drawable); + RegionUninit(&pixregion); + } + diff --git a/srcpkgs/xf86-video-nouveau/template b/srcpkgs/xf86-video-nouveau/template index 5eb9af9c6e62..e8af10f784ef 100644 --- a/srcpkgs/xf86-video-nouveau/template +++ b/srcpkgs/xf86-video-nouveau/template @@ -1,7 +1,7 @@ # Template file for 'xf86-video-nouveau' pkgname=xf86-video-nouveau version=1.0.17 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="eudev-libudev-devel libdrm-devel xorg-server-devel"