[pkgsrc/trunk]: pkgsrc/graphics/MesaLib MesaLib: remove some patches for unsu...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/graphics/MesaLib MesaLib: remove some patches for unsu...
From: nia <nia%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 11:50:33 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/ba36a8c9f6ad
branches:  trunk
changeset: 400643:ba36a8c9f6ad
user:      nia <nia%pkgsrc.org@localhost>
date:      Sat Aug 31 17:56:09 2019 +0000

description:
MesaLib: remove some patches for unsupported NetBSD versions.

pointed out by maya.

bump PKGREVISION

diffstat:

 graphics/MesaLib/Makefile                                                |   4 +-
 graphics/MesaLib/distinfo                                                |   8 +-
 graphics/MesaLib/patches/patch-src_compiler_builtin__type__macros.h      |   4 +-
 graphics/MesaLib/patches/patch-src_egl_drivers_dri2_platform__drm.c      |  18 ----
 graphics/MesaLib/patches/patch-src_mesa_drivers_dri_i915_intel__screen.c |  44 ----------
 graphics/MesaLib/patches/patch-src_mesa_drivers_dri_i965_intel__screen.c |  44 ----------
 graphics/MesaLib/patches/patch-src_mesa_drivers_dri_swrast_swrast.c      |  19 ----
 7 files changed, 6 insertions(+), 135 deletions(-)

diffs (197 lines):

diff -r fdbbc0c97ab3 -r ba36a8c9f6ad graphics/MesaLib/Makefile
--- a/graphics/MesaLib/Makefile Sat Aug 31 15:48:07 2019 +0000
+++ b/graphics/MesaLib/Makefile Sat Aug 31 17:56:09 2019 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.158 2019/08/30 13:00:56 nia Exp $
+# $NetBSD: Makefile,v 1.159 2019/08/31 17:56:09 nia Exp $
 
 DISTNAME=      mesa-19.1.5
 PKGNAME=       ${DISTNAME:S/mesa/MesaLib/}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    graphics
 MASTER_SITES=  https://mesa.freedesktop.org/archive/
 EXTRACT_SUFX=  .tar.xz
diff -r fdbbc0c97ab3 -r ba36a8c9f6ad graphics/MesaLib/distinfo
--- a/graphics/MesaLib/distinfo Sat Aug 31 15:48:07 2019 +0000
+++ b/graphics/MesaLib/distinfo Sat Aug 31 17:56:09 2019 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.129 2019/08/29 14:12:57 nia Exp $
+$NetBSD: distinfo,v 1.130 2019/08/31 17:56:09 nia Exp $
 
 SHA1 (mesa-19.1.5.tar.xz) = 7a80ac32b4da4066dd00b3dc8274682be18b35cb
 RMD160 (mesa-19.1.5.tar.xz) = f626b041b041a6b3c95ba6b62ecf8c4a038d5f87
@@ -7,9 +7,8 @@
 SHA1 (patch-meson.build) = a9fdcaa59aed9b56ff95d4153dd73064e2261c45
 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_builtin__type__macros.h) = e4868011711fb89a293580a12eb603b8e7162336
 SHA1 (patch-src_compiler_glsl_glsl__parser__extras.cpp) = ef114d6e288e6d212fce9d1c0606f7d454a171c4
-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
@@ -41,9 +40,6 @@
 SHA1 (patch-src_mapi_entry__x86__tls.h) = 11c0f5302d305a77f3a1780d44a2c61f48a66273
 SHA1 (patch-src_mapi_u__current.c) = 38d324fcd1c28d155106ccd248edb5eb1aa9ffac
 SHA1 (patch-src_mapi_u__current.h) = 465a992bd34057e9521f0a33e6f2e25cefc145ca
-SHA1 (patch-src_mesa_drivers_dri_i915_intel__screen.c) = 0b2bd5c4c65fce4577cd20fe0d894c4570d9cc14
-SHA1 (patch-src_mesa_drivers_dri_i965_intel__screen.c) = d5d2b9eb0d6719b3446f9d6afb6c535559a01348
-SHA1 (patch-src_mesa_drivers_dri_swrast_swrast.c) = 3106f350e590f62c8bd29cd85f24f977639dccdb
 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
diff -r fdbbc0c97ab3 -r ba36a8c9f6ad graphics/MesaLib/patches/patch-src_compiler_builtin__type__macros.h
--- a/graphics/MesaLib/patches/patch-src_compiler_builtin__type__macros.h       Sat Aug 31 15:48:07 2019 +0000
+++ b/graphics/MesaLib/patches/patch-src_compiler_builtin__type__macros.h       Sat Aug 31 17:56:09 2019 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-src_compiler_builtin__type__macros.h,v 1.1 2019/08/21 13:35:28 nia Exp $
+$NetBSD: patch-src_compiler_builtin__type__macros.h,v 1.2 2019/08/31 17:56:09 nia Exp $
 
-Workaround netbsd headers.
+Workaround netbsd 8 headers.
 
 --- src/compiler/builtin_type_macros.h.orig    2018-09-07 21:18:07.000000000 +0000
 +++ src/compiler/builtin_type_macros.h
diff -r fdbbc0c97ab3 -r ba36a8c9f6ad graphics/MesaLib/patches/patch-src_egl_drivers_dri2_platform__drm.c
--- a/graphics/MesaLib/patches/patch-src_egl_drivers_dri2_platform__drm.c       Sat Aug 31 15:48:07 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-$NetBSD: patch-src_egl_drivers_dri2_platform__drm.c,v 1.3 2019/08/21 13:35:28 nia Exp $
-
-netbsd-5 build fix
-
---- src/egl/drivers/dri2/platform_drm.c.orig   2019-01-17 11:26:22.000000000 +0000
-+++ src/egl/drivers/dri2/platform_drm.c
-@@ -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";
-          goto cleanup;
diff -r fdbbc0c97ab3 -r ba36a8c9f6ad graphics/MesaLib/patches/patch-src_mesa_drivers_dri_i915_intel__screen.c
--- a/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_i915_intel__screen.c  Sat Aug 31 15:48:07 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-$NetBSD: patch-src_mesa_drivers_dri_i915_intel__screen.c,v 1.4 2019/08/23 07:05:18 tnn Exp $
-
-Move sys/sysctl.h include because on NetBSD, sysctl.h includes sys/param.h,
-and sys/param.h defines a one argument ALIGN.  Allows mesa to redefine
-to a two argument ALIGN.
-
-Fix build on older NetBSD w/o _SC_PHYS_PAGES.
-
---- src/mesa/drivers/dri/i915/intel_screen.c.orig      2019-08-07 16:39:17.000000000 +0000
-+++ src/mesa/drivers/dri/i915/intel_screen.c
-@@ -28,6 +28,11 @@
- #include <errno.h>
- #include <time.h>
- #include <unistd.h>
-+
-+#if defined(HAVE_SYS_SYSCTL_H) && defined(__NetBSD__)
-+# include <sys/sysctl.h>
-+#endif
-+
- #include "main/glheader.h"
- #include "main/context.h"
- #include "main/framebuffer.h"
-@@ -733,6 +738,13 @@ i915_query_renderer_integer(__DRIscreen 
-       const unsigned gpu_mappable_megabytes =
-          (aper_size / (1024 * 1024)) * 3 / 4;
- 
-+#if defined(HW_PHYSMEM64) && defined(__NetBSD__)
-+      int mib[2] = { CTL_HW, HW_PHYSMEM64 };
-+      uint64_t system_memory_bytes;
-+      size_t len = sizeof(system_memory_bytes);
-+      if (sysctl(mib, 2, (void*)&system_memory_bytes, &len, NULL, 0) != 0)
-+         return -1;
-+#else
-       const long system_memory_pages = sysconf(_SC_PHYS_PAGES);
-       const long system_page_size = sysconf(_SC_PAGE_SIZE);
- 
-@@ -741,6 +753,7 @@ i915_query_renderer_integer(__DRIscreen 
- 
-       const uint64_t system_memory_bytes = (uint64_t) system_memory_pages
-          * (uint64_t) system_page_size;
-+#endif
- 
-       const unsigned system_memory_megabytes =
-          (unsigned) (system_memory_bytes / (1024 * 1024));
diff -r fdbbc0c97ab3 -r ba36a8c9f6ad graphics/MesaLib/patches/patch-src_mesa_drivers_dri_i965_intel__screen.c
--- a/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_i965_intel__screen.c  Sat Aug 31 15:48:07 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-$NetBSD: patch-src_mesa_drivers_dri_i965_intel__screen.c,v 1.4 2019/08/23 07:05:18 tnn Exp $
-
-Move sys/sysctl.h include because on NetBSD, sysctl.h includes sys/param.h,
-and sys/param.h defines a one argument ALIGN.  Allows mesa to redefine
-to a two argument ALIGN.
-
-Fix build on older NetBSD w/o _SC_PHYS_PAGES.
-
---- src/mesa/drivers/dri/i965/intel_screen.c.orig      2019-08-07 16:39:17.000000000 +0000
-+++ src/mesa/drivers/dri/i965/intel_screen.c
-@@ -27,6 +27,11 @@
- #include <errno.h>
- #include <time.h>
- #include <unistd.h>
-+
-+#if defined(HAVE_SYS_SYSCTL_H) && defined(__NetBSD__)
-+# include <sys/sysctl.h>
-+#endif
-+
- #include "main/context.h"
- #include "main/framebuffer.h"
- #include "main/renderbuffer.h"
-@@ -1523,6 +1528,13 @@ brw_query_renderer_integer(__DRIscreen *
-       const unsigned gpu_mappable_megabytes =
-          screen->aperture_threshold / (1024 * 1024);
- 
-+#if defined(HW_PHYSMEM64) && defined(__NetBSD__)
-+      int mib[2] = { CTL_HW, HW_PHYSMEM64 };
-+      uint64_t system_memory_bytes;
-+      size_t len = sizeof(system_memory_bytes);
-+      if (sysctl(mib, 2, (void*)&system_memory_bytes, &len, NULL, 0) != 0)
-+         return -1;
-+#else
-       const long system_memory_pages = sysconf(_SC_PHYS_PAGES);
-       const long system_page_size = sysconf(_SC_PAGE_SIZE);
- 
-@@ -1531,6 +1543,7 @@ brw_query_renderer_integer(__DRIscreen *
- 
-       const uint64_t system_memory_bytes = (uint64_t) system_memory_pages
-          * (uint64_t) system_page_size;
-+#endif
- 
-       const unsigned system_memory_megabytes =
-          (unsigned) (system_memory_bytes / (1024 * 1024));
diff -r fdbbc0c97ab3 -r ba36a8c9f6ad graphics/MesaLib/patches/patch-src_mesa_drivers_dri_swrast_swrast.c
--- a/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_swrast_swrast.c       Sat Aug 31 15:48:07 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-$NetBSD: patch-src_mesa_drivers_dri_swrast_swrast.c,v 1.3 2019/08/21 13:35:28 nia Exp $
-
-Fix build on older NetBSD w/o _SC_PHYS_PAGES.
-
---- src/mesa/drivers/dri/swrast/swrast.c.orig  2017-10-19 12:23:53.000000000 +0000
-+++ src/mesa/drivers/dri/swrast/swrast.c
-@@ -151,6 +151,12 @@ swrast_query_renderer_integer(__DRIscree
-         size_t len = sizeof(system_memory_bytes);
-         if (sysctl(mib, 2, &system_memory_bytes, &len, NULL, 0) != 0)
-             return -1;
-+#elif defined(HW_PHYSMEM64) && defined(__NetBSD__)
-+        int mib[2] = { CTL_HW, HW_PHYSMEM64 };
-+        uint64_t system_memory_bytes;
-+        size_t len = sizeof(system_memory_bytes);
-+        if (sysctl(mib, 2, &system_memory_bytes, &len, NULL, 0) != 0)
-+            return -1;
- #elif defined(_SC_PHYS_PAGES) && defined(_SC_PAGE_SIZE)
-       /* XXX: Do we want to return the full amount of system memory ? */
-       const long system_memory_pages = sysconf(_SC_PHYS_PAGES);
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc doc: Updated sysutils/xfce4-xarchiver to 0.5.4.14
Next by Date: [pkgsrc/trunk]: pkgsrc/textproc/xapian Fix checksum on new patch.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: Updated sysutils/xfce4-xarchiver to 0.5.4.14
Next by Thread: [pkgsrc/trunk]: pkgsrc/textproc/xapian Fix checksum on new patch.
Indexes:
Home | Main Index | Thread Index | Old Index