X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=xorg-xserver-server.spec;h=253dfa849c0c8769d3732996b2f76a2ce4f42a08;hb=e2712cc3e55158b1d70eefc3163ebe1801ba63b2;hp=8752791500574a03c23820aec52cbb115544f704;hpb=5b8bb759afe09bed265dfcb57298b63c96b14e84;p=packages%2Fxorg-xserver-server.git

diff --git a/xorg-xserver-server.spec b/xorg-xserver-server.spec
index 8752791..253dfa8 100644
--- a/xorg-xserver-server.spec
+++ b/xorg-xserver-server.spec
@@ -22,7 +22,7 @@
 # ABI versions, see hw/xfree86/common/xf86Module.h
 %define	xorg_xserver_server_ansic_abi		0.4
 %define	xorg_xserver_server_extension_abi	10.0
-%define	xorg_xserver_server_videodrv_abi	24.0
+%define	xorg_xserver_server_videodrv_abi	24.1
 %define	xorg_xserver_server_xinput_abi		24.1
 
 %define	pixman_ver	0.30.0
@@ -34,12 +34,12 @@
 Summary:	X.org server
 Summary(pl.UTF-8):	Serwer X.org
 Name:		xorg-xserver-server
-Version:	1.20.4
-Release:	3
+Version:	1.20.8
+Release:	2
 License:	MIT
 Group:		X11/Servers
-Source0:	http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-%{version}.tar.bz2
-# Source0-md5:	c4841cc24b79420205d082fe82e0a650
+Source0:	https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-%{version}.tar.bz2
+# Source0-md5:	a770aec600116444a953ff632f51f839
 Source1:	10-quirks.conf
 Source2:	xserver.pamd
 Source10:	%{name}-Xvfb.init
@@ -50,7 +50,7 @@ Patch1:		%{name}-xwrapper-pam.patch
 Patch4:		%{name}-builtin-SHA1.patch
 
 Patch6:		110_nvidia_slowdow_fix.patch
-URL:		http://xorg.freedesktop.org/
+URL:		https://xorg.freedesktop.org/
 BuildRequires:	Mesa-libGL-devel >= 7.8.1
 %{?with_dri2:BuildRequires:	Mesa-libGL-devel >= 9.2.0}
 %{?with_glamor:BuildRequires:	Mesa-libgbm-devel >= 17.1.0}
@@ -68,9 +68,8 @@ BuildRequires:	dbus-devel >= 1.0
 %{?with_eglstream:BuildRequires:	egl-wayland-devel >= 1.0.2}
 %{?with_hal:BuildRequires:	hal-devel}
 BuildRequires:	libdrm-devel >= 2.4.89
-%if %{with glamor} || %{with wayland}
-BuildRequires:	libepoxy-devel >= 1.4.4
-%{?with_eglstream:BuildRequires:	libepoxy-devel >= 1.5.0}
+%if %{with glamor}
+BuildRequires:	libepoxy-devel >= 1.5.4
 %endif
 %{?with_xselinux:BuildRequires:	libselinux-devel >= 2.0.86}
 BuildRequires:	libtool >= 2:2.2
@@ -154,7 +153,7 @@ BuildRequires:	xorg-util-util-macros >= 1.14
 Requires(triggerpostun):	sed >= 4.0
 %{?with_glamor:Requires:	Mesa-libgbm >= 17.1.0}
 Requires:	libdrm >= 2.4.89
-Requires:	libepoxy >= 1.4.4
+%{?with_glamor:Requires:	libepoxy >= 1.5.4}
 Requires:	pixman >= %{pixman_ver}
 Requires:	udev-libs >= 1:143
 Requires:	xkeyboard-config
@@ -257,7 +256,7 @@ Summary:	Xephyr - nested X server
 Summary(pl.UTF-8):	Xephyr - zagnieżdżony serwer X
 Group:		X11/Servers
 Requires:	Mesa-libGL >= 7.1.0
-Requires:	libepoxy >= 1.4.4
+%{?with_glamor:Requires:	libepoxy >= 1.5.4}
 Requires:	libxcb >= 1.9.3
 Requires:	pixman >= %{pixman_ver}
 Requires:	xorg-lib-libXfont2 >= 2.0.0
@@ -337,11 +336,7 @@ Summary:	Xwayland - X server integrated into a Wayland window system
 Summary(pl.UTF-8):	Xwayland - serwer X integrowalny w Wayland
 Group:		X11/Servers
 %{?with_eglstream:Requires:	egl-wayland >= 1.0.2}
-%if %{with eglstream}
-Requires:	libepoxy >= 1.5.0
-%else
-Requires:	libepoxy >= 1.4.4
-%endif
+%{?with_glamor:Requires:	libepoxy >= 1.5.4}
 Requires:	pixman >= %{pixman_ver}
 Requires:	xorg-lib-libX11 >= 1.6
 Requires:	xorg-lib-libXext >= 1.0.99.4
@@ -435,6 +430,8 @@ sed -i -e 's#<pixman\.h#<pixman-1/pixman.h#g' ./fb/fb.h ./include/miscstruct.h .
 # support __filemansuffix__ with "x" suffix (per FHS 2.3)
 %{__sed} -i -e 's,\.so man__filemansuffix__/,.so man5/,' hw/xfree86/man/*.man
 
+%{__sed} -i -e '1s|#!/usr/bin/python$|#!%{__python}|' config/fdi2iclass.py
+
 %build
 API=$(awk '/#define ABI_ANSIC_VERSION/ { split($0,A,/[(,)]/); printf("%d.%d",A[2], A[3]); }' hw/xfree86/common/xf86Module.h)
 if [ "$API" != "%{xorg_xserver_server_ansic_abi}" ]; then
@@ -495,7 +492,7 @@ fi
 	--enable-suid-wrapper \
 	--with-systemd-daemon
 
-%{__make} -j1
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT