Attachment #198676 for bug #232729

View | Details | Raw Unified | Return to bug 232729 | Differences between
Collapse All | Expand All





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

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




@comment etc/drirc
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

include/GLES3/gl32.h
include/GLES3/gl3ext.h
include/GLES3/gl3platform.h
include/KHR/khrplatform.h
include/gbm.h
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

@comment %%WAYLAND%%lib/libwayland-egl.so
@comment %%WAYLAND%%lib/libwayland-egl.so.1
@comment %%WAYLAND%%lib/libwayland-egl.so.1.0.0
libdata/pkgconfig/egl.pc
libdata/pkgconfig/gbm.pc
libdata/pkgconfig/gl.pc
libdata/pkgconfig/glesv2.pc

Return to bug 232729

Lines 24-43 WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland \ Link Here

(-)b/graphics/mesa-libs/Makefile (-14 lines)
24		24
25	CONFIGURE_ARGS+= --with-dri-drivers="" --with-gallium-drivers=""	25	CONFIGURE_ARGS+= --with-dri-drivers="" --with-gallium-drivers=""
26		26
27	# libEGL needs gallium enabled which depends on llvm
28	.if "${MESA_LLVM_VER}" != ""
29	.if ${PORT_OPTIONS:MWAYLAND}	27	.if ${PORT_OPTIONS:MWAYLAND}
30	CONFIGURE_ARGS+= --with-platforms=x11,surfaceless,drm,wayland	28	CONFIGURE_ARGS+= --with-platforms=x11,surfaceless,drm,wayland
31	.else
32	CONFIGURE_ARGS+= --with-platforms=x11,surfaceless,drm
33	.endif
34	PLIST_SUB+= EGL=""
35	.else
36	CONFIGURE_ARGS+= --disable-egl
37	PLIST_SUB+= EGL="@comment "
38	.if ${PORT_OPTIONS:MWAYLAND}
39	IGNORE= option WAYLAND is only valid on platforms with LLVM
40	.endif
41	.endif	29	.endif
42		30
43	MESA_BUILD_WRKSRC= src/mapi src/util	31	MESA_BUILD_WRKSRC= src/mapi src/util
Lines 51-60 MESA_INSTALL_WRKSRC+= src/egl/wayland/wayland-egl Link Here
51	MESA_BUILD_WRKSRC+= src/gbm src/glx	39	MESA_BUILD_WRKSRC+= src/gbm src/glx
52	MESA_INSTALL_WRKSRC+= src/gbm src/glx	40	MESA_INSTALL_WRKSRC+= src/gbm src/glx
53		41
54	.if "${MESA_LLVM_VER}" != ""
55	MESA_BUILD_WRKSRC+= src/egl	42	MESA_BUILD_WRKSRC+= src/egl
56	MESA_INSTALL_WRKSRC+= src/egl	43	MESA_INSTALL_WRKSRC+= src/egl
57	.endif
58		44
59	.if ${ARCH} == "i386"	45	.if ${ARCH} == "i386"
60	# PR230239 Fix the build for i386 when WITH_LLD_IS_LD is set	46	# PR230239 Fix the build for i386 when WITH_LLD_IS_LD is set

Lines 1-9 Link Here

(-)b/graphics/mesa-libs/pkg-plist (-10 / +10 lines)
1	@comment etc/drirc	1	@comment etc/drirc
2	%%EGL%%include/EGL/egl.h	2	include/EGL/egl.h
3	%%EGL%%include/EGL/eglext.h	3	include/EGL/eglext.h
4	%%EGL%%include/EGL/eglextchromium.h	4	include/EGL/eglextchromium.h
5	%%EGL%%include/EGL/eglmesaext.h	5	include/EGL/eglmesaext.h
6	%%EGL%%include/EGL/eglplatform.h	6	include/EGL/eglplatform.h
7	include/GL/gl.h	7	include/GL/gl.h
8	include/GL/gl_mangle.h	8	include/GL/gl_mangle.h
9	include/GL/glcorearb.h	9	include/GL/glcorearb.h
Lines 19-29 include/GLES3/gl31.h Link Here
19	include/GLES3/gl32.h	19	include/GLES3/gl32.h
20	include/GLES3/gl3ext.h	20	include/GLES3/gl3ext.h
21	include/GLES3/gl3platform.h	21	include/GLES3/gl3platform.h
22	%%EGL%%include/KHR/khrplatform.h	22	include/KHR/khrplatform.h
23	include/gbm.h	23	include/gbm.h
24	%%EGL%%lib/libEGL.so	24	lib/libEGL.so
25	%%EGL%%lib/libEGL.so.1	25	lib/libEGL.so.1
26	%%EGL%%lib/libEGL.so.1.0.0	26	lib/libEGL.so.1.0.0
27	lib/libGL.so	27	lib/libGL.so
28	lib/libGL.so.1	28	lib/libGL.so.1
29	lib/libGL.so.1.2.0	29	lib/libGL.so.1.2.0
Lines 39-45 lib/libglapi.so.0.0.0 Link Here
39	@comment %%WAYLAND%%lib/libwayland-egl.so	39	@comment %%WAYLAND%%lib/libwayland-egl.so
40	@comment %%WAYLAND%%lib/libwayland-egl.so.1	40	@comment %%WAYLAND%%lib/libwayland-egl.so.1
41	@comment %%WAYLAND%%lib/libwayland-egl.so.1.0.0	41	@comment %%WAYLAND%%lib/libwayland-egl.so.1.0.0
42	%%EGL%%libdata/pkgconfig/egl.pc	42	libdata/pkgconfig/egl.pc
43	libdata/pkgconfig/gbm.pc	43	libdata/pkgconfig/gbm.pc
44	libdata/pkgconfig/gl.pc	44	libdata/pkgconfig/gl.pc
45	libdata/pkgconfig/glesv2.pc	45	libdata/pkgconfig/glesv2.pc