--- trunk/extras/xorg-server/xorg-server-1.20.5-r1.smage2	2019/10/18 21:04:12	33146
+++ trunk/extras/xorg-server/xorg-server-1.20.5-r1.smage2	2019/10/18 22:07:55	33148
@@ -9,11 +9,6 @@
 PCAT="x11-base"
 HOMEPAGE="http://xorg.freedesktop.org"
 
-# mesa sources are needed to compile opengl extensions
-MESA_PVER="19.2.1"
-MESA_SRCFILE="mesa-${MESA_PVER/_/-}.tar.xz"
-MESA_SRCDIR="${BUILDDIR}/mesa-${MESA_PVER/_/-}"
-
 PROVIDE="virtual/x11"
 
 # see hw/xfree86/common/xf86Module.h for ABI versions
@@ -43,7 +38,7 @@
 LIBXEXT_DEPEND=">= x11-libs/libXext-1.3"
 LIBX11_DEPEND=">= x11-libs/libX11-1.6"
 LIBXI_DEPEND=">= x11-libs/libXi-1.7"
-MESA_DEPEND="== media-libs/mesa-${MESA_PVER}"
+MESA_DEPEND="== media-libs/mesa-19.2"
 EPOXY_DEPEND=">= media-libs/libepoxy-1.4"
 
 XORG_DEPEND="${COMMON_DEPEND}
@@ -104,9 +99,6 @@
 
 SRC_URI=( ${SRC_URI[*]}
 	mirror://${PNAME}/${SRCFILE}
-	ftp://ftp.freedesktop.org/pub/mesa/${MESA_PVER}/${MESA_SRCFILE}
-	ftp://ftp.freedesktop.org/pub/mesa/${MESA_SRCFILE}
-	mirror://mesa/${MESA_SRCFILE}
 	mirror://${PNAME}/xvfb-run
 	mirror://${PNAME}/xvfb-run.1
 	mirror://${PNAME}/${PNAME}-1.12.3-die-ugly-pattern-die-die-die.patch
@@ -174,7 +166,6 @@
 src_prepare()
 {
 	munpack ${SRCFILE} || die
-	munpack ${MESA_SRCFILE} || die
 	cd ${SRCDIR}
 
 	# adopted from redhat; use a black background
@@ -204,7 +195,6 @@
 	cd ${SRCDIR}
 
 	xorg_src_configure \
-		--with-mesa-source=${MESA_SRCDIR} \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--libexecdir=/usr/$(mlibdir)/${PNAME} \