Enable libEGL for all platforms

Enable libEGL build for all platforms, even those without llvm.  Previously
it was disabled on those platforms.  This has been tested on sparc64.

Remove the EGL option completely.

PR:		232729
Submitted by:	jbeich
Tested by:	Yoshihiko Iwama (sparc64 support)
This commit is contained in:
Niclas Zeising 2018-11-08 20:31:08 +00:00
parent a1fb50ad64
commit a245eb7b5a
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=484475
4 changed files with 14 additions and 39 deletions

View File

@ -13,18 +13,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
USES= localbase meson pkgconfig python:3.3+,build tar:xz
USE_XORG= x11
USE_GL= gl glesv2
USE_GL= gl glesv2 egl
USE_LDCONFIG= yes
OPTIONS_SUB= yes
OPTIONS_DEFINE= EGL
OPTIONS_DEFAULT=EGL
OPTIONS_EXCLUDE_sparc64= EGL
OPTIONS_EXCLUDE_mips= EGL
EGL_DESC= Build EGL support
EGL_USE= GL=egl
EGL_MESON_YES= egl
.include <bsd.port.mk>

View File

@ -1,6 +1,6 @@
include/epoxy/common.h
%%EGL%%include/epoxy/egl.h
%%EGL%%include/epoxy/egl_generated.h
include/epoxy/egl.h
include/epoxy/egl_generated.h
include/epoxy/gl.h
include/epoxy/gl_generated.h
include/epoxy/glx.h

View File

@ -3,7 +3,7 @@
PORTNAME= mesa-libs
PORTVERSION= ${MESAVERSION}
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= graphics
COMMENT= OpenGL libraries that support GLX and EGL clients
@ -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

View File

@ -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