From 813c3b27cbd6029943cc99c2ffdb8291060bd043 Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@FreeBSD.org>
Date: Fri, 26 Oct 2018 18:25:28 +0000
Subject: [PATCH] graphics/mesa-libs: enable libGL on sparc64

PR:		232729
Approved by:	x11 (NOT YET)
---
 graphics/mesa-libs/Makefile  | 14 --------------
 graphics/mesa-libs/pkg-plist | 20 ++++++++++----------
 2 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/graphics/mesa-libs/Makefile b/graphics/mesa-libs/Makefile
index c61aa4e276fe..794988812805 100644
--- a/graphics/mesa-libs/Makefile
+++ b/graphics/mesa-libs/Makefile
@@ -24,20 +24,8 @@ WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland \
 
 CONFIGURE_ARGS+=	--with-dri-drivers="" --with-gallium-drivers=""
 
-# libEGL needs gallium enabled which depends on llvm
-.if "${MESA_LLVM_VER}" != ""
 .if ${PORT_OPTIONS:MWAYLAND}
 CONFIGURE_ARGS+=	--with-platforms=x11,surfaceless,drm,wayland
-.else
-CONFIGURE_ARGS+=	--with-platforms=x11,surfaceless,drm
-.endif
-PLIST_SUB+=		EGL=""
-.else
-CONFIGURE_ARGS+=	--disable-egl
-PLIST_SUB+=		EGL="@comment "
-.if ${PORT_OPTIONS:MWAYLAND}
-IGNORE=	option WAYLAND is only valid on platforms with LLVM
-.endif
 .endif
 
 MESA_BUILD_WRKSRC=	src/mapi src/util
@@ -51,10 +39,8 @@ MESA_INSTALL_WRKSRC+=	src/egl/wayland/wayland-egl
 MESA_BUILD_WRKSRC+=	src/gbm src/glx
 MESA_INSTALL_WRKSRC+=	src/gbm src/glx
 
-.if "${MESA_LLVM_VER}" != ""
 MESA_BUILD_WRKSRC+=	src/egl
 MESA_INSTALL_WRKSRC+=	src/egl
-.endif
 
 .if ${ARCH} == "i386"
 # PR230239 Fix the build for i386 when WITH_LLD_IS_LD is set
diff --git a/graphics/mesa-libs/pkg-plist b/graphics/mesa-libs/pkg-plist
index 5d6caba93303..ed52d98e35de 100644
--- a/graphics/mesa-libs/pkg-plist
+++ b/graphics/mesa-libs/pkg-plist
@@ -1,9 +1,9 @@
 @comment etc/drirc
-%%EGL%%include/EGL/egl.h
-%%EGL%%include/EGL/eglext.h
-%%EGL%%include/EGL/eglextchromium.h
-%%EGL%%include/EGL/eglmesaext.h
-%%EGL%%include/EGL/eglplatform.h
+include/EGL/egl.h
+include/EGL/eglext.h
+include/EGL/eglextchromium.h
+include/EGL/eglmesaext.h
+include/EGL/eglplatform.h
 include/GL/gl.h
 include/GL/gl_mangle.h
 include/GL/glcorearb.h
@@ -19,11 +19,11 @@ include/GLES3/gl31.h
 include/GLES3/gl32.h
 include/GLES3/gl3ext.h
 include/GLES3/gl3platform.h
-%%EGL%%include/KHR/khrplatform.h
+include/KHR/khrplatform.h
 include/gbm.h
-%%EGL%%lib/libEGL.so
-%%EGL%%lib/libEGL.so.1
-%%EGL%%lib/libEGL.so.1.0.0
+lib/libEGL.so
+lib/libEGL.so.1
+lib/libEGL.so.1.0.0
 lib/libGL.so
 lib/libGL.so.1
 lib/libGL.so.1.2.0
@@ -39,7 +39,7 @@ lib/libglapi.so.0.0.0
 @comment %%WAYLAND%%lib/libwayland-egl.so
 @comment %%WAYLAND%%lib/libwayland-egl.so.1
 @comment %%WAYLAND%%lib/libwayland-egl.so.1.0.0
-%%EGL%%libdata/pkgconfig/egl.pc
+libdata/pkgconfig/egl.pc
 libdata/pkgconfig/gbm.pc
 libdata/pkgconfig/gl.pc
 libdata/pkgconfig/glesv2.pc