#
# ABI versions, see hw/xfree86/common/xf86Module.h
%define xorg_xserver_server_ansic_abi 0.4
-%define xorg_xserver_server_extension_abi 6.0
+%define xorg_xserver_server_extension_abi 7.0
%define xorg_xserver_server_font_abi 0.6
-%define xorg_xserver_server_videodrv_abi 11.0
-%define xorg_xserver_server_xinput_abi 13.0
+%define xorg_xserver_server_videodrv_abi 14.1
+%define xorg_xserver_server_xinput_abi 19.1
#
-%define pixman_ver 0.24.0
+%define pixman_ver 0.28.0
Summary: X.org server
Summary(pl.UTF-8): Serwer X.org
Name: xorg-xserver-server
-Version: 1.11.4
+Version: 1.14.0
Release: 1
License: MIT
Group: X11/Servers
Source0: http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-%{version}.tar.bz2
-# Source0-md5: 256325e9b17dff479d92bed97f6b0adb
+# Source0-md5: 86110278b784e279381b7f6f2295c508
Source1: 10-quirks.conf
Source2: xserver.pamd
Source10: %{name}-Xvfb.init
Source11: %{name}-Xvfb.sysconfig
Patch0: %{name}-xwrapper.patch
Patch1: %{name}-pic-libxf86config.patch
-Patch2: %{name}-fb-size.patch
+
Patch3: %{name}-less-acpi-brokenness.patch
Patch4: %{name}-builtin-SHA1.patch
Patch5: %{name}-export-GetMaster.patch
Patch6: 110_nvidia_slowdow_fix.patch
+Patch7: %{name}-include-defs.patch
URL: http://xorg.freedesktop.org/
BuildRequires: Mesa-libGL-devel >= 7.8.1
# for glx headers
BuildRequires: OpenGL-GLX-devel
%{?with_xselinux:BuildRequires: audit-libs-devel}
-BuildRequires: autoconf >= 2.57
+BuildRequires: autoconf >= 2.60
BuildRequires: automake
BuildRequires: cpp
BuildRequires: docbook-dtd43-xml
BuildRequires: dbus-devel >= 1.0
%endif
%{?with_hal:BuildRequires: hal-devel}
-BuildRequires: libdrm-devel >= 2.4.5
+BuildRequires: libdrm-devel >= 2.4.39
%{?with_xselinux:BuildRequires: libselinux-devel >= 2.0.86}
BuildRequires: libtool
BuildRequires: ncurses-devel
BuildRequires: xorg-lib-libXxf86vm-devel
%{?with_dmx:BuildRequires: xorg-lib-libdmx-devel >= 1.0.99.1}
BuildRequires: xorg-lib-libfontenc-devel
-BuildRequires: xorg-lib-libpciaccess-devel >= 0.8.0
+BuildRequires: xorg-lib-libpciaccess-devel >= 0.12.901
BuildRequires: xorg-lib-libxkbfile-devel
BuildRequires: xorg-lib-libxkbui-devel >= 1.0.2
BuildRequires: xorg-lib-xtrans-devel >= 1.2.2
BuildRequires: xorg-proto-compositeproto-devel >= 0.4
BuildRequires: xorg-proto-damageproto-devel >= 1.1
%{?with_dmx:BuildRequires: xorg-proto-dmxproto-devel >= 2.2.99.1}
-%{?with_dri2:BuildRequires: xorg-proto-dri2proto-devel >= 2.6}
+%{?with_dri2:BuildRequires: xorg-proto-dri2proto-devel >= 2.8}
BuildRequires: xorg-proto-fixesproto-devel >= 5.0
BuildRequires: xorg-proto-fontcacheproto-devel
BuildRequires: xorg-proto-fontsproto-devel
-BuildRequires: xorg-proto-glproto-devel >= 1.4.14
-BuildRequires: xorg-proto-inputproto-devel >= 1.9.99.902
+BuildRequires: xorg-proto-glproto-devel >= 1.4.16
+BuildRequires: xorg-proto-inputproto-devel >= 2.2.99.1
BuildRequires: xorg-proto-kbproto-devel >= 1.0.3
BuildRequires: xorg-proto-printproto-devel
-BuildRequires: xorg-proto-randrproto-devel >= 1.3
+BuildRequires: xorg-proto-randrproto-devel >= 1.4.0
%{?with_record:BuildRequires: xorg-proto-recordproto-devel >= 1.13.99.1}
BuildRequires: xorg-proto-renderproto-devel >= 0.11
-BuildRequires: xorg-proto-resourceproto-devel
+BuildRequires: xorg-proto-resourceproto-devel >= 1.2.0
BuildRequires: xorg-proto-scrnsaverproto-devel >= 1.1
BuildRequires: xorg-proto-videoproto-devel
BuildRequires: xorg-proto-xcmiscproto-devel >= 1.2.0
BuildRequires: xorg-proto-xproto-devel >= 7.0.22
BuildRequires: xorg-sgml-doctools >= 1.8
BuildRequires: xorg-util-util-macros >= 1.14
-#BR: xcalibrateproto, tslib (for KDRIVE only)
+#BR: tslib (for KDRIVE only)
Requires(triggerpostun): sed >= 4.0
Requires: pixman >= %{pixman_ver}
Requires: xkeyboard-config
Provides: xorg-xserver-server(font-abi) = %{xorg_xserver_server_font_abi}
Provides: xorg-xserver-server(videodrv-abi) = %{xorg_xserver_server_videodrv_abi}
Provides: xorg-xserver-server(xinput-abi) = %{xorg_xserver_server_xinput_abi}
+Provides: xorg-xserver-module(dri)
+Provides: xorg-xserver-libdri = %{version}-%{release}
Obsoletes: X11-Xserver < 1:7.0.0
Obsoletes: X11-driver-i2c < 1:7.0.0
Obsoletes: X11-modules < 1:7.0.0
Obsoletes: XFree86-setup < 1:7.0.0
Obsoletes: Xserver
Obsoletes: xorg-xserver-server-xorgcfg
+Obsoletes: xorg-xserver-libdri
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
# avoid self-dependencies on included modules
Summary: Header files for X.org server
Summary(pl.UTF-8): Pliki nagłówkowe dla serwera X.org
Group: X11/Development/Libraries
-Requires: libdrm-devel >= 2.4.5
+Requires: libdrm-devel >= 2.4.39
Requires: pixman-devel >= %{pixman_ver}
-Requires: xorg-lib-libpciaccess-devel >= 0.8.0
+Requires: xorg-lib-libpciaccess-devel >= 0.12.901
Requires: xorg-lib-libxkbfile-devel
-%{?with_dri2:Requires: xorg-proto-dri2proto-devel >= 2.6}
+%{?with_dri2:Requires: xorg-proto-dri2proto-devel >= 2.8}
Requires: xorg-proto-fontsproto-devel
-Requires: xorg-proto-inputproto-devel >= 1.9.99.902
+Requires: xorg-proto-inputproto-devel >= 2.2.99.1
Requires: xorg-proto-kbproto-devel >= 1.0.3
-Requires: xorg-proto-randrproto-devel >= 1.3
+Requires: xorg-proto-randrproto-devel >= 1.4.0
Requires: xorg-proto-renderproto-devel >= 0.11
+Requires: xorg-proto-resourceproto-devel >= 1.2.0
+Requires: xorg-proto-scrnsaverproto-devel >= 1.1
Requires: xorg-proto-videoproto-devel
Requires: xorg-proto-xextproto-devel >= 1:7.2.0
Requires: xorg-proto-xf86driproto-devel >= 2.1.0
%description source -l pl.UTF-8
Pliki źródłowe dla serwera X.org.
-%package -n xorg-xserver-libdri
-Summary: DRI extension library for X.org server
-Summary(pl.UTF-8): Biblioteka rozszerzenia DRI dla serwera X.org
-Group: X11/Servers
-Requires: %{name} = %{version}-%{release}
-Provides: xorg-xserver-module(dri)
-
-%description -n xorg-xserver-libdri
-DRI extension library for X.org server.
-
-%description -n xorg-xserver-libdri -l pl.UTF-8
-Biblioteka rozszerzenia DRI dla serwera X.org.
-
%package -n xorg-xserver-libglx
Summary: GLX extension library for X.org server
Summary(pl.UTF-8): Biblioteka rozszerzenia GLX dla serwera X.org
Group: X11/Servers
Requires: %{name} = %{version}-%{release}
-Requires: xorg-xserver-libdri = %{version}-%{release}
# Mesa version glapi tables in glx/ dir come from
Provides: xorg-xserver-libglx(glapi) = 7.1.0
Provides: xorg-xserver-module(glx)
%setup -q -n xorg-server-%{version}
%patch0 -p0
%patch1 -p1
-%patch2 -p1
+
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
+#unfortunately breaks build
+#patch7 -p1
+
# xserver uses pixman-1 API/ABI so put that explictly here
sed -i -e 's#<pixman\.h#<pixman-1/pixman.h#g' ./fb/fb.h ./include/miscstruct.h ./render/picture.h
%dir %{_libdir}/xorg/modules/dri
%dir %{_libdir}/xorg/modules/drivers
%dir %{_libdir}/xorg/modules/extensions
-%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libdbe.so
-%{?with_dri2:%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libdri2.so}
-%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libextmod.so
-%{?with_record:%attr(755,root,root) %{_libdir}/xorg/modules/extensions/librecord.so}
%dir %{_libdir}/xorg/modules/input
%dir %{_libdir}/xorg/modules/multimedia
%attr(755,root,root) %{_libdir}/xorg/modules/multimedia/*.so
%defattr(-,root,root,755)
%{_usrsrc}/%{name}-%{version}
-%files -n xorg-xserver-libdri
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libdri.so
-
%files -n xorg-xserver-libglx
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so
projects / packages / xorg-xserver-server.git / blobdiff