|
@@ -7,7 +7,7 @@
|
|
|
Summary: X.Org X11 X server
|
|
|
Summary(ja): X.Org X11 X サーバ
|
|
|
Name: xorg-x11-server
|
|
|
-Version: 1.20.11
|
|
|
+Version: 1.20.14
|
|
|
Release: 1%{?_dist_release}%{?with_systemd:.systemd}
|
|
|
Group: system
|
|
|
Vendor: Project Vine
|
|
@@ -18,7 +18,7 @@ License: MIT/X11
|
|
|
%if 0%{?gitdate}
|
|
|
Source0: ftp://ftp.x.org/pub/individual/xserver/%{pkgname}-%{gitdate}.tar.xz
|
|
|
%else
|
|
|
-Source0: https://www.x.org/archive/individual/xserver/%{pkgname}-%{version}.tar.bz2
|
|
|
+Source0: https://www.x.org/archive/individual/xserver/%{pkgname}-%{version}.tar.xz
|
|
|
%endif
|
|
|
Source4: 10-quirks.conf
|
|
|
Source10: xserver.pamd
|
|
@@ -30,21 +30,34 @@ Source20: http://svn.exactcode.de/t2/trunk/package/xorg/xorg-server/xvfb-r
|
|
|
Patch1: 06_use-intel-only-on-pre-gen4.diff
|
|
|
# Default to xf86-video-modesetting on GeForce 8 and newer
|
|
|
Patch2: 0001-xfree86-use-modesetting-driver-by-default-on-GeForce.patch
|
|
|
+
|
|
|
# Default to va_gl on intel i965 as we use the modesetting drv there
|
|
|
# va_gl should probably just be the default everywhere ?
|
|
|
Patch3: 0001-xf86-dri2-Use-va_gl-as-vdpau_driver-for-Intel-i965-G.patch
|
|
|
+
|
|
|
# Submitted upstream, but not going anywhere
|
|
|
Patch5: 0001-autobind-GPUs-to-the-screen.patch
|
|
|
+
|
|
|
# because the display-managers are not ready yet, do not upstream
|
|
|
Patch6: 0001-Fedora-hack-Make-the-suid-root-wrapper-always-start-.patch
|
|
|
|
|
|
+# Backports from current stable "server-1.20-branch":
|
|
|
+# <empty>
|
|
|
+
|
|
|
+# Backports from "master" upstream:
|
|
|
+Patch100: 0001-present-Check-for-NULL-to-prevent-crash.patch
|
|
|
+Patch101: 0001-render-Fix-build-with-gcc-12.patch
|
|
|
+Patch102: 0001-xf86-Accept-devices-with-the-simpledrm-driver.patch
|
|
|
+Patch103: 0001-Don-t-hardcode-fps-for-fake-screen.patch
|
|
|
+
|
|
|
+# CVE-2022-2319/ZDI-CAN-16062, CVE-2022-2320/ZDI-CAN-16070
|
|
|
+Patch110: 0001-xkb-switch-to-array-index-loops-to-moving-pointers.patch
|
|
|
+Patch111: 0002-xkb-swap-XkbSetDeviceInfo-and-XkbSetDeviceInfoCheck.patch
|
|
|
+Patch112: 0003-xkb-add-request-length-validation-for-XkbSetGeometry.patch
|
|
|
+
|
|
|
# security patch
|
|
|
|
|
|
## Vine Patch
|
|
|
-# add elogind support
|
|
|
-Patch10000: 0001-add-elogind-support.patch
|
|
|
-# autodetect nvidia driver
|
|
|
-Patch10010: 0001-nvidia.patch
|
|
|
# autodetect fglrx driver
|
|
|
Patch10020: 0002-fglrx.patch
|
|
|
# autodetect virtual video device (qemu) driver
|
|
@@ -65,15 +78,6 @@ Patch20000: 0005-dont-disable-kbd-if-AEI-on.patch
|
|
|
%define with_hw_servers 1
|
|
|
%endif
|
|
|
|
|
|
-%if %{with_hw_servers}
|
|
|
-%define enable_xorg --enable-xorg
|
|
|
-%else
|
|
|
-%define enable_xorg --disable-xorg
|
|
|
-%endif
|
|
|
-
|
|
|
-%define kdrive --enable-kdrive --enable-xephyr --disable-xfake --disable-xfbdev
|
|
|
-%define xservers --enable-xvfb --enable-xnest %{kdrive} %{enable_xorg}
|
|
|
-
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
|
|
|
|
# FIXME: Temporary Build deps on autotools, as needed...
|
|
@@ -86,7 +90,6 @@ BuildRequires: xorg-x11-proto-devel >= 7.4-9
|
|
|
|
|
|
BuildRequires: xorg-x11-xtrans-devel >= 1.2.3
|
|
|
BuildRequires: xorg-x11-font-utils
|
|
|
-BuildRequires: libXfont-devel
|
|
|
BuildRequires: libXfont2-devel
|
|
|
BuildRequires: libXau-devel
|
|
|
BuildRequires: libxkbfile-devel
|
|
@@ -117,6 +120,7 @@ BuildRequires: freetype2-devel
|
|
|
|
|
|
BuildRequires: libgudev-devel
|
|
|
BuildRequires: dbus-devel
|
|
|
+BuildRequires: libepoxy-devel
|
|
|
|
|
|
%if %{with systemd}
|
|
|
BuildRequires: systemd-devel
|
|
@@ -133,14 +137,12 @@ BuildRequires: libXi-devel
|
|
|
BuildRequires: libXpm-devel
|
|
|
BuildRequires: libXaw-devel >= 1.0.5
|
|
|
BuildRequires: libXfixes-devel
|
|
|
-BuildRequires: libXdamage-devel
|
|
|
BuildRequires: libXv-devel
|
|
|
BuildRequires: libxshmfence-devel
|
|
|
|
|
|
BuildRequires: mesa-libGL-devel >= 7.8
|
|
|
BuildRequires: mesa-libEGL-devel
|
|
|
BuildRequires: mesa-libgbm-devel
|
|
|
-BuildRequires: libepoxy-devel
|
|
|
BuildRequires: mesa-source >= 7.8
|
|
|
# XXX silly...
|
|
|
BuildRequires: libdrm-devel >= 2.4.0-3
|
|
@@ -148,9 +150,6 @@ BuildRequires: libdrm-devel >= 2.4.0-3
|
|
|
Requires: libdrm
|
|
|
%endif
|
|
|
|
|
|
-# Make sure libXfont has the catalogue FPE
|
|
|
-Requires: libXfont
|
|
|
-
|
|
|
# All server subpackages have a virtual provide for the name of the server
|
|
|
# they deliver. The Xorg one is versioned, the others are intentionally
|
|
|
# unversioned.
|
|
@@ -305,24 +304,7 @@ Xserver source code needed to build VNC server (Xvnc)
|
|
|
%prep
|
|
|
%setup -q -n %{pkgname}-%{version}
|
|
|
#%setup -q -n %{pkgname}-%{gitdate}
|
|
|
-
|
|
|
-# fedora patches
|
|
|
-
|
|
|
-%patch1 -p1
|
|
|
-%patch2 -p1
|
|
|
-%patch3 -p1
|
|
|
-%patch5 -p1
|
|
|
-%patch6 -p1
|
|
|
-
|
|
|
-# security patch
|
|
|
-
|
|
|
-# Vine patch
|
|
|
-%patch10020 -p1 -b .fglrx
|
|
|
-%patch10030 -p1 -b .virtual-device
|
|
|
-%patch10040 -p1 -b .vesa-fallback
|
|
|
-
|
|
|
-# Vine
|
|
|
-%patch20000 -p1 -b .dont-disable-kbd
|
|
|
+%autopatch -p1
|
|
|
|
|
|
# Patch5: xserver-1.8.1-pic-libxf86config.patch
|
|
|
sed -i \
|
|
@@ -333,6 +315,15 @@ autoreconf -vif
|
|
|
|
|
|
|
|
|
%build
|
|
|
+%if %{with_hw_servers}
|
|
|
+%define enable_xorg --enable-xorg
|
|
|
+%else
|
|
|
+%define enable_xorg --disable-xorg
|
|
|
+%endif
|
|
|
+
|
|
|
+%define kdrive --enable-kdrive --enable-xephyr --disable-xfake --disable-xfbdev
|
|
|
+%define xservers --enable-xvfb --enable-xnest %{kdrive} %{enable_xorg}
|
|
|
+
|
|
|
%define default_font_path "catalogue:/etc/X11/fontpath.d,built-ins"
|
|
|
|
|
|
%if %{with_hw_servers}
|
|
@@ -346,6 +337,7 @@ export CXXFLAGS="%{build_cxxflags} -Wstrict-overflow -rdynamic $CFLAGS"
|
|
|
export LDFLAGS="%{build_ldflags}"
|
|
|
%configure \
|
|
|
%{xservers} \
|
|
|
+ --enable-dependency-tracking \
|
|
|
--disable-static \
|
|
|
--with-pic \
|
|
|
--with-int10=x86emu \
|
|
@@ -358,9 +350,13 @@ export LDFLAGS="%{build_ldflags}"
|
|
|
--with-xkb-output=%{_localstatedir}/lib/xkb \
|
|
|
--enable-install-libxf86config \
|
|
|
--disable-linux-acpi --disable-linux-apm \
|
|
|
- --disable-xselinux --enable-record \
|
|
|
+ --disable-xselinux --enable-record --enable-present \
|
|
|
+ --enable-xcsecurity \
|
|
|
--enable-config-udev \
|
|
|
--enable-dmx \
|
|
|
+ --disable-unit-tests \
|
|
|
+ --enable-dmx \
|
|
|
+ --disable-xwayland \
|
|
|
%{dri_flags} \
|
|
|
--enable-systemd-logind \
|
|
|
%if %{with systemd}
|
|
@@ -368,11 +364,12 @@ export LDFLAGS="%{build_ldflags}"
|
|
|
%endif
|
|
|
${CONFIGURE}
|
|
|
|
|
|
-make -s %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
|
|
|
+make V=1 %{?_smp_mflags}
|
|
|
+
|
|
|
|
|
|
%install
|
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
-make install DESTDIR=$RPM_BUILD_ROOT moduledir=%{moduledir} LIBTOOL=/usr/bin/libtool
|
|
|
+%make_install
|
|
|
|
|
|
|
|
|
%if %{with_hw_servers}
|
|
@@ -565,6 +562,9 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Tue Sep 13 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.20.14-1
|
|
|
+- new upstream release.
|
|
|
+
|
|
|
* Thu May 20 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.20.11-1
|
|
|
- new upstream release.
|
|
|
|