From f4d631d40e2465840986aacfe63463c85ae01bfe Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Fri, 5 Jan 2024 19:48:58 +0100
Subject: [PATCH] rebuilt with libglvnd [release 1.20.11-2mamba;Mon Apr 26
 2021]

---
 xorg-server.spec | 63 ++++++++++++------------------------------------
 1 file changed, 16 insertions(+), 47 deletions(-)

diff --git a/xorg-server.spec b/xorg-server.spec
index 0c9842d..6920d39 100644
--- a/xorg-server.spec
+++ b/xorg-server.spec
@@ -1,6 +1,6 @@
 Name:          xorg-server
 Version:       1.20.11
-Release:       1mamba
+Release:       2mamba
 Summary:       The core of the X.Org Foundation implementation of the X Window system
 Group:         System/X11
 Vendor:        openmamba
@@ -19,7 +19,6 @@ Patch3:        xorg-server-1.15.2-libunwind-arm.patch
 License:       MIT
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
-BuildRequires: libGL-devel
 BuildRequires: libICE-devel
 BuildRequires: libSM-devel
 BuildRequires: libX11-devel
@@ -34,6 +33,7 @@ BuildRequires: libXmu-devel
 BuildRequires: libXpm-devel
 BuildRequires: libXrender-devel
 BuildRequires: libXt-devel
+BuildRequires: libbrotli-devel
 BuildRequires: libbsd-devel
 BuildRequires: libbzip2-devel
 BuildRequires: libdbus-devel
@@ -43,12 +43,13 @@ BuildRequires: libepoxy-devel
 BuildRequires: libffi-devel
 BuildRequires: libfontenc-devel
 BuildRequires: libfreetype-devel
-BuildRequires: libgbm-devel
 BuildRequires: libgcc
 BuildRequires: libglib-devel
+BuildRequires: libglvnd-devel
 BuildRequires: libgraphite2-devel
 BuildRequires: libharfbuzz-devel
 BuildRequires: liblzma-devel
+BuildRequires: libmesa-devel
 BuildRequires: libnettle-devel
 BuildRequires: libpciaccess-devel
 BuildRequires: libpcre-devel
@@ -215,9 +216,9 @@ install -D -m0644 %{SOURCE2} %{buildroot}%{_mandir}/man1/xvfb-run.1
 install hw/xfree86/parser/xf86Parser.h %{buildroot}%{_includedir}/xorg/
 install hw/xfree86/parser/xf86Optrec.h %{buildroot}%{_includedir}/xorg/
 
-install -d -m0755 %{buildroot}%{_libdir}/xorg/glx-dri
-mv %{buildroot}%{_libdir}/xorg/modules/extensions/libglx.so \
-   %{buildroot}%{_libdir}/xorg/glx-dri/libglx.so
+#install -d -m0755 %{buildroot}%{_libdir}/xorg/glx-dri
+#mv %{buildroot}%{_libdir}/xorg/modules/extensions/libglx.so \
+#   %{buildroot}%{_libdir}/xorg/glx-dri/libglx.so
 
 #mv %{buildroot}%{_libdir}/xorg/modules/extensions/libdri.so \
 #   %{buildroot}%{_libdir}/xorg/modules/extensions/libdri_so
@@ -225,6 +226,11 @@ mv %{buildroot}%{_libdir}/xorg/modules/extensions/libglx.so \
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 
+%pre
+# Remove obsolete alternatives configuration for libglx.so
+[ -L %{_libdir}/xorg/modules/extensions/libglx.so ] && rm -f %{_libdir}/xorg/modules/extensions/libglx.so
+:
+
 %post
 if [ $1 -eq 1 ]; then
    [ -e %{_sysconfdir}/X11/xorg.conf ] && {
@@ -245,46 +251,6 @@ if [ $1 -eq 1 ]; then
 fi
 exit 0
 
-%post -n xorg-ext-libglx
-/usr/sbin/update-alternatives \
-   --remove libglx.so %{_libdir}/xorg/modules/extensions/libglx_dri.so 2>/dev/null
-/usr/sbin/update-alternatives \
-   --remove libglx.so %{_libdir}/xorg/modules/extensions/libglx_dri_so 2>/dev/null
-/usr/sbin/update-alternatives \
-   --remove libglx.so %{_libdir}/xorg/modules/extensions/dri/libglx.so 2>/dev/null
-/usr/sbin/update-alternatives \
-   --remove libglx.so %{_libdir}/xorg/modules/extensions/glx-dri/libglx.so 2>/dev/null
-/usr/sbin/update-alternatives \
-   --remove libglx.so %{_libdir}/xorg/modules/glx-dri/libglx.so 2>/dev/null
-   
-/usr/sbin/update-alternatives \
-   --install %{_libdir}/xorg/modules/extensions/libglx.so libglx.so \
-   %{_libdir}/xorg/glx-dri/libglx.so 50
-
-#/usr/sbin/update-alternatives \
-#   --install %{_libdir}/xorg/modules/extensions/libdri.so libdri.so \
-#   %{_libdir}/xorg/modules/extensions/libdri_so 50
-
-[ -e `readlink /etc/alternatives/libglx.so` ] || {
-   /usr/sbin/update-alternatives --set libglx.so %{_libdir}/xorg/glx-dri/libglx.so
-}
-exit 0
-
-%preun -n xorg-ext-libglx
-if [ $1 -eq 0 ]; then
-   /usr/sbin/update-alternatives --remove libglx.so \
-      %{_libdir}/xorg/modules/extensions/libglx_dri_so
-   /usr/sbin/update-alternatives --remove libglx.so \
-      %{_libdir}/xorg/modules/extensions/dri/libglx.so
-   /usr/sbin/update-alternatives --remove libglx.so \
-      %{_libdir}/xorg/modules/glx-dri/libglx.so
-   /usr/sbin/update-alternatives --remove libglx.so \
-      %{_libdir}/xorg/glx-dri/libglx.so
-   /usr/sbin/update-alternatives --remove libdri.so \
-      %{_libdir}/xorg/modules/extensions/libdri_so
-fi
-exit 0
-
 %files
 %defattr(-,root,root)
 %dir %{_sysconfdir}/X11
@@ -365,9 +331,12 @@ exit 0
 %defattr(-,root,root)
 %dir %{_libdir}/xorg/modules/extensions
 %{_libdir}/xorg/modules/extensions/libglx.la
-%{_libdir}/xorg/glx-dri/libglx.so
+%{_libdir}/xorg/modules/extensions/libglx.so
 
 %changelog
+* Mon Apr 26 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 1.20.11-2mamba
+- rebuilt with libglvnd
+
 * Wed Apr 14 2021 Automatic Build System <autodist@mambasoft.it> 1.20.11-1mamba
 - automatic version update by autodist