CVS commit: pkgsrc/graphics/MesaLib

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Mon Sep  9 14:42:29 UTC 2019

Modified Files:
        pkgsrc/graphics/MesaLib: distinfo
        pkgsrc/graphics/MesaLib/patches:
            patch-src_gallium_drivers_nouveau_meson.build

Log Message:
MesaLib: improve previous patch. Should use idep_nir_headers.

Thanks Maya for the hint.


To generate a diff of this commit:
cvs rdiff -u -r1.132 -r1.133 pkgsrc/graphics/MesaLib/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/graphics/MesaLib/patches/patch-src_gallium_drivers_nouveau_meson.build

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/MesaLib/distinfo
diff -u pkgsrc/graphics/MesaLib/distinfo:1.132 pkgsrc/graphics/MesaLib/distinfo:1.133
--- pkgsrc/graphics/MesaLib/distinfo:1.132      Mon Sep  9 14:04:13 2019
+++ pkgsrc/graphics/MesaLib/distinfo    Mon Sep  9 14:42:29 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.132 2019/09/09 14:04:13 tnn Exp $
+$NetBSD: distinfo,v 1.133 2019/09/09 14:42:29 tnn Exp $
 
 SHA1 (mesa-19.1.6.tar.xz) = 6344c54ff6f66c85c1f0a44a96259263163f9969
 RMD160 (mesa-19.1.6.tar.xz) = dd0cfe323b38bdcb5c2b262150bd7127feee60a6
@@ -13,7 +13,7 @@ SHA1 (patch-src_egl_drivers_dri2_platfor
 SHA1 (patch-src_egl_main_eglglobals.c) = 0d52014f52e62fc5fa6650336ddb0011ecf331e6
 SHA1 (patch-src_gallium_auxiliary_drivers_trace_tr__dump.c) = 360e1608508a7bbb41acecd58930781038e2309e
 SHA1 (patch-src_gallium_auxiliary_pipe-loader_pipe__loader__drm.c) = f913b779404e6bd8ae707a4fd66eb7c1dca9b311
-SHA1 (patch-src_gallium_drivers_nouveau_meson.build) = 024da06e43fa376d204e0d66c5eafa586470175f
+SHA1 (patch-src_gallium_drivers_nouveau_meson.build) = 27918a92a72a9da88bc8e887a3d293c332c2862f
 SHA1 (patch-src_gallium_drivers_nouveau_nouveau__vp3__video.c) = 04f95784c3270c9bb7e95377982e217962481525
 SHA1 (patch-src_gallium_drivers_nouveau_nv50_nv84__video.c) = 1b4239fe053523835ecac006894bdb0cde0ee626
 SHA1 (patch-src_gallium_drivers_radeonsi_si__state__shaders.c) = ed51a57765f2349bc91fd509dc03e709241bd899

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