Sun Dec 8 13:07:20 2019 UTC ()
MesaLib: Update to 19.2.7

This is a bugfix release.

EGL platform selection was reworked so we have to move X11 to always
be the first fallback because Mesa is apparently bad at detecting X11 now.


(nia)
diff -r1.178 -r1.179 pkgsrc/graphics/MesaLib/Makefile
diff -r1.144 -r1.145 pkgsrc/graphics/MesaLib/distinfo
diff -r1.76 -r1.77 pkgsrc/graphics/MesaLib/options.mk
cvs diff -r1.178 -r1.179 pkgsrc/graphics/MesaLib/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/MesaLib/Makefile 2019/12/02 10:09:29 1.178
+++ pkgsrc/graphics/MesaLib/Makefile 2019/12/08 13:07:20 1.179
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.178 2019/12/02 10:09:29 jperkin Exp $ 1# $NetBSD: Makefile,v 1.179 2019/12/08 13:07:20 nia Exp $
2 2
3DISTNAME= mesa-19.2.4 3DISTNAME= mesa-19.2.7
4PKGNAME= ${DISTNAME:S/mesa/MesaLib/} 4PKGNAME= ${DISTNAME:S/mesa/MesaLib/}
5CATEGORIES= graphics 5CATEGORIES= graphics
6MASTER_SITES= https://mesa.freedesktop.org/archive/ 6MASTER_SITES= https://mesa.freedesktop.org/archive/
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= nia@NetBSD.org 9MAINTAINER= nia@NetBSD.org
10HOMEPAGE= https://www.mesa3d.org/ 10HOMEPAGE= https://www.mesa3d.org/
11COMMENT= Open source OpenGL implementation 11COMMENT= Open source OpenGL implementation
12LICENSE= mit 12LICENSE= mit
13 13
14USE_TOOLS+= bison flex pkg-config xgettext 14USE_TOOLS+= bison flex pkg-config xgettext
15USE_LANGUAGES= c99 c++14 15USE_LANGUAGES= c99 c++14
16USE_LIBTOOL= yes 16USE_LIBTOOL= yes
@@ -18,47 +18,47 @@ USE_LIBTOOL= yes @@ -18,47 +18,47 @@ USE_LIBTOOL= yes
18# ERROR: C++ Compiler does not support -std=c++14 18# ERROR: C++ Compiler does not support -std=c++14
19GCC_REQD+= 5 19GCC_REQD+= 5
20 20
21USE_FEATURES+= strnlen 21USE_FEATURES+= strnlen
22 22
23CFLAGS.SunOS+= -D_POSIX_PTHREAD_SEMANTICS 23CFLAGS.SunOS+= -D_POSIX_PTHREAD_SEMANTICS
24CXXFLAGS.SunOS+= -Drestrict=__restrict__ 24CXXFLAGS.SunOS+= -Drestrict=__restrict__
25LDFLAGS.SunOS+= -lsocket -lnsl 25LDFLAGS.SunOS+= -lsocket -lnsl
26 26
27# Some of these get appended in options.mk. 27# Some of these get appended in options.mk.
28DRI_DRIVERS= # 28DRI_DRIVERS= #
29GALLIUM_DRIVERS= swrast 29GALLIUM_DRIVERS= swrast
30VULKAN_DRIVERS= # 30VULKAN_DRIVERS= #
31MESA_PLATFORMS= surfaceless 31MESA_PLATFORMS= #
32 32
33.include "../../mk/compiler.mk" 33.include "../../mk/compiler.mk"
34.include "features.mk" 34.include "features.mk"
35.include "options.mk" 35.include "options.mk"
36 36
37PLIST_SUBST+= GLVER="1.2.0" 37PLIST_SUBST+= GLVER="1.2.0"
38 38
39# classic DRI drivers 39# classic DRI drivers
40PLIST_VARS+= i915 i965 r100 r200 nouveau_dri 40PLIST_VARS+= i915 i965 r100 r200 nouveau_dri
41 41
42# Gallium drivers 42# Gallium drivers
43PLIST_VARS+= r300 svga nouveau vc4 lima panfrost 43PLIST_VARS+= r300 svga nouveau vc4 lima panfrost
44 44
45# other features 45# other features
46PLIST_VARS+= kms vaapi 46PLIST_VARS+= kms vaapi
47 47
48.if ${MESALIB_SUPPORTS_DRI} == "yes" 48.if ${MESALIB_SUPPORTS_DRI} == "yes"
49BUILDLINK_API_DEPENDS.libdrm+= libdrm>=2.4.81 49BUILDLINK_API_DEPENDS.libdrm+= libdrm>=2.4.81
50.include "../../x11/libdrm/buildlink3.mk" 50.include "../../x11/libdrm/buildlink3.mk"
51MESA_PLATFORMS+= drm 51MESA_PLATFORMS+= drm surfaceless
52MESON_ARGS+= -Degl=true 52MESON_ARGS+= -Degl=true
53MESON_ARGS+= -Dgbm=true 53MESON_ARGS+= -Dgbm=true
54MESON_ARGS+= -Dgallium-xa=true 54MESON_ARGS+= -Dgallium-xa=true
55PLIST.kms= yes 55PLIST.kms= yes
56. include "../../multimedia/libva/available.mk" 56. include "../../multimedia/libva/available.mk"
57. if ${VAAPI_AVAILABLE} == "yes" 57. if ${VAAPI_AVAILABLE} == "yes"
58MESON_ARGS+= -Dgallium-va=true 58MESON_ARGS+= -Dgallium-va=true
59PLIST.vaapi= yes 59PLIST.vaapi= yes
60. include "../../multimedia/libva/buildlink3.mk" 60. include "../../multimedia/libva/buildlink3.mk"
61. else 61. else
62MESON_ARGS+= -Dgallium-va=false 62MESON_ARGS+= -Dgallium-va=false
63. endif 63. endif
64. if !empty(MACHINE_ARCH:M*arm*) || \ 64. if !empty(MACHINE_ARCH:M*arm*) || \
@@ -99,26 +99,27 @@ DRI_DRIVERS+= nouveau @@ -99,26 +99,27 @@ DRI_DRIVERS+= nouveau
99#GALLIUM_DRIVERS+= virgl 99#GALLIUM_DRIVERS+= virgl
100#PLIST.virgl= yes 100#PLIST.virgl= yes
101. endif 101. endif
102# theoretically cross platform PCI drivers 102# theoretically cross platform PCI drivers
103. if empty(MACHINE_PLATFORM:MNetBSD-*-*arm*) && \ 103. if empty(MACHINE_PLATFORM:MNetBSD-*-*arm*) && \
104 empty(MACHINE_PLATFORM:MNetBSD-*-mipsel) 104 empty(MACHINE_PLATFORM:MNetBSD-*-mipsel)
105DRI_DRIVERS+= r100 r200 105DRI_DRIVERS+= r100 r200
106GALLIUM_DRIVERS+= r300 106GALLIUM_DRIVERS+= r300
107PLIST.r100= yes 107PLIST.r100= yes
108PLIST.r200= yes 108PLIST.r200= yes
109PLIST.r300= yes 109PLIST.r300= yes
110. endif 110. endif
111.else 111.else
 112MESA_PLATFORMS+= surfaceless
112MESON_ARGS+= -Degl=false 113MESON_ARGS+= -Degl=false
113MESON_ARGS+= -Dgbm=false 114MESON_ARGS+= -Dgbm=false
114.endif # ${MESALIB_SUPPORTS_DRI} == "yes" 115.endif # ${MESALIB_SUPPORTS_DRI} == "yes"
115 116
116MESON_ARGS+= -Dgallium-drivers=${GALLIUM_DRIVERS:ts,} 117MESON_ARGS+= -Dgallium-drivers=${GALLIUM_DRIVERS:ts,}
117MESON_ARGS+= -Ddri-drivers=${DRI_DRIVERS:ts,} 118MESON_ARGS+= -Ddri-drivers=${DRI_DRIVERS:ts,}
118MESON_ARGS+= -Dvulkan-drivers=${VULKAN_DRIVERS:ts,} 119MESON_ARGS+= -Dvulkan-drivers=${VULKAN_DRIVERS:ts,}
119MESON_ARGS+= -Dplatforms=${MESA_PLATFORMS:ts,} 120MESON_ARGS+= -Dplatforms=${MESA_PLATFORMS:ts,}
120 121
121.if ${MACHINE_ARCH} == "i386" 122.if ${MACHINE_ARCH} == "i386"
122MESON_ARGS+= -Dglx-read-only-text=true 123MESON_ARGS+= -Dglx-read-only-text=true
123.endif 124.endif
124 125
@@ -144,29 +145,27 @@ BUILDLINK_TRANSFORM+= rm:-Werror=return @@ -144,29 +145,27 @@ BUILDLINK_TRANSFORM+= rm:-Werror=return
144# ../src/intel/perf/gen_perf.c:426:7: error: %m is only allowed in syslog(3) like functions 145# ../src/intel/perf/gen_perf.c:426:7: error: %m is only allowed in syslog(3) like functions
145BUILDLINK_TRANSFORM+= rm:-Werror=format 146BUILDLINK_TRANSFORM+= rm:-Werror=format
146BUILDLINK_TRANSFORM+= rm:-Wformat-security 147BUILDLINK_TRANSFORM+= rm:-Wformat-security
147 148
148# https://gitlab.freedesktop.org/mesa/mesa/merge_requests/1853 149# https://gitlab.freedesktop.org/mesa/mesa/merge_requests/1853
149BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--build-id=sha1 150BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--build-id=sha1
150 151
151# Work around Xorg segfaulting in radeon driver due to wrong alloca being used 152# Work around Xorg segfaulting in radeon driver due to wrong alloca being used
152CFLAGS.NetBSD+= -Dalloca=__builtin_alloca 153CFLAGS.NetBSD+= -Dalloca=__builtin_alloca
153CXXFLAGS.NetBSD+= -Dalloca=__builtin_alloca 154CXXFLAGS.NetBSD+= -Dalloca=__builtin_alloca
154 155
155EGDIR= ${PREFIX}/share/examples/mesa 156EGDIR= ${PREFIX}/share/examples/mesa
156 157
157OWN_DIRS= ${PKG_SYSCONFDIR}/drirc.d 158CONF_FILES+= ${EGDIR}/00-mesa-defaults.conf ${PKG_SYSCONFDIR}/drirc
158CONF_FILES+= ${EGDIR}/00-mesa-defaults.conf \ 
159 ${PKG_SYSCONFDIR}/drirc.d/00-mesa-defaults.conf 
160 159
161INSTALLATION_DIRS+= ${EGDIR} 160INSTALLATION_DIRS+= ${EGDIR}
162 161
163PYTHON_FOR_BUILD_ONLY= tool 162PYTHON_FOR_BUILD_ONLY= tool
164PYTHON_VERSIONS_INCOMPATIBLE= 27 163PYTHON_VERSIONS_INCOMPATIBLE= 27
165 164
166PKGCONFIG_OVERRIDE_STAGE= pre-install 165PKGCONFIG_OVERRIDE_STAGE= pre-install
167PKGCONFIG_OVERRIDE+= output/meson-private/glesv1_cm.pc 166PKGCONFIG_OVERRIDE+= output/meson-private/glesv1_cm.pc
168PKGCONFIG_OVERRIDE+= output/meson-private/glesv2.pc 167PKGCONFIG_OVERRIDE+= output/meson-private/glesv2.pc
169PKGCONFIG_OVERRIDE+= output/meson-private/dri.pc 168PKGCONFIG_OVERRIDE+= output/meson-private/dri.pc
170PKGCONFIG_OVERRIDE+= output/meson-private/gbm.pc 169PKGCONFIG_OVERRIDE+= output/meson-private/gbm.pc
171PKGCONFIG_OVERRIDE+= output/meson-private/egl.pc 170PKGCONFIG_OVERRIDE+= output/meson-private/egl.pc
172PKGCONFIG_OVERRIDE+= output/meson-private/osmesa.pc 171PKGCONFIG_OVERRIDE+= output/meson-private/osmesa.pc
cvs diff -r1.144 -r1.145 pkgsrc/graphics/MesaLib/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/MesaLib/distinfo 2019/11/29 10:34:13 1.144
+++ pkgsrc/graphics/MesaLib/distinfo 2019/12/08 13:07:20 1.145
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: distinfo,v 1.144 2019/11/29 10:34:13 jperkin Exp $ 1$NetBSD: distinfo,v 1.145 2019/12/08 13:07:20 nia Exp $
2 2
3SHA1 (mesa-19.2.4.tar.xz) = 85cc1b57840f14d720f806f8160356b8c9b13a7f 3SHA1 (mesa-19.2.7.tar.xz) = 9b8ebf66770353a48bd710e12e2727fb33645f44
4RMD160 (mesa-19.2.4.tar.xz) = f2c7d454fb67cc27bf28de3ea4f5c85979523e96 4RMD160 (mesa-19.2.7.tar.xz) = 5323b623ac22c168b86548cf6d842ce004e346a9
5SHA512 (mesa-19.2.4.tar.xz) = e8a0e90460f3153d730f8fb13f2c912a9826c05d2af9e22dc575bcd8885bf6a33c0af1c6659e81701ff097a132df88eead208e89dceb552b9da809ab543fa479 5SHA512 (mesa-19.2.7.tar.xz) = 87a82664381432e956ee23dc92bec5accf667606232e38d9458d67132c16fdc44584f65671293b83f00c58ad7742b80e942a5d1bd66d457705be60aaaf35395b
6Size (mesa-19.2.4.tar.xz) = 11458340 bytes 6Size (mesa-19.2.7.tar.xz) = 11460812 bytes
7SHA1 (patch-include_c11_threads__posix.h) = e1dca04b5c514d20123ef99338c6dabedbc14c5f 7SHA1 (patch-include_c11_threads__posix.h) = e1dca04b5c514d20123ef99338c6dabedbc14c5f
8SHA1 (patch-src_amd_common_ac__debug.c) = 8233367c3b5bc344442ea8d19488fdd1e3791ae9 8SHA1 (patch-src_amd_common_ac__debug.c) = 8233367c3b5bc344442ea8d19488fdd1e3791ae9
9SHA1 (patch-src_compiler_builtin__type__macros.h) = e4868011711fb89a293580a12eb603b8e7162336 9SHA1 (patch-src_compiler_builtin__type__macros.h) = e4868011711fb89a293580a12eb603b8e7162336
10SHA1 (patch-src_compiler_glsl_glsl__parser__extras.cpp) = ef114d6e288e6d212fce9d1c0606f7d454a171c4 10SHA1 (patch-src_compiler_glsl_glsl__parser__extras.cpp) = ef114d6e288e6d212fce9d1c0606f7d454a171c4
11SHA1 (patch-src_egl_drivers_dri2_platform__x11.c) = 49e48c31eacb79d1da357fe70eaffd2926b5280e 11SHA1 (patch-src_egl_drivers_dri2_platform__x11.c) = 49e48c31eacb79d1da357fe70eaffd2926b5280e
12SHA1 (patch-src_egl_main_eglglobals.c) = 0d52014f52e62fc5fa6650336ddb0011ecf331e6 12SHA1 (patch-src_egl_main_eglglobals.c) = 0d52014f52e62fc5fa6650336ddb0011ecf331e6
13SHA1 (patch-src_gallium_auxiliary_pipe-loader_pipe__loader__drm.c) = f913b779404e6bd8ae707a4fd66eb7c1dca9b311 13SHA1 (patch-src_gallium_auxiliary_pipe-loader_pipe__loader__drm.c) = f913b779404e6bd8ae707a4fd66eb7c1dca9b311
14SHA1 (patch-src_gallium_auxiliary_rbug_rbug__texture.c) = 57d831b1001419191a27c05d9cb7734481372d27 14SHA1 (patch-src_gallium_auxiliary_rbug_rbug__texture.c) = 57d831b1001419191a27c05d9cb7734481372d27
15SHA1 (patch-src_gallium_drivers_nouveau_nouveau__vp3__video.c) = 04f95784c3270c9bb7e95377982e217962481525 15SHA1 (patch-src_gallium_drivers_nouveau_nouveau__vp3__video.c) = 04f95784c3270c9bb7e95377982e217962481525
16SHA1 (patch-src_gallium_drivers_nouveau_nv50_nv84__video.c) = 1b4239fe053523835ecac006894bdb0cde0ee626 16SHA1 (patch-src_gallium_drivers_nouveau_nv50_nv84__video.c) = 1b4239fe053523835ecac006894bdb0cde0ee626
17SHA1 (patch-src_gallium_drivers_radeonsi_si__state__shaders.c) = 2a6fb80e2dd8c19a73c1ae9c037e7b1769ca100f 17SHA1 (patch-src_gallium_drivers_radeonsi_si__state__shaders.c) = 2a6fb80e2dd8c19a73c1ae9c037e7b1769ca100f
18SHA1 (patch-src_gallium_drivers_vc4_vc4__bufmgr.c) = 1d591d346486fdf58893f69ab92a272e6a31a987 18SHA1 (patch-src_gallium_drivers_vc4_vc4__bufmgr.c) = 1d591d346486fdf58893f69ab92a272e6a31a987
19SHA1 (patch-src_gallium_include_pipe_p__config.h) = f4e38eac66167b619c30076bb0144dd716310967 19SHA1 (patch-src_gallium_include_pipe_p__config.h) = f4e38eac66167b619c30076bb0144dd716310967
cvs diff -r1.76 -r1.77 pkgsrc/graphics/MesaLib/options.mk (expand / switch to unified diff)

--- pkgsrc/graphics/MesaLib/options.mk 2019/10/21 20:47:55 1.76
+++ pkgsrc/graphics/MesaLib/options.mk 2019/12/08 13:07:20 1.77
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.76 2019/10/21 20:47:55 nia Exp $ 1# $NetBSD: options.mk,v 1.77 2019/12/08 13:07:20 nia Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.MesaLib 3PKG_OPTIONS_VAR= PKG_OPTIONS.MesaLib
4 4
5.include "features.mk" 5.include "features.mk"
6 6
7PKG_SUPPORTED_OPTIONS+= llvm vulkan x11 7PKG_SUPPORTED_OPTIONS+= llvm vulkan x11
8 8
9.if ${MESALIB_SUPPORTS_DRI} == "yes" 9.if ${MESALIB_SUPPORTS_DRI} == "yes"
10PKG_SUPPORTED_OPTIONS+= wayland 10PKG_SUPPORTED_OPTIONS+= wayland
11.endif 11.endif
12 12
13PKG_SUGGESTED_OPTIONS+= x11 13PKG_SUGGESTED_OPTIONS+= x11
14 14
@@ -58,36 +58,26 @@ GALLIUM_DRIVERS+= radeonsi @@ -58,36 +58,26 @@ GALLIUM_DRIVERS+= radeonsi
58MESON_ARGS+= -Dllvm=false 58MESON_ARGS+= -Dllvm=false
59.endif 59.endif
60 60
61# 61#
62# Vulkan support - experimental 62# Vulkan support - experimental
63# 63#
64.if !empty(PKG_OPTIONS:Mvulkan) 64.if !empty(PKG_OPTIONS:Mvulkan)
65MESON_ARGS+= -Dvulkan-drivers="auto" 65MESON_ARGS+= -Dvulkan-drivers="auto"
66.else 66.else
67MESON_ARGS+= -Dvulkan-drivers="" 67MESON_ARGS+= -Dvulkan-drivers=""
68.endif 68.endif
69 69
70# 70#
71# Wayland support 
72# 
73.if !empty(PKG_OPTIONS:Mwayland) 
74MESA_PLATFORMS+= wayland 
75PLIST.wayland= yes 
76. include "../../devel/wayland/buildlink3.mk" 
77. include "../../devel/wayland-protocols/buildlink3.mk" 
78.endif 
79 
80# 
81# X11 support 71# X11 support
82# 72#
83.if !empty(PKG_OPTIONS:Mx11) 73.if !empty(PKG_OPTIONS:Mx11)
84MESA_PLATFORMS+= x11 74MESA_PLATFORMS+= x11
85PLIST.glx= yes 75PLIST.glx= yes
86. if ${MESALIB_SUPPORTS_DRI} == "yes" 76. if ${MESALIB_SUPPORTS_DRI} == "yes"
87MESON_ARGS+= -Dglx=dri 77MESON_ARGS+= -Dglx=dri
88. include "../../multimedia/libvdpau/available.mk" 78. include "../../multimedia/libvdpau/available.mk"
89. if ${VDPAU_AVAILABLE} == "yes" 79. if ${VDPAU_AVAILABLE} == "yes"
90MESON_ARGS+= -Dgallium-vdpau=true 80MESON_ARGS+= -Dgallium-vdpau=true
91PLIST.vdpau= yes 81PLIST.vdpau= yes
92. include "../../multimedia/libvdpau/buildlink3.mk" 82. include "../../multimedia/libvdpau/buildlink3.mk"
93. else 83. else
@@ -98,13 +88,23 @@ MESON_ARGS+= -Dgallium-vdpau=false @@ -98,13 +88,23 @@ MESON_ARGS+= -Dgallium-vdpau=false
98. include "../../x11/libXdamage/buildlink3.mk" 88. include "../../x11/libXdamage/buildlink3.mk"
99. include "../../x11/libXext/buildlink3.mk" 89. include "../../x11/libXext/buildlink3.mk"
100. include "../../x11/libXfixes/buildlink3.mk" 90. include "../../x11/libXfixes/buildlink3.mk"
101. include "../../x11/libXrandr/buildlink3.mk" 91. include "../../x11/libXrandr/buildlink3.mk"
102. include "../../x11/libXxf86vm/buildlink3.mk" 92. include "../../x11/libXxf86vm/buildlink3.mk"
103. include "../../x11/libxcb/buildlink3.mk" 93. include "../../x11/libxcb/buildlink3.mk"
104. include "../../x11/libxshmfence/buildlink3.mk" 94. include "../../x11/libxshmfence/buildlink3.mk"
105. include "../../x11/xcb-proto/buildlink3.mk" 95. include "../../x11/xcb-proto/buildlink3.mk"
106. include "../../x11/xorgproto/buildlink3.mk" 96. include "../../x11/xorgproto/buildlink3.mk"
107.else 97.else
108MESON_ARGS+= -Dglx=disabled 98MESON_ARGS+= -Dglx=disabled
109MESON_ARGS+= -Dgallium-vdpau=false 99MESON_ARGS+= -Dgallium-vdpau=false
110.endif 100.endif
 101
 102#
 103# Wayland support
 104#
 105.if !empty(PKG_OPTIONS:Mwayland)
 106MESA_PLATFORMS+= wayland
 107PLIST.wayland= yes
 108. include "../../devel/wayland/buildlink3.mk"
 109. include "../../devel/wayland-protocols/buildlink3.mk"
 110.endif