X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=xorg-xserver-server.spec;h=253dfa849c0c8769d3732996b2f76a2ce4f42a08;hb=e2712cc3e55158b1d70eefc3163ebe1801ba63b2;hp=2f18962a831d8821dae0b3b3883fd1c8380efb87;hpb=bfa9777f1568f844e3ec337610d8e25c4fa3ecfa;p=packages%2Fxorg-xserver-server.git diff --git a/xorg-xserver-server.spec b/xorg-xserver-server.spec index 2f18962..253dfa8 100644 --- a/xorg-xserver-server.spec +++ b/xorg-xserver-server.spec @@ -14,6 +14,7 @@ %bcond_with xselinux # SELinux extension %bcond_without dmx # DMX DDX (Xdmx server) %bcond_without wayland # Wayland DDX (Xwayland server) +%bcond_with eglstream # XWayland eglstream support %bcond_without glamor # glamor dix module %bcond_without systemtap # systemtap/dtrace probes %bcond_without libunwind # use libunwind for backtracing @@ -21,8 +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_font_abi 0.6 -%define xorg_xserver_server_videodrv_abi 23.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.19.5 -Release: 1 +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: 4ac6feeae6790436ce9de879ca9a3bf8 +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,10 +50,10 @@ 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 >= 10.2.0} +%{?with_glamor:BuildRequires: Mesa-libgbm-devel >= 17.1.0} # for glx headers BuildRequires: OpenGL-GLX-devel %{?with_xselinux:BuildRequires: audit-libs-devel} @@ -65,25 +65,26 @@ BuildRequires: docbook-dtd43-xml %if %{with hal} || %{with dbus} BuildRequires: dbus-devel >= 1.0 %endif +%{?with_eglstream:BuildRequires: egl-wayland-devel >= 1.0.2} %{?with_hal:BuildRequires: hal-devel} -BuildRequires: libdrm-devel >= 2.4.46 -%if %{with glamor} || %{with wayland} -BuildRequires: libepoxy-devel +BuildRequires: libdrm-devel >= 2.4.89 +%if %{with glamor} +BuildRequires: libepoxy-devel >= 1.5.4 %endif %{?with_xselinux:BuildRequires: libselinux-devel >= 2.0.86} BuildRequires: libtool >= 2:2.2 %{?with_libunwind:BuildRequires: libunwind-devel} -BuildRequires: libxcb-devel >= 1.6 +BuildRequires: libxcb-devel >= 1.9.3 BuildRequires: pam-devel BuildRequires: perl-base BuildRequires: pixman-devel >= %{pixman_ver} BuildRequires: pkgconfig >= 1:0.19 %{?with_systemtap:BuildRequires: systemtap-sdt-devel} -BuildRequires: systemd-devel >= 209 +BuildRequires: systemd-devel >= 1:209 BuildRequires: udev-devel >= 1:143 # wayland-client %{?with_wayland:BuildRequires: wayland-devel >= 1.3.0} -%{?with_wayland:BuildRequires: wayland-protocols >= 1.1} +%{?with_wayland:BuildRequires: wayland-protocols >= 1.10} BuildRequires: xcb-util-devel BuildRequires: xcb-util-image-devel BuildRequires: xcb-util-keysyms-devel @@ -122,16 +123,16 @@ 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.8} -BuildRequires: xorg-proto-dri3proto-devel >= 1.0 +BuildRequires: xorg-proto-dri3proto-devel >= 1.2 BuildRequires: xorg-proto-fixesproto-devel >= 5.0 BuildRequires: xorg-proto-fontcacheproto-devel BuildRequires: xorg-proto-fontsproto-devel >= 2.1.3 BuildRequires: xorg-proto-glproto-devel >= 1.4.17 BuildRequires: xorg-proto-inputproto-devel >= 2.3 BuildRequires: xorg-proto-kbproto-devel >= 1.0.3 -BuildRequires: xorg-proto-presentproto-devel >= 1.0 +BuildRequires: xorg-proto-presentproto-devel >= 1.1 BuildRequires: xorg-proto-printproto-devel -BuildRequires: xorg-proto-randrproto-devel >= 1.5.0 +BuildRequires: xorg-proto-randrproto-devel >= 1.6.0 %{?with_record:BuildRequires: xorg-proto-recordproto-devel >= 1.13.99.1} BuildRequires: xorg-proto-renderproto-devel >= 0.11 BuildRequires: xorg-proto-resourceproto-devel >= 1.2.0 @@ -150,8 +151,9 @@ BuildRequires: xorg-sgml-doctools >= 1.8 BuildRequires: xorg-util-util-macros >= 1.14 #BR: tslib (for KDRIVE only) Requires(triggerpostun): sed >= 4.0 -%{?with_glamor:Requires: Mesa-libgbm >= 10.2.0} -Requires: libdrm >= 2.4.46 +%{?with_glamor:Requires: Mesa-libgbm >= 17.1.0} +Requires: libdrm >= 2.4.89 +%{?with_glamor:Requires: libepoxy >= 1.5.4} Requires: pixman >= %{pixman_ver} Requires: udev-libs >= 1:143 Requires: xkeyboard-config @@ -174,7 +176,6 @@ Provides: xorg-xserver-libdri = %{version}-%{release} Provides: xorg-xserver-module(dri) Provides: xorg-xserver-server(ansic-abi) = %{xorg_xserver_server_ansic_abi} Provides: xorg-xserver-server(extension-abi) = %{xorg_xserver_server_extension_abi} -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} Obsoletes: X11-Xserver < 1:7.0.0 @@ -255,7 +256,8 @@ 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: libxcb >= 1.6 +%{?with_glamor:Requires: libepoxy >= 1.5.4} +Requires: libxcb >= 1.9.3 Requires: pixman >= %{pixman_ver} Requires: xorg-lib-libXfont2 >= 2.0.0 @@ -276,20 +278,6 @@ Xephyr jest serwerem opartym na kdrive wyświetlającym w oknie na istniejącym ekranie X. Można o nim myśleć jako o Xnest ze wsparciem do wspólczesnych rozszerzeń jak composite, damage i randr. -%package -n xorg-xserver-Xfbdev -Summary: Xfbdev - Linux framebuffer device X server -Summary(pl.UTF-8): Xfbdev - serwer X dla framebuffera -Group: X11/Servers -Requires: pixman >= %{pixman_ver} -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 -server. - -%description -n xorg-xserver-Xfbdev -l pl.UTF-8 -Xfbdev jest serwerem X dla framebuffera opartym na kdrive. - %package -n xorg-xserver-Xvfb Summary: Xvfb - virtual framebuffer X server Summary(pl.UTF-8): Xvfb - serwer X z wirtualnym framebufferem @@ -347,6 +335,8 @@ usługę systemową. 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} +%{?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 @@ -364,7 +354,7 @@ Summary: Header files for X.org server Summary(pl.UTF-8): Pliki nagłówkowe dla serwera X.org Group: X11/Development/Libraries Requires: Mesa-libGL-devel >= 7.8.0 -Requires: libdrm-devel >= 2.4.46 +Requires: libdrm-devel >= 2.4.89 Requires: pixman-devel >= %{pixman_ver} Requires: xorg-lib-libXfont2-devel >= 2.0.0 Requires: xorg-lib-libpciaccess-devel >= 0.12.901 @@ -376,8 +366,8 @@ Requires: xorg-proto-fontsproto-devel >= 2.1.3 Requires: xorg-proto-glproto-devel >= 1.4.17 Requires: xorg-proto-inputproto-devel >= 2.3 Requires: xorg-proto-kbproto-devel >= 1.0.3 -Requires: xorg-proto-presentproto-devel >= 1.0 -Requires: xorg-proto-randrproto-devel >= 1.5.0 +Requires: xorg-proto-presentproto-devel >= 1.1 +Requires: xorg-proto-randrproto-devel >= 1.6.0 Requires: xorg-proto-renderproto-devel >= 0.11 Requires: xorg-proto-resourceproto-devel >= 1.2.0 Requires: xorg-proto-scrnsaverproto-devel >= 1.1 @@ -440,31 +430,28 @@ sed -i -e 's#