Mon Sep 9 14:42:29 2019 UTC ()
MesaLib: improve previous patch. Should use idep_nir_headers.

Thanks Maya for the hint.


(tnn)
diff -r1.132 -r1.133 pkgsrc/graphics/MesaLib/distinfo
diff -r1.1 -r1.2 pkgsrc/graphics/MesaLib/patches/patch-src_gallium_drivers_nouveau_meson.build
cvs diff -r1.132 -r1.133 pkgsrc/graphics/MesaLib/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/MesaLib/distinfo 2019/09/09 14:04:13 1.132
+++ pkgsrc/graphics/MesaLib/distinfo 2019/09/09 14:42:29 1.133
@@ -1,29 +1,29 @@ @@ -1,29 +1,29 @@
1$NetBSD: distinfo,v 1.132 2019/09/09 14:04:13 tnn Exp $ 1$NetBSD: distinfo,v 1.133 2019/09/09 14:42:29 tnn Exp $
2 2
3SHA1 (mesa-19.1.6.tar.xz) = 6344c54ff6f66c85c1f0a44a96259263163f9969 3SHA1 (mesa-19.1.6.tar.xz) = 6344c54ff6f66c85c1f0a44a96259263163f9969
4RMD160 (mesa-19.1.6.tar.xz) = dd0cfe323b38bdcb5c2b262150bd7127feee60a6 4RMD160 (mesa-19.1.6.tar.xz) = dd0cfe323b38bdcb5c2b262150bd7127feee60a6
5SHA512 (mesa-19.1.6.tar.xz) = 399ce97a293769893ef9a4a6af1f77c7d835f5405bdbc03bbf9b73e052e4ff3b43dec5dafd6b9fedaaf2c59531aeccaa0f685a8bfdc5719a26c3815fc7f68024 5SHA512 (mesa-19.1.6.tar.xz) = 399ce97a293769893ef9a4a6af1f77c7d835f5405bdbc03bbf9b73e052e4ff3b43dec5dafd6b9fedaaf2c59531aeccaa0f685a8bfdc5719a26c3815fc7f68024
6Size (mesa-19.1.6.tar.xz) = 10939908 bytes 6Size (mesa-19.1.6.tar.xz) = 10939908 bytes
7SHA1 (patch-meson.build) = a9fdcaa59aed9b56ff95d4153dd73064e2261c45 7SHA1 (patch-meson.build) = a9fdcaa59aed9b56ff95d4153dd73064e2261c45
8SHA1 (patch-src_amd_common_ac__debug.c) = 8233367c3b5bc344442ea8d19488fdd1e3791ae9 8SHA1 (patch-src_amd_common_ac__debug.c) = 8233367c3b5bc344442ea8d19488fdd1e3791ae9
9SHA1 (patch-src_amd_vulkan_winsys_amdgpu_radv__amdgpu__cs.c) = 1fe81a7b16e36dc9125400c20543271216a33a45 9SHA1 (patch-src_amd_vulkan_winsys_amdgpu_radv__amdgpu__cs.c) = 1fe81a7b16e36dc9125400c20543271216a33a45
10SHA1 (patch-src_compiler_builtin__type__macros.h) = e4868011711fb89a293580a12eb603b8e7162336 10SHA1 (patch-src_compiler_builtin__type__macros.h) = e4868011711fb89a293580a12eb603b8e7162336
11SHA1 (patch-src_compiler_glsl_glsl__parser__extras.cpp) = ef114d6e288e6d212fce9d1c0606f7d454a171c4 11SHA1 (patch-src_compiler_glsl_glsl__parser__extras.cpp) = ef114d6e288e6d212fce9d1c0606f7d454a171c4
12SHA1 (patch-src_egl_drivers_dri2_platform__x11.c) = 49e48c31eacb79d1da357fe70eaffd2926b5280e 12SHA1 (patch-src_egl_drivers_dri2_platform__x11.c) = 49e48c31eacb79d1da357fe70eaffd2926b5280e
13SHA1 (patch-src_egl_main_eglglobals.c) = 0d52014f52e62fc5fa6650336ddb0011ecf331e6 13SHA1 (patch-src_egl_main_eglglobals.c) = 0d52014f52e62fc5fa6650336ddb0011ecf331e6
14SHA1 (patch-src_gallium_auxiliary_drivers_trace_tr__dump.c) = 360e1608508a7bbb41acecd58930781038e2309e 14SHA1 (patch-src_gallium_auxiliary_drivers_trace_tr__dump.c) = 360e1608508a7bbb41acecd58930781038e2309e
15SHA1 (patch-src_gallium_auxiliary_pipe-loader_pipe__loader__drm.c) = f913b779404e6bd8ae707a4fd66eb7c1dca9b311 15SHA1 (patch-src_gallium_auxiliary_pipe-loader_pipe__loader__drm.c) = f913b779404e6bd8ae707a4fd66eb7c1dca9b311
16SHA1 (patch-src_gallium_drivers_nouveau_meson.build) = 024da06e43fa376d204e0d66c5eafa586470175f 16SHA1 (patch-src_gallium_drivers_nouveau_meson.build) = 27918a92a72a9da88bc8e887a3d293c332c2862f
17SHA1 (patch-src_gallium_drivers_nouveau_nouveau__vp3__video.c) = 04f95784c3270c9bb7e95377982e217962481525 17SHA1 (patch-src_gallium_drivers_nouveau_nouveau__vp3__video.c) = 04f95784c3270c9bb7e95377982e217962481525
18SHA1 (patch-src_gallium_drivers_nouveau_nv50_nv84__video.c) = 1b4239fe053523835ecac006894bdb0cde0ee626 18SHA1 (patch-src_gallium_drivers_nouveau_nv50_nv84__video.c) = 1b4239fe053523835ecac006894bdb0cde0ee626
19SHA1 (patch-src_gallium_drivers_radeonsi_si__state__shaders.c) = ed51a57765f2349bc91fd509dc03e709241bd899 19SHA1 (patch-src_gallium_drivers_radeonsi_si__state__shaders.c) = ed51a57765f2349bc91fd509dc03e709241bd899
20SHA1 (patch-src_gallium_drivers_vc4_vc4__bufmgr.c) = 1d591d346486fdf58893f69ab92a272e6a31a987 20SHA1 (patch-src_gallium_drivers_vc4_vc4__bufmgr.c) = 1d591d346486fdf58893f69ab92a272e6a31a987
21SHA1 (patch-src_gallium_include_pipe_p__config.h) = f4e38eac66167b619c30076bb0144dd716310967 21SHA1 (patch-src_gallium_include_pipe_p__config.h) = f4e38eac66167b619c30076bb0144dd716310967
22SHA1 (patch-src_gallium_state__trackers_clover_llvm_invocation.cpp) = 3053db09fbfffffd82e232b60b244a0a80c8f181 22SHA1 (patch-src_gallium_state__trackers_clover_llvm_invocation.cpp) = 3053db09fbfffffd82e232b60b244a0a80c8f181
23SHA1 (patch-src_gallium_state__trackers_clover_llvm_metadata.hpp) = c97d38098ea03658bc193a50e445b87f1c020839 23SHA1 (patch-src_gallium_state__trackers_clover_llvm_metadata.hpp) = c97d38098ea03658bc193a50e445b87f1c020839
24SHA1 (patch-src_gallium_state__trackers_clover_util_range.hpp) = cdc78067986c1b92818472c4201c58ef1b42c4f4 24SHA1 (patch-src_gallium_state__trackers_clover_util_range.hpp) = cdc78067986c1b92818472c4201c58ef1b42c4f4
25SHA1 (patch-src_glx_apple_apple__glapi.c) = c4eea8dabf74eb03d22da4eb834b18ae3384c63b 25SHA1 (patch-src_glx_apple_apple__glapi.c) = c4eea8dabf74eb03d22da4eb834b18ae3384c63b
26SHA1 (patch-src_glx_dri__common.h) = 0274877f8c65a4bb729536a897df4704897a4c6e 26SHA1 (patch-src_glx_dri__common.h) = 0274877f8c65a4bb729536a897df4704897a4c6e
27SHA1 (patch-src_glx_dri__glx.c) = 8fd48776e9953b18bd17ba130d90ae2935e67242 27SHA1 (patch-src_glx_dri__glx.c) = 8fd48776e9953b18bd17ba130d90ae2935e67242
28SHA1 (patch-src_glx_glxclient.h) = f0358179ae397bc8677597b0ccb9a471f40f15de 28SHA1 (patch-src_glx_glxclient.h) = f0358179ae397bc8677597b0ccb9a471f40f15de
29SHA1 (patch-src_glx_glxcurrent.c) = 8b8e949eded13491c5865601253c6e7d4b06e228 29SHA1 (patch-src_glx_glxcurrent.c) = 8b8e949eded13491c5865601253c6e7d4b06e228
cvs diff -r1.1 -r1.2 pkgsrc/graphics/MesaLib/patches/Attic/patch-src_gallium_drivers_nouveau_meson.build (expand / switch to unified diff)

--- pkgsrc/graphics/MesaLib/patches/Attic/patch-src_gallium_drivers_nouveau_meson.build 2019/09/09 14:04:13 1.1
+++ pkgsrc/graphics/MesaLib/patches/Attic/patch-src_gallium_drivers_nouveau_meson.build 2019/09/09 14:42:29 1.2
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-src_gallium_drivers_nouveau_meson.build,v 1.1 2019/09/09 14:04:13 tnn Exp $ 1$NetBSD: patch-src_gallium_drivers_nouveau_meson.build,v 1.2 2019/09/09 14:42:29 tnn Exp $
2 2
3libnouveau needs nir_intrinsics.h 3libnouveau needs nir_intrinsics.h
4 4
5--- src/gallium/drivers/nouveau/meson.build.orig 2019-09-03 10:54:49.000000000 +0000 5--- src/gallium/drivers/nouveau/meson.build.orig 2019-09-03 10:54:49.000000000 +0000
6+++ src/gallium/drivers/nouveau/meson.build 6+++ src/gallium/drivers/nouveau/meson.build
7@@ -211,7 +211,7 @@ files_libnouveau = files( 7@@ -217,7 +217,7 @@ libnouveau = static_library(
8  
9 libnouveau = static_library( 
10 'nouveau', 
11- [files_libnouveau, nir_opcodes_h], 
12+ [files_libnouveau, nir_opcodes_h, nir_intrinsics_h], 
13 include_directories : [ 
14 inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_common, 
15 ], 8 ],
 9 c_args : [c_vis_args],
 10 cpp_args : [cpp_vis_args],
 11- dependencies : [dep_libdrm, dep_libdrm_nouveau],
 12+ dependencies : [dep_libdrm, dep_libdrm_nouveau, idep_nir_headers],
 13 )
 14
 15 nouveau_compiler = executable(