|
 |
4c4b8b |
%global commit 280aac5a0ee09c45b17ec4be0681397f7c34c12e
|
|
|
4c4b8b |
%global shortcommit %(c=%{commit}; echo ${c:0:7})
|
|
|
4c4b8b |
|
|
|
4c4b8b |
#global gitdate 20210201
|
|
|
4c4b8b |
%global pkgname %{?gitdate:xserver}%{!?gitdate:xwayland}
|
|
|
4c4b8b |
|
|
|
4c4b8b |
%global default_font_path "catalogue:/etc/X11/fontpath.d,built-ins"
|
|
|
4c4b8b |
|
|
|
4c4b8b |
Summary: Xwayland
|
|
|
4c4b8b |
Name: xorg-x11-server-Xwayland
|
|
|
4c4b8b |
Version: 21.1.1
|
|
|
4c4b8b |
Release: 6%{?gitdate:.%{gitdate}git%{shortcommit}}%{?dist}
|
|
|
4c4b8b |
|
|
|
4c4b8b |
URL: http://www.x.org
|
|
|
4c4b8b |
%if 0%{?gitdate}
|
|
|
4c4b8b |
Source0: https://gitlab.freedesktop.org/xorg/%{pkgname}/-/archive/%{commit}/%{pkgname}-%{shortcommit}.tar.gz
|
|
|
4c4b8b |
%else
|
|
|
4c4b8b |
Source0: https://www.x.org/pub/individual/xserver/%{pkgname}-%{version}.tar.xz
|
|
|
4c4b8b |
%endif
|
|
|
4c4b8b |
|
|
|
4c4b8b |
Patch1: 0001-xwayland-Move-dmabuf-interface-to-common-glamor-code.patch
|
|
|
4c4b8b |
Patch2: 0002-xwayland-move-formats-and-modifiers-functions-to-com.patch
|
|
|
4c4b8b |
Patch3: 0003-xwayland-Add-check_flip-glamor-backend-function.patch
|
|
|
4c4b8b |
Patch4: 0004-xwayland-implement-pixmap_from_buffers-for-the-eglst.patch
|
|
|
4c4b8b |
Patch5: 0005-xwayland-eglstream-fix-X11-rendering-to-flipping-GL-.patch
|
|
|
4c4b8b |
Patch6: 0006-xwayland-eglstream-Check-buffer-creation.patch
|
|
|
4c4b8b |
Patch7: 0007-xwayland-Check-buffer-prior-to-attaching-it.patch
|
|
|
4c4b8b |
Patch8: 0008-glamor-Dump-backtrace-on-GL-error.patch
|
|
|
4c4b8b |
Patch9: 0009-xwayland-glamor-Add-return-status-to-post_damage.patch
|
|
|
4c4b8b |
Patch10: 0010-xwayland-eglstream-Check-framebuffer-status.patch
|
|
|
4c4b8b |
Patch11: 0011-xwayland-eglstream-Small-refactoring.patch
|
|
|
4c4b8b |
Patch12: 0012-xwayland-eglstream-Add-more-error-checking.patch
|
|
|
4c4b8b |
Patch13: 0013-xwayland-eglstream-Dissociate-pending-stream-from-wi.patch
|
|
|
4c4b8b |
Patch14: 0014-xwayland-eglstream-Keep-a-reference-to-the-pixmap.patch
|
|
|
4c4b8b |
Patch15: 0015-xwayland-eglstream-Drop-the-list-of-pending-streams.patch
|
|
|
4c4b8b |
Patch16: 0016-xwayland-eglstream-Do-not-commit-without-surface.patch
|
|
|
4c4b8b |
Patch17: 0017-xwayland-eglstream-Fix-calloc-malloc.patch
|
|
|
4c4b8b |
Patch18: 0018-xwayland-eglstream-Check-eglSwapBuffers.patch
|
|
|
4c4b8b |
Patch19: 0019-xwayland-eglstream-Do-not-always-increment-pixmap-re.patch
|
|
|
4c4b8b |
Patch20: 0020-xwayland-eglstream-Set-ALU-to-GXCopy-for-blitting.patch
|
|
|
4c4b8b |
Patch21: 0021-xwayland-eglstream-allow-commits-to-dma-buf-backed-p.patch
|
|
|
4c4b8b |
Patch22: 0022-xwayland-eglstream-flush-stream-after-eglSwapBuffers.patch
|
|
|
4c4b8b |
Patch23: 0023-xwayland-Add-preferred-GLVND-vendor-to-xwl_screen.patch
|
|
|
4c4b8b |
Patch24: 0024-xwayland-eglstream-Use-nvidia-for-GLVND.patch
|
|
|
4c4b8b |
Patch25: 0025-xwayland-eglstream-Log-when-GL_OES_EGL_image-is-miss.patch
|
|
|
4c4b8b |
Patch26: 0026-glx-don-t-create-implicit-GLXWindow-if-one-already-e.patch
|
|
|
4c4b8b |
Patch27: 0027-glx-Set-ContextTag-for-all-contexts.patch
|
|
|
4c4b8b |
# https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/704
|
|
|
4c4b8b |
Patch28: 0001-xwayland-eglstream-Keep-pending-stream-if-the-pixmap.patch
|
|
|
4c4b8b |
Patch29: 0002-xwayland-eglstream-Remove-stream-validity.patch
|
|
|
4c4b8b |
|
|
|
4c4b8b |
License: MIT
|
|
|
4c4b8b |
|
|
|
4c4b8b |
Requires: xorg-x11-server-common
|
|
|
4c4b8b |
Requires: libEGL
|
|
|
4c4b8b |
Requires: libepoxy >= 1.5.5
|
|
|
4c4b8b |
|
|
|
4c4b8b |
BuildRequires: gcc
|
|
|
4c4b8b |
BuildRequires: git-core
|
|
|
4c4b8b |
BuildRequires: meson
|
|
|
4c4b8b |
|
|
|
4c4b8b |
BuildRequires: wayland-devel
|
|
|
4c4b8b |
BuildRequires: pkgconfig(wayland-client) >= 1.3.0
|
|
|
4c4b8b |
BuildRequires: pkgconfig(wayland-protocols)
|
|
|
4c4b8b |
BuildRequires: pkgconfig(wayland-eglstream-protocols)
|
|
|
4c4b8b |
|
|
|
4c4b8b |
BuildRequires: pkgconfig(dmx)
|
|
|
4c4b8b |
BuildRequires: pkgconfig(epoxy) >= 1.5.5
|
|
|
4c4b8b |
BuildRequires: pkgconfig(fontenc)
|
|
|
4c4b8b |
BuildRequires: pkgconfig(libdrm) >= 2.4.0
|
|
|
4c4b8b |
BuildRequires: pkgconfig(libssl)
|
|
|
4c4b8b |
BuildRequires: pkgconfig(libtirpc)
|
|
|
4c4b8b |
BuildRequires: pkgconfig(pixman-1)
|
|
|
4c4b8b |
BuildRequires: pkgconfig(x11)
|
|
|
4c4b8b |
BuildRequires: pkgconfig(xau)
|
|
|
4c4b8b |
BuildRequires: pkgconfig(xdmcp)
|
|
|
4c4b8b |
BuildRequires: pkgconfig(xext)
|
|
|
4c4b8b |
BuildRequires: pkgconfig(xfixes)
|
|
|
4c4b8b |
BuildRequires: pkgconfig(xfont2)
|
|
|
4c4b8b |
BuildRequires: pkgconfig(xi)
|
|
|
4c4b8b |
BuildRequires: pkgconfig(xinerama)
|
|
|
4c4b8b |
BuildRequires: pkgconfig(xkbfile)
|
|
|
4c4b8b |
BuildRequires: pkgconfig(xmu)
|
|
|
4c4b8b |
BuildRequires: pkgconfig(xorg-macros) >= 1.17
|
|
|
4c4b8b |
BuildRequires: pkgconfig(xpm)
|
|
|
4c4b8b |
BuildRequires: pkgconfig(xrender)
|
|
|
4c4b8b |
BuildRequires: pkgconfig(xres)
|
|
|
4c4b8b |
BuildRequires: pkgconfig(xshmfence) >= 1.1
|
|
|
4c4b8b |
BuildRequires: pkgconfig(xtrans) >= 1.3.2
|
|
|
4c4b8b |
BuildRequires: pkgconfig(xtst)
|
|
|
4c4b8b |
BuildRequires: pkgconfig(xv)
|
|
|
4c4b8b |
BuildRequires: xorg-x11-proto-devel >= 7.7-10
|
|
|
4c4b8b |
|
|
|
4c4b8b |
BuildRequires: mesa-libGL-devel >= 9.2
|
|
|
4c4b8b |
BuildRequires: mesa-libEGL-devel
|
|
|
4c4b8b |
BuildRequires: mesa-libgbm-devel
|
|
|
4c4b8b |
|
|
|
4c4b8b |
BuildRequires: audit-libs-devel
|
|
|
4c4b8b |
BuildRequires: libselinux-devel >= 2.0.86-1
|
|
|
4c4b8b |
|
|
|
4c4b8b |
# libunwind is Exclusive for the following arches
|
|
|
4c4b8b |
%ifarch aarch64 %{arm} hppa ia64 mips ppc ppc64 %{ix86} x86_64
|
|
|
4c4b8b |
%if !0%{?rhel}
|
|
|
4c4b8b |
BuildRequires: libunwind-devel
|
|
|
4c4b8b |
%endif
|
|
|
4c4b8b |
%endif
|
|
|
4c4b8b |
|
|
|
4c4b8b |
BuildRequires: pkgconfig(xcb-aux)
|
|
|
4c4b8b |
BuildRequires: pkgconfig(xcb-image)
|
|
|
4c4b8b |
BuildRequires: pkgconfig(xcb-icccm)
|
|
|
4c4b8b |
BuildRequires: pkgconfig(xcb-keysyms)
|
|
|
4c4b8b |
BuildRequires: pkgconfig(xcb-renderutil)
|
|
|
4c4b8b |
|
|
|
4c4b8b |
%description
|
|
|
4c4b8b |
Xwayland is an X server for running X clients under Wayland.
|
|
|
4c4b8b |
|
|
|
4c4b8b |
%package devel
|
|
|
4c4b8b |
Summary: Development package
|
|
|
4c4b8b |
Requires: pkgconfig
|
|
|
4c4b8b |
|
|
|
4c4b8b |
%description devel
|
|
|
4c4b8b |
The development package provides the developmental files which are
|
|
|
4c4b8b |
necessary for developing Wayland compositors using Xwayland.
|
|
|
4c4b8b |
|
|
|
4c4b8b |
%prep
|
|
|
4c4b8b |
%autosetup -S git_am -n %{pkgname}-%{?gitdate:%{commit}}%{!?gitdate:%{version}}
|
|
|
4c4b8b |
|
|
|
4c4b8b |
%build
|
|
|
4c4b8b |
%meson \
|
|
|
4c4b8b |
-Dxwayland_eglstream=true \
|
|
|
4c4b8b |
-Ddefault_font_path=%{default_font_path} \
|
|
|
4c4b8b |
-Dbuilder_string="Build ID: %{name} %{version}-%{release}" \
|
|
|
4c4b8b |
-Dxkb_output_dir=%{_localstatedir}/lib/xkb \
|
|
|
4c4b8b |
-Dxcsecurity=true \
|
|
|
4c4b8b |
-Dglamor=true \
|
|
|
4c4b8b |
-Ddri3=true
|
|
|
4c4b8b |
|
|
|
4c4b8b |
%meson_build
|
|
|
4c4b8b |
|
|
|
4c4b8b |
%install
|
|
|
4c4b8b |
%meson_install
|
|
|
4c4b8b |
|
|
|
4c4b8b |
# Remove unwanted files/dirs
|
|
|
4c4b8b |
rm $RPM_BUILD_ROOT%{_mandir}/man1/Xserver.1*
|
|
|
4c4b8b |
rm -Rf $RPM_BUILD_ROOT%{_libdir}/xorg
|
|
|
4c4b8b |
rm -Rf $RPM_BUILD_ROOT%{_includedir}/xorg
|
|
|
4c4b8b |
rm -Rf $RPM_BUILD_ROOT%{_datadir}/aclocal
|
|
|
4c4b8b |
rm -Rf $RPM_BUILD_ROOT%{_localstatedir}/lib/xkb
|
|
|
4c4b8b |
|
|
|
4c4b8b |
%files
|
|
|
4c4b8b |
%{_bindir}/Xwayland
|
|
|
4c4b8b |
%{_mandir}/man1/Xwayland.1*
|
|
|
4c4b8b |
|
|
|
4c4b8b |
%files devel
|
|
|
4c4b8b |
%{_libdir}/pkgconfig/xwayland.pc
|
|
|
4c4b8b |
|
|
|
4c4b8b |
%changelog
|
|
|
4c4b8b |
* Mon Aug 9 2021 Olivier Fourdan <ofourdan@redhat.com> - 21.1.1-6
|
|
|
4c4b8b |
- Backport the latest fixes from Xwayland for EGLstream (rhbz#1977741)
|
|
|
4c4b8b |
|
|
|
4c4b8b |
* Tue Jun 29 2021 Olivier Fourdan <ofourdan@redhat.com> - 21.1.1-5
|
|
|
4c4b8b |
- Require libepoxy >= 1.5.5 (rhbz#1976132)
|
|
|
4c4b8b |
|
|
|
4c4b8b |
* Mon Jun 21 2021 Olivier Fourdan <ofourdan@redhat.com> - 21.1.1-4
|
|
|
4c4b8b |
- Fix a use-after-free in the previous changes for GLX
|
|
|
4c4b8b |
|
|
|
4c4b8b |
* Mon Jun 14 2021 Olivier Fourdan <ofourdan@redhat.com> - 21.1.1-3
|
|
|
4c4b8b |
- Backport fixes for GLX and EGLstream (#1961981)
|
|
|
4c4b8b |
|
|
|
4c4b8b |
* Thu Jun 03 2021 Tomas Pelka <tpelka@redhat.com> - 21.1.1-2
|
|
|
4c4b8b |
- bump release and rebuild to correctly trigger gating
|
|
|
4c4b8b |
|
|
|
4c4b8b |
* Wed Apr 14 2021 Olivier Fourdan <ofourdan@redhat.com> - 21.1.1-1
|
|
|
4c4b8b |
- xwayland 21.1.1 (CVE-2021-3472 / ZDI-CAN-1259)
|
|
|
4c4b8b |
|
|
|
4c4b8b |
* Thu Mar 18 2021 Olivier Fourdan <ofourdan@redhat.com> - 21.1.0-1
|
|
|
4c4b8b |
- xwayland 21.1.0
|
|
|
4c4b8b |
|
|
|
4c4b8b |
* Thu Mar 4 2021 Olivier Fourdan <ofourdan@redhat.com> - 21.0.99.902-1
|
|
|
4c4b8b |
- xwayland 21.0.99.902
|
|
|
4c4b8b |
- Remove xdmcp, udev, udev_kms build options
|
|
|
4c4b8b |
- Stop overriding the vendor name, same as xorg-x11-server
|
|
|
4c4b8b |
|
|
|
4c4b8b |
* Thu Feb 18 2021 Olivier Fourdan <ofourdan@redhat.com> - 21.0.99.901-1
|
|
|
4c4b8b |
- xwayland 21.0.99.901
|
|
|
4c4b8b |
|
|
|
4c4b8b |
* Mon Feb 1 2021 Olivier Fourdan <ofourdan@redhat.com> - 1.20.99.1-0.1.20210201git5429791
|
|
|
4c4b8b |
- Initial import (#1912335).
|