rpm/xorg-x11-server
SHA256
1
0
Fork 0
forked from pool/xorg-x11-server
Code Pull Requests Activity

Accepting request 318963 from home:eeich:branches:X11:XOrg

Browse Source 
- Improve conditional enablement of XWayland.

OBS-URL: https://build.opensuse.org/request/show/318963
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=581
This commit is contained in:
Egbert Eich 2015-07-27 14:24:15 +00:00 committed by Git OBS Bridge
parent 83f70c8a9a
commit a5baea265b
2 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
xorg-x11-server.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Jul 27 11:52:32 UTC 2015 - eich@suse.com
- Improve conditional enablement of XWayland.
-------------------------------------------------------------------
Fri Jul 17 13:01:12 UTC 2015 - tobias.johannes.klausmann@mni.thm.de

31
xorg-x11-server.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package xorg-x11-server
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -16,6 +16,14 @@
#
%ifarch s390 s390x
%define have_wayland 0
%else
%if 0%{?suse_version} >= 1320
%define have_wayland 1
%endif
%endif
Name: xorg-x11-server
%define dirsuffix 1.17.2
@ -49,6 +57,9 @@ BuildRequires: pkgconfig(dri) >= 7.8.0
BuildRequires: pkgconfig(dri2proto)
BuildRequires: pkgconfig(dri3proto)
BuildRequires: pkgconfig(epoxy) >= 1.1
%if 0%{?have_wayland} == 1
BuildRequires: pkgconfig(wayland-client)
%endif
BuildRequires: pkgconfig(fixesproto) >= 4.1
BuildRequires: pkgconfig(fontconfig)
BuildRequires: pkgconfig(fontenc)
@ -298,19 +309,18 @@ autoreconf -fi
--disable-linux-acpi \
--disable-linux-apm \
%ifarch s390 s390x
--disable-xwayland \
--disable-xorg \
--disable-aiglx \
%else
%if 0%{?suse_version} > 1310
--enable-xwayland \
%else
--disable-xwayland \
%endif
--enable-xorg \
%if 0%{?suse_version} > 1120
--enable-config-udev \
%endif
%endif
%if 0%{?have_wayland} == 1
--enable-xwayland \
%else
--disable-xwayland \
%endif
--with-log-dir="/var/log" \
--with-os-name="openSUSE" \
@ -448,10 +458,6 @@ fi
%{_bindir}/Xorg
%{_bindir}/X
%if 0%{?suse_version} > 1310
%{_bindir}/Xwayland
%endif
%{_bindir}/cvt
%{_bindir}/gtf
%{_libdir}/xorg/modules/
@ -463,6 +469,9 @@ fi
%ghost %{_sysconfdir}/alternatives/libglx.so
%endif
%endif
%if 0%{?have_wayland} == 1
%{_bindir}/Xwayland
%endif
%{_bindir}/Xvfb
%{_bindir}/xorg-backtrace