summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2019-09-09 14:42:29 +0000
committertnn <tnn@pkgsrc.org>2019-09-09 14:42:29 +0000
commitae4701cc8e39e6912ff95c1cb29a7de98e0899ab (patch)
treeef22cb0513be8cdc26f28a08007a68227a3ef81e
parent478d0eeac1e58f9b79d34e00b8578bdf455ea812 (diff)
downloadpkgsrc-ae4701cc8e39e6912ff95c1cb29a7de98e0899ab.tar.gz
MesaLib: improve previous patch. Should use idep_nir_headers.
Thanks Maya for the hint.
-rw-r--r--graphics/MesaLib/distinfo4
-rw-r--r--graphics/MesaLib/patches/patch-src_gallium_drivers_nouveau_meson.build18
2 files changed, 11 insertions, 11 deletions
diff --git a/graphics/MesaLib/distinfo b/graphics/MesaLib/distinfo
index 8185c835c2a..44b155ca519 100644
--- a/graphics/MesaLib/distinfo
+++ b/graphics/MesaLib/distinfo
@@ -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_platform__x11.c) = 49e48c31eacb79d1da357fe70eaf
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
diff --git a/graphics/MesaLib/patches/patch-src_gallium_drivers_nouveau_meson.build b/graphics/MesaLib/patches/patch-src_gallium_drivers_nouveau_meson.build
index 4cd7a7e0916..32875d02fdd 100644
--- a/graphics/MesaLib/patches/patch-src_gallium_drivers_nouveau_meson.build
+++ b/graphics/MesaLib/patches/patch-src_gallium_drivers_nouveau_meson.build
@@ -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(