CVS commit: pkgsrc/graphics/MesaLib18

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

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sat Jan 19 18:26:31 UTC 2019

Modified Files:
        pkgsrc/graphics/MesaLib18: distinfo
        pkgsrc/graphics/MesaLib18/patches:
            patch-src_gallium_drivers_radeonsi_si__state__shaders.c

Log Message:
fix botched #endif


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/graphics/MesaLib18/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/graphics/MesaLib18/patches/patch-src_gallium_drivers_radeonsi_si__state__shaders.c

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

Modified files:

Index: pkgsrc/graphics/MesaLib18/distinfo
diff -u pkgsrc/graphics/MesaLib18/distinfo:1.9 pkgsrc/graphics/MesaLib18/distinfo:1.10
--- pkgsrc/graphics/MesaLib18/distinfo:1.9      Sat Jan 19 17:47:51 2019
+++ pkgsrc/graphics/MesaLib18/distinfo  Sat Jan 19 18:26:30 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2019/01/19 17:47:51 tnn Exp $
+$NetBSD: distinfo,v 1.10 2019/01/19 18:26:30 tnn Exp $
 
 SHA1 (mesa-18.3.2.tar.xz) = 8775d7bfac7e07141ac4299888d426d5550949f7
 RMD160 (mesa-18.3.2.tar.xz) = d3662f72a39d009adb21a70bd7b49c28960c0d5c
@@ -19,7 +19,7 @@ SHA1 (patch-src_gallium_auxiliary_util_u
 SHA1 (patch-src_gallium_auxiliary_util_u__helpers.c) = 636fb98c4cbf70a5d8a6d94c24e75d2b05968b3c
 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) = d3d01523413506b7d02b0ec1a9b290af2a91dc32
+SHA1 (patch-src_gallium_drivers_radeonsi_si__state__shaders.c) = 08119700b80ddc99f7f2ec1b7b8212147fabda27
 SHA1 (patch-src_gallium_drivers_vc4_vc4__bufmgr.c) = 1d591d346486fdf58893f69ab92a272e6a31a987
 SHA1 (patch-src_gallium_include_pipe_p__config.h) = f4e38eac66167b619c30076bb0144dd716310967
 SHA1 (patch-src_gallium_state__trackers_clover_llvm_invocation.cpp) = 3053db09fbfffffd82e232b60b244a0a80c8f181

Index: pkgsrc/graphics/MesaLib18/patches/patch-src_gallium_drivers_radeonsi_si__state__shaders.c
diff -u pkgsrc/graphics/MesaLib18/patches/patch-src_gallium_drivers_radeonsi_si__state__shaders.c:1.1 pkgsrc/graphics/MesaLib18/patches/patch-src_gallium_drivers_radeonsi_si__state__shaders.c:1.2
--- pkgsrc/graphics/MesaLib18/patches/patch-src_gallium_drivers_radeonsi_si__state__shaders.c:1.1       Sat Jan 19 17:47:51 2019
+++ pkgsrc/graphics/MesaLib18/patches/patch-src_gallium_drivers_radeonsi_si__state__shaders.c   Sat Jan 19 18:26:30 2019
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_gallium_drivers_radeonsi_si__state__shaders.c,v 1.1 2019/01/19 17:47:51 tnn Exp $
+$NetBSD: patch-src_gallium_drivers_radeonsi_si__state__shaders.c,v 1.2 2019/01/19 18:26:30 tnn Exp $
 
 #if'out some debug code on SunOS. There is no open_memstream(3)
 
 --- src/gallium/drivers/radeonsi/si_state_shaders.c.orig       2019-01-17 11:26:22.000000000 +0000
 +++ src/gallium/drivers/radeonsi/si_state_shaders.c
-@@ -1721,6 +1721,7 @@ static void si_build_shader_variant(stru
+@@ -1721,12 +1721,14 @@ static void si_build_shader_variant(stru
        }
  
        if (shader->compiler_ctx_state.is_debug_context) {
@@ -12,11 +12,10 @@ $NetBSD: patch-src_gallium_drivers_radeo
                FILE *f = open_memstream(&shader->shader_log,
                                         &shader->shader_log_size);
                if (f) {
-@@ -1728,6 +1729,7 @@ static void si_build_shader_variant(stru
+                       si_shader_dump(sscreen, shader, NULL, sel->type, f, false);
                        fclose(f);
                }
-       }
 +#endif
+       }
  
        si_shader_init_pm4_state(sscreen, shader);
- }