%bcond_with hal # HAL support for configuration (if no udev)
%bcond_without udev # UDEV support for configuration
%bcond_without dri2 # DRI2 extension
+%bcond_without dri3 # DRI3 extension
%bcond_without record # RECORD extension
%bcond_with xcsecurity # XC-SECURITY extension (deprecated)
%bcond_with xf86bigfont # XF86BigFont extension
#
# ABI versions, see hw/xfree86/common/xf86Module.h
%define xorg_xserver_server_ansic_abi 0.4
-%define xorg_xserver_server_extension_abi 9.0
+%define xorg_xserver_server_extension_abi 10.0
%define xorg_xserver_server_font_abi 0.6
-%define xorg_xserver_server_videodrv_abi 20.0
-%define xorg_xserver_server_xinput_abi 22.1
+%define xorg_xserver_server_videodrv_abi 23.0
+%define xorg_xserver_server_xinput_abi 24.1
%define pixman_ver 0.30.0
Summary: X.org server
Summary(pl.UTF-8): Serwer X.org
Name: xorg-xserver-server
-Version: 1.18.0
-Release: 2
+Version: 1.19.3
+Release: 1
License: MIT
Group: X11/Servers
Source0: http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-%{version}.tar.bz2
-# Source0-md5: 3c1c1057d3ad27380d8dd87ffcc182cd
+# Source0-md5: 015d2fc4b9f2bfe7a626edb63a62c65e
Source1: 10-quirks.conf
Source2: xserver.pamd
Source10: %{name}-Xvfb.init
Source11: %{name}-Xvfb.sysconfig
Source12: xvfb-run.sh
Patch1: %{name}-xwrapper-pam.patch
-Patch2: dtrace-link.patch
Patch4: %{name}-builtin-SHA1.patch
Patch6: 110_nvidia_slowdow_fix.patch
-Patch7: %{name}-include-defs.patch
URL: http://xorg.freedesktop.org/
BuildRequires: Mesa-libGL-devel >= 7.8.1
%{?with_dri2:BuildRequires: Mesa-libGL-devel >= 9.2.0}
BuildRequires: pixman-devel >= %{pixman_ver}
BuildRequires: pkgconfig >= 1:0.19
%{?with_systemtap:BuildRequires: systemtap-sdt-devel}
-BuildRequires: systemd-devel
+BuildRequires: systemd-devel >= 209
BuildRequires: udev-devel >= 1:143
# wayland-client
%{?with_wayland:BuildRequires: wayland-devel >= 1.3.0}
+%{?with_wayland:BuildRequires: wayland-protocols >= 1.1}
BuildRequires: xcb-util-devel
BuildRequires: xcb-util-image-devel
BuildRequires: xcb-util-keysyms-devel
BuildRequires: xorg-lib-libXdmcp-devel
BuildRequires: xorg-lib-libXext-devel >= 1.0.99.4
BuildRequires: xorg-lib-libXfixes-devel
-BuildRequires: xorg-lib-libXfont-devel >= 1.4.2
+BuildRequires: xorg-lib-libXfont2-devel >= 2.0.0
BuildRequires: xorg-lib-libXi-devel >= 1.2.99.1
%{?with_dmx:BuildRequires: xorg-lib-libXmu-devel}
%{?with_dmx:BuildRequires: xorg-lib-libXpm-devel}
BuildRequires: xorg-proto-xf86miscproto-devel
BuildRequires: xorg-proto-xf86vidmodeproto-devel >= 2.2.99.1
BuildRequires: xorg-proto-xineramaproto-devel
-BuildRequires: xorg-proto-xproto-devel >= 7.0.28
+BuildRequires: xorg-proto-xproto-devel >= 7.0.31
BuildRequires: xorg-sgml-doctools >= 1.8
BuildRequires: xorg-util-util-macros >= 1.14
#BR: tslib (for KDRIVE only)
# for rgb.txt
Requires: xorg-app-rgb >= 0.99.3
Requires: xorg-app-xkbcomp
-Requires: xorg-lib-libXfont >= 1.4.2
+Requires: xorg-lib-libXfont2 >= 2.0.0
Requires: xorg-lib-libpciaccess >= 0.12.901
Requires: xorg-lib-libxshmfence >= 1.1
Suggests: dbus-x11 >= 1.0
Suggests: udev-acl >= 1:143
%{?with_udev:Suggests: udev-core >= 1:143}
Suggests: xkeyboard-config
-Suggests: xorg-driver-input-evdev
+Suggests: xorg-driver-input-libinput
# Usual desktop setups need least one video driver to run, see xorg.log which one exactly
Suggests: xorg-driver-video
+Provides: xorg-driver-video-modesetting
Provides: xorg-xserver-libdri = %{version}-%{release}
Provides: xorg-xserver-module(dri)
Provides: xorg-xserver-server(ansic-abi) = %{xorg_xserver_server_ansic_abi}
Obsoletes: xorg-driver-video-modesetting
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-# avoid self-dependencies on included modules
-%define _noautoreq libscanpci.so libxf1bpp.so
-
%description
Xorg server is a generally used X server which uses display hardware.
It requires proper driver for your display hardware.
Requires: pixman >= %{pixman_ver}
Requires: xorg-lib-libX11 >= 1.6
Requires: xorg-lib-libXext >= 1.0.99.4
-Requires: xorg-lib-libXfont >= 1.4.2
+Requires: xorg-lib-libXfont2 >= 2.0.0
Requires: xorg-lib-libXi >= 1.2.99.1
Requires: xorg-lib-libdmx >= 1.0.99.1
Group: X11/Servers
Requires: pixman >= %{pixman_ver}
Requires: xorg-lib-libXext >= 1.0.99.4
-Requires: xorg-lib-libXfont >= 1.4.2
+Requires: xorg-lib-libXfont2 >= 2.0.0
Obsoletes: X11-Xnest < 1:7.0.0
Obsoletes: XFree86-Xnest < 1:7.0.0
Obsoletes: Xserver-Xnest
Requires: Mesa-libGL >= 7.1.0
Requires: libxcb >= 1.6
Requires: pixman >= %{pixman_ver}
-Requires: xorg-lib-libXfont >= 1.4.2
+Requires: xorg-lib-libXfont2 >= 2.0.0
%description -n xorg-xserver-Xephyr
Xephyr is a kdrive server that outputs to a window on a pre-existing
Summary(pl.UTF-8): Xfbdev - serwer X dla framebuffera
Group: X11/Servers
Requires: pixman >= %{pixman_ver}
-Requires: xorg-lib-libXfont >= 1.4.2
+Requires: xorg-lib-libXfont2 >= 2.0.0
%description -n xorg-xserver-Xfbdev
Xfbdev is a Linux framebuffer device X server based on the kdrive X
Requires: xkeyboard-config
Requires: xorg-app-xauth
Requires: xorg-app-xkbcomp
-Requires: xorg-lib-libXfont >= 1.4.2
+Requires: xorg-lib-libXfont2 >= 2.0.0
Obsoletes: X11-Xvfb < 1:7.0.0
Obsoletes: XFree86-Xvfb < 1:7.0.0
Requires: pixman >= %{pixman_ver}
Requires: xorg-lib-libX11 >= 1.6
Requires: xorg-lib-libXext >= 1.0.99.4
-Requires: xorg-lib-libXfont >= 1.4.2
+Requires: xorg-lib-libXfont2 >= 2.0.0
Requires: xorg-lib-libXi >= 1.2.99.1
%description -n xorg-xserver-Xwayland
Requires: Mesa-libGL-devel >= 7.8.0
Requires: libdrm-devel >= 2.4.46
Requires: pixman-devel >= %{pixman_ver}
-Requires: xorg-lib-libXfont-devel
+Requires: xorg-lib-libXfont2-devel >= 2.0.0
Requires: xorg-lib-libpciaccess-devel >= 0.12.901
Requires: xorg-lib-libxkbfile-devel
%{?with_dri2:Requires: xorg-proto-dri2proto-devel >= 2.8}
+%{?with_dri3:Requires: xorg-proto-dri3proto-devel >= 1.0}
Requires: xorg-proto-dri3proto-devel >= 1.0
Requires: xorg-proto-fontsproto-devel >= 2.1.3
Requires: xorg-proto-glproto-devel >= 1.4.17
Requires: xorg-proto-xextproto-devel >= 1:7.3.0
Requires: xorg-proto-xf86driproto-devel >= 2.1.0
Requires: xorg-proto-xineramaproto-devel
-Requires: xorg-proto-xproto-devel >= 7.0.28
+Requires: xorg-proto-xproto-devel >= 7.0.31
Obsoletes: X11-Xserver-devel < 1:7.0.0
Obsoletes: XFree86-Xserver-devel < 1:7.0.0
%{?with_glamor:Obsoletes: glamor-devel}
%prep
%setup -q -n xorg-server-%{version}
%patch1 -p1
-%patch2 -p1
%patch4 -p1
%patch6 -p1
-%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
--enable-dga \
%{?with_dmx:--enable-dmx} \
--enable-dri2%{!?with_dri2:=no} \
+ --enable-dri3%{!?with_dri3:=no} \
%{?with_glamor:--enable-glamor} \
--enable-kdrive \
%{?with_libunwind:--enable-libunwind} \
projects / packages / xorg-xserver-server.git / blobdiff