xorg-server: update to 21.1.3
This commit is contained in:
Leah Neukirchen
parent
d4441fc025
commit
bb1ced6855
8 changed files with 17 additions and 165 deletions
|
|
@ -1 +0,0 @@
|
|||
xorg-server
|
||||
|
|
@ -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:
|
||||
|
|
@ -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
|
||||
|
||||
|
|
@ -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()))
|
||||
|
|
@ -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)
|
||||
|
|
@ -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',
|
||||
|
|
@ -1,24 +1,23 @@
|
|||
From 94b4a3d45451d29e9539ea234ce8b5e9ed58546c Mon Sep 17 00:00:00 2001
|
||||
From 22d5818851967408bb7c903cb345b7ca8766094c Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?B=C5=82a=C5=BCej=20Szczygie=C5=82?= <spaz16@wp.pl>
|
||||
Date: Thu, 13 Jan 2022 00:47:27 +0100
|
||||
Subject: [PATCH xserver] present: Check for NULL to prevent crash
|
||||
Subject: [PATCH] present: Check for NULL to prevent crash
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1275
|
||||
Signed-off-by: Błażej Szczygieł <spaz16@wp.pl>
|
||||
Signed-off-by: Błażej Szczygieł <spaz16@wp.pl>
|
||||
Tested-by: Aaron Plattner <aplattner@nvidia.com>
|
||||
(cherry picked from commit 22d5818851967408bb7c903cb345b7ca8766094c)
|
||||
---
|
||||
present/present_scmd.c | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/present/present_scmd.c b/present/present_scmd.c
|
||||
index 3c68e690b..11391adbb 100644
|
||||
index da836ea6b..239055bc1 100644
|
||||
--- a/present/present_scmd.c
|
||||
+++ b/present/present_scmd.c
|
||||
@@ -168,6 +168,9 @@ present_scmd_get_crtc(present_screen_priv_ptr screen_priv, WindowPtr window)
|
||||
@@ -158,6 +158,9 @@ present_scmd_get_crtc(present_screen_priv_ptr screen_priv, WindowPtr window)
|
||||
if (!screen_priv->info)
|
||||
return NULL;
|
||||
|
||||
|
|
@ -28,7 +27,7 @@ index 3c68e690b..11391adbb 100644
|
|||
return (*screen_priv->info->get_crtc)(window);
|
||||
}
|
||||
|
||||
@@ -206,6 +209,9 @@ present_flush(WindowPtr window)
|
||||
@@ -196,6 +199,9 @@ present_flush(WindowPtr window)
|
||||
if (!screen_priv->info)
|
||||
return;
|
||||
|
||||
|
|
@ -39,5 +38,5 @@ index 3c68e690b..11391adbb 100644
|
|||
}
|
||||
|
||||
--
|
||||
2.34.1
|
||||
GitLab
|
||||
|
||||
|
|
|
|||
|
|
@ -1,22 +1,21 @@
|
|||
# Template file for 'xorg-server'
|
||||
pkgname=xorg-server
|
||||
version=1.20.14
|
||||
revision=2
|
||||
version=21.1.3
|
||||
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,10 +24,10 @@ 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=5cc5b70b9be89443e2594b93656c60bd5e82cd7f01deb4ce4faf81dcf546a16b
|
||||
checksum=61d6aad5b6b47a116b960bd7f0cba4ee7e6da95d6bb0b127bde75d7d1acdebe5
|
||||
lib32disabled=yes
|
||||
provides="xserver-abi-extension-10_1 xserver-abi-input-24_1
|
||||
xserver-abi-video-24_1 xf86-video-modesetting-1_1"
|
||||
xserver-abi-video-25_1 xf86-video-modesetting-1_1"
|
||||
replaces="xf86-video-modesetting>=0 glamor-egl>=0"
|
||||
conf_files="/etc/X11/Xwrapper.config"
|
||||
|
||||
|
|
@ -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() {
|
||||
|
|
|
|||
Loading…
Reference in a new issue