Sat Jan 19 21:54:03 2019 UTC ()
MesaLib18: fix build on Mac OS X

Tested with x11/modular-xorg-xquartz on Mojave.


(tnn)
diff -r1.12 -r1.13 pkgsrc/graphics/MesaLib18/Makefile
diff -r1.4 -r1.5 pkgsrc/graphics/MesaLib18/PLIST
diff -r1.10 -r1.11 pkgsrc/graphics/MesaLib18/distinfo
diff -r1.9 -r1.10 pkgsrc/graphics/MesaLib18/options.mk
diff -r1.2 -r0 pkgsrc/graphics/MesaLib18/files/patch-manual_fdo90311
diff -r0 -r1.1 pkgsrc/graphics/MesaLib18/patches/patch-src_glx_Makefile.am
diff -r0 -r1.1 pkgsrc/graphics/MesaLib18/patches/patch-src_glx_dri__common.h
diff -r0 -r1.1 pkgsrc/graphics/MesaLib18/patches/patch-src_mesa_drivers_x11_Makefile.am
cvs diff -r1.12 -r1.13 pkgsrc/graphics/MesaLib18/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/MesaLib18/Attic/Makefile 2019/01/19 17:47:51 1.12
+++ pkgsrc/graphics/MesaLib18/Attic/Makefile 2019/01/19 21:54:03 1.13
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.12 2019/01/19 17:47:51 tnn Exp $ 1# $NetBSD: Makefile,v 1.13 2019/01/19 21:54:03 tnn Exp $
2 2
3DISTNAME= mesa-18.3.2 3DISTNAME= mesa-18.3.2
4PKGNAME= ${DISTNAME:S/mesa/MesaLib/} 4PKGNAME= ${DISTNAME:S/mesa/MesaLib/}
5CATEGORIES= graphics x11 5CATEGORIES= graphics x11
6MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/ 6MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/
7# MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/${PKGVERSION_NOREV}/ 7# MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/${PKGVERSION_NOREV}/
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://www.mesa3d.org/ 11HOMEPAGE= https://www.mesa3d.org/
12COMMENT= The Mesa 3D Graphics Library 12COMMENT= The Mesa 3D Graphics Library
13LICENSE= mit 13LICENSE= mit
14 14
@@ -78,35 +78,27 @@ CONFIGURE_ENV+= PYTHON=${PYTHONBIN} @@ -78,35 +78,27 @@ CONFIGURE_ENV+= PYTHON=${PYTHONBIN}
78 78
79# Handle platforms without exp2 79# Handle platforms without exp2
80.if !empty(MACHINE_PLATFORM:MNetBSD-[1-5].*-*) 80.if !empty(MACHINE_PLATFORM:MNetBSD-[1-5].*-*)
81CPPFLAGS+= -Dexp2\(x\)=exp\(\(x\)\*M_LN2\) 81CPPFLAGS+= -Dexp2\(x\)=exp\(\(x\)\*M_LN2\)
82CPPFLAGS+= -Dexp2f\(x\)=expf\(\(x\)\*M_LN2\) 82CPPFLAGS+= -Dexp2f\(x\)=expf\(\(x\)\*M_LN2\)
83.endif 83.endif
84 84
85# Work around Xorg segfaulting in radeon driver due to wrong alloca being used 85# Work around Xorg segfaulting in radeon driver due to wrong alloca being used
86CFLAGS.NetBSD+= -Dalloca=__builtin_alloca 86CFLAGS.NetBSD+= -Dalloca=__builtin_alloca
87CXXFLAGS.NetBSD+= -Dalloca=__builtin_alloca 87CXXFLAGS.NetBSD+= -Dalloca=__builtin_alloca
88 88
89pre-configure: 89pre-configure:
90 cd ${WRKSRC} && autoreconf -vif 90 cd ${WRKSRC} && autoreconf -vif
91# Manual patch for FDO bug 90311. Don't apply if not on Darwin as there could 
92# be side effects. 
93.if ${OPSYS} == "Darwin" 
94pre-configure: ${WRKDIR}/.manual_patch_done 
95${WRKDIR}/.manual_patch_done: 
96 cd ${WRKSRC} && ${TOOLS_PATCH} -z .manual -p0 < ${FILESDIR}/patch-manual_fdo90311 
97 touch ${WRKSRC}/src/glx/dummy.cpp 91 touch ${WRKSRC}/src/glx/dummy.cpp
98 touch ${.TARGET} 
99.endif 
100 92
101DRIRC_DIR= ${PKG_SYSCONFDIR}/drirc.d 93DRIRC_DIR= ${PKG_SYSCONFDIR}/drirc.d
102EGDIR= ${PREFIX}/share/examples/mesa 94EGDIR= ${PREFIX}/share/examples/mesa
103OWN_DIRS+= ${DRIRC_DIR} 95OWN_DIRS+= ${DRIRC_DIR}
104INSTALLATION_DIRS+= ${EGDIR} 96INSTALLATION_DIRS+= ${EGDIR}
105CONF_FILES+= ${EGDIR}/00-mesa-defaults.conf \ 97CONF_FILES+= ${EGDIR}/00-mesa-defaults.conf \
106 ${DRIRC_DIR}/00-mesa-defaults.conf 98 ${DRIRC_DIR}/00-mesa-defaults.conf
107 99
108post-install: 100post-install:
109 ${INSTALL_DATA} ${WRKSRC}/src/util/00-mesa-defaults.conf ${DESTDIR}${EGDIR} 101 ${INSTALL_DATA} ${WRKSRC}/src/util/00-mesa-defaults.conf ${DESTDIR}${EGDIR}
110 102
111.include "../../devel/zlib/buildlink3.mk" 103.include "../../devel/zlib/buildlink3.mk"
112.include "../../x11/libXrandr/buildlink3.mk" 104.include "../../x11/libXrandr/buildlink3.mk"
cvs diff -r1.4 -r1.5 pkgsrc/graphics/MesaLib18/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/graphics/MesaLib18/Attic/PLIST 2019/01/19 17:47:51 1.4
+++ pkgsrc/graphics/MesaLib18/Attic/PLIST 2019/01/19 21:54:03 1.5
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1@comment $NetBSD: PLIST,v 1.4 2019/01/19 17:47:51 tnn Exp $ 1@comment $NetBSD: PLIST,v 1.5 2019/01/19 21:54:03 tnn Exp $
2${PLIST.dri}include/EGL/egl.h 2${PLIST.egl}include/EGL/egl.h
3${PLIST.dri}include/EGL/eglext.h 3${PLIST.egl}include/EGL/eglext.h
4${PLIST.dri}include/EGL/eglextchromium.h 4${PLIST.egl}include/EGL/eglextchromium.h
5${PLIST.dri}include/EGL/eglmesaext.h 5${PLIST.egl}include/EGL/eglmesaext.h
6${PLIST.dri}include/EGL/eglplatform.h 6${PLIST.egl}include/EGL/eglplatform.h
7include/GL/gl.h 7include/GL/gl.h
8include/GL/gl_mangle.h 8include/GL/gl_mangle.h
9include/GL/glcorearb.h 9include/GL/glcorearb.h
10include/GL/glext.h 10include/GL/glext.h
11include/GL/glx.h 11include/GL/glx.h
12include/GL/glx_mangle.h 12include/GL/glx_mangle.h
13include/GL/glxext.h 13include/GL/glxext.h
14${PLIST.osmesa}include/GL/osmesa.h 14${PLIST.osmesa}include/GL/osmesa.h
15${PLIST.dri}include/GL/internal/dri_interface.h 15${PLIST.dri}include/GL/internal/dri_interface.h
16${PLIST.glesv1}include/GLES/egl.h 16${PLIST.glesv1}include/GLES/egl.h
17${PLIST.glesv1}include/GLES/gl.h 17${PLIST.glesv1}include/GLES/gl.h
18${PLIST.glesv1}include/GLES/glext.h 18${PLIST.glesv1}include/GLES/glext.h
19${PLIST.glesv1}include/GLES/glplatform.h 19${PLIST.glesv1}include/GLES/glplatform.h
@@ -39,45 +39,45 @@ ${PLIST.i965}lib/dri/i965_dri.so @@ -39,45 +39,45 @@ ${PLIST.i965}lib/dri/i965_dri.so
39${PLIST.freedreno}lib/dri/kgsl_dri.so 39${PLIST.freedreno}lib/dri/kgsl_dri.so
40${PLIST.swrast}lib/dri/kms_swrast_dri.so 40${PLIST.swrast}lib/dri/kms_swrast_dri.so
41${PLIST.freedreno}lib/dri/msm_dri.so 41${PLIST.freedreno}lib/dri/msm_dri.so
42${PLIST.nouveau}lib/dri/nouveau_dri.so 42${PLIST.nouveau}lib/dri/nouveau_dri.so
43${PLIST.nouveau_dri}lib/dri/nouveau_vieux_dri.so 43${PLIST.nouveau_dri}lib/dri/nouveau_vieux_dri.so
44${PLIST.r200}lib/dri/r200_dri.so 44${PLIST.r200}lib/dri/r200_dri.so
45${PLIST.r300}lib/dri/r300_dri.so 45${PLIST.r300}lib/dri/r300_dri.so
46${PLIST.r600}lib/dri/r600_dri.so 46${PLIST.r600}lib/dri/r600_dri.so
47${PLIST.radeon_dri}lib/dri/radeon_dri.so 47${PLIST.radeon_dri}lib/dri/radeon_dri.so
48${PLIST.radeonsi}lib/dri/radeonsi_dri.so 48${PLIST.radeonsi}lib/dri/radeonsi_dri.so
49${PLIST.swrast_dri}lib/dri/swrast_dri.so 49${PLIST.swrast_dri}lib/dri/swrast_dri.so
50${PLIST.vc4}lib/dri/vc4_dri.so 50${PLIST.vc4}lib/dri/vc4_dri.so
51${PLIST.svga}lib/dri/vmwgfx_dri.so 51${PLIST.svga}lib/dri/vmwgfx_dri.so
52${PLIST.dri}lib/libEGL.la 52${PLIST.egl}lib/libEGL.la
53lib/libGL.la 53lib/libGL.la
54${PLIST.glesv1}lib/libGLESv1_CM.la 54${PLIST.glesv1}lib/libGLESv1_CM.la
55${PLIST.glesv2}lib/libGLESv2.la 55${PLIST.glesv2}lib/libGLESv2.la
56${PLIST.osmesa}lib/libOSMesa.la 56${PLIST.osmesa}lib/libOSMesa.la
57${PLIST.xvmc}${PLIST.nouveau}lib/libXvMCnouveau.so 57${PLIST.xvmc}${PLIST.nouveau}lib/libXvMCnouveau.so
58${PLIST.xvmc}${PLIST.nouveau}lib/libXvMCnouveau.so.1 58${PLIST.xvmc}${PLIST.nouveau}lib/libXvMCnouveau.so.1
59${PLIST.xvmc}${PLIST.nouveau}lib/libXvMCnouveau.so.1.0 59${PLIST.xvmc}${PLIST.nouveau}lib/libXvMCnouveau.so.1.0
60${PLIST.xvmc}${PLIST.nouveau}lib/libXvMCnouveau.so.1.0.0 60${PLIST.xvmc}${PLIST.nouveau}lib/libXvMCnouveau.so.1.0.0
61${PLIST.xvmc}${PLIST.r600}lib/libXvMCr600.so 61${PLIST.xvmc}${PLIST.r600}lib/libXvMCr600.so
62${PLIST.xvmc}${PLIST.r600}lib/libXvMCr600.so.1 62${PLIST.xvmc}${PLIST.r600}lib/libXvMCr600.so.1
63${PLIST.xvmc}${PLIST.r600}lib/libXvMCr600.so.1.0 63${PLIST.xvmc}${PLIST.r600}lib/libXvMCr600.so.1.0
64${PLIST.xvmc}${PLIST.r600}lib/libXvMCr600.so.1.0.0 64${PLIST.xvmc}${PLIST.r600}lib/libXvMCr600.so.1.0.0
65${PLIST.gbm}lib/libgbm.la 65${PLIST.gbm}lib/libgbm.la
66lib/libglapi.la 66lib/libglapi.la
67${PLIST.wayland}lib/libwayland-egl.la 67${PLIST.wayland}lib/libwayland-egl.la
68${PLIST.xatracker}lib/libxatracker.la 68${PLIST.xatracker}lib/libxatracker.la
69${PLIST.dri}lib/pkgconfig/dri.pc 69${PLIST.dri}lib/pkgconfig/dri.pc
70${PLIST.dri}lib/pkgconfig/egl.pc 70${PLIST.egl}lib/pkgconfig/egl.pc
71${PLIST.gbm}lib/pkgconfig/gbm.pc 71${PLIST.gbm}lib/pkgconfig/gbm.pc
72${PLIST.osmesa}lib/pkgconfig/osmesa.pc 72${PLIST.osmesa}lib/pkgconfig/osmesa.pc
73lib/pkgconfig/gl.pc 73lib/pkgconfig/gl.pc
74${PLIST.glesv1}lib/pkgconfig/glesv1_cm.pc 74${PLIST.glesv1}lib/pkgconfig/glesv1_cm.pc
75${PLIST.glesv2}lib/pkgconfig/glesv2.pc 75${PLIST.glesv2}lib/pkgconfig/glesv2.pc
76${PLIST.wayland}lib/pkgconfig/wayland-egl.pc 76${PLIST.wayland}lib/pkgconfig/wayland-egl.pc
77${PLIST.xatracker}lib/pkgconfig/xatracker.pc 77${PLIST.xatracker}lib/pkgconfig/xatracker.pc
78${PLIST.nouveau}${PLIST.vdpau}lib/vdpau/libvdpau_nouveau.so 78${PLIST.nouveau}${PLIST.vdpau}lib/vdpau/libvdpau_nouveau.so
79${PLIST.nouveau}${PLIST.vdpau}lib/vdpau/libvdpau_nouveau.so.1 79${PLIST.nouveau}${PLIST.vdpau}lib/vdpau/libvdpau_nouveau.so.1
80${PLIST.nouveau}${PLIST.vdpau}lib/vdpau/libvdpau_nouveau.so.1.0 80${PLIST.nouveau}${PLIST.vdpau}lib/vdpau/libvdpau_nouveau.so.1.0
81${PLIST.nouveau}${PLIST.vdpau}lib/vdpau/libvdpau_nouveau.so.1.0.0 81${PLIST.nouveau}${PLIST.vdpau}lib/vdpau/libvdpau_nouveau.so.1.0.0
82${PLIST.vdpau}lib/vdpau/libvdpau_r300.so 82${PLIST.vdpau}lib/vdpau/libvdpau_r300.so
83${PLIST.vdpau}lib/vdpau/libvdpau_r300.so.1 83${PLIST.vdpau}lib/vdpau/libvdpau_r300.so.1
cvs diff -r1.10 -r1.11 pkgsrc/graphics/MesaLib18/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/MesaLib18/Attic/distinfo 2019/01/19 18:26:30 1.10
+++ pkgsrc/graphics/MesaLib18/Attic/distinfo 2019/01/19 21:54:03 1.11
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.10 2019/01/19 18:26:30 tnn Exp $ 1$NetBSD: distinfo,v 1.11 2019/01/19 21:54:03 tnn Exp $
2 2
3SHA1 (mesa-18.3.2.tar.xz) = 8775d7bfac7e07141ac4299888d426d5550949f7 3SHA1 (mesa-18.3.2.tar.xz) = 8775d7bfac7e07141ac4299888d426d5550949f7
4RMD160 (mesa-18.3.2.tar.xz) = d3662f72a39d009adb21a70bd7b49c28960c0d5c 4RMD160 (mesa-18.3.2.tar.xz) = d3662f72a39d009adb21a70bd7b49c28960c0d5c
5SHA512 (mesa-18.3.2.tar.xz) = 34b66520728d720b1f3d3d63f8ba5c255d57b9e8fe427264419e4163b474df662ff6db9ca8b81283866da415e34346a4c39fc37bebe2a0929be14480faf4db45 5SHA512 (mesa-18.3.2.tar.xz) = 34b66520728d720b1f3d3d63f8ba5c255d57b9e8fe427264419e4163b474df662ff6db9ca8b81283866da415e34346a4c39fc37bebe2a0929be14480faf4db45
6Size (mesa-18.3.2.tar.xz) = 11868440 bytes 6Size (mesa-18.3.2.tar.xz) = 11868440 bytes
7SHA1 (patch-configure.ac) = 355b04270d2036fa879215d3f58278d5d32d22da 7SHA1 (patch-configure.ac) = 355b04270d2036fa879215d3f58278d5d32d22da
8SHA1 (patch-include_GL_internal_dri__interface.h) = 146d2f3f3e50fc1947e8941301d9cf9d90a035e2 8SHA1 (patch-include_GL_internal_dri__interface.h) = 146d2f3f3e50fc1947e8941301d9cf9d90a035e2
9SHA1 (patch-src_amd_common_ac__debug.c) = eb73957adc7ed81db99d4edbc507b05231fda218 9SHA1 (patch-src_amd_common_ac__debug.c) = eb73957adc7ed81db99d4edbc507b05231fda218
10SHA1 (patch-src_amd_vulkan_winsys_amdgpu_radv__amdgpu__cs.c) = 1fe81a7b16e36dc9125400c20543271216a33a45 10SHA1 (patch-src_amd_vulkan_winsys_amdgpu_radv__amdgpu__cs.c) = 1fe81a7b16e36dc9125400c20543271216a33a45
11SHA1 (patch-src_compiler_builtin__type__macros.h) = 857bca0c0f55ec8d7a20b3807c7a5d7bd06bdfbf 11SHA1 (patch-src_compiler_builtin__type__macros.h) = 857bca0c0f55ec8d7a20b3807c7a5d7bd06bdfbf
12SHA1 (patch-src_compiler_glsl_glsl__parser__extras.cpp) = ef114d6e288e6d212fce9d1c0606f7d454a171c4 12SHA1 (patch-src_compiler_glsl_glsl__parser__extras.cpp) = ef114d6e288e6d212fce9d1c0606f7d454a171c4
13SHA1 (patch-src_egl_drivers_dri2_platform__drm.c) = 94ec2e969e7cf7c89c3192e60758e5ad14b02629 13SHA1 (patch-src_egl_drivers_dri2_platform__drm.c) = 94ec2e969e7cf7c89c3192e60758e5ad14b02629
14SHA1 (patch-src_egl_drivers_dri2_platform__x11.c) = 49e48c31eacb79d1da357fe70eaffd2926b5280e 14SHA1 (patch-src_egl_drivers_dri2_platform__x11.c) = 49e48c31eacb79d1da357fe70eaffd2926b5280e
@@ -16,51 +16,54 @@ SHA1 (patch-src_egl_main_eglglobals.c) = @@ -16,51 +16,54 @@ SHA1 (patch-src_egl_main_eglglobals.c) =
16SHA1 (patch-src_gallium_auxiliary_drivers_trace_tr__dump.c) = 360e1608508a7bbb41acecd58930781038e2309e 16SHA1 (patch-src_gallium_auxiliary_drivers_trace_tr__dump.c) = 360e1608508a7bbb41acecd58930781038e2309e
17SHA1 (patch-src_gallium_auxiliary_pipe-loader_pipe__loader__drm.c) = f913b779404e6bd8ae707a4fd66eb7c1dca9b311 17SHA1 (patch-src_gallium_auxiliary_pipe-loader_pipe__loader__drm.c) = f913b779404e6bd8ae707a4fd66eb7c1dca9b311
18SHA1 (patch-src_gallium_auxiliary_util_u__format__tests.c) = 4d5e4677c2825778c43440ab131b8807f6840975 18SHA1 (patch-src_gallium_auxiliary_util_u__format__tests.c) = 4d5e4677c2825778c43440ab131b8807f6840975
19SHA1 (patch-src_gallium_auxiliary_util_u__helpers.c) = 636fb98c4cbf70a5d8a6d94c24e75d2b05968b3c 19SHA1 (patch-src_gallium_auxiliary_util_u__helpers.c) = 636fb98c4cbf70a5d8a6d94c24e75d2b05968b3c
20SHA1 (patch-src_gallium_drivers_nouveau_nouveau__vp3__video.c) = 04f95784c3270c9bb7e95377982e217962481525 20SHA1 (patch-src_gallium_drivers_nouveau_nouveau__vp3__video.c) = 04f95784c3270c9bb7e95377982e217962481525
21SHA1 (patch-src_gallium_drivers_nouveau_nv50_nv84__video.c) = 1b4239fe053523835ecac006894bdb0cde0ee626 21SHA1 (patch-src_gallium_drivers_nouveau_nv50_nv84__video.c) = 1b4239fe053523835ecac006894bdb0cde0ee626
22SHA1 (patch-src_gallium_drivers_radeonsi_si__state__shaders.c) = 08119700b80ddc99f7f2ec1b7b8212147fabda27 22SHA1 (patch-src_gallium_drivers_radeonsi_si__state__shaders.c) = 08119700b80ddc99f7f2ec1b7b8212147fabda27
23SHA1 (patch-src_gallium_drivers_vc4_vc4__bufmgr.c) = 1d591d346486fdf58893f69ab92a272e6a31a987 23SHA1 (patch-src_gallium_drivers_vc4_vc4__bufmgr.c) = 1d591d346486fdf58893f69ab92a272e6a31a987
24SHA1 (patch-src_gallium_include_pipe_p__config.h) = f4e38eac66167b619c30076bb0144dd716310967 24SHA1 (patch-src_gallium_include_pipe_p__config.h) = f4e38eac66167b619c30076bb0144dd716310967
25SHA1 (patch-src_gallium_state__trackers_clover_llvm_invocation.cpp) = 3053db09fbfffffd82e232b60b244a0a80c8f181 25SHA1 (patch-src_gallium_state__trackers_clover_llvm_invocation.cpp) = 3053db09fbfffffd82e232b60b244a0a80c8f181
26SHA1 (patch-src_gallium_state__trackers_clover_llvm_metadata.hpp) = c97d38098ea03658bc193a50e445b87f1c020839 26SHA1 (patch-src_gallium_state__trackers_clover_llvm_metadata.hpp) = c97d38098ea03658bc193a50e445b87f1c020839
27SHA1 (patch-src_gallium_state__trackers_clover_util_range.hpp) = cdc78067986c1b92818472c4201c58ef1b42c4f4 27SHA1 (patch-src_gallium_state__trackers_clover_util_range.hpp) = cdc78067986c1b92818472c4201c58ef1b42c4f4
28SHA1 (patch-src_gbm_Makefile.am) = 5f3107afbf64b97f7d21ce427cecc4fb78974db3 28SHA1 (patch-src_gbm_Makefile.am) = 5f3107afbf64b97f7d21ce427cecc4fb78974db3
 29SHA1 (patch-src_glx_Makefile.am) = 315d35777550ae7a7ba814b6d74d0c3cefd04630
29SHA1 (patch-src_glx_apple_apple__glapi.c) = c4eea8dabf74eb03d22da4eb834b18ae3384c63b 30SHA1 (patch-src_glx_apple_apple__glapi.c) = c4eea8dabf74eb03d22da4eb834b18ae3384c63b
 31SHA1 (patch-src_glx_dri__common.h) = 0274877f8c65a4bb729536a897df4704897a4c6e
30SHA1 (patch-src_glx_dri__glx.c) = 8fd48776e9953b18bd17ba130d90ae2935e67242 32SHA1 (patch-src_glx_dri__glx.c) = 8fd48776e9953b18bd17ba130d90ae2935e67242
31SHA1 (patch-src_glx_glxclient.h) = f0358179ae397bc8677597b0ccb9a471f40f15de 33SHA1 (patch-src_glx_glxclient.h) = f0358179ae397bc8677597b0ccb9a471f40f15de
32SHA1 (patch-src_glx_glxcurrent.c) = 8b8e949eded13491c5865601253c6e7d4b06e228 34SHA1 (patch-src_glx_glxcurrent.c) = 8b8e949eded13491c5865601253c6e7d4b06e228
33SHA1 (patch-src_glx_glxext.c) = 15c2c5e0c6b5095ce849fb86ad148aa05d7d907a 35SHA1 (patch-src_glx_glxext.c) = 15c2c5e0c6b5095ce849fb86ad148aa05d7d907a
34SHA1 (patch-src_intel_Makefile.tools.am) = 5253d5972b48ae3bc8d648bb9f479dcf6cbd3fab 36SHA1 (patch-src_intel_Makefile.tools.am) = 5253d5972b48ae3bc8d648bb9f479dcf6cbd3fab
35SHA1 (patch-src_intel_compiler_brw__fs__bank__conflicts.cpp) = 6276d2c6846bb4dd08699921bec4e20202a17478 37SHA1 (patch-src_intel_compiler_brw__fs__bank__conflicts.cpp) = 6276d2c6846bb4dd08699921bec4e20202a17478
36SHA1 (patch-src_intel_tools_aub__mem.c) = 8709def06ea0ac225af9ae38374c33944e560076 38SHA1 (patch-src_intel_tools_aub__mem.c) = 8709def06ea0ac225af9ae38374c33944e560076
37SHA1 (patch-src_intel_tools_aubinator__error__decode.c) = d8f636e3c3e76763a505a1dce23de0b198ad62fa 39SHA1 (patch-src_intel_tools_aubinator__error__decode.c) = d8f636e3c3e76763a505a1dce23de0b198ad62fa
38SHA1 (patch-src_intel_vulkan_anv__allocator.c) = 5dd27eea9811d739558c5b488c57a3d7ae539d87 40SHA1 (patch-src_intel_vulkan_anv__allocator.c) = 5dd27eea9811d739558c5b488c57a3d7ae539d87
39SHA1 (patch-src_intel_vulkan_anv__device.c) = 5d581dcd9695c869855f200c575cf98b7165c1ba 41SHA1 (patch-src_intel_vulkan_anv__device.c) = 5d581dcd9695c869855f200c575cf98b7165c1ba
40SHA1 (patch-src_intel_vulkan_anv__gem.c) = b8eb487fa704151e7c3c3b1d23973b2b0aa5922e 42SHA1 (patch-src_intel_vulkan_anv__gem.c) = b8eb487fa704151e7c3c3b1d23973b2b0aa5922e
41SHA1 (patch-src_intel_vulkan_anv__gem__stubs.c) = 7f0a25e96624815ef0912024b52bbb512d4fa42f 43SHA1 (patch-src_intel_vulkan_anv__gem__stubs.c) = 7f0a25e96624815ef0912024b52bbb512d4fa42f
42SHA1 (patch-src_intel_vulkan_anv__queue.c) = 2dbf7dfd0c77f74f510032bf8d12109f58c50a30 44SHA1 (patch-src_intel_vulkan_anv__queue.c) = 2dbf7dfd0c77f74f510032bf8d12109f58c50a30
43SHA1 (patch-src_mapi_entry__x86-64__tls.h) = 11b7ef1da435fa17fc7025a46a123d447d6a7d07 45SHA1 (patch-src_mapi_entry__x86-64__tls.h) = 11b7ef1da435fa17fc7025a46a123d447d6a7d07
44SHA1 (patch-src_mapi_entry__x86__tls.h) = 11c0f5302d305a77f3a1780d44a2c61f48a66273 46SHA1 (patch-src_mapi_entry__x86__tls.h) = 11c0f5302d305a77f3a1780d44a2c61f48a66273
45SHA1 (patch-src_mapi_glapi_gen_gl__gentable.py) = 0b1d4ef3f78a9b3726ef7f9921608a48a5e4ac56 47SHA1 (patch-src_mapi_glapi_gen_gl__gentable.py) = 0b1d4ef3f78a9b3726ef7f9921608a48a5e4ac56
46SHA1 (patch-src_mapi_u__current.c) = 38d324fcd1c28d155106ccd248edb5eb1aa9ffac 48SHA1 (patch-src_mapi_u__current.c) = 38d324fcd1c28d155106ccd248edb5eb1aa9ffac
47SHA1 (patch-src_mapi_u__current.h) = 465a992bd34057e9521f0a33e6f2e25cefc145ca 49SHA1 (patch-src_mapi_u__current.h) = 465a992bd34057e9521f0a33e6f2e25cefc145ca
48SHA1 (patch-src_mesa_drivers_dri_i915_intel__screen.c) = e33f51b3502e8c52ff7283aeb807996717f79f4f 50SHA1 (patch-src_mesa_drivers_dri_i915_intel__screen.c) = e33f51b3502e8c52ff7283aeb807996717f79f4f
49SHA1 (patch-src_mesa_drivers_dri_i965_brw__oa__metrics.c) = bb7ca6a8b9e42c1dc4e59a3cf78d063699f7b66e 51SHA1 (patch-src_mesa_drivers_dri_i965_brw__oa__metrics.c) = bb7ca6a8b9e42c1dc4e59a3cf78d063699f7b66e
50SHA1 (patch-src_mesa_drivers_dri_i965_brw__performance__query.c) = 1250b3477c4b8013b928772b7dc7f24e8c4b67aa 52SHA1 (patch-src_mesa_drivers_dri_i965_brw__performance__query.c) = 1250b3477c4b8013b928772b7dc7f24e8c4b67aa
51SHA1 (patch-src_mesa_drivers_dri_i965_intel__screen.c) = 795b17970e95347222514bacc0701aa86fa1ff02 53SHA1 (patch-src_mesa_drivers_dri_i965_intel__screen.c) = 795b17970e95347222514bacc0701aa86fa1ff02
52SHA1 (patch-src_mesa_drivers_dri_i965_intel__tiled__memcpy.c) = 5b940f9a56c694ffaf8a4383c3a2eae25cfd35a6 54SHA1 (patch-src_mesa_drivers_dri_i965_intel__tiled__memcpy.c) = 5b940f9a56c694ffaf8a4383c3a2eae25cfd35a6
53SHA1 (patch-src_mesa_drivers_dri_swrast_swrast.c) = 3106f350e590f62c8bd29cd85f24f977639dccdb 55SHA1 (patch-src_mesa_drivers_dri_swrast_swrast.c) = 3106f350e590f62c8bd29cd85f24f977639dccdb
 56SHA1 (patch-src_mesa_drivers_x11_Makefile.am) = 172a8da11a620edce790f64338a0390cd1e93188
54SHA1 (patch-src_mesa_main_context.c) = 74226013b56ad6c9678f1970458538b35967678f 57SHA1 (patch-src_mesa_main_context.c) = 74226013b56ad6c9678f1970458538b35967678f
55SHA1 (patch-src_mesa_main_extensions.c) = 2f48bdb1176c2878bb33bcfab7556172b50a987e 58SHA1 (patch-src_mesa_main_extensions.c) = 2f48bdb1176c2878bb33bcfab7556172b50a987e
56SHA1 (patch-src_mesa_main_macros.h) = c5dceaa8dc02a58e5b2273d82e3fe1cc12e327d3 59SHA1 (patch-src_mesa_main_macros.h) = c5dceaa8dc02a58e5b2273d82e3fe1cc12e327d3
57SHA1 (patch-src_mesa_main_shader__query.cpp) = 3f9c31645d87855759def11344dee16af23c7be3 60SHA1 (patch-src_mesa_main_shader__query.cpp) = 3f9c31645d87855759def11344dee16af23c7be3
58SHA1 (patch-src_mesa_tnl_t__pipeline.c) = e6abcdb24019ca57527d25c5cd86737332db98e3 61SHA1 (patch-src_mesa_tnl_t__pipeline.c) = e6abcdb24019ca57527d25c5cd86737332db98e3
59SHA1 (patch-src_mesa_x86_common__x86.c) = f8c4b93443ef66d017f6aa114b877565b30f2598 62SHA1 (patch-src_mesa_x86_common__x86.c) = f8c4b93443ef66d017f6aa114b877565b30f2598
60SHA1 (patch-src_util_Makefile.am) = e390cd47b784ad08987b81fdbce537968ad4a624 63SHA1 (patch-src_util_Makefile.am) = e390cd47b784ad08987b81fdbce537968ad4a624
61SHA1 (patch-src_util_build__id.c) = 7a9547bbda9d2fb9f0018ccf27b70b59e497aa2c 64SHA1 (patch-src_util_build__id.c) = 7a9547bbda9d2fb9f0018ccf27b70b59e497aa2c
62SHA1 (patch-src_util_disk__cache.c) = cc0b29780dba5d5b5e43c0798336f16a1f0008de 65SHA1 (patch-src_util_disk__cache.c) = cc0b29780dba5d5b5e43c0798336f16a1f0008de
63SHA1 (patch-src_util_futex.h) = 35097c3b8baf8b969c6ec5ec1feb6f4e0a48237e 66SHA1 (patch-src_util_futex.h) = 35097c3b8baf8b969c6ec5ec1feb6f4e0a48237e
64SHA1 (patch-src_util_ralloc.c) = d311bfd9ed7e673d72e050668d351c1e6552cdc8 67SHA1 (patch-src_util_ralloc.c) = d311bfd9ed7e673d72e050668d351c1e6552cdc8
65SHA1 (patch-src_util_strndup.h) = 73f49694ca48ad6b9a9d8346c5b84fddec2463bd 68SHA1 (patch-src_util_strndup.h) = 73f49694ca48ad6b9a9d8346c5b84fddec2463bd
66SHA1 (patch-src_util_u__atomic.h) = 31d4514538ef5ee53012695eb5c66134aaec981e 69SHA1 (patch-src_util_u__atomic.h) = 31d4514538ef5ee53012695eb5c66134aaec981e
cvs diff -r1.9 -r1.10 pkgsrc/graphics/MesaLib18/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/graphics/MesaLib18/Attic/options.mk 2019/01/19 18:45:28 1.9
+++ pkgsrc/graphics/MesaLib18/Attic/options.mk 2019/01/19 21:54:03 1.10
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.9 2019/01/19 18:45:28 tnn Exp $ 1# $NetBSD: options.mk,v 1.10 2019/01/19 21:54:03 tnn Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.MesaLib 3PKG_OPTIONS_VAR= PKG_OPTIONS.MesaLib
4PKG_SUPPORTED_OPTIONS= llvm dri 4PKG_SUPPORTED_OPTIONS= llvm dri
5PKG_SUGGESTED_OPTIONS= 5PKG_SUGGESTED_OPTIONS=
6 6
7PKG_SUPPORTED_OPTIONS+= glx-tls xvmc debug 7PKG_SUPPORTED_OPTIONS+= glx-tls xvmc debug
8PKG_SUPPORTED_OPTIONS+= vdpau vaapi 8PKG_SUPPORTED_OPTIONS+= vdpau vaapi
9PKG_SUPPORTED_OPTIONS+= osmesa 9PKG_SUPPORTED_OPTIONS+= osmesa
10PKG_SUPPORTED_OPTIONS+= glesv1 glesv2 10PKG_SUPPORTED_OPTIONS+= glesv1 glesv2
11PKG_SUPPORTED_OPTIONS+= xa 11PKG_SUPPORTED_OPTIONS+= xa
12PKG_SUPPORTED_OPTIONS+= noatexit 12PKG_SUPPORTED_OPTIONS+= noatexit
13PKG_SUPPORTED_OPTIONS+= vulkan 13PKG_SUPPORTED_OPTIONS+= vulkan
14 14
@@ -44,41 +44,44 @@ PKG_SUGGESTED_OPTIONS+= dri @@ -44,41 +44,44 @@ PKG_SUGGESTED_OPTIONS+= dri
44 !empty(MACHINE_PLATFORM:MFreeBSD-1[0-9].*-x86_64) || \ 44 !empty(MACHINE_PLATFORM:MFreeBSD-1[0-9].*-x86_64) || \
45 !empty(MACHINE_PLATFORM:MDragonFly-*-x86_64) 45 !empty(MACHINE_PLATFORM:MDragonFly-*-x86_64)
46PKG_SUGGESTED_OPTIONS+= glx-tls 46PKG_SUGGESTED_OPTIONS+= glx-tls
47.endif 47.endif
48 48
49.include "../../mk/bsd.options.mk" 49.include "../../mk/bsd.options.mk"
50 50
51# gallium 51# gallium
52PLIST_VARS+= freedreno i915 i965 nouveau r300 r600 radeonsi \ 52PLIST_VARS+= freedreno i915 i965 nouveau r300 r600 radeonsi \
53 swrast svga vc4 virgl vulkan 53 swrast svga vc4 virgl vulkan
54# classic DRI 54# classic DRI
55PLIST_VARS+= dri swrast_dri nouveau_dri radeon_dri r200 55PLIST_VARS+= dri swrast_dri nouveau_dri radeon_dri r200
56# other features 56# other features
57PLIST_VARS+= gbm vaapi vdpau wayland xatracker 57PLIST_VARS+= egl gbm vaapi vdpau wayland xatracker
58PLIST_VARS+= osmesa xvmc 58PLIST_VARS+= osmesa xvmc
59PLIST_VARS+= glesv1 glesv2 59PLIST_VARS+= glesv1 glesv2
60 60
61.if !empty(PKG_OPTIONS:Mdri) 61.if !empty(PKG_OPTIONS:Mdri)
62 62
63CONFIGURE_ARGS+= --enable-dri 63CONFIGURE_ARGS+= --enable-dri
64# Having DRI3 and egl compiled in by default doesn't hurt, the X server 64# Having DRI3 and egl compiled in by default doesn't hurt, the X server
65# will only use it if it is supported at run time. 65# will only use it if it is supported at run time.
66CONFIGURE_ARGS+= --enable-dri3 66CONFIGURE_ARGS+= --enable-dri3
67CONFIGURE_ARGS+= --enable-egl 
68 
69.if ${OPSYS} != "Darwin" 67.if ${OPSYS} != "Darwin"
 68CONFIGURE_ARGS+= --enable-egl
70CONFIGURE_ARGS+= --enable-gbm 69CONFIGURE_ARGS+= --enable-gbm
 70PLIST.egl= yes
71PLIST.gbm= yes 71PLIST.gbm= yes
 72.else
 73CONFIGURE_ARGS+= --disable-egl
 74CONFIGURE_ARGS+= --disable-gbm
72.endif 75.endif
73 76
74.if !empty(PKG_OPTIONS:Mosmesa) 77.if !empty(PKG_OPTIONS:Mosmesa)
75CONFIGURE_ARGS+= --enable-osmesa 78CONFIGURE_ARGS+= --enable-osmesa
76PLIST.osmesa= yes 79PLIST.osmesa= yes
77.endif 80.endif
78 81
79.if !empty(PKG_OPTIONS:Mglesv1) 82.if !empty(PKG_OPTIONS:Mglesv1)
80CONFIGURE_ARGS+= --enable-gles1 83CONFIGURE_ARGS+= --enable-gles1
81PLIST.glesv1= yes 84PLIST.glesv1= yes
82.else 85.else
83CONFIGURE_ARGS+= --disable-gles1 86CONFIGURE_ARGS+= --disable-gles1
84.endif 87.endif
File Deleted: pkgsrc/graphics/MesaLib18/files/Attic/patch-manual_fdo90311
File Added: pkgsrc/graphics/MesaLib18/patches/Attic/patch-src_glx_Makefile.am
$NetBSD: patch-src_glx_Makefile.am,v 1.1 2019/01/19 21:54:03 tnn Exp $

- FDO bug 90311
- We don't need libmesautil.la here. Those symbols seem to already be
  included in libmesa.la.

--- src/glx/Makefile.am.orig	2019-01-17 11:26:23.000000000 +0000
+++ src/glx/Makefile.am
@@ -89,10 +89,16 @@ libglx_la_SOURCES = \
 	singlepix.c \
 	vertarr.c
 
+if HAVE_APPLEDRI
+libglx_la_LIBADD = \
+	$(top_builddir)/src/loader/libloader.la \
+	$(top_builddir)/src/util/libxmlconfig.la
+else
 libglx_la_LIBADD = \
 	$(top_builddir)/src/loader/libloader.la \
 	$(top_builddir)/src/util/libmesautil.la \
 	$(top_builddir)/src/util/libxmlconfig.la
+endif
 
 if HAVE_DRISW
 libglx_la_SOURCES += \
@@ -136,6 +142,8 @@ libglx_la_SOURCES += \
 
 SUBDIRS += apple
 libglx_la_LIBADD += $(builddir)/apple/libappleglx.la
+libglx_la_LIBADD += $(top_builddir)/src/mesa/libmesa.la
+libglx_la_SOURCES += dummy.cpp
 endif
 
 if HAVE_WINDOWSDRI
File Added: pkgsrc/graphics/MesaLib18/patches/Attic/patch-src_glx_dri__common.h
$NetBSD: patch-src_glx_dri__common.h,v 1.1 2019/01/19 21:54:03 tnn Exp $

Fix error on OSX.

--- src/glx/dri_common.h.orig	2019-01-17 11:26:23.000000000 +0000
+++ src/glx/dri_common.h
@@ -55,8 +55,10 @@ extern struct glx_config *driConvertConf
 
 extern void driDestroyConfigs(const __DRIconfig **configs);
 
+#if !defined(GLX_USE_APPLEGL)
 extern __GLXDRIdrawable *
 driFetchDrawable(struct glx_context *gc, GLXDrawable glxDrawable);
+#endif
 
 extern void
 driReleaseDrawables(struct glx_context *gc);
File Added: pkgsrc/graphics/MesaLib18/patches/Attic/patch-src_mesa_drivers_x11_Makefile.am
$NetBSD: patch-src_mesa_drivers_x11_Makefile.am,v 1.1 2019/01/19 21:54:03 tnn Exp $

We don't need libmesautil.la here. Those symbols seem to already be
included in libmesa.la.

--- src/mesa/drivers/x11/Makefile.am.orig	2019-01-17 11:26:23.000000000 +0000
+++ src/mesa/drivers/x11/Makefile.am
@@ -68,7 +68,6 @@ GL_PATCH = 0
 lib@GL_LIB@_la_LIBADD = \
 	$(top_builddir)/src/mesa/libmesa.la \
 	$(top_builddir)/src/mapi/glapi/libglapi.la \
-	$(top_builddir)/src/util/libmesautil.la \
 	$(SHARED_GLAPI_LIB) \
 	$(GL_LIB_DEPS)