From 6a06b41658dddacd37693fc59abfbe2fade88cce Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 1 Dec 2019 15:52:06 +0100
Subject: [PATCH] xorg-server: switch to glvnd.

- no need to make the libglx symlink anymore.
- removed 20-modules.conf, not needed anymore with a recent musl.
---
 srcpkgs/xorg-server/files/20-modules.conf | 14 --------------
 srcpkgs/xorg-server/template              | 11 +----------
 2 files changed, 1 insertion(+), 24 deletions(-)
 delete mode 100644 srcpkgs/xorg-server/files/20-modules.conf

diff --git a/srcpkgs/xorg-server/files/20-modules.conf b/srcpkgs/xorg-server/files/20-modules.conf
deleted file mode 100644
index 5498000bdb7..00000000000
--- a/srcpkgs/xorg-server/files/20-modules.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-Section "Module"
-	Load "exa"
-	Load "glx"
-	Load "int10"
-	Load "vbe"
-	# Load "wfb"
-	Load "fb"
-	Load "fbdevhw"
-	Load "shadowfb"
-	Load "shadow"
-	Load "vgahw"
-	Load "evdev"
-	Load "glamoregl"
-EndSection
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index af02d94730a..f3014184280 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,7 +1,7 @@
 # Template file for 'xorg-server'
 pkgname=xorg-server
 version=1.20.6
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
  -Dxvfb=true -Dhal=false -Dudev=true -Dxkb_dir=/usr/share/X11/xkb
@@ -66,21 +66,12 @@ pre_configure() {
 }
 
 post_install() {
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl) vinstall ${FILESDIR}/20-modules.conf 644 usr/share/X11/xorg.conf.d;;
-	esac
 	vinstall ${FILESDIR}/Xwrapper.config 644 etc/X11
 
 	vlicense COPYING
 
 	chmod 4755 ${DESTDIR}/usr/libexec/Xorg.wrap
 
-	if [ -e ${DESTDIR}/usr/lib/xorg/modules/extensions/libglx.so ]; then
-		# Support nvidia and amd binary blobs to provide their own
-		# implementation.
-		mv ${DESTDIR}/usr/lib/xorg/modules/extensions/{libglx.so,libglx-xorg.so}
-	fi
-
 	find "${DESTDIR}"/usr/share/man -type f -iname '*[1-5].gz' -exec gunzip '{}' \;
 
 	# Readd old symlink