[pkgsrc/trunk]: pkgsrc/graphics/MesaLib18 MesaLib18: more patch cleanup

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/graphics/MesaLib18 MesaLib18: more patch cleanup
From: tnn <tnn%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 10:34:15 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/0e75280c4db5
branches:  trunk
changeset: 390363:0e75280c4db5
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sun Jan 20 09:50:28 2019 +0000

description:
MesaLib18: more patch cleanup

patch-configure.ac: configure test for HAVE_OPEN_MEMSTREAM
patch-src_amd_common_ac__debug.c: ditto
patch-src_gallium_drivers_radeonsi_si__state__shaders.c: ditto
patch-src_gallium_auxiliary_util_u__helpers.c: add comment
patch-src_util_u__thread.h: add comment
patch-src_egl_drivers_dri2_platform__drm.c: fix incomplete #ifdef
patch-src_mesa_tnl_t__pipeline.c: delete obsolete patch

diffstat:

 graphics/MesaLib18/distinfo                                                        |  15 ++---
 graphics/MesaLib18/patches/patch-configure.ac                                      |  26 ++++++---
 graphics/MesaLib18/patches/patch-src_amd_common_ac__debug.c                        |   4 +-
 graphics/MesaLib18/patches/patch-src_egl_drivers_dri2_platform__drm.c              |   8 +-
 graphics/MesaLib18/patches/patch-src_gallium_auxiliary_util_u__helpers.c           |   4 +-
 graphics/MesaLib18/patches/patch-src_gallium_drivers_radeonsi_si__state__shaders.c |   4 +-
 graphics/MesaLib18/patches/patch-src_mesa_tnl_t__pipeline.c                        |  21 --------
 graphics/MesaLib18/patches/patch-src_util_u__thread.h                              |   4 +-
 8 files changed, 40 insertions(+), 46 deletions(-)

diffs (239 lines):

diff -r 33f3d158655b -r 0e75280c4db5 graphics/MesaLib18/distinfo
--- a/graphics/MesaLib18/distinfo       Sun Jan 20 09:19:44 2019 +0000
+++ b/graphics/MesaLib18/distinfo       Sun Jan 20 09:50:28 2019 +0000
@@ -1,25 +1,25 @@
-$NetBSD: distinfo,v 1.13 2019/01/19 23:21:43 tnn Exp $
+$NetBSD: distinfo,v 1.14 2019/01/20 09:50:28 tnn Exp $
 
 SHA1 (mesa-18.3.2.tar.xz) = 8775d7bfac7e07141ac4299888d426d5550949f7
 RMD160 (mesa-18.3.2.tar.xz) = d3662f72a39d009adb21a70bd7b49c28960c0d5c
 SHA512 (mesa-18.3.2.tar.xz) = 34b66520728d720b1f3d3d63f8ba5c255d57b9e8fe427264419e4163b474df662ff6db9ca8b81283866da415e34346a4c39fc37bebe2a0929be14480faf4db45
 Size (mesa-18.3.2.tar.xz) = 11868440 bytes
-SHA1 (patch-configure.ac) = 355b04270d2036fa879215d3f58278d5d32d22da
+SHA1 (patch-configure.ac) = 5283215d27410c80f81ffd28b3f7b02506d1c1b8
 SHA1 (patch-include_GL_internal_dri__interface.h) = 146d2f3f3e50fc1947e8941301d9cf9d90a035e2
-SHA1 (patch-src_amd_common_ac__debug.c) = eb73957adc7ed81db99d4edbc507b05231fda218
+SHA1 (patch-src_amd_common_ac__debug.c) = 8233367c3b5bc344442ea8d19488fdd1e3791ae9
 SHA1 (patch-src_amd_vulkan_winsys_amdgpu_radv__amdgpu__cs.c) = 1fe81a7b16e36dc9125400c20543271216a33a45
 SHA1 (patch-src_compiler_builtin__type__macros.h) = 857bca0c0f55ec8d7a20b3807c7a5d7bd06bdfbf
 SHA1 (patch-src_compiler_glsl_glsl__parser__extras.cpp) = ef114d6e288e6d212fce9d1c0606f7d454a171c4
-SHA1 (patch-src_egl_drivers_dri2_platform__drm.c) = 94ec2e969e7cf7c89c3192e60758e5ad14b02629
+SHA1 (patch-src_egl_drivers_dri2_platform__drm.c) = e18e7b1ffbc74b8acf3d9095a92c750f9d005479
 SHA1 (patch-src_egl_drivers_dri2_platform__x11.c) = 49e48c31eacb79d1da357fe70eaffd2926b5280e
 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_auxiliary_util_u__format__tests.c) = 4d5e4677c2825778c43440ab131b8807f6840975
-SHA1 (patch-src_gallium_auxiliary_util_u__helpers.c) = 636fb98c4cbf70a5d8a6d94c24e75d2b05968b3c
+SHA1 (patch-src_gallium_auxiliary_util_u__helpers.c) = a955657951d6d7d84ef349b3b6639a94e44994a5
 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) = 08119700b80ddc99f7f2ec1b7b8212147fabda27
+SHA1 (patch-src_gallium_drivers_radeonsi_si__state__shaders.c) = ed51a57765f2349bc91fd509dc03e709241bd899
 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
@@ -58,7 +58,6 @@
 SHA1 (patch-src_mesa_main_extensions.c) = 2f48bdb1176c2878bb33bcfab7556172b50a987e
 SHA1 (patch-src_mesa_main_macros.h) = c5dceaa8dc02a58e5b2273d82e3fe1cc12e327d3
 SHA1 (patch-src_mesa_main_shader__query.cpp) = 3f9c31645d87855759def11344dee16af23c7be3
-SHA1 (patch-src_mesa_tnl_t__pipeline.c) = e6abcdb24019ca57527d25c5cd86737332db98e3
 SHA1 (patch-src_mesa_x86_common__x86.c) = f8c4b93443ef66d017f6aa114b877565b30f2598
 SHA1 (patch-src_util_Makefile.am) = e390cd47b784ad08987b81fdbce537968ad4a624
 SHA1 (patch-src_util_build__id.c) = 7a9547bbda9d2fb9f0018ccf27b70b59e497aa2c
@@ -68,5 +67,5 @@
 SHA1 (patch-src_util_strndup.h) = 73f49694ca48ad6b9a9d8346c5b84fddec2463bd
 SHA1 (patch-src_util_u__atomic.h) = 31d4514538ef5ee53012695eb5c66134aaec981e
 SHA1 (patch-src_util_u__queue.c) = ed1ea3f6fc37e9a64894a3e865c48691b6e01b2c
-SHA1 (patch-src_util_u__thread.h) = 57bbf209575da7fd89f7ed6ac56a2ea19aec71d1
+SHA1 (patch-src_util_u__thread.h) = f0453485bb62d0b7c00a1b840cfce2726ebcbfd2
 SHA1 (patch-src_util_xmlconfig.c) = ad5619e067957b120a70c1c63421c92b356e16ac
diff -r 33f3d158655b -r 0e75280c4db5 graphics/MesaLib18/patches/patch-configure.ac
--- a/graphics/MesaLib18/patches/patch-configure.ac     Sun Jan 20 09:19:44 2019 +0000
+++ b/graphics/MesaLib18/patches/patch-configure.ac     Sun Jan 20 09:50:28 2019 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure.ac,v 1.4 2019/01/10 22:30:11 tnn Exp $
+$NetBSD: patch-configure.ac,v 1.5 2019/01/20 09:50:28 tnn Exp $
 
 Don't check for pthread stubs anywhere, as we don't provide it.
 
@@ -21,7 +21,7 @@
 which fails to fall back to using DRI2 when run on a system
 without DRI3 support.
 
---- configure.ac.orig  2018-12-11 21:13:57.000000000 +0000
+--- configure.ac.orig  2019-01-17 11:26:22.000000000 +0000
 +++ configure.ac
 @@ -726,7 +726,7 @@ dnl
  dnl OSX linker does not support build-id
@@ -41,7 +41,17 @@
                     [AC_CHECK_LIB([rt], [clock_gettime], [CLOCK_LIB=-lrt],
                                   [AC_MSG_ERROR([Could not find clock_gettime])])])
      AC_SUBST([CLOCK_LIB])
-@@ -966,7 +966,7 @@ PTHREAD_LIBS="$PTHREAD_LIBS -pthread"
+@@ -941,6 +941,9 @@ esac
+ dnl See if posix_memalign is available
+ AC_CHECK_FUNC([posix_memalign], [DEFINES="$DEFINES -DHAVE_POSIX_MEMALIGN"])
+ 
++dnl See if open_memstream is available
++AC_CHECK_FUNC([open_memstream], [DEFINES="$DEFINES -DHAVE_OPEN_MEMSTREAM"])
++
+ dnl Check for zlib
+ PKG_CHECK_MODULES([ZLIB], [zlib >= $ZLIB_REQUIRED])
+ DEFINES="$DEFINES -DHAVE_ZLIB"
+@@ -966,7 +969,7 @@ PTHREAD_LIBS="$PTHREAD_LIBS -pthread"
  dnl pthread-stubs is mandatory on some BSD platforms, due to the nature of the
  dnl project. Even then there's a notable issue as described in the project README
  case "$host_os" in
@@ -50,7 +60,7 @@
      pthread_stubs_possible="no"
      ;;
  * )
-@@ -995,7 +995,10 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([[
+@@ -995,7 +998,10 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([[
  LIBS="$save_LIBS"
  
  dnl Check for futex for fast inline simple_mtx_t.
@@ -62,7 +72,7 @@
  
  dnl SELinux awareness.
  AC_ARG_ENABLE([selinux],
-@@ -1278,7 +1281,7 @@ fi
+@@ -1278,7 +1284,7 @@ fi
  AC_SUBST(LIBSENSORS_LIBS)
  
  case "$host_os" in
@@ -71,7 +81,7 @@
      dri3_default=yes
      ;;
  *)
-@@ -1908,7 +1911,7 @@ if test x"$enable_dri3" = xyes; then
+@@ -1908,7 +1914,7 @@ if test x"$enable_dri3" = xyes; then
      dri3_modifier_modules="xcb-dri3 >= $XCBDRI3_MODIFIERS_REQUIRED xcb-present >= $XCBPRESENT_MODIFIERS_REQUIRED"
      PKG_CHECK_MODULES([XCB_DRI3_MODIFIERS], [$dri3_modifier_modules], [have_dri3_modifiers=yes], [have_dri3_modifiers=no])
  
@@ -80,7 +90,7 @@
          DEFINES="$DEFINES -DHAVE_DRI3_MODIFIERS"
      fi
  fi
-@@ -2505,8 +2508,6 @@ if test "x$enable_opencl" = xyes; then
+@@ -2505,8 +2511,6 @@ if test "x$enable_opencl" = xyes; then
          CLANG_LIBDIR=${LLVM_LIBDIR}
      fi
      CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION}
@@ -89,7 +99,7 @@
  fi
  AM_CONDITIONAL(HAVE_CLOVER, test "x$enable_opencl" = xyes)
  AM_CONDITIONAL(HAVE_CLOVER_ICD, test "x$enable_opencl_icd" = xyes)
-@@ -2941,7 +2942,7 @@ if test "x$enable_llvm" = xyes; then
+@@ -2941,7 +2945,7 @@ if test "x$enable_llvm" = xyes; then
      dnl the LLVM library propagated in the Libs.private of the respective .pc
      dnl file which ensures complete dependency information when statically
      dnl linking.
diff -r 33f3d158655b -r 0e75280c4db5 graphics/MesaLib18/patches/patch-src_amd_common_ac__debug.c
--- a/graphics/MesaLib18/patches/patch-src_amd_common_ac__debug.c       Sun Jan 20 09:19:44 2019 +0000
+++ b/graphics/MesaLib18/patches/patch-src_amd_common_ac__debug.c       Sun Jan 20 09:50:28 2019 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_amd_common_ac__debug.c,v 1.1 2019/01/19 17:47:51 tnn Exp $
+$NetBSD: patch-src_amd_common_ac__debug.c,v 1.2 2019/01/20 09:50:28 tnn Exp $
 
 #if'out some debug code on SunOS. There is no open_memstream(3)
 
@@ -8,7 +8,7 @@
  
        char *out;
        size_t outsize;
-+#if !defined(__sun)
++#if defined(HAVE_OPEN_MEMSTREAM)
        FILE *memf = open_memstream(&out, &outsize);
        ib.f = memf;
        ac_do_parse_ib(memf, &ib);
diff -r 33f3d158655b -r 0e75280c4db5 graphics/MesaLib18/patches/patch-src_egl_drivers_dri2_platform__drm.c
--- a/graphics/MesaLib18/patches/patch-src_egl_drivers_dri2_platform__drm.c     Sun Jan 20 09:19:44 2019 +0000
+++ b/graphics/MesaLib18/patches/patch-src_egl_drivers_dri2_platform__drm.c     Sun Jan 20 09:50:28 2019 +0000
@@ -1,15 +1,17 @@
-$NetBSD: patch-src_egl_drivers_dri2_platform__drm.c,v 1.1 2018/10/07 23:49:31 ryoon Exp $
+$NetBSD: patch-src_egl_drivers_dri2_platform__drm.c,v 1.2 2019/01/20 09:50:28 tnn Exp $
 
 netbsd-5 build fix
 
---- src/egl/drivers/dri2/platform_drm.c.orig   2017-10-19 12:23:53.000000000 +0000
+--- src/egl/drivers/dri2/platform_drm.c.orig   2019-01-17 11:26:22.000000000 +0000
 +++ src/egl/drivers/dri2/platform_drm.c
-@@ -688,7 +688,9 @@ dri2_initialize_drm(_EGLDriver *drv, _EG
+@@ -725,7 +725,11 @@ dri2_initialize_drm(_EGLDriver *drv, _EG
        }
        dri2_dpy->own_device = true;
     } else {
 +#ifdef F_DUPFD_CLOEXEC
        dri2_dpy->fd = fcntl(gbm_device_get_fd(gbm), F_DUPFD_CLOEXEC, 3);
++#else
++      dri2_dpy->fd = -1;
 +#endif
        if (dri2_dpy->fd < 0) {
           err = "DRI2: failed to fcntl() existing gbm device";
diff -r 33f3d158655b -r 0e75280c4db5 graphics/MesaLib18/patches/patch-src_gallium_auxiliary_util_u__helpers.c
--- a/graphics/MesaLib18/patches/patch-src_gallium_auxiliary_util_u__helpers.c  Sun Jan 20 09:19:44 2019 +0000
+++ b/graphics/MesaLib18/patches/patch-src_gallium_auxiliary_util_u__helpers.c  Sun Jan 20 09:50:28 2019 +0000
@@ -1,4 +1,6 @@
-$NetBSD: patch-src_gallium_auxiliary_util_u__helpers.c,v 1.1 2019/01/10 22:30:11 tnn Exp $
+$NetBSD: patch-src_gallium_auxiliary_util_u__helpers.c,v 1.2 2019/01/20 09:50:28 tnn Exp $
+
+handle NetBSD-style pthread_setaffinity_np(3)
 
 --- src/gallium/auxiliary/util/u_helpers.c.orig        2018-12-11 21:13:57.000000000 +0000
 +++ src/gallium/auxiliary/util/u_helpers.c
diff -r 33f3d158655b -r 0e75280c4db5 graphics/MesaLib18/patches/patch-src_gallium_drivers_radeonsi_si__state__shaders.c
--- a/graphics/MesaLib18/patches/patch-src_gallium_drivers_radeonsi_si__state__shaders.c        Sun Jan 20 09:19:44 2019 +0000
+++ b/graphics/MesaLib18/patches/patch-src_gallium_drivers_radeonsi_si__state__shaders.c        Sun Jan 20 09:50:28 2019 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_gallium_drivers_radeonsi_si__state__shaders.c,v 1.2 2019/01/19 18:26:30 tnn Exp $
+$NetBSD: patch-src_gallium_drivers_radeonsi_si__state__shaders.c,v 1.3 2019/01/20 09:50:28 tnn Exp $
 
 #if'out some debug code on SunOS. There is no open_memstream(3)
 
@@ -8,7 +8,7 @@
        }
  
        if (shader->compiler_ctx_state.is_debug_context) {
-+#if !defined(__sun)
++#if defined(HAVE_OPEN_MEMSTREAM)
                FILE *f = open_memstream(&shader->shader_log,
                                         &shader->shader_log_size);
                if (f) {
diff -r 33f3d158655b -r 0e75280c4db5 graphics/MesaLib18/patches/patch-src_mesa_tnl_t__pipeline.c
--- a/graphics/MesaLib18/patches/patch-src_mesa_tnl_t__pipeline.c       Sun Jan 20 09:19:44 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-$NetBSD: patch-src_mesa_tnl_t__pipeline.c,v 1.1 2018/10/07 23:49:31 ryoon Exp $
-
-i386 FPU control word defaults.
-
-Neither FreeBSD ports nor DragonFly dports graphics/mesa-dri
-mentions any concern with DEFAULT_X86_FPUs value.
-
---- src/mesa/tnl/t_pipeline.c.orig     2018-01-09 16:03:44.000000000 +0000
-+++ src/mesa/tnl/t_pipeline.c
-@@ -132,7 +132,11 @@ static GLuint check_output_changes( stru
- /* Hardware default: All exceptions masked, extended double precision,
-  * round to nearest (IEEE compliant):
-  */
-+#if defined(__NetBSD__)
-+#define DEFAULT_X86_FPU       0x127f  /* __NetBSD_NPXCW__ */
-+#else
- #define DEFAULT_X86_FPU               0x037f
-+#endif
- /* All exceptions masked, single precision, round to nearest:
-  */
- #define FAST_X86_FPU          0x003f
diff -r 33f3d158655b -r 0e75280c4db5 graphics/MesaLib18/patches/patch-src_util_u__thread.h
--- a/graphics/MesaLib18/patches/patch-src_util_u__thread.h     Sun Jan 20 09:19:44 2019 +0000
+++ b/graphics/MesaLib18/patches/patch-src_util_u__thread.h     Sun Jan 20 09:50:28 2019 +0000
@@ -1,4 +1,6 @@
-$NetBSD: patch-src_util_u__thread.h,v 1.1 2019/01/10 22:30:11 tnn Exp $
+$NetBSD: patch-src_util_u__thread.h,v 1.2 2019/01/20 09:50:28 tnn Exp $
+
+handle NetBSD-style pthread_setaffinity_np(3)
 
 --- src/util/u_thread.h.orig   2018-12-11 21:13:57.000000000 +0000
 +++ src/util/u_thread.h
Prev by Date: [pkgsrc/trunk]: pkgsrc/security/py-cryptodome py-cryptodome: updated to 3.7.3
Next by Date: [pkgsrc/trunk]: pkgsrc/devel/py-packaging py-packaging: updated to 19.0
Previous by Thread: [pkgsrc/trunk]: pkgsrc/security/py-cryptodome py-cryptodome: updated to 3.7.3
Next by Thread: [pkgsrc/trunk]: pkgsrc/devel/py-packaging py-packaging: updated to 19.0
Indexes:
Home | Main Index | Thread Index | Old Index