[packages/xorg-xserver-server] - up to 1.18.0

[arekm]

commit 6dee40e09f4a6b7a26709511fdba2abb58b70d9d
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Mon Nov 9 22:47:59 2015 +0100

    - up to 1.18.0

 xorg-xserver-server-pic-libxf86config.patch | 10 ----------
 xorg-xserver-server.spec                    | 17 ++++++-----------
 2 files changed, 6 insertions(+), 21 deletions(-)
---
diff --git a/xorg-xserver-server.spec b/xorg-xserver-server.spec
index 3484e66..00001fb 100644
--- a/xorg-xserver-server.spec
+++ b/xorg-xserver-server.spec
@@ -22,8 +22,8 @@
 %define	xorg_xserver_server_ansic_abi		0.4
 %define	xorg_xserver_server_extension_abi	9.0
 %define	xorg_xserver_server_font_abi		0.6
-%define	xorg_xserver_server_videodrv_abi	19.0
-%define	xorg_xserver_server_xinput_abi		21.0
+%define	xorg_xserver_server_videodrv_abi	20.0
+%define	xorg_xserver_server_xinput_abi		22.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.17.4
+Version:	1.18.0
 Release:	1
 License:	MIT
 Group:		X11/Servers
 Source0:	http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-%{version}.tar.bz2
-# Source0-md5:	1509a9daae713895e7f5bcba8bcc05b2
+# Source0-md5:	3c1c1057d3ad27380d8dd87ffcc182cd
 Source1:	10-quirks.conf
 Source2:	xserver.pamd
 Source10:	%{name}-Xvfb.init
@@ -47,7 +47,7 @@ Source11:	%{name}-Xvfb.sysconfig
 Source12:	xvfb-run.sh
 
 Patch0:		%{name}-xwrapper.patch
-Patch1:		%{name}-pic-libxf86config.patch
+
 Patch2:		dtrace-link.patch
 
 Patch4:		%{name}-builtin-SHA1.patch
@@ -429,7 +429,7 @@ Biblioteka rozszerzenia GLX dla serwera X.org.
 %prep
 %setup -q -n xorg-server-%{version}
 %patch0 -p0
-%patch1 -p1
+
 %patch2 -p1
 
 %patch4 -p1
@@ -494,8 +494,6 @@ fi
 	%{?with_dmx:--enable-dmx} \
 	--enable-dri2%{!?with_dri2:=no} \
 	%{?with_glamor:--enable-glamor} \
-	--enable-glx-tls \
-	--enable-install-libxf86config \
 	--enable-kdrive \
 	%{?with_libunwind:--enable-libunwind} \
 	%{?with_record:--enable-record} \
@@ -616,7 +614,6 @@ fi
 %dir /etc/X11/xorg.conf.d
 %dir %{_datadir}/X11/xorg.conf.d
 # overwrite these settings with local configs in /etc/X11/xorg.conf.d
-%verify(not md5 mtime size) %{_datadir}/X11/xorg.conf.d/10-evdev.conf
 %verify(not md5 mtime size) %{_datadir}/X11/xorg.conf.d/10-quirks.conf
 %{_mandir}/man1/Xorg.1*
 %{_mandir}/man1/Xserver.1*
@@ -684,8 +681,6 @@ fi
 %defattr(644,root,root,755)
 %doc doc/{Xinput,Xserver-spec}.html %{?with_systemtap:doc/dtrace/Xserver-DTrace.html}
 %{_includedir}/xorg
-%{_libdir}/libxf86config.a
-%{_libdir}/libxf86config.la
 %{_aclocaldir}/xorg-server.m4
 %{_pkgconfigdir}/xorg-server.pc
 
diff --git a/xorg-xserver-server-pic-libxf86config.patch b/xorg-xserver-server-pic-libxf86config.patch
deleted file mode 100644
index f0a9c9f..0000000
--- a/xorg-xserver-server-pic-libxf86config.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- xorg-server-1.8.0.901/hw/xfree86/parser/Makefile.am~	2010-04-23 05:19:28.000000000 +0200
-+++ xorg-server-1.8.0.901/hw/xfree86/parser/Makefile.am	2010-04-27 08:16:45.772678719 +0200
-@@ -35,6 +35,7 @@
- libxf86config_a_CFLAGS = $(AM_CFLAGS)
- 
- AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) \
-+	-fPIC -fvisibility=hidden \
- 	-DSYSCONFDIR=\"$(sysconfdir)\" \
- 	-DDATADIR=\"$(datadir)\"
- 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xorg-xserver-server.git/commitdiff/6dee40e09f4a6b7a26709511fdba2abb58b70d9d