From e0047ab4248c3df0737f694ed75e1311603fd4fef286a80d48cb823a0fa0b34e Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Fri, 26 Feb 2021 10:10:59 +0000 Subject: [PATCH] Accepting request 873819 from home:tobijk:X11:XOrg With the stop of the general xserver development and no release on sight, we should provide Xwayland on its own, to at least allow wayland users to profit from the ongoing development in this particular area. So here is a first iteration of a stand-alone xwayland package. See the below link for the release notes: https://lists.x.org/archives/xorg-announce/2021-February/003071.html OBS-URL: https://build.opensuse.org/request/show/873819 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xwayland?expand=0&rev=1 --- .gitattributes | 23 +++ .gitignore | 1 + xwayland-21.0.99.901.tar.xz | 3 + xwayland.changes | 4 + xwayland.spec | 282 ++++++++++++++++++++++++++++++++++++ 5 files changed, 313 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 xwayland-21.0.99.901.tar.xz create mode 100644 xwayland.changes create mode 100644 xwayland.spec diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/xwayland-21.0.99.901.tar.xz b/xwayland-21.0.99.901.tar.xz new file mode 100644 index 0000000..2476cfa --- /dev/null +++ b/xwayland-21.0.99.901.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bed61b4f2cf780bff3ce2abc218bbcba9d4eadb7c5ff372403a27a0a6915ef0b +size 1257308 diff --git a/xwayland.changes b/xwayland.changes new file mode 100644 index 0000000..ce7077f --- /dev/null +++ b/xwayland.changes @@ -0,0 +1,4 @@ +------------------------------------------------------------------- +Fri Feb 19 13:22:04 UTC 2021 - Tobias Klausmann + +- Initial stand-alone Xwayland package version 21.0.99.901 diff --git a/xwayland.spec b/xwayland.spec new file mode 100644 index 0000000..4e16f2c --- /dev/null +++ b/xwayland.spec @@ -0,0 +1,282 @@ +# +# spec file for package xwayland +# +# Copyright (c) 2021 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +%define have_wayland_eglstream 0 + +#Compat macro for new _fillupdir macro introduced in Nov 2017 +%if ! %{defined _fillupdir} + %define _fillupdir /var/adm/fillup-templates +%endif + +Name: xwayland +Version: 21.0.99.901 +Release: 0 +URL: http://xorg.freedesktop.org/ +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Summary: X +# Source URL: https://xorg.freedesktop.org/archive/individual/xserver/ +License: MIT +Group: System/X11/Servers/XF86_4 +Source0: %{name}-%{version}.tar.xz + +BuildRequires: meson +BuildRequires: ninja +#BuildRequires: bison +#BuildRequires: flex +#BuildRequires: libtool +BuildRequires: pkgconfig +#BuildRequires: systemd-rpm-macros +BuildRequires: rendercheck +BuildRequires: pkgconfig(libtirpc) +BuildRequires: pkgconfig(bigreqsproto) +BuildRequires: pkgconfig(compositeproto) +BuildRequires: pkgconfig(damageproto) +#BuildRequires: pkgconfig(dbus-1) +#BuildRequires: pkgconfig(dmx) +BuildRequires: pkgconfig(dri) +#BuildRequires: pkgconfig(dri2proto) +BuildRequires: pkgconfig(dri3proto) +#BuildRequires: pkgconfig(egl) +BuildRequires: pkgconfig(epoxy) + +BuildRequires: pkgconfig(wayland-client) +BuildRequires: pkgconfig(wayland-protocols) +%if 0%{?have_wayland_eglstream} == 1 +BuildRequires: pkgconfig(wayland-eglstream-protocols) +%endif +BuildRequires: pkgconfig(fixesproto) +#BuildRequires: pkgconfig(fontconfig) +#BuildRequires: pkgconfig(fontenc) +BuildRequires: pkgconfig(fontsproto) +BuildRequires: pkgconfig(fontutil) +#BuildRequires: pkgconfig(freetype2) +BuildRequires: pkgconfig(gbm) +#BuildRequires: pkgconfig(gl) +#BuildRequires: pkgconfig(glproto) +#BuildRequires: pkgconfig(ice) +BuildRequires: pkgconfig(inputproto) +BuildRequires: pkgconfig(kbproto) +BuildRequires: pkgconfig(libbsd) +BuildRequires: pkgconfig(libdrm) +#BuildRequires: pkgconfig(libsystemd) +BuildRequires: pkgconfig(openssl) +#BuildRequires: pkgconfig(pciaccess) +BuildRequires: pkgconfig(pixman-1) +BuildRequires: pkgconfig(presentproto) +BuildRequires: pkgconfig(randrproto) +BuildRequires: pkgconfig(recordproto) +BuildRequires: pkgconfig(renderproto) +BuildRequires: pkgconfig(resourceproto) +BuildRequires: pkgconfig(scrnsaverproto) +#BuildRequires: pkgconfig(sm) +BuildRequires: pkgconfig(videoproto) +#BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xau) +BuildRequires: pkgconfig(xcb) +BuildRequires: pkgconfig(xcb-damage) +BuildRequires: pkgconfig(xcb-sync) +BuildRequires: pkgconfig(xcb-xinput) +#BuildRequires: pkgconfig(xaw7) +#BuildRequires: pkgconfig(xcb-aux) +#BuildRequires: pkgconfig(xcb-icccm) +#BuildRequires: pkgconfig(xcb-image) +#BuildRequires: pkgconfig(xcb-keysyms) +#BuildRequires: pkgconfig(xcb-renderutil) +BuildRequires: pkgconfig(xcmiscproto) +BuildRequires: pkgconfig(xdmcp) +#BuildRequires: pkgconfig(xext) +BuildRequires: pkgconfig(xextproto) +BuildRequires: pkgconfig(xf86bigfontproto) +#BuildRequires: pkgconfig(xf86dgaproto) +#BuildRequires: pkgconfig(xf86driproto) +BuildRequires: pkgconfig(xf86vidmodeproto) +#BuildRequires: pkgconfig(xfixes) +BuildRequires: pkgconfig(xfont2) +#BuildRequires: pkgconfig(xi) +BuildRequires: pkgconfig(xineramaproto) +BuildRequires: pkgconfig(xkbcomp) +BuildRequires: pkgconfig(xkbfile) +#BuildRequires: pkgconfig(xmu) +#BuildRequires: pkgconfig(xorg-macros) +#BuildRequires: pkgconfig(xp) +#BuildRequires: pkgconfig(xpm) +#BuildRequires: pkgconfig(xprintutil) +BuildRequires: pkgconfig(xproto) +#BuildRequires: pkgconfig(xrender) +#BuildRequires: pkgconfig(xres) +BuildRequires: pkgconfig(xshmfence) +#BuildRequires: pkgconfig(xt) +BuildRequires: pkgconfig(xtrans) +#BuildRequires: pkgconfig(xtst) +#BuildRequires: pkgconfig(xv) + +#BuildRequires: pkgconfig(libudev) + + +%ifnarch s390 s390x +Requires(pre): %fillup_prereq +%endif +Requires: pkgconfig +Requires: xkbcomp +#Recommends: xorg-x11-fonts-core +%ifnarch s390 s390x +Requires: libpixman-1-0 +%(cat %{SOURCE91}) +%endif +#Requires: Mesa +%if 0%{?suse_version} >= 1315 +Requires(post): update-alternatives +Requires(postun): update-alternatives +%endif +# ? +#Requires: xf86-video-modesetting = %{version} +#Requires: xkeyboard-config +Obsoletes: xorg-x11-server-wayland < %{version} +Provides: xorg-x11-server-wayland = %{version} + + +%description +This package contains the Xwayland Server. + +%package %{name} +Summary: Xwayland Xserver +Group: System/X11/Servers/XF86_4 +Requires: xkbcomp +Requires: xkeyboard-config +Recommends: xorg-x11-fonts-core + +%description %{name} +This package contains the Xserver running on the Wayland Display Server. + +%package devel +Summary: X +Group: System/Libraries +Requires: meson +Requires: c_compiler +Requires: %{name} +#Requires: pkgconfig(fontconfig) +#Requires: pkgconfig(fontenc) +#Requires: pkgconfig(freetype2) +#Requires: pkgconfig(ice) +Requires: pkgconfig(libdrm) +#Requires: pkgconfig(libevdev) +#Requires: pkgconfig(libudev) +#Requires: pkgconfig(mtdev) +#Requires: pkgconfig(sm) +#Requires: pkgconfig(x11) +Requires: pkgconfig(xau) +Requires: pkgconfig(xdmcp) +#Requires: pkgconfig(xext) +#Requires: pkgconfig(xfixes) +Requires: pkgconfig(xkbfile) +#Requires: pkgconfig(xmu) +#Requires: pkgconfig(xorg-macros) +#Requires: pkgconfig(xp) +#Requires: pkgconfig(xpm) +#Requires: pkgconfig(xprintutil) +#Requires: pkgconfig(xrender) +#Requires: pkgconfig(xt) +Requires: pkgconfig(xtrans) +Requires: pkgconfig(xv) + + +%description devel +This package contains the Xwayland Server development files. + +%prep +%setup -q -n %{name}-%{version} + +%build +%define _lto_cflags %{nil} + +#option('builder_addr', type: 'string', description: 'Builder address', value: 'xorg@lists.freedesktop.org') +#option('builder_string', type: 'string', description: 'Additional builder string') + +#option('xkb_default_rules', type: 'string', value: 'evdev') +#option('xkb_default_model', type: 'string', value: 'pc105') +#option('xkb_default_layout', type: 'string', value: 'us') +#option('xkb_default_variant', type: 'string') +#option('xkb_default_options', type: 'string') + +%{meson} \ + -Dglamor=true \ +%if 0%{?have_wayland_eglstream} == 1 + -Dxwayland_eglstream=true \ +%endif + -Dxvfb=true \ + -Dglx=true \ + -Dxdmcp=true \ + -Dxdm-auth-1=true \ + -Dsecure-rpc=true \ + -Dipv6=true \ + -Dinput_thread=true \ + -Dvendor_name="openSUSE Linux" \ + -Dvendor_name_short="openSUSE" \ + -Dvendor_web="https://www.opensuse.org" \ + -Dlisten_tcp=false \ + -Dlisten_unix=true \ + -Dlisten_local=true \ + -Ddpms=true \ + -Dxf86bigfont=true \ + -Dscreensaver=true \ + -Dxres=true \ + -Dxace=true \ + -Dxselinux=false \ + -Dxinerama=true \ + -Dxcsecurity=true \ + -Dxv=true \ + -Dmitshm=true \ + -Dsha1=libcrypto \ + -Ddri3=true \ + -Dxwayland-path="%{_bindir}" \ + -Ddtrace=false \ + -Dlibunwind=false \ + -Dxkb_dir="/usr/share/X11/xkb" \ + -Dxkb_output_dir="/var/lib/xkb/compiled" \ + -Ddefault_font_path="/usr/share/fonts/misc:unscaled,\ +/usr/share/fonts/Type1/,/usr/share/fonts/100dpi:unscaled,\ +/usr/share/fonts/75dpi:unscaled,/usr/share/fonts/ghostscript/,\ +/usr/share/fonts/cyrillic:unscaled,\ +/usr/share/fonts/misc/sgi:unscaled,\ +/usr/share/fonts/truetype/,built-ins" \ + %{nil} + +%{meson_build} + +%install +%{meson_install} +# Let xorg-x11-server provide the Xserver manual +rm -f %{buildroot}%{_mandir}/man1/Xserver.1 + +%post + +%postun + +%files +%{_bindir}/Xwayland + +%files devel +%defattr(-,root,root) +%ifnarch s390 s390x +%{_libdir}/pkgconfig/*.pc +%endif +%dir %{_libdir}/xorg +%{_libdir}/xorg/protocol.txt +%{_mandir}/man1/Xwayland.1.gz + +%changelog