Attachment 212657 Details for Bug 239939 – [patch] fix stage-qa findings & speed up the build a bit

[patch] [patch] fix stage-qa findings & speed up the build a bit

pr-mesa-dri-fix-warnings.diff (text/plain), 3.49 KB, created by John Hein on 2020-03-23 21:31:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Hein

Created: 2020-03-23 21:31:49 UTC

Size: 3.49 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 528643)
>+++ Makefile	(working copy)
>@@ -74,6 +74,8 @@
> . endif
> .endif
> 
>+CONFIGURE_ARGS+=	--disable-egl --disable-gles2 --disable-glx
>+
> # enables VK_KHR_wayland_surface in Vulkan drivers
> .if ${PORT_OPTIONS:MWAYLAND} && !empty(VULKAN_DRIVERS)
> CONFIGURE_ARGS+=	--with-platforms=x11,surfaceless,drm,wayland
>Index: Makefile.common
>===================================================================
>--- Makefile.common	(revision 528643)
>+++ Makefile.common	(working copy)
>@@ -48,7 +48,7 @@
> .endif
> 
> USES+=		compiler:c++11-lib bison gettext-tools gmake libtool \
>-		localbase pathfix pkgconfig python:2.7,build shebangfix tar:xz
>+		localbase pathfix pkgconfig python:build shebangfix tar:xz
> USE_LDCONFIG=	yes
> GNU_CONFIGURE=	yes
> 
>Index: Makefile.targets
>===================================================================
>--- Makefile.targets	(revision 528643)
>+++ Makefile.targets	(working copy)
>@@ -6,8 +6,6 @@
> .if ${OPSYS} == FreeBSD
> 	@${REINPLACE_CMD} -e 's|x86_64|amd64|' ${WRKSRC}/configure
> .endif
>-	@${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' \
>-		${WRKSRC}/src/util/xmlconfig.c
> 
> pre-build: mesa-pre-build
> 
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 528643)
>+++ pkg-plist	(working copy)
>@@ -1,25 +1,8 @@
>-@comment include/EGL/egl.h
>-@comment include/EGL/eglext.h
>-@comment include/EGL/eglextchromium.h
>-@comment include/EGL/eglmesaext.h
>-@comment include/EGL/eglplatform.h
> @comment include/GL/gl.h
> @comment include/GL/gl_mangle.h
> @comment include/GL/glcorearb.h
> @comment include/GL/glext.h
>-@comment include/GL/glx.h
>-@comment include/GL/glx_mangle.h
>-@comment include/GL/glxext.h
> include/GL/internal/dri_interface.h
>-@comment include/GL/osmesa.h
>-@comment include/GLES2/gl2.h
>-@comment include/GLES2/gl2ext.h
>-@comment include/GLES2/gl2platform.h
>-@comment include/GLES3/gl3.h
>-@comment include/GLES3/gl31.h
>-@comment include/GLES3/gl32.h
>-@comment include/GLES3/gl3ext.h
>-@comment include/GLES3/gl3platform.h
> @comment include/KHR/khrplatform.h
> @comment include/gbm.h
> %%INTEL_VDRIVER%%include/vulkan/vulkan_intel.h
>@@ -38,26 +21,6 @@
> %%SWRAST_DRIVER%%lib/dri/swrast_dri.so
> %%VC4_GDRIVER%%lib/dri/vc4_dri.so
> %%SVGA_GDRIVER%%lib/dri/vmwgfx_dri.so
>-@comment lib/gallium-pipe/pipe_r300.so
>-@comment lib/gallium-pipe/pipe_r600.so
>-@comment lib/gallium-pipe/pipe_radeonsi.so
>-@comment lib/gallium-pipe/pipe_swrast.so
>-@comment lib/gallium-pipe/pipe_vmwgfx.so
>-@comment lib/libEGL.so
>-@comment lib/libEGL.so.1
>-@comment lib/libEGL.so.1.0.0
>-@comment lib/libGL.so
>-@comment lib/libGL.so.1
>-@comment lib/libGL.so.1.2.0
>-@comment lib/libGLESv2.so
>-@comment lib/libGLESv2.so.2
>-@comment lib/libGLESv2.so.2.0.0
>-@comment lib/libMesaOpenCL.so
>-@comment lib/libMesaOpenCL.so.1
>-@comment lib/libMesaOpenCL.so.1.0.0
>-@comment lib/libOSMesa.so
>-@comment lib/libOSMesa.so.8
>-@comment lib/libOSMesa.so.8.0.0
> %%R600_GDRIVER%%lib/libXvMCr600.so
> %%R600_GDRIVER%%lib/libXvMCr600.so.1
> %%R600_GDRIVER%%lib/libXvMCr600.so.1.0
>@@ -83,11 +46,7 @@
> %%INTEL_VDRIVER%%lib/libvulkan_intel.so
> %%RADEON_VDRIVER%%lib/libvulkan_radeon.so
> libdata/pkgconfig/dri.pc
>-@comment libdata/pkgconfig/egl.pc
> @comment libdata/pkgconfig/gbm.pc
>-@comment libdata/pkgconfig/gl.pc
>-@comment libdata/pkgconfig/glesv2.pc
>-@comment libdata/pkgconfig/osmesa.pc
> share/drirc.d/00-mesa-defaults.conf
> %%INTEL_VDRIVER%%share/vulkan/icd.d/intel_icd.%%ARCH%%.json
> %%RADEON_VDRIVER%%share/vulkan/icd.d/radeon_icd.%%ARCH%%.json

Flags:

koobs: maintainer-approval-

Actions: View | Diff

Attachments on bug 239939: 206658 | 212657