Browse Source

updated 8 packages

egl-wayland-1.1.6-3

eglexternalplatform-1.1-1

libglvnd-1.3.2-1

mesa-21.0.1-1

shared-mime-info-2.1-1

wayland-protocols-1.20-4

wayland-1.19.0-1

xorg-x11-server-Xwayland-21.1.0-2
Tomohiro "Tomo-p" KATO 1 year ago
parent
commit
40d67bc3e7

+ 202 - 0
e/egl-wayland/egl-wayland-vl.spec

@@ -0,0 +1,202 @@
+%bcond_without  libglvnd
+
+Name:           egl-wayland
+Version:        1.1.6
+Release:        3%{?_dist_release}
+Summary:        Wayland EGL External Platform library
+Group:          system
+Distribution:   Vine Linux
+Vendor:         Project Vine
+
+License:        MIT
+URL:            https://github.com/NVIDIA/%{name}
+Source0:        %url/archive/%{version}/%{name}-%{version}.tar.gz
+Source1:        10_nvidia_wayland.json
+
+BuildRequires:  meson
+BuildRequires:  libtool
+BuildRequires:  eglexternalplatform-devel
+%if %{with libglvnd}
+BuildRequires:  libglvnd-devel
+%else
+BuildRequires:  mesa-libEGL-devel
+%endif
+BuildRequires:  wayland-devel
+
+%if %{with libglvnd}
+# Required for directory ownership
+Requires:       libglvnd-egl%{?_isa}
+%endif
+
+%description
+Wayland EGL External Platform library
+
+
+%package devel
+Summary:        Wayland EGL External Platform library development package
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+
+%description devel
+Wayland EGL External Platform library development package
+
+
+%debug_package
+
+
+%prep
+%autosetup -p1
+%if 0%{?rhel}
+sed -i -e 's@>= 0.50@>= 0.47@g'  meson.build
+%endif
+
+
+%build
+%meson
+%meson_build
+
+
+%install
+%meson_install
+%if %{with libglvnd}
+install -m 0755 -d %{buildroot}%{_datadir}/egl/egl_external_platform.d/
+install -pm 0644 %{SOURCE1} %{buildroot}%{_datadir}/egl/egl_external_platform.d/
+%endif
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
+
+
+%files
+%doc README.md
+%license COPYING
+%{_libdir}/*.so.*
+%if %{with libglvnd}
+%{_datadir}/egl/egl_external_platform.d/10_nvidia_wayland.json
+%endif
+
+%files devel
+%{_libdir}/libnvidia-egl-wayland.so
+%{_libdir}/pkgconfig/wayland-eglstream.pc
+%{_datadir}/pkgconfig/wayland-eglstream-protocols.pc
+%{_datadir}/wayland-eglstream/
+
+
+%changelog
+* Sat Mar 27 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.1.6-3
+- initial build for Vine Linux.
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Thu Jan  7 2021 Leigh Scott <leigh123linux@gmail.com> - 1.1.6-1
+- Update to 1.1.6
+
+* Fri Aug 14 2020 Leigh Scott <leigh123linux@gmail.com> - 1.1.5-3
+- Add upstream patch to address rhbz#1842473
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jun 01 2020 Leigh Scott <leigh123linux@gmail.com> - 1.1.5-1
+- Update to 1.1.5
+
+* Mon Mar 30 2020 leigh123linux <leigh123linux@googlemail.com> - 1.1.4-4
+- Use upstream commit to address missing mesa includes
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Mon Dec 16 2019 Leigh Scott <leigh123linux@gmail.com> - 1.1.4-2
+- Add patch to add missing mesa includes
+
+* Sun Sep 15 2019 Leigh Scott <leigh123linux@googlemail.com> - 1.1.4-1
+- Update to 1.1.4
+
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sun Jun 02 2019 Leigh Scott <leigh123linux@googlemail.com> - 1.1.3-1
+- Update to 1.1.3
+
+* Tue Apr 16 2019 Adam Williamson <awilliam@redhat.com> - 1.1.2-3
+- Rebuild with Meson fix for #1699099
+
+* Sat Mar 30 2019 Leigh Scott <leigh123linux@googlemail.com> - 1.1.2-2
+- Switch to upstream fix
+
+* Fri Feb 01 2019 Leigh Scott <leigh123linux@googlemail.com> - 1.1.2-1
+- Update to 1.1.2
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Dec 06 2018 Leigh Scott <leigh123linux@googlemail.com> - 1.1.1-3
+- Fix the same crappy warning f28 generates
+
+* Thu Dec 06 2018 Leigh Scott <leigh123linux@googlemail.com> - 1.1.1-2
+- Fix the crappy warning epel7 generates
+
+* Thu Dec 06 2018 Leigh Scott <leigh123linux@googlemail.com> - 1.1.1-1
+- Update to 1.1.1
+
+* Mon Nov 26 2018 Leigh Scott <leigh123linux@googlemail.com> - 1.1.0-0.2.20181015git0eb29d4
+- Update to latest git snapshot (rhbz#1653118)
+
+* Mon Aug 20 2018 Leigh Scott <leigh123linux@googlemail.com> - 1.1.0-0.1.20180916git1676d1d
+- Update to 1.1.0 snapshot
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-0.2.20180626git395ce9f
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Sat Jun 30 2018 Leigh Scott <leigh123linux@googlemail.com> - 1.0.5-0.1.20180626git395ce9f
+- Update to 1.0.5 snapshot
+
+* Sat Jun 16 2018 Leigh Scott <leigh123linux@googlemail.com> - 1.0.4-0.1.20180602git4ab0873
+- Update to 1.0.4 snapshot
+
+* Tue Feb 06 2018 Leigh Scott <leigh123linux@googlemail.com> - 1.0.3-2.20180201git6f5f7d0
+- Update to latest git snapshot
+- Switch to meson
+- Install .so file to -devel as it's listed in wayland-eglstream.pc
+- Fix directory ownership
+
+* Wed Jan 31 2018 Jonas Ådahl <jadahl@redhat.com> - 1.0.3-1.20180111gitb283689
+- Update to 1.0.3
+- Add -devel package
+
+* Thu Aug 03 2017 Leigh Scott <leigh123linux@googlemail.com> - 1.0.2-0.4.20170802git1f4b1fd
+- Update to latest git snapshot
+
+* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-0.3.20170628git818b613
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-0.2.20170628git818b613
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Wed Jun 28 2017 Leigh Scott <leigh123linux@googlemail.com> - 1.0.2-0.1.20170628git818b613
+- Update to 1.0.2 git
+
+* Wed Mar 08 2017 Leigh Scott <leigh123linux@googlemail.com> - 1.0.1-0.1.20170308git582fbf3
+- Update to 1.0.1 git
+
+* Tue Feb 07 2017 Leigh Scott <leigh123linux@googlemail.com> - 1.0.0-0.7.20170207git05eb000
+- Add license file
+
+* Thu Feb 02 2017 Leigh Scott <leigh123linux@googlemail.com> - 1.0.0-0.6.20170120git743d702
+- Add requires libglvnd-egl
+- Make review changes
+
+* Wed Feb 01 2017 Leigh Scott <leigh123linux@googlemail.com> - 1.0.0-0.5.20170120git743d702
+- Drop devel sub-package
+
+* Wed Feb 01 2017 Leigh Scott <leigh123linux@googlemail.com> - 1.0.0-0.4.20170120git743d702
+- Add 10_nvidia_wayland.json to libs sub-package
+
+* Wed Feb 01 2017 Leigh Scott <leigh123linux@googlemail.com> - 1.0.0-0.3.20170120git743d702
+- Add loader directory to common sub-package
+- Move libs to sub-package
+
+* Fri Jan 20 2017 Leigh Scott <leigh123linux@googlemail.com> - 1.0.0-0.2.20170120git743d702
+- Add date to release
+
+* Fri Jan 20 2017 Leigh Scott <leigh123linux@googlemail.com> - 1.0.0-0.1.git743d702
+- First build
+

+ 96 - 0
e/eglexternalplatform/eglexternalplatform-vl.spec

@@ -0,0 +1,96 @@
+%global debug_package %{nil}
+
+Name:           eglexternalplatform
+Summary:        EGL External Platform Interface headers
+Version:        1.1
+Release:        1%{?_dist_release}
+Group:          system
+Distribution:   Vine Linux
+Vendor:         Project Vine
+
+License:        MIT
+URL:            https://github.com/NVIDIA
+Source0:        https://github.com/NVIDIA/eglexternalplatform/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+
+BuildArch:      noarch
+
+%description
+%summary
+
+
+%package        devel
+Summary:        Development files for %{name}
+Group:          programming
+
+%description    devel
+The %{name}-devel package contains the header files for
+developing applications that use %{name}.
+
+
+%prep
+%autosetup
+
+
+%build
+
+
+%install
+mkdir -p %{buildroot}%{_includedir}/
+install -p -m 0644 interface/eglexternalplatform.h %{buildroot}%{_includedir}/
+install -p -m 0644 interface/eglexternalplatformversion.h %{buildroot}%{_includedir}/
+mkdir -p %{buildroot}%{_datadir}/pkgconfig/
+install -p -m 0644 eglexternalplatform.pc %{buildroot}%{_datadir}/pkgconfig/
+
+
+%files devel
+%doc README.md samples
+%license COPYING
+%{_includedir}/*
+%{_datadir}/pkgconfig/eglexternalplatform.pc
+
+
+%changelog
+* Sat Mar 27 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.1-1
+- initial build for Vine Linux.
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-0.6.20180916git7c8f8e2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-0.5.20180916git7c8f8e2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-0.4.20180916git7c8f8e2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-0.3.20180916git7c8f8e2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-0.2.20180916git7c8f8e2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Mon Aug 20 2018 Leigh Scott <leigh123linux@googlemail.com> - 1.1-0.1.20180916git7c8f8e2
+- Update snapshot
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-0.7.20170201git76e2948
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-0.6.20170201git76e2948
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-0.5.20170201git76e2948
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-0.4.20170201git76e2948
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Wed Feb 01 2017 Leigh Scott <leigh123linux@googlemail.com> - 1.0-0.3.20170201git76e2948
+- Update snapshot
+- Change to noarch
+- Add license file
+
+* Fri Jan 20 2017 Leigh Scott <leigh123linux@googlemail.com> - 1.0-0.2.20170120git53bf47c
+- Add date to release
+
+* Thu Jan 19 2017 Leigh Scott <leigh123linux@googlemail.com> - 1.0-0.1.git53bf47c
+- First build
+

+ 271 - 0
lib/libg/libglvnd/libglvnd-vl.spec

@@ -0,0 +1,271 @@
+%bcond_without  mesa_glvnd_default
+
+Name:           libglvnd
+Version:        1.3.2
+Release:        1%{?_dist_release}
+Summary:        The GL Vendor-Neutral Dispatch library
+Group:          system
+Distribution:   Vine Linux
+Vendor:         Project Vine
+
+License:        MIT
+URL:            https://github.com/NVIDIA/libglvnd
+Source0:        %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
+Source1000:     ChangeLog.fedora
+Patch0:         libglvnd-python3.patch
+Patch1:         0001-glx-Add-another-fallback-library-name.patch
+
+BuildRequires: make
+BuildRequires:  libtool
+BuildRequires:  gcc
+BuildRequires:  python3-rpm-macros
+BuildRequires:  python3-libxml2
+BuildRequires:  pkgconfig(glproto)
+BuildRequires:  pkgconfig(x11)
+BuildRequires:  pkgconfig(xext)
+# for tests
+BuildRequires:  xorg-x11-server-Xvfb
+BuildRequires:  xorg-x11-xauth
+BuildRequires:  xorg-x11-xkb-utils
+BuildRequires:  xkeyboard-config
+
+%if %{without mesa_glvnd_default}
+%global _without_mesa_glvnd_default 1
+%endif
+
+%{?_without_mesa_glvnd_default:
+%global __provides_exclude_from %{_libdir}/%{name}
+%global __requires_exclude_from %{_libdir}/%{name}
+}
+
+%description
+libglvnd is an implementation of the vendor-neutral dispatch layer for
+arbitrating OpenGL API calls between multiple vendors on a per-screen basis.
+
+
+%package        devel
+Summary:        Development files for %{name}
+Group:          programming
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       %{name}-opengl%{?_isa} = %{version}-%{release}
+Requires:       %{name}-gles%{?_isa} = %{version}-%{release}
+Requires:       %{name}-glx%{?_isa} = %{version}-%{release}
+Requires:       %{name}-egl%{?_isa} = %{version}-%{release}
+Requires:       %{name}-core-devel%{?_isa} = %{version}-%{release}
+# Required by any glx.h users.
+Requires:       libX11-devel%{?_isa}
+# We might split into more sub-packages
+Obsoletes:      mesa-libGLES-devel < 21.0.0
+Provides:       mesa-libGLES-devel = %{version}-%{release}
+Provides:       mesa-libGLES-devel%{?_isa} = %{version}-%{release}
+Provides:       mesa-khr-devel = %{version}-%{release}
+Provides:       mesa-khr-devel%{?_isa} = %{version}-%{release}
+Provides:       libGLES-devel = %{version}-%{release}
+Provides:       libGLES-devel%{?_isa} = %{version}-%{release}
+
+%description    devel
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
+
+%package        core-devel
+Summary:        Core development files for %{name}
+Group:          programming
+
+%description core-devel
+The %{name}-core-devel package is a bootstrap trick for Mesa, which wants
+to build against the %{name} headers but does not link against any of
+its libraries (and, initially, has file conflicts with them). If you are
+not Mesa you almost certainly want %{name}-devel instead.
+
+
+%package        opengl
+Summary:        OpenGL support for libglvnd
+Group:          system
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+
+%description    opengl
+libOpenGL is the common dispatch interface for the workstation OpenGL API.
+
+
+%package        gles
+Summary:        GLES support for libglvnd
+Group:          system
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+%{!?_without_mesa_glvnd_default:
+# mesa is the default EGL implementation provider
+Requires:       mesa-libEGL%{?_isa} > 21.0.0
+Obsoletes:      mesa-libGLES < 21.0.0
+Provides:       mesa-libGLES
+Provides:       mesa-libGLES%{?_isa}
+Provides:       libGLES
+Provides:       libGLES%{?_isa}
+}
+
+%description    gles
+libGLESv[12] are the common dispatch interface for the GLES API.
+
+
+%package        egl
+Summary:        EGL support for libglvnd
+Group:          system
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+%{!?_without_mesa_glvnd_default:
+# mesa is the default EGL implementation provider
+Requires:       mesa-libEGL%{?_isa} > 21.0.0
+Provides:       libEGL
+Provides:       libEGL%{?_isa}
+}
+
+%description    egl
+libEGL are the common dispatch interface for the EGL API.
+
+
+%package        glx
+Summary:        GLX support for libglvnd
+Group:          system
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+%{!?_without_mesa_glvnd_default:
+# mesa is the default GL implementation provider
+Requires:       mesa-libGL%{?_isa} > 21.0.0
+Provides:       libGL
+Provides:       libGL%{?_isa}
+}
+
+%description    glx
+libGL and libGLX are the common dispatch interface for the GLX API.
+
+
+%debug_package
+
+
+%prep
+%autosetup -p1 -n %{name}-%{version}
+autoreconf -vif
+
+
+%build
+export PYTHON=%{__python3}
+#Prefer asm and tls for x86* and ppc64*
+#armhfp and aarch64 fallback to asm and tsd
+#Others arches fallback to pure-c and tls.
+%configure \
+  --disable-static \
+  --enable-asm \
+  --enable-tls
+
+%make_build V=1
+
+
+%install
+%make_install INSTALL="install -p"
+find %{buildroot} -name '*.la' -delete
+
+%{?_without_mesa_glvnd_default:
+# Avoid conflict with mesa-libGL
+mkdir -p %{buildroot}%{_libdir}/%{name}/
+for l in libEGL libGL libGLESv1_CM libGLESv2 libGLX; do
+  mv %{buildroot}%{_libdir}/${l}.so* \
+    %{buildroot}%{_libdir}/%{name}/
+done
+}
+
+# Create directory layout
+mkdir -p %{buildroot}%{_sysconfdir}/glvnd/egl_vendor.d/
+mkdir -p %{buildroot}%{_datadir}/glvnd/egl_vendor.d/
+mkdir -p %{buildroot}%{_sysconfdir}/egl/egl_external_platform.d/
+mkdir -p %{buildroot}%{_datadir}/egl/egl_external_platform.d/
+
+cp -pf %{SOURCE1000} ./
+
+
+%check
+export DO_X11_TESTS=1
+xvfb-run -e xvfb-error.log -s '-screen 0 640x480x24' -d make check V=1 || \
+%ifarch s390x ppc64
+    :
+%else
+    if [ `find . -name test-suite.log | wc --lines` -gt 0 ]; then
+        (cat `find . -name test-suite.log` ; exit 1)
+    else
+        if [ -f xvfb-error.log ]; then
+            cat xvfb-error.log
+        else
+            echo "unknown error occured."
+        fi
+        exit 1
+    fi
+%endif
+
+
+%files
+%doc README.md ChangeLog.fedora
+%dir %{_sysconfdir}/glvnd/
+%dir %{_datadir}/glvnd/
+%{_libdir}/libGLdispatch.so.0*
+
+%ldconfig_scriptlets opengl
+%files opengl
+%{_libdir}/libOpenGL.so.0*
+
+%ldconfig_scriptlets gles
+%files gles
+%if 0%{?_without_mesa_glvnd_default}
+%{_libdir}/%{name}/libGLES*.so.*
+%else
+%{_libdir}/libGLES*.so.*
+%endif
+
+%files glx
+%if 0%{?_without_mesa_glvnd_default}
+%{_libdir}/%{name}/libGL.so.*
+%{_libdir}/%{name}/libGLX.so.*
+%else
+%{_libdir}/libGL.so.*
+%{_libdir}/libGLX.so.*
+%endif
+
+%files egl
+%dir %{_sysconfdir}/glvnd/egl_vendor.d/
+%dir %{_datadir}/glvnd/egl_vendor.d/
+%dir %{_sysconfdir}/egl/
+%dir %{_sysconfdir}/egl/egl_external_platform.d/
+%dir %{_datadir}/egl/
+%dir %{_datadir}/egl/egl_external_platform.d/
+%if 0%{?_without_mesa_glvnd_default}
+%{_libdir}/%{name}/libEGL*.so.*
+%else
+%{_libdir}/libEGL*.so.*
+%endif
+
+%files core-devel
+%dir %{_includedir}/glvnd/
+%{_includedir}/glvnd/*.h
+%{_libdir}/pkgconfig/libglvnd.pc
+
+%files devel
+%dir %{_includedir}/EGL/
+%dir %{_includedir}/GL/
+%dir %{_includedir}/GLES/
+%dir %{_includedir}/GLES2/
+%dir %{_includedir}/GLES3/
+%dir %{_includedir}/KHR/
+%{_includedir}/EGL/*.h
+%{_includedir}/GL/*.h
+%{_includedir}/GLES/*.h
+%{_includedir}/GLES2/*.h
+%{_includedir}/GLES3/*.h
+%{_includedir}/KHR/*.h
+%{_libdir}/lib*.so
+%if 0%{?_without_mesa_glvnd_default}
+%{_libdir}/%{name}/lib*.so
+%endif
+%{_libdir}/pkgconfig/gl*.pc
+%{_libdir}/pkgconfig/egl.pc
+%{_libdir}/pkgconfig/opengl.pc
+
+
+%changelog
+* Sat Mar 27 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.3.2-1
+- initial build for Vine Linux.
+- moved Fedora's %%changelog to ChangeLog.fedora.

+ 99 - 226
m/mesa/mesa-vl.spec

@@ -1,7 +1,9 @@
 # When bootstrapping an arch, omit the -demos subpackage.
 %bcond_without vulkan
+%bcond_without glvnd
+%bcond_without wayland
 %bcond_with libva
-%bcond_with glvnd
+%bcond_with source
 
 %global with_hardware 1
 %global with_vdpau 1
@@ -36,7 +38,7 @@
 Summary:        Mesa graphics libraries
 Summary(ja):    Mesa グラフィックスライブラリ
 Name:           mesa
-Version:        20.2.1
+Version:        21.0.1
 Release:        1%{?_dist_release}
 Group:          system
 Vendor:         Project Vine
@@ -46,15 +48,15 @@ License:        MIT
 URL:            https://www.mesa3d.org/
 Source0:        https://mesa.freedesktop.org/archive/%{name}-%{version}.tar.xz
 
-Source2:        glesv2.pc
-Source3:        egl.pc
-
 # src/gallium/auxiliary/postprocess/pp_mlaa* have an ... interestingly worded license.
 # Source4 contains email correspondence clarifying the license terms.
 # Fedora opts to ignore the optional part of clause 2 and treat that code as 2 clause BSD.
 Source4:        Mesa-MLAA-License-Clarification-Email.txt
 
 Patch3:         0003-evergreen-big-endian.patch
+# https://gitlab.freedesktop.org/mesa/mesa/-/issues/4442
+Patch0: mesa-llvm12.patch
+Patch1: 0001-drisw-move-zink-down-the-list-below-the-sw-drivers.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: meson
@@ -100,6 +102,17 @@ BuildRequires: zlib-devel
 %if %{with vulkan}
 BuildRequires: vulkan-devel
 %endif
+%if %{with glvnd}
+BuildRequires: libglvnd-devel
+%endif
+%if %{with wayland}
+BuildRequires:  pkgconfig(wayland-scanner)
+BuildRequires:  pkgconfig(wayland-protocols) >= 1.8
+BuildRequires:  pkgconfig(wayland-client) >= 1.11
+BuildRequires:  pkgconfig(wayland-server) >= 1.11
+BuildRequires:  pkgconfig(wayland-egl-backend)
+%endif
+
 
 %description
 Mesa
@@ -109,8 +122,9 @@ Mesa
 Summary: Mesa libGL runtime libraries
 Summary(ja): Mesa libGL ランタイムライブラリ
 Group: system
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
+%if %{with glvnd}
+Requires: libglvnd-glx%{?_isa}
+%endif
 Provides: libGL
 Obsoletes: Mesa, XFree86-gl, XOrg-gl
 
@@ -130,6 +144,9 @@ Requires: libXdamage-devel
 Requires: libXfixes-devel
 Requires: libXext-devel
 Requires: libdrm-devel
+%if %{with glvnd}
+Requires: libglvnd-devel%{?_isa}
+%endif
 Obsoletes: Mesa-devel, XFree86-gl-devel, XOrg-gl-devel
 
 %description libGL-devel
@@ -163,6 +180,9 @@ Group: system
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Requires: libdrm >= 2.4.24-1
+%if %{with glvnd}
+Requires: libglvnd-egl%{?_isa}
+%endif
 
 %description libEGL
 Mesa libEGL runtime libraries
@@ -173,33 +193,16 @@ Summary: Mesa libEGL development package
 Summary(ja): Mesa libEGL 開発パッケージ
 Group: programming
 Requires: mesa-libEGL = %{version}-%{release}
+%if %{with glvnd}
+Requires: libglvnd-devel%{?_isa}
+%endif
+Provides: libEGL-devel
+Provides: libEGL-devel%{?_isa}
 
 %description libEGL-devel
 Mesa libEGL development package
 
 
-%package libGLES
-Summary: Mesa libGLES runtime libraries
-Summary(ja): Mesa libGLES ランタイムライブラリ
-Group: system
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-Requires: libdrm >= 2.4.24-1
-
-%description libGLES
-Mesa GLES runtime libraries
-
-
-%package libGLES-devel
-Summary: Mesa libGLES development package
-Summary(ja): Mesa libGLES 開発パッケージ
-Group: programming
-Requires: mesa-libGLES = %{version}-%{release}
-
-%description libGLES-devel
-Mesa libGLES development package
-
-
 %package libOSMesa
 Summary: Mesa offscreen rendering libraries
 Summary(ja): Mesa オフスクリーンレンダリングライブラリ
@@ -349,27 +352,6 @@ Requires: compat32-mesa-libEGL = %{version}-%{release}
 Mesa libEGL development package
 
 
-%package -n compat32-%{name}-libGLES
-Summary: Mesa libGLES runtime libraries
-Summary(ja): Mesa libGLES ランタイムライブラリ
-Group: system
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-Requires: compat32-libdrm >= 2.4.24-1
-
-%description -n compat32-%{name}-libGLES
-Mesa GLES runtime libraries
-
-%package -n compat32-%{name}-libGLES-devel
-Summary: Mesa libGLES development package
-Summary(ja): Mesa libGLES 開発パッケージ
-Group: programming
-Requires: mesa-libGLES = %{version}-%{release}
-Requires: compat32-mesa-libGLES = %{version}-%{release}
-
-%description -n compat32-%{name}-libGLES-devel
-Mesa libGLES development package
-
 %package -n compat32-%{name}-libOSMesa
 Summary: Mesa offscreen rendering libraries
 Summary(ja): Mesa オフスクリーンレンダリングライブラリ
@@ -459,19 +441,25 @@ Headers for development with the Vulkan API.
 
 
 %prep
-%autosetup -n %{name}-%{version} -p1
-cp %{SOURCE2} .
-cp %{SOURCE3} .
+%setup -n %{name}-%{version}
+%if 0
+# enable after LLVM-12.
+%patch0 -p1
+%endif
+%patch1 -p1
 
 cp %{SOURCE4} docs/
 
-# Make sure the build uses gnu++14 as llvm 10 headers require that
-sed -i -e 's/cpp_std=gnu++11/cpp_std=gnu++14/g' meson.build
 
 %build
+export PYTHON=%{__pythpn3}
 
-%meson -Dcpp_std=gnu++14 \
-  -Dplatforms=x11,drm,surfaceless \
+%meson \
+%if %{with wayland}
+  -Dplatforms=x11,wayland \
+%else
+  -Dplatforms=x11 \
+%endif
   -Ddri3=true \
   -Ddri-drivers=%{?dri_drivers} \
 %if 0%{?with_hardware}
@@ -487,9 +475,10 @@ sed -i -e 's/cpp_std=gnu++11/cpp_std=gnu++14/g' meson.build
   -Dgallium-nine=%{?with_nine:true}%{!?with_nine:false} \
   -Dgallium-opencl=%{?with_opencl:icd}%{!?with_opencl:disabled} \
   -Dvulkan-drivers=%{?vulkan_drivers} \
-  -Dshared-glapi=true \
-  -Dgles1=false \
-  -Dgles2=true \
+  -Dvulkan-device-select-layer=true \
+  -Dshared-glapi=enabled \
+  -Dgles1=disabled \
+  -Dgles2=enabled \
   -Dopengl=true \
   -Dgbm=true \
   -Dglx=dri \
@@ -499,25 +488,20 @@ sed -i -e 's/cpp_std=gnu++11/cpp_std=gnu++14/g' meson.build
 %else
   -Dglvnd=false \
 %endif
-  -Dasm=%{?with_asm:true}%{!?with_asm:false} \
+  -Dmicrosoft-clc=disabled \
   -Dllvm=true \
   -Dshared-llvm=true \
   -Dvalgrind=%{?with_valgrind:true}%{!?with_valgrind:false} \
   -Dbuild-tests=false \
   -Dselinux=false \
-  -Dosmesa=gallium \
-  -Dvulkan-device-select-layer=true \
+  -Dosmesa=true \
   %{nil}
 %meson_build
 
+
 %install
-rm -rf $RPM_BUILD_ROOT
 %meson_install
 
-install glesv2.pc %{buildroot}%{_libdir}/pkgconfig/
-
-install egl.pc %{buildroot}%{_libdir}/pkgconfig/
-
 # libvdpau opens the versioned name, don't bother including the unversioned
 rm -f %{buildroot}%{_libdir}/vdpau/*.so
 # likewise glvnd
@@ -529,7 +513,6 @@ rm -f %{buildroot}%{_libdir}/libGLES*
 
 # glvnd needs a default provider for indirect rendering where it cannot
 # determine the vendor
-ln -s %{_libdir}/libGLX_mesa.so.0 %{buildroot}%{_libdir}/libGLX_indirect.so.0
 ln -s %{_libdir}/libGLX_mesa.so.0 %{buildroot}%{_libdir}/libGLX_system.so.0
 %endif
 
@@ -547,10 +530,7 @@ for i in libOSMesa*.so libGL.so ; do
 done
 popd
 
-
-# remove .la files
-find %{buildroot} -name '*.la' -delete
-
+%if %{with source}
 # Install the source needed to build the X server.  The egreps are just
 # stripping out unnecessary dirs; only tricky bit is the [^c] to make sure
 # .../dri/common is included.
@@ -562,137 +542,33 @@ mkdir -p $RPM_BUILD_ROOT/%{mesasourcedir}
     egrep -v '^src/mesa/drivers/(windows|dri/[^c])' |
     xargs tar cf - --mode a=r |
        (cd $RPM_BUILD_ROOT/%{mesasourcedir} && tar xf -)
-
-# this keeps breaking, check it early.  note that the exit from eu-ftr is odd.
-pushd %{buildroot}%{_libdir}
-for i in libOSMesa*.so libGL.so ; do
-    eu-findtextrel $i && exit 1
-done
-# check that we really didn't link libstdc++ dynamically
-eu-readelf -d mesa_dri_drivers.so | grep -q libstdc && exit 1
-popd
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%check
-
-%post libGL -p /sbin/ldconfig
-%postun libGL -p /sbin/ldconfig
-%post libOSMesa -p /sbin/ldconfig
-%postun libOSMesa -p /sbin/ldconfig
-%post libEGL -p /sbin/ldconfig
-%postun libEGL -p /sbin/ldconfig
-%post libGLES -p /sbin/ldconfig
-%postun libGLES -p /sbin/ldconfig
-%post libglapi -p /sbin/ldconfig
-%postun libglapi -p /sbin/ldconfig
-%post libgbm -p /sbin/ldconfig
-%postun libgbm -p /sbin/ldconfig
-%post libxatracker -p /sbin/ldconfig
-%postun libxatracker -p /sbin/ldconfig
-
-%if %{build_compat32}
-%post -n compat32-%{name}-libGL -p /sbin/ldconfig
-%postun -n compat32-%{name}-libGL -p /sbin/ldconfig
-%post -n compat32-%{name}-libOSMesa -p /sbin/ldconfig
-%postun -n compat32-%{name}-libOSMesa -p /sbin/ldconfig
-%post -n compat32-%{name}-libEGL -p /sbin/ldconfig
-%postun -n compat32-%{name}-libEGL -p /sbin/ldconfig
-%post -n compat32-%{name}-libGLES -p /sbin/ldconfig
-%postun -n compat32-%{name}-libGLES -p /sbin/ldconfig
-%post -n compat32-%{name}-libglapi -p /sbin/ldconfig
-%postun -n compat32-%{name}-libglapi -p /sbin/ldconfig
-%post -n compat32-%{name}-libgbm -p /sbin/ldconfig
-%postun -n compat32-%{name}-libgbm -p /sbin/ldconfig
-%post -n compat32-%{name}-libxatracker -p /sbin/ldconfig
-%postun -n compat32-%{name}-libxatracker -p /sbin/ldconfig
 %endif
 
+
 %files libGL
 %defattr(-,root,root,-)
-%{_libdir}/libGL.so.1
-%{_libdir}/libGL.so.1.2*
+%{_libdir}/libGLX_mesa.so.0*
+%{_libdir}/libGLX_system.so.0*
 
 %files libGL-devel
-%defattr(-,root,root,-)
-%{_includedir}/GL/gl.h
-%{_includedir}/GL/glext.h
-%{_includedir}/GL/glx.h
-%{_includedir}/GL/glxext.h
-%{_includedir}/GL/glcorearb.h
 %dir %{_includedir}/GL/internal
 %{_includedir}/GL/internal/dri_interface.h
-%{_libdir}/libGL.so
-%{_libdir}/libglapi.so
-%{_libdir}/pkgconfig/gl.pc
 %{_libdir}/pkgconfig/dri.pc
-
-%files dri-drivers
-%defattr(-,root,root,-)
-%dir %{_libdir}/dri
-%{_libdir}/dri/*_dri.so
-%{_libdir}/dri/*_drv_video.so
-%dir %{_datadir}/drirc.d
-%config(noreplace) %{_datadir}/drirc.d/*
-%if 0%{?with_opencl}
-%dir %{_libdir}/gallium-pipe
-%{_libdir}/gallium-pipe/*.so
-%endif
-
-%files vdpau-drivers
-%defattr(-,root,root,-)
-%{_libdir}/vdpau/libvdpau_nouveau.so.1*
-%{_libdir}/vdpau/libvdpau_r300.so.1*
-%{_libdir}/vdpau/libvdpau_r600.so.1*
-%{_libdir}/vdpau/libvdpau_radeonsi.so.1*
+%{_libdir}/libglapi.so
 
 %files libEGL
-%defattr(-,root,root,-)
-%{_libdir}/libEGL.so.1
-%{_libdir}/libEGL.so.1.*
+%{_datadir}/glvnd/egl_vendor.d/50_mesa.json
+%{_libdir}/libEGL_mesa.so.0*
 
 %files libEGL-devel
-%defattr(-,root,root,-)
 %dir %{_includedir}/EGL
-%{_includedir}/EGL/eglext.h
-%{_includedir}/EGL/egl.h
-%{_includedir}/EGL/eglplatform.h
 %{_includedir}/EGL/eglmesaext.h
 %{_includedir}/EGL/eglextchromium.h
-%dir %{_includedir}/KHR
-%{_includedir}/KHR/*.h
-%{_libdir}/pkgconfig/egl.pc
-%{_libdir}/libEGL.so
-
-%files libGLES
-%defattr(-,root,root,-)
-%{_libdir}/libGLESv2.so.2
-%{_libdir}/libGLESv2.so.2.*
-%{_libdir}/libglapi.so.0
-%{_libdir}/libglapi.so.0.*
-
-%files libGLES-devel
-%defattr(-,root,root,-)
-%dir %{_includedir}/GLES2
-%{_includedir}/GLES2/gl2platform.h
-%{_includedir}/GLES2/gl2.h
-%{_includedir}/GLES2/gl2ext.h
-%dir %{_includedir}/GLES3
-%{_includedir}/GLES3/gl3platform.h
-%{_includedir}/GLES3/gl3.h
-%{_includedir}/GLES3/gl3ext.h
-%{_includedir}/GLES3/gl31.h
-%{_includedir}/GLES3/gl32.h
-%{_libdir}/pkgconfig/glesv2.pc
-%{_libdir}/libGLESv2.so
 
 %files libOSMesa
-%defattr(-,root,root,-)
-%{_libdir}/libOSMesa.so.*
+%{_libdir}/libOSMesa.so.8*
 
 %files libOSMesa-devel
-%defattr(-,root,root,-)
 %dir %{_includedir}/GL
 %{_includedir}/GL/osmesa.h
 %{_libdir}/libOSMesa.so
@@ -703,23 +579,19 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libglapi.so.0.*
 
 %files libgbm
-%defattr(-,root,root,-)
 %{_libdir}/libgbm.so.1
 %{_libdir}/libgbm.so.1.*
 
 %files libgbm-devel
-%defattr(-,root,root,-)
 %{_libdir}/libgbm.so
 %{_includedir}/gbm.h
 %{_libdir}/pkgconfig/gbm.pc
 
 %files libxatracker
-%defattr(-,root,root,-)
 %{_libdir}/libxatracker.so.2
 %{_libdir}/libxatracker.so.2.*
 
 %files libxatracker-devel
-%defattr(-,root,root,-)
 %{_libdir}/libxatracker.so
 %{_includedir}/xa_tracker.h
 %{_includedir}/xa_composite.h
@@ -737,10 +609,22 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/d3d/*.so
 %endif
 
-# We constructed this dir carefully, so just slurp in the whole thing.
-%files source
-%defattr(-,root,root,-)
-%{mesasourcedir}
+%files dri-drivers
+%dir %{_libdir}/dri
+%{_libdir}/dri/*_dri.so
+%{_libdir}/dri/*_drv_video.so
+%dir %{_datadir}/drirc.d
+%config(noreplace) %{_datadir}/drirc.d/*
+%if 0%{?with_opencl}
+%dir %{_libdir}/gallium-pipe
+%{_libdir}/gallium-pipe/*.so
+%endif
+
+%files vdpau-drivers
+%{_libdir}/vdpau/libvdpau_nouveau.so.1*
+%{_libdir}/vdpau/libvdpau_r300.so.1*
+%{_libdir}/vdpau/libvdpau_r600.so.1*
+%{_libdir}/vdpau/libvdpau_radeonsi.so.1*
 
 %if %{with vulkan}
 %files vulkan-drivers
@@ -763,50 +647,34 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 %endif
 
+%if %{with source}
+# We constructed this dir carefully, so just slurp in the whole thing.
+%files source
+%defattr(-,root,root,-)
+%{mesasourcedir}
+%endif
+
 # compat32
 %if %{build_compat32}
 %files -n compat32-%{name}-libGL
-%defattr(-,root,root,-)
-%{_libdir}/libGL.so.1
-%{_libdir}/libGL.so.1.2*
-#%dir %{_libdir}/dri
-#%{_libdir}/dri/*_dri.so
+%{_libdir}/libGLX_mesa.so.0*
+%{_libdir}/libGLX_system.so.0*
 
 %files -n compat32-%{name}-libGL-devel
-%defattr(-,root,root,-)
-%{_libdir}/libGL.so
-
-%files -n compat32-%{name}-libOSMesa
-%defattr(-,root,root,-)
-%{_libdir}/libOSMesa.so.*
-
-%files -n compat32-%{name}-libOSMesa-devel
-%defattr(-,root,root,-)
-%{_libdir}/libOSMesa.so
+%{_libdir}/libglapi.so
 
 %files -n compat32-%{name}-libEGL
-%defattr(-,root,root,-)
-%{_libdir}/libEGL.so.1
-%{_libdir}/libEGL.so.1.*
+%{_libdir}/libEGL_mesa.so.0*
 
 %files -n compat32-%{name}-libEGL-devel
-%defattr(-,root,root,-)
-%{_libdir}/libEGL.so
 
-%files -n compat32-%{name}-libGLES
-%defattr(-,root,root,-)
-%{_libdir}/libGLESv2.so.2
-%{_libdir}/libGLESv2.so.2.*
-%{_libdir}/libglapi.so.0
-%{_libdir}/libglapi.so.0.*
+%files -n compat32-%{name}-libOSMesa
+%{_libdir}/libOSMesa.so.*
 
-%files -n compat32-%{name}-libGLES-devel
-%defattr(-,root,root,-)
-%{_libdir}/libGLESv2.so
-%{_libdir}/libglapi.so
+%files -n compat32-%{name}-libOSMesa-devel
+%{_libdir}/libOSMesa.so
 
 %files -n compat32-%{name}-libxatracker
-%defattr(-,root,root,-)
 %{_libdir}/libxatracker.so.2
 %{_libdir}/libxatracker.so.2.*
 
@@ -815,19 +683,24 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libglapi.so.0.*
 
 %files -n compat32-%{name}-libgbm
-%defattr(-,root,root,-)
 %{_libdir}/libgbm.so.1
 %{_libdir}/libgbm.so.1.*
 
 %files -n compat32-%{name}-dri-drivers
-%defattr(-,root,root,-)
 %dir %{_libdir}/dri
 %{_libdir}/dri/*_dri.so
 %{_libdir}/dri/*_drv_video.so
-
 %endif
 
+
 %changelog
+* Sat Mar 27 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 21.0.1-1
+- updated to 21.0.1.
+- dropped Patch3.
+- imported Patch0 from rawhide (not applied now).
+- imported Patch1 from rawhide.
+- built with libglvnd.
+
 * Thu Oct 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 20.2.1-1
 - updated to 20.2.1.
 

+ 58 - 28
s/shared-mime-info/shared-mime-info-vl.spec

@@ -1,29 +1,36 @@
 Summary: Shared MIME information database
 Summary(ja): 共有 MIME 情報データベース
 Name: shared-mime-info
-Version: 1.15
+Version: 2.1
 Release: 1%{?_dist_release}
-Group: User Interface/Desktops
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
+
 License: GPL
 URL: https://freedesktop.org/wiki/Software/shared-mime-info/
 %define altver %(echo %{version} | tr . -)
-Source0: https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/Release-%{altver}/shared-mime-info-Release-%{altver}.tar.bz2
-Source1: defaults.list
+# archive on gitlab is tooooo bad.
+# https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/%{version}/shared-mime-info-Release-%{version}.tar.bz2
+Source0: https://github.com/freedesktop/xdg-shared-mime-info/archive/refs/tags/%{version}.tar.gz#/shared-mime-info-%{version}.tar.gz
+Source1: mimeapps.list
+# git HEAD of https://gitlab.freedesktop.org/xdg/xdgmime
+Source2: xdgmime.tar.xz
+Patch1: 0001-Remove-sub-classing-from-OO.o-mime-types.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-#BuildRequires:  meson
+BuildRequires:  meson
 BuildRequires:  itstool
-BuildRequires:  gawk
 BuildRequires:  libxml2-devel
+BuildRequires:  xmlto
 BuildRequires:  glib2-devel >= 2.6.0
-BuildRequires:  gettext
 # For intltool:
 BuildRequires: perl-XML-Parser >= 2.31-16
 Requires: libxml2
 Requires: glib2 >= 2.6.0
 
-Vendor: Project Vine
-Distribution: Vine Linux
+# Disable pkgconfig autodep
+%global __requires_exclude ^/usr/bin/pkg-config$
 
 %description
 This is the freedesktop.org shared MIME info database.
@@ -33,47 +40,70 @@ files. Frequently, it is necessary to work out the correct MIME type for
 a file. This is generally done by examining the file's name or contents,
 and looking up the correct MIME type in a database.
 
+
+%debug_package
+
+
 %prep
-%setup -q -n shared-mime-info-Release-%{altver}
+%setup -q -n xdg-%{name}-%{version} -a 2
+%autopatch -p1
 
-./autogen.sh
 
 %build
-#meson -Dupdate-mimedb=false
-#meson_build
+%meson -Dupdate-mimedb=true -Dxdg-mime-path=./xdgmime/
+%meson_build
 
-%configure --disable-update-mimedb
-%make_build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-%makeinstall
-#meson_install
+%meson_install
+
+find $RPM_BUILD_ROOT%{_datadir}/mime -type d \
+| sed -e "s|^$RPM_BUILD_ROOT|%%dir |" > %{name}.files
+find $RPM_BUILD_ROOT%{_datadir}/mime -type f -not -path "*/packages/*" \
+| sed -e "s|^$RPM_BUILD_ROOT|%%ghost |" >> %{name}.files
 
+# Support fallback/generic mimeapps.list (currently based on an old version of
+# gnome-mimeapps.list), see:
+# https://lists.fedoraproject.org/pipermail/devel/2015-July/212403.html
+# https://bugzilla.redhat.com/show_bug.cgi?id=1243049
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/applications/defaults.list
+install -m 644 %SOURCE1 $RPM_BUILD_ROOT/%{_datadir}/applications/mimeapps.list
 
-## remove these bogus files
+## remove bogus translation files
+## translations are already in the xml file installed
 rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/*
 
+
+%check
+%meson_test
+
+
 %post 
-%{_bindir}/update-mime-database %{_datadir}/mime &> /dev/null
+/bin/touch --no-create %{_datadir}/mime/packages &>/dev/null ||:
+
+%transfiletriggerin -- %{_datadir}/mime
+update-mime-database -n %{_datadir}/mime &> /dev/null ||:
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%transfiletriggerpostun -- %{_datadir}/mime
+update-mime-database -n %{_datadir}/mime &> /dev/null ||:
 
-%files
-%defattr(-,root,root,-)
+
+%files -f %{name}.files
 %license COPYING
 %doc README* NEWS
 %{_bindir}/*
-%dir %{_datadir}/mime/
-%{_datadir}/mime/packages
-%{_datadir}/applications/defaults.list
+%{_datadir}/applications/*
+%{_datadir}/gettext/its/*
+%{_datadir}/mime/packages/*
+%dir %{_datadir}/pkgconfig
 %{_datadir}/pkgconfig/*.pc
 %{_mandir}/man*/*
 
+
 %changelog
+* Fri Mar 26 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.1-1
+- new upstream release.
+
 * Fri Apr 10 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.15-1
 - new upstream release.
 

+ 153 - 0
w/wayland-protocols/wayland-protocols-vl.spec

@@ -0,0 +1,153 @@
+Name:           wayland-protocols
+Version:        1.20
+Release:        4%{?_dist_release}
+Summary:        Wayland protocols that adds functionality not available in the core protocol
+Group:          system
+Distribution:   Vine Linux
+Vendor:         Project Vine
+
+License:        MIT
+URL:            https://wayland.freedesktop.org/
+Source0:        https://wayland.freedesktop.org/releases/%{name}-%{version}.tar.xz
+
+BuildArch:      noarch
+BuildRequires:  make
+BuildRequires:  wayland-devel
+
+%description
+wayland-protocols contains Wayland protocols that adds functionality not
+available in the Wayland core protocol. Such protocols either adds
+completely new functionality, or extends the functionality of some other
+protocol either in Wayland core, or some other protocol in
+wayland-protocols.
+
+
+%package devel
+Summary:        Wayland protocols that adds functionality not available in the core protocol
+Group:          programming
+
+%description devel
+wayland-protocols contains Wayland protocols that adds functionality not
+available in the Wayland core protocol. Such protocols either adds
+completely new functionality, or extends the functionality of some other
+protocol either in Wayland core, or some other protocol in
+wayland-protocols.
+
+
+%prep
+%autosetup
+
+
+%build
+%configure
+
+
+%install
+%make_install
+
+
+%files devel
+%license COPYING
+%doc README.md
+%{_datadir}/pkgconfig/%{name}.pc
+%{_datadir}/%{name}/
+
+
+%changelog
+* Sat Mar 27 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.20-4
+- initial build for Vine Linux.
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.20-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.20-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sat Feb 29 2020 Jonas Ådahl <jadahl@redhat.com> - 1.20-1
+- Update to 1.20
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.18-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Mon Jul 29 2019 Olivier Fourdan <ofourdan@redhat.com> - 1.18-1
+- Update to 1.18
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.17-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.17-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Wed Nov 21 2018 Kalev Lember <klember@redhat.com> - 1.17-1
+- Update to 1.17
+
+* Tue Jul 31 2018 Kalev Lember <klember@redhat.com> - 1.16-1
+- Update to 1.16
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.15-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Thu Jul 05 2018 Adam Jackson <ajax@redhat.com> - 1.15-1
+- Update to 1.15
+
+* Tue May 08 2018 Kalev Lember <klember@redhat.com> - 1.14-1
+- Update to 1.14
+
+* Thu Feb 15 2018 Kalev Lember <klember@redhat.com> - 1.13-1
+- Update to 1.13
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.12-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Dec 07 2017 Kalev Lember <klember@redhat.com> - 1.12-1
+- Update to 1.12
+
+* Wed Nov 15 2017 Kalev Lember <klember@redhat.com> - 1.11-1
+- Update to 1.11
+
+* Mon Jul 31 2017 Kalev Lember <klember@redhat.com> - 1.10-1
+- Update to 1.10
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Wed Jul 19 2017 Kalev Lember <klember@redhat.com> - 1.9-1
+- Update to 1.9
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Tue Aug 16 2016 Kalev Lember <klember@redhat.com> - 1.7-1
+- Update to 1.7
+
+* Fri Aug 12 2016 Kalev Lember <klember@redhat.com> - 1.6-1
+- Update to 1.6
+
+* Tue Jul 26 2016 Kalev Lember <klember@redhat.com> - 1.5-1
+- Update to 1.5
+
+* Tue May 24 2016 Kalev Lember <klember@redhat.com> - 1.4-1
+- Update to 1.4
+
+* Mon Apr 11 2016 Kalev Lember <klember@redhat.com> - 1.3-1
+- Update to 1.3
+
+* Mon Mar 07 2016 Kalev Lember <klember@redhat.com> - 1.2-1
+- Update to 1.2
+
+* Thu Feb 18 2016 Kalev Lember <klember@redhat.com> - 1.1-1
+- Update to 1.1
+
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Sat Dec 05 2015 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 1.0-2
+- Fix description
+
+* Thu Nov 26 2015 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 1.0-1
+- Update to released 1.0
+- Move XMLs to devel pkg
+- Drop non-interesting part of description
+
+* Sun Nov 22 2015 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.1.0-0.gitf828a43
+- Initial package

+ 76 - 93
w/wayland/wayland-vl.spec

@@ -1,35 +1,28 @@
-%define ver 1.0.3
-%define rel 1
-#global gitdate 20120424
-
 Name:           wayland
-Version:        %{ver}
-Release:        %{rel}%{?gitdate:.date%{gitdate}}%{?_dist_release}
+Version:        1.19.0
+Release:        1%{?_dist_release}
 Summary:        Wayland Compositor Infrastructure
+Group:          system
+Distribution:   Vine Linux
+Vendor:         Project Vine
+Packager:       iwaim
 
-Group:          User Interface/X
 License:        MIT
-URL:            http://%{name}.freedesktop.org/
-%if 0%{?gitdate}
-Source0:        wayland-%{gitdate}.tar.bz2
-%else
-Source0:        http://wayland.freedesktop.org/releases/%{name}-%{version}.tar.xz
-%endif
-Source1:        make-git-snapshot.sh
+URL:            https://wayland.freedesktop.org/
+Source0:        https://wayland.freedesktop.org/releases/%{name}-%{version}.tar.xz
 
-BuildRequires:  autoconf automake libtool
+BuildRequires:  docbook-style-xsl
 BuildRequires:  doxygen
-BuildRequires:  pkgconfig(libffi)
 BuildRequires:  expat-devel
+BuildRequires:  graphviz
+BuildRequires:  libxml2-devel
 BuildRequires:  libxslt
-BuildRequires:  docbook-style-xsl
+BuildRequires:  meson
+BuildRequires:  pkgconfig(libffi)
+BuildRequires:  xmlto
 
 Provides:       %{name}-common = %{version}-%{release}
 
-Distribution:	Vine Linux
-Vendor:		Project Vine
-Packager:	iwaim
-
 %description
 Wayland is a protocol for a compositor to talk to its clients as well as a C
 library implementation of that protocol. The compositor can be a standalone
@@ -37,125 +30,115 @@ display server running on Linux kernel modesetting and evdev input devices,
 an X application, or a wayland client itself. The clients can be traditional
 applications, X servers (rootless or fullscreen) or other display servers.
 
+
 %package devel
-Summary: Common headers for wayland
-License: MIT
+Summary: Development files for wayland
+Group: programming
+Requires: libwayland-client%{?_isa} = %{version}-%{release}
+Requires: libwayland-cursor%{?_isa} = %{version}-%{release}
+Requires: libwayland-egl%{?_isa} = %{version}-%{release}
+Requires: libwayland-server%{?_isa} = %{version}-%{release}
 %description devel
-Common headers for wayland
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
+
+%package doc
+Summary: Wayland development documentation
+Group: documentation
+BuildArch: noarch
+%description doc
+Wayland development documentation
+
 
 %package -n libwayland-client
 Summary: Wayland client library
-License: MIT
+Group: system
 %description -n libwayland-client
 Wayland client library
 
+
 %package -n libwayland-cursor
 Summary: Wayland cursor library
-License: MIT
+Group: system
 %description -n libwayland-cursor
 Wayland cursor library
 
+
+%package -n libwayland-egl
+Summary: Wayland egl library
+%description -n libwayland-egl
+Wayland egl library
+
+
 %package -n libwayland-server
 Summary: Wayland server library
-License: MIT
+Group: system
 %description -n libwayland-server
 Wayland server library
 
-%package -n libwayland-client-devel
-Summary: Headers and symlinks for developing wayland client applications
-License: MIT
-Requires: libwayland-client%{?_isa} = %{version}-%{release}
-Requires: wayland-devel%{?_isa} = %{version}-%{release}
-%description -n libwayland-client-devel
-Headers and symlinks for developing wayland client applications.
 
-%package -n libwayland-cursor-devel
-Summary: Headers and symlinks for developing wayland cursor applications
-License: MIT
-Requires: libwayland-cursor%{?_isa} = %{version}-%{release}
-Requires: wayland-devel%{?_isa} = %{version}-%{release}
-%description -n libwayland-cursor-devel
-Headers and symlinks for developing wayland cursor applications.
+%debug_package
 
-%package -n libwayland-server-devel
-Summary: Headers and symlinks for developing wayland server applications
-License: MIT
-Requires: libwayland-server%{?_isa} = %{version}-%{release}
-Requires: wayland-devel%{?_isa} = %{version}-%{release}
-%description -n libwayland-server-devel
-Headers and symlinks for developing wayland server applications.
 
 %prep
-%setup -q -n %{name}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
+%autosetup -p1
+
 
 %build
-autoreconf -v --install
-%configure --disable-static --enable-documentation
-make %{?_smp_mflags}
+%meson
+%meson_build
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+%meson_install
 
-find $RPM_BUILD_ROOT -name \*.la | xargs rm -f
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%check
+%meson_test
 
-%post -n libwayland-client -p /sbin/ldconfig
-%postun -n libwayland-client -p /sbin/ldconfig
-
-%post -n libwayland-server -p /sbin/ldconfig
-%postun -n libwayland-server -p /sbin/ldconfig
-
-
-%files
-%defattr(-,root,root,-)
-%doc README TODO
-#doc %{_datadir}/doc/wayland/*
 
 %files devel
-%defattr(-,root,root,-)
 %{_bindir}/wayland-scanner
-%{_includedir}/wayland-util.h
-%{_includedir}/wayland-egl.h
-%{_includedir}/wayland-version.h
+%{_includedir}/wayland-*.h
+%{_libdir}/pkgconfig/wayland-*.pc
+%{_libdir}/libwayland-*.so
 %{_datadir}/aclocal/wayland-scanner.m4
-%{_datadir}/aclocal/wayland-scanner.mk
+%dir %{_datadir}/wayland
+%{_datadir}/wayland/wayland-scanner.mk
+%{_datadir}/wayland/wayland.xml
+%{_datadir}/wayland/wayland.dtd
 %{_mandir}/man3/*.3*
 
+%ifarch x86_64
+%files doc
+%doc README
+%{_datadir}/doc/wayland/
+%else
+%exclude %{_datadir}/doc/wayland/*
+%endif
+
 %files -n libwayland-client
-%defattr(-,root,root,-)
 %{_libdir}/libwayland-client.so.0*
 
+
 %files -n libwayland-cursor
-%defattr(-,root,root,-)
 %{_libdir}/libwayland-cursor.so.0*
 
-%files -n libwayland-server
-%defattr(-,root,root,-)
-%{_libdir}/libwayland-server.so.0*
 
-%files -n libwayland-client-devel
-%defattr(-,root,root,-)
-%{_includedir}/wayland-client*.h
-%{_libdir}/libwayland-client.so
-%{_libdir}/pkgconfig/wayland-client.pc
+%files -n libwayland-egl
+%license COPYING
+%{_libdir}/libwayland-egl.so.1*
 
-%files -n libwayland-cursor-devel
-%defattr(-,root,root,-)
-%{_includedir}/wayland-cursor*.h
-%{_libdir}/libwayland-cursor.so
-%{_libdir}/pkgconfig/wayland-cursor.pc
 
-%files -n libwayland-server-devel
-%defattr(-,root,root,-)
-%{_includedir}/wayland-server*.h
-%{_libdir}/libwayland-server.so
-%{_libdir}/pkgconfig/wayland-server.pc
+%files -n libwayland-server
+%{_libdir}/libwayland-server.so.0*
+
 
 %changelog
+* Sat Mar 27 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.19.0-1
+- new upstream release.
+
 * Sun Jan  6 2013 IWAI, Masaharu <iwai@alib.jp> 1.0.3-1
 - initial build for Vine Linux
 - drop Obsoletes: wayland-common

+ 148 - 0
x/xorg-x11-server-Xwayland/xorg-x11-server-Xwayland-vl.spec

@@ -0,0 +1,148 @@
+%bcond_without  eglstream
+
+%global default_font_path "catalogue:/etc/X11/fontpath.d,built-ins"
+
+Summary:        Xwayland
+Name:           xorg-x11-server-Xwayland
+Version:        21.1.0
+Release:        2%{?_dist_release}
+Group:          system
+Distribution:   Vine Linux
+Vendor:         Project Vine
+
+URL:            https://www.x.org/wiki/
+Source0:        https://www.x.org/pub/individual/xserver/xwayland-%{version}.tar.xz
+License:        MIT
+
+Requires:       xorg-x11-server-common
+Requires:       libEGL
+
+BuildRequires:  gcc
+BuildRequires:  git-core
+BuildRequires:  meson
+
+BuildRequires:  wayland-devel
+BuildRequires:  pkgconfig(wayland-client) >= 1.3.0
+BuildRequires:  pkgconfig(wayland-protocols)
+%if %{with eglstream}
+BuildRequires:  pkgconfig(wayland-eglstream-protocols)
+%endif
+BuildRequires:  pkgconfig(dmx)
+BuildRequires:  pkgconfig(epoxy)
+BuildRequires:  pkgconfig(fontenc)
+BuildRequires:  pkgconfig(libdrm) >= 2.4.0
+#BuildRequires:  pkgconfig(libssl)
+BuildRequires:  openssl-devel
+BuildRequires:  pkgconfig(libtirpc)
+#BuildRequires:  pkgconfig(pixman-1)
+BuildRequires:  pixman-devel
+BuildRequires:  pkgconfig(x11)
+BuildRequires:  pkgconfig(xau)
+BuildRequires:  pkgconfig(xdmcp)
+BuildRequires:  pkgconfig(xext)
+BuildRequires:  pkgconfig(xfixes)
+BuildRequires:  pkgconfig(xfont2)
+BuildRequires:  pkgconfig(xi)
+BuildRequires:  pkgconfig(xinerama)
+BuildRequires:  pkgconfig(xkbfile)
+BuildRequires:  pkgconfig(xmu)
+BuildRequires:  pkgconfig(xorg-macros) >= 1.17
+BuildRequires:  pkgconfig(xpm)
+BuildRequires:  pkgconfig(xrender)
+BuildRequires:  pkgconfig(xres)
+BuildRequires:  pkgconfig(xshmfence) >= 1.1
+BuildRequires:  pkgconfig(xtrans) >= 1.3.2
+BuildRequires:  pkgconfig(xtst)
+BuildRequires:  pkgconfig(xv)
+BuildRequires:  xorg-x11-proto-devel >= 7.7-10
+
+BuildRequires:  mesa-libGL-devel >= 9.2
+BuildRequires:  mesa-libEGL-devel
+BuildRequires:  mesa-libgbm-devel
+
+BuildRequires:  audit-libs-devel
+#BuildRequires:  libselinux-devel >= 2.0.86-1
+
+# libunwind is Exclusive for the following arches
+%ifarch aarch64 %{arm} hppa ia64 mips ppc ppc64 %{ix86} x86_64
+BuildRequires:  libunwind-devel
+%endif
+
+BuildRequires:  pkgconfig(xcb-aux)
+BuildRequires:  pkgconfig(xcb-image)
+BuildRequires:  pkgconfig(xcb-icccm)
+BuildRequires:  pkgconfig(xcb-keysyms)
+BuildRequires:  pkgconfig(xcb-renderutil)
+
+%description
+Xwayland is an X server for running X clients under Wayland.
+
+
+%package devel
+Summary: Development package
+Group: programming
+Requires: pkgconfig
+
+%description devel
+The development package provides the developmental files which are
+necessary for developing Wayland compositors using Xwayland.
+
+
+%debug_package
+
+
+%prep
+%autosetup -S git_am -n xwayland-%{version}
+
+
+%build
+%meson \
+%if %{with eglstream}
+        -Dxwayland_eglstream=true \
+%endif
+        -Ddefault_font_path=%{default_font_path} \
+        -Dbuilder_string="Build ID: %{name} %{version}-%{release}" \
+        -Dxkb_output_dir=%{_localstatedir}/lib/xkb \
+        -Dxcsecurity=true \
+        -Dglamor=true \
+        -Ddri3=true
+
+%meson_build
+
+
+%install
+%meson_install
+
+# Remove unwanted files/dirs
+rm $RPM_BUILD_ROOT%{_mandir}/man1/Xserver.1*
+rm -Rf $RPM_BUILD_ROOT%{_libdir}/xorg
+rm -Rf $RPM_BUILD_ROOT%{_includedir}/xorg
+rm -Rf $RPM_BUILD_ROOT%{_datadir}/aclocal
+rm -Rf $RPM_BUILD_ROOT%{_localstatedir}/lib/xkb
+
+
+%files
+%{_bindir}/Xwayland
+%{_mandir}/man1/Xwayland.1*
+
+%files devel
+%{_libdir}/pkgconfig/xwayland.pc
+
+
+%changelog
+* Sat Mar 27 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 21.1.0-2
+- initial build for Vine Linux.
+
+* Thu Mar  18 2021 Olivier Fourdan <ofourdan@redhat.com> - 21.1.0-1
+- xwayland 21.1.0
+
+* Thu Mar  4 2021 Olivier Fourdan <ofourdan@redhat.com> - 21.0.99.902-1
+- xwayland 21.0.99.902
+- Remove xdmcp, udev, udev_kms build options
+- Stop overriding the vendor name, same as xorg-x11-server
+
+* Thu Feb 18 2021 Olivier Fourdan <ofourdan@redhat.com> - 21.0.99.901-1
+- xwayland 21.0.99.901
+
+* Mon Feb  1 2021 Olivier Fourdan <ofourdan@redhat.com> - 1.20.99.1-0.1.20210201git5429791
+- Initial import (#1912335).