pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

MesaLib-dfbsd-meson: Update wip/MesaLib-dfbsd-meson to git 2019-04-16

Module Name:	pkgsrc-wip
Committed By:	David Shao <davshao%gmail.com@localhost>
Pushed By:	dshao
Date:		Wed Apr 17 09:08:08 2019 -0700
Changeset:	c9a9d05d34e3c195e7ea59b61c1380940115219f

Modified Files:
	MesaLib-dfbsd-meson/Makefile
	MesaLib-dfbsd-meson/distinfo
	MesaLib-dfbsd-meson/patches/patch-src_amd_vulkan_radv__device.c
Removed Files:
	MesaLib-dfbsd-meson/patches/patch-configure.ac
	MesaLib-dfbsd-meson/patches/patch-src_gbm_Makefile.am
	MesaLib-dfbsd-meson/patches/patch-src_glx_Makefile.am
	MesaLib-dfbsd-meson/patches/patch-src_intel_Makefile.tools.am
	MesaLib-dfbsd-meson/patches/patch-src_mesa_drivers_x11_Makefile.am
	MesaLib-dfbsd-meson/patches/patch-src_util_Makefile.am

Log Message:
MesaLib-dfbsd-meson: Update wip/MesaLib-dfbsd-meson to git 2019-04-16

Autotools support seems removed for imminent mesa 19.1.x.  Plan accordingly.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c9a9d05d34e3c195e7ea59b61c1380940115219f

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

diffstat:
 MesaLib-dfbsd-meson/Makefile                       |  32 +++---
 MesaLib-dfbsd-meson/distinfo                       |  16 +--
 MesaLib-dfbsd-meson/patches/patch-configure.ac     | 109 ---------------------
 .../patches/patch-src_amd_vulkan_radv__device.c    |   6 +-
 .../patches/patch-src_gbm_Makefile.am              |  12 ---
 .../patches/patch-src_glx_Makefile.am              |  49 ---------
 .../patches/patch-src_intel_Makefile.tools.am      |  14 ---
 .../patches/patch-src_mesa_drivers_x11_Makefile.am |  15 ---
 .../patches/patch-src_util_Makefile.am             |  15 ---
 9 files changed, 24 insertions(+), 244 deletions(-)

diffs:
diff --git a/MesaLib-dfbsd-meson/Makefile b/MesaLib-dfbsd-meson/Makefile
index 31792a2921..ec68360b4c 100644
--- a/MesaLib-dfbsd-meson/Makefile
+++ b/MesaLib-dfbsd-meson/Makefile
@@ -1,7 +1,22 @@
 # $NetBSD: Makefile,v 1.19 2019/04/11 15:52:08 maya Exp $
 
+# 2019-04-16	radeonsi/nir: fix scanning of bindless images
+COMMIT_ID=	3c5a9ab9f01d1d299eea1b99b9346c639fc30612
+
+# 2019-04-16	iris: Add texture cache flushing hacks for blit and resource_copy_regionHEADmaster
+# COMMIT_ID=	c4478889b7176ea5aed52d1630bedb43797a00f0
+
+# 2019-04-16	winsys/amdgpu: don't set GTT with GDS & OA placements on APUs
+# COMMIT_ID=	4f715868a94b2c43656b3574b876bd254757521b
+
+# 2019-04-16	compiler/glsl: handle case where we have multiple users for types
+# COMMIT_ID=	624789e3708c87ea2a4c8d2266266b489b421cba
+
+# 2019-04-14	draw: fix building error in draw_gs_init()
+# COMMIT_ID=	1af7701666bea2d6f4d0d226f5efc2fa65103872
+
 # 2019-04-13	nir: add lower_ftrunc
-COMMIT_ID=	b6bed115a5efb281b450c749418646b4ea2e7db7
+# COMMIT_ID=	b6bed115a5efb281b450c749418646b4ea2e7db7
 
 # 2019-04-12	v3d: Use the new lower_to_scratch implementation for indirects on temps.
 # COMMIT_ID=	dc402be73e4bbb9b43213a4266b98a46092e3038
@@ -21,21 +36,6 @@ COMMIT_ID=	b6bed115a5efb281b450c749418646b4ea2e7db7
 # 2019-04-08	drisw: Try harder to probe whether MIT-SHM works
 # COMMIT_ID=	52426ce4a929f7e1389baf490967fc02357b3f5e
 
-# 2019-03-31	i965: perf: update render basic configs for big core gen9/gen10
-# COMMIT_ID=	f0b472b3016c9625e1324fc7f70fc875e5926e00
-
-# 2019-03-30	iris: fix set_sampler_view
-# COMMIT_ID=	b2d651b86267f7511e3c4c35d92c0ff72e174bc
-
-# 2019-03-25	freedreno/ir3: Fix operand order for DSX/DSY
-# COMMIT_ID=	c7c432738a68d543dc1b73eae895ec4dfacd92b2
-
-# 2019-03-23	spirv: Add an execution environment to the options
-# COMMIT_ID=	15012077bceda24cbf38afeda7723c47e1b0d3c3
-
-# 2019-03-22	docs: update freedreno status
-# COMMIT_ID=	cdd90a7502e501b0f25d35a2e9715fbe5d09a211
-
 PORTNAME=	mesa		
 
 DISTNAME=	${PORTNAME}-${COMMIT_ID}
diff --git a/MesaLib-dfbsd-meson/distinfo b/MesaLib-dfbsd-meson/distinfo
index 033597f2b4..5fa4c25735 100644
--- a/MesaLib-dfbsd-meson/distinfo
+++ b/MesaLib-dfbsd-meson/distinfo
@@ -1,15 +1,14 @@
 $NetBSD: distinfo,v 1.16 2019/02/22 15:40:35 tnn Exp $
 
-SHA1 (mesa-b6bed115a5efb281b450c749418646b4ea2e7db7.tar.xz) = d86b027817c711f826b90be4f830052d3aafde24
-RMD160 (mesa-b6bed115a5efb281b450c749418646b4ea2e7db7.tar.xz) = fd508df1d4aa631a6df03218e7b8b11bb89afe6c
-SHA512 (mesa-b6bed115a5efb281b450c749418646b4ea2e7db7.tar.xz) = 100b197bf43629352ae5c927db81408d244a060bd5cc08477307632ba2552db2c5fedee2965eee955fa4fe7a45a7a35adcc6563d4ac67c84c112e2b21fe333d4
-Size (mesa-b6bed115a5efb281b450c749418646b4ea2e7db7.tar.xz) = 10883784 bytes
-SHA1 (patch-configure.ac) = cddca44dbf1e2f447dd30a03440104920d6c24ab
+SHA1 (mesa-3c5a9ab9f01d1d299eea1b99b9346c639fc30612.tar.xz) = 3978b3ac7de30224597a93d3e34ef7a40b921c73
+RMD160 (mesa-3c5a9ab9f01d1d299eea1b99b9346c639fc30612.tar.xz) = 2ad43694458087c7ba7bb02f151c573a983fcf90
+SHA512 (mesa-3c5a9ab9f01d1d299eea1b99b9346c639fc30612.tar.xz) = 6c33f6bf2608cceb176eed042fecdb54b94597f7bf79885569c30ef87749d102a3419102ac4d10d6a7d123ea3b0edb286066bb06494a0adb94fb979421d9fefb
+Size (mesa-3c5a9ab9f01d1d299eea1b99b9346c639fc30612.tar.xz) = 10822044 bytes
 SHA1 (patch-include_GL_internal_dri__interface.h) = 76803a4ab6ff7e596900a0099dd9712093f8bc21
 SHA1 (patch-meson.build) = 3cd30902cd5af7bc860dd2984a51d9ebf051662e
 SHA1 (patch-meson__options.txt) = 171ac109444b0ce8ea37e53b72f529a4b5e5c6f6
 SHA1 (patch-src_amd_common_ac__debug.c) = 8233367c3b5bc344442ea8d19488fdd1e3791ae9
-SHA1 (patch-src_amd_vulkan_radv__device.c) = a7d9549147b662fca0bfff02bf8e8e543ee80fc1
+SHA1 (patch-src_amd_vulkan_radv__device.c) = d47b69cd3bc70b38a128ffe686e1ffdbf4f9c960
 SHA1 (patch-src_amd_vulkan_winsys_amdgpu_radv__amdgpu__cs.c) = 1fe81a7b16e36dc9125400c20543271216a33a45
 SHA1 (patch-src_compiler_builtin__type__macros.h) = 128030d0c532e5f3982dc6ebde1957fc0ca7f5d5
 SHA1 (patch-src_compiler_glsl_glsl__parser__extras.cpp) = ef114d6e288e6d212fce9d1c0606f7d454a171c4
@@ -42,9 +41,7 @@ SHA1 (patch-src_gallium_state__trackers_clover_llvm_invocation.cpp) = 3053db09fb
 SHA1 (patch-src_gallium_state__trackers_clover_llvm_metadata.hpp) = c97d38098ea03658bc193a50e445b87f1c020839
 SHA1 (patch-src_gallium_state__trackers_clover_util_range.hpp) = cdc78067986c1b92818472c4201c58ef1b42c4f4
 SHA1 (patch-src_gallium_winsys_radeon_drm_radeon__drm__winsys.c) = 8c73f29a93e4e7ae8c0acd6f5f345047dc8a8541
-SHA1 (patch-src_gbm_Makefile.am) = 5f3107afbf64b97f7d21ce427cecc4fb78974db3
 SHA1 (patch-src_gbm_backends_dri_gbm__dri.c) = b827957f7df62bf3a25979b29a8cd8576e3ea62b
-SHA1 (patch-src_glx_Makefile.am) = 869c4f2388f835b9b296b3c84c2a03ef7717f17d
 SHA1 (patch-src_glx_apple_apple__glapi.c) = c4eea8dabf74eb03d22da4eb834b18ae3384c63b
 SHA1 (patch-src_glx_dri__common.c) = 7f87917dbef11621a488554a49797b1407c4a5c4
 SHA1 (patch-src_glx_dri__common.h) = 0274877f8c65a4bb729536a897df4704897a4c6e
@@ -52,7 +49,6 @@ SHA1 (patch-src_glx_dri__glx.c) = 8fd48776e9953b18bd17ba130d90ae2935e67242
 SHA1 (patch-src_glx_glxclient.h) = 5e597362c3839f26118fe98983701f33d6047cfd
 SHA1 (patch-src_glx_glxcurrent.c) = 67142b977aadf23b0b0d3a06db3d9450e0b7f892
 SHA1 (patch-src_glx_glxext.c) = 1c044d38faebc310f49248a6b937b1bbc5a16870
-SHA1 (patch-src_intel_Makefile.tools.am) = 5253d5972b48ae3bc8d648bb9f479dcf6cbd3fab
 SHA1 (patch-src_intel_compiler_brw__fs__bank__conflicts.cpp) = 6276d2c6846bb4dd08699921bec4e20202a17478
 SHA1 (patch-src_intel_isl_isl__tiled__memcpy.c) = f019e47e535e2c2ab8d324937362a4c7965311f1
 SHA1 (patch-src_intel_tools_aub__mem.c) = 671e478a843b70c12c5038ad314c108925ab5cc7
@@ -75,14 +71,12 @@ SHA1 (patch-src_mesa_drivers_dri_i965_brw__bufmgr.c) = 7a6edf46b9364bcdb2dbe8d70
 SHA1 (patch-src_mesa_drivers_dri_i965_brw__performance__query.c) = 9579ab29e0a913aa0516665e72a8573097932312
 SHA1 (patch-src_mesa_drivers_dri_i965_intel__screen.c) = 1b5de370add6984fb44968c055b7d8d5a54417dd
 SHA1 (patch-src_mesa_drivers_dri_swrast_swrast.c) = 4c0ca7dec2398a15f77b643d0f86af41ca202be3
-SHA1 (patch-src_mesa_drivers_x11_Makefile.am) = 172a8da11a620edce790f64338a0390cd1e93188
 SHA1 (patch-src_mesa_main_context.c) = a7c796810104971e2fd76b15397d068e628f0a9e
 SHA1 (patch-src_mesa_main_execmem.c) = 4a0a790e648e63907454b78318c7edbecc11d02c
 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_x86_common__x86.c) = f8c4b93443ef66d017f6aa114b877565b30f2598
-SHA1 (patch-src_util_Makefile.am) = e390cd47b784ad08987b81fdbce537968ad4a624
 SHA1 (patch-src_util_build__id.c) = fee28ddf5c91208492efcfdebf32e0cfef35502d
 SHA1 (patch-src_util_disk__cache.c) = cc0b29780dba5d5b5e43c0798336f16a1f0008de
 SHA1 (patch-src_util_os__time.c) = d33f0cbdfc5a09661f906aab5feda0b0c70f2f48
diff --git a/MesaLib-dfbsd-meson/patches/patch-configure.ac b/MesaLib-dfbsd-meson/patches/patch-configure.ac
deleted file mode 100644
index 5aee475b70..0000000000
--- a/MesaLib-dfbsd-meson/patches/patch-configure.ac
+++ /dev/null
@@ -1,109 +0,0 @@
-$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.
-
-From FreeBSD ports graphics/mesa-dri 18.0.0,
-DragonFly dports graphics/mesa-dri 17.3.1,
-files/patch-configure
-
-For FreeBSD 11.2-RELEASE
-  CXXLD    mesa_dri_drivers.la
-/usr/bin/ld: unrecognized option '--build-id=sha1'
-
-* But do NOT extend to FreeBSD, instead use binutils ld to link.
-osx: ld does not support --build-ld
-
-* For FreeBSD: Use monotonic clock for timeouts.
-
-* For FreeBSD: Implement futex_wake() and futex_wait() via _umtx_op() 
-
-* dri3: Mon Apr 10 19:14:48 2017 UTC
-DRI3 remains enabled at compile time, but it is now disabled at
-runtime for stock FreeBSD.  Set LIBGL_DRI3_ENABLE in the
-environment to enable DRI3.
-This change was made to work around a problem in libEGL,
-which fails to fall back to using DRI2 when run on a system
-without DRI3 support.
-
---- configure.ac.orig	2019-02-27 03:56:56.000000000 +0000
-+++ configure.ac
-@@ -739,7 +739,7 @@ dnl
- dnl OSX linker does not support build-id
- dnl
- case "$host_os" in
--darwin*)
-+darwin* | solaris*)
-     LD_BUILD_ID=""
-     ;;
- *)
-@@ -944,7 +944,7 @@ case "$host_os" in
- darwin*)
-     ;;
- *)
--    AC_CHECK_FUNCS([clock_gettime], [CLOCK_LIB=],
-+    AC_CHECK_FUNCS([clock_gettime clock_nanosleep], [CLOCK_LIB=],
-                    [AC_CHECK_LIB([rt], [clock_gettime], [CLOCK_LIB=-lrt],
-                                  [AC_MSG_ERROR([Could not find clock_gettime])])])
-     AC_SUBST([CLOCK_LIB])
-@@ -954,6 +954,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"
-@@ -979,7 +982,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
--linux* | cygwin* | darwin* | solaris* | *-gnu* | gnu* | openbsd*)
-+*)
-     pthread_stubs_possible="no"
-     ;;
- * )
-@@ -995,8 +998,12 @@ save_LIBS="$LIBS"
- LIBS="$PTHREAD_LIBS"
- AC_MSG_CHECKING(whether pthread_setaffinity_np is supported)
- AC_LINK_IFELSE([AC_LANG_SOURCE([[
-+    #if  defined(__DragonFly__) || defined(__FreeBSD__)
-+    #include <pthread_np.h>
-+    #else
-     #define _GNU_SOURCE
-     #include <pthread.h>
-+    #endif
-     int main() {
-        void *a = (void*) &pthread_setaffinity_np;
-        long b = (long) a;
-@@ -1008,7 +1015,10 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([[
- LIBS="$save_LIBS"
- 
- dnl Check for futex for fast inline simple_mtx_t.
--AC_CHECK_HEADER([linux/futex.h], [DEFINES="$DEFINES -DHAVE_LINUX_FUTEX_H"])
-+AC_CHECK_HEADERS([linux/futex.h sys/umtx.h],
-+    [DEFINES="$DEFINES -DHAVE_LINUX_FUTEX_H"],,
-+    [#include <errno.h>
-+     #include <sys/types.h>])
- 
- dnl SELinux awareness.
- AC_ARG_ENABLE([selinux],
-@@ -1291,7 +1301,7 @@ fi
- AC_SUBST(LIBSENSORS_LIBS)
- 
- case "$host_os" in
--linux*)
-+linux* | freebsd* | dragonfly*)
-     dri3_default=yes
-     ;;
- *)
-@@ -2519,8 +2529,6 @@ if test "x$enable_opencl" = xyes; then
-         CLANG_LIBDIR=${LLVM_LIBDIR}
-     fi
-     CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION}
--    AS_IF([test ! -f "$CLANG_RESOURCE_DIR/include/stddef.h"],
--        [AC_MSG_ERROR([Could not find clang internal header stddef.h in $CLANG_RESOURCE_DIR Use --with-clang-libdir to specify the correct path to the clang libraries.])])
- fi
- AM_CONDITIONAL(HAVE_CLOVER, test "x$enable_opencl" = xyes)
- AM_CONDITIONAL(HAVE_CLOVER_ICD, test "x$enable_opencl_icd" = xyes)
diff --git a/MesaLib-dfbsd-meson/patches/patch-src_amd_vulkan_radv__device.c b/MesaLib-dfbsd-meson/patches/patch-src_amd_vulkan_radv__device.c
index 2d4f20d41b..1ae185a840 100644
--- a/MesaLib-dfbsd-meson/patches/patch-src_amd_vulkan_radv__device.c
+++ b/MesaLib-dfbsd-meson/patches/patch-src_amd_vulkan_radv__device.c
@@ -4,11 +4,11 @@ From graphics/mesa-dri: update to 18.3.1
 
 https://reviews.freebsd.org/D17872
 
---- src/amd/vulkan/radv_device.c.orig	2019-03-30 17:05:31.000000000 +0000
+--- src/amd/vulkan/radv_device.c.orig	2019-04-16 20:04:22.000000000 +0000
 +++ src/amd/vulkan/radv_device.c
-@@ -49,6 +49,14 @@
- #include "util/debug.h"
+@@ -50,6 +50,14 @@
  #include "util/mesa-sha1.h"
+ #include "compiler/glsl_types.h"
  
 +#ifndef CLOCK_MONOTONIC_RAW
 +# ifdef CLOCK_MONOTONIC_FAST
diff --git a/MesaLib-dfbsd-meson/patches/patch-src_gbm_Makefile.am b/MesaLib-dfbsd-meson/patches/patch-src_gbm_Makefile.am
deleted file mode 100644
index bc09de51da..0000000000
--- a/MesaLib-dfbsd-meson/patches/patch-src_gbm_Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_gbm_Makefile.am,v 1.1 2018/10/07 23:49:31 ryoon Exp $
-
---- src/gbm/Makefile.am.orig	2017-11-20 14:25:47.000000000 +0000
-+++ src/gbm/Makefile.am
-@@ -28,6 +28,7 @@ libgbm_la_LIBADD = \
- 	$(top_builddir)/src/loader/libloader.la \
- 	$(top_builddir)/src/util/libmesautil.la \
- 	$(top_builddir)/src/util/libxmlconfig.la \
-+	$(PTHREAD_LIBS) \
- 	$(DLOPEN_LIBS)
- 
- if HAVE_PLATFORM_WAYLAND
diff --git a/MesaLib-dfbsd-meson/patches/patch-src_glx_Makefile.am b/MesaLib-dfbsd-meson/patches/patch-src_glx_Makefile.am
deleted file mode 100644
index 8b397f010e..0000000000
--- a/MesaLib-dfbsd-meson/patches/patch-src_glx_Makefile.am
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-src_glx_Makefile.am,v 1.3 2019/01/19 23:21:43 tnn Exp $
-
-- We don't need libmesautil.la here. Those symbols seem to already be
-  included in libmesa.la.
-- force libtool to use clang++ to link libGL on OSX.
-  Otherwise we get:
-  Undefined symbols for architecture x86_64:
-  "std::terminate()", referenced from:
-      ___clang_call_terminate in libglx.a(glsl_parser.o)
-      ...
-
---- src/glx/Makefile.am.orig	2019-01-17 11:26:23.000000000 +0000
-+++ src/glx/Makefile.am
-@@ -89,10 +89,16 @@ libglx_la_SOURCES = \
- 	singlepix.c \
- 	vertarr.c
- 
-+if HAVE_APPLEDRI
-+libglx_la_LIBADD = \
-+	$(top_builddir)/src/loader/libloader.la \
-+	$(top_builddir)/src/util/libxmlconfig.la
-+else
- libglx_la_LIBADD = \
- 	$(top_builddir)/src/loader/libloader.la \
- 	$(top_builddir)/src/util/libmesautil.la \
- 	$(top_builddir)/src/util/libxmlconfig.la
-+endif
- 
- if HAVE_DRISW
- libglx_la_SOURCES += \
-@@ -136,6 +142,7 @@ libglx_la_SOURCES += \
- 
- SUBDIRS += apple
- libglx_la_LIBADD += $(builddir)/apple/libappleglx.la
-+libglx_la_LIBADD += $(top_builddir)/src/mesa/libmesa.la
- endif
- 
- if HAVE_WINDOWSDRI
-@@ -187,6 +194,10 @@ lib@GL_LIB@_la_SOURCES =
- lib@GL_LIB@_la_LIBADD = $(GL_LIBS)
- lib@GL_LIB@_la_LDFLAGS = $(GL_LDFLAGS)
- 
-+if HAVE_APPLEDRI
-+lib@GL_LIB@_la_SOURCES += apple_dummy.cpp
-+endif
-+
- if HAVE_WINDOWSDRI
- lib@GL_LIB@_la_LDFLAGS += -lgdi32 -lopengl32 -Wl,--disable-stdcall-fixup
- endif
diff --git a/MesaLib-dfbsd-meson/patches/patch-src_intel_Makefile.tools.am b/MesaLib-dfbsd-meson/patches/patch-src_intel_Makefile.tools.am
deleted file mode 100644
index cc2f67a2dc..0000000000
--- a/MesaLib-dfbsd-meson/patches/patch-src_intel_Makefile.tools.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_intel_Makefile.tools.am,v 1.1 2018/10/07 23:49:31 ryoon Exp $
-
--lrt for shm_open in aubinator.c, a more portable alternative to memfd_create
-
---- src/intel/Makefile.tools.am.orig	2018-09-07 21:18:07.000000000 +0000
-+++ src/intel/Makefile.tools.am
-@@ -43,6 +43,7 @@ tools_aubinator_LDADD = \
- 	$(PTHREAD_LIBS) \
- 	$(DLOPEN_LIBS) \
- 	$(ZLIB_LIBS) \
-+	-lrt \
- 	-lm
- 
- 
diff --git a/MesaLib-dfbsd-meson/patches/patch-src_mesa_drivers_x11_Makefile.am b/MesaLib-dfbsd-meson/patches/patch-src_mesa_drivers_x11_Makefile.am
deleted file mode 100644
index 6e9b38bd41..0000000000
--- a/MesaLib-dfbsd-meson/patches/patch-src_mesa_drivers_x11_Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_mesa_drivers_x11_Makefile.am,v 1.1 2019/01/19 21:54:03 tnn Exp $
-
-We don't need libmesautil.la here. Those symbols seem to already be
-included in libmesa.la.
-
---- src/mesa/drivers/x11/Makefile.am.orig	2019-01-17 11:26:23.000000000 +0000
-+++ src/mesa/drivers/x11/Makefile.am
-@@ -68,7 +68,6 @@ GL_PATCH = 0
- lib@GL_LIB@_la_LIBADD = \
- 	$(top_builddir)/src/mesa/libmesa.la \
- 	$(top_builddir)/src/mapi/glapi/libglapi.la \
--	$(top_builddir)/src/util/libmesautil.la \
- 	$(SHARED_GLAPI_LIB) \
- 	$(GL_LIB_DEPS)
- 
diff --git a/MesaLib-dfbsd-meson/patches/patch-src_util_Makefile.am b/MesaLib-dfbsd-meson/patches/patch-src_util_Makefile.am
deleted file mode 100644
index 48facf1ec6..0000000000
--- a/MesaLib-dfbsd-meson/patches/patch-src_util_Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_util_Makefile.am,v 1.1 2019/01/10 22:30:11 tnn Exp $
-
-handled with CONF_FILES
-
---- src/util/Makefile.am.orig	2018-12-11 21:13:57.000000000 +0000
-+++ src/util/Makefile.am
-@@ -75,7 +75,7 @@ libxmlconfig_la_CFLAGS = \
- libxmlconfig_la_LIBADD = $(EXPAT_LIBS) -lm
- 
- drircdir = $(datadir)/drirc.d
--drirc_DATA = 00-mesa-defaults.conf
-+drirc_DATA = # 00-mesa-defaults.conf
- 
- u_atomic_test_LDADD = libmesautil.la
- roundeven_test_LDADD = -lm
Home | Main Index | Thread Index | Old Index