waffle: Update to 1.7.0

[Taylor R Campbell (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Taylor R Campbell <riastradh%NetBSD.org@localhost>
Pushed By:	riastradh
Date:		Sat Mar 8 15:41:56 2025 +0000
Changeset:	dcdf6798d3ab8f9aed6abdf292fd370e8b7e18f8

Modified Files:
	waffle/Makefile
	waffle/PLIST
	waffle/distinfo
	waffle/patches/patch-third__party_threads_threads__posix.c

Log Message:
waffle: Update to 1.7.0

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

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

diffstat:
 waffle/Makefile                                            | 13 ++++++-------
 waffle/PLIST                                               | 12 ++++++++----
 waffle/distinfo                                            |  8 ++++----
 waffle/patches/patch-third__party_threads_threads__posix.c |  8 ++++----
 4 files changed, 22 insertions(+), 19 deletions(-)

diffs:
diff --git a/waffle/Makefile b/waffle/Makefile
index 47fb486713..25e013865b 100644
--- a/waffle/Makefile
+++ b/waffle/Makefile
@@ -1,27 +1,26 @@
 # $NetBSD: Makefile,v 1.1 2015/09/19 14:51:52 tnn2 Exp $
 
 GITHUB_PROJECT=	waffle
-DISTNAME=	waffle-1.5.2
+DISTNAME=	waffle-v1.7.0
+PKGNAME=	${DISTNAME:C/waffle-v/waffle-/}
 CATEGORIES=	graphics x11
-MASTER_SITES=	${MASTER_SITE_GITHUB:=waffle-gl/}
-GITHUB_TAG=	v${PKGVERSION_NOREV}
+MASTER_SITES=	https://gitlab.freedesktop.org/mesa/waffle/-/archive/v${PKGVERSION_NOREV}/
 
 MAINTAINER=	tnn%NetBSD.org@localhost
-HOMEPAGE=	http://www.waffle-gl.org/
+HOMEPAGE=	https://gitlab.freedesktop.org/mesa/waffle/
 COMMENT=	OpenGL runtime selection library
 LICENSE=	2-clause-bsd
 
-USE_CMAKE=	yes
 USE_TOOLS+=	pkg-config
 USE_LANGUAGES=	c c++
 
 PKGCONFIG_OVERRIDE+=	waffle.pc.in
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../devel/cmake/build.mk"
 
 .include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
 .if empty(BUILDLINK_LDADD.dl)
 BUILDLINK_TRANSFORM+=	rm:-ldl
 .endif
diff --git a/waffle/PLIST b/waffle/PLIST
index 30a3fbd117..86f5b6777e 100644
--- a/waffle/PLIST
+++ b/waffle/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2015/09/19 14:51:52 tnn2 Exp $
+@comment $NetBSD$
 bin/wflinfo
 include/waffle-1/waffle.h
 include/waffle-1/waffle_gbm.h
@@ -10,13 +10,13 @@ lib/cmake/Waffle/WaffleConfig.cmake
 lib/cmake/Waffle/WaffleConfigVersion.cmake
 lib/libwaffle-1.so
 lib/libwaffle-1.so.0
-lib/libwaffle-1.so.0.5.2
+lib/libwaffle-1.so.0.7.0
 lib/pkgconfig/waffle-1.pc
-share/cmake/Modules/FindWaffle.cmake
+share/bash-completion/completions/wflinfo
 share/doc/waffle1/HACKING.txt
 share/doc/waffle1/LICENSE-threads.txt
 share/doc/waffle1/LICENSE.txt
-share/doc/waffle1/README.txt
+share/doc/waffle1/README.md
 share/doc/waffle1/examples/Makefile.example
 share/doc/waffle1/examples/gl_basic.c
 share/doc/waffle1/examples/simple-x11-egl.c
@@ -41,3 +41,7 @@ share/doc/waffle1/release-notes/waffle-1.4.4.txt
 share/doc/waffle1/release-notes/waffle-1.5.0.txt
 share/doc/waffle1/release-notes/waffle-1.5.1.txt
 share/doc/waffle1/release-notes/waffle-1.5.2.txt
+share/doc/waffle1/release-notes/waffle-1.6.0.md
+share/doc/waffle1/release-notes/waffle-1.6.1.md
+share/doc/waffle1/release-notes/waffle-1.6.2.md
+share/doc/waffle1/release-notes/waffle-1.6.3.md
diff --git a/waffle/distinfo b/waffle/distinfo
index 4f8a7dac4d..18b52f07ed 100644
--- a/waffle/distinfo
+++ b/waffle/distinfo
@@ -1,7 +1,7 @@
 $NetBSD: distinfo,v 1.1 2015/09/19 14:51:52 tnn2 Exp $
 
-RMD160 (waffle-1.5.2.tar.gz) = 0f73fc5933e323a3237536aaba5e87b90707cdf4
-SHA512 (waffle-1.5.2.tar.gz) = 9baa8dee8467625606f4b85f2a3116ca56b0326b2ee8dfd8c7aa7210ec23e81811465f29873e6cd48f42da38e4b81f9f06248ec6e230fcca185d21bf580f8d09
-Size (waffle-1.5.2.tar.gz) = 262667 bytes
+BLAKE2s (waffle-v1.7.0.tar.gz) = 4c8f835a33aa2f32cb9b1058575bf5f8b38e76b461005bade90a1c7a1d25754c
+SHA512 (waffle-v1.7.0.tar.gz) = 49893570f9973c4b0ac3cbc9dcd61c05273226c4916ebc80ae238f96a6c17e906d3f025aaed310eb387bc4d31bb8f2b77a738c1b88a2bd30a6e0e855738b82bc
+Size (waffle-v1.7.0.tar.gz) = 386389 bytes
 SHA1 (patch-cmake_modules_WaffleDefineOS.cmake) = 2dc602294c6a468b954f8df00bfb976b417ad1b2
-SHA1 (patch-third__party_threads_threads__posix.c) = a439ecc2f22cc14d2c2c15c757d5ee96677fee06
+SHA1 (patch-third__party_threads_threads__posix.c) = b1e8975bc5a985a379060542d7649eae64f2f558
diff --git a/waffle/patches/patch-third__party_threads_threads__posix.c b/waffle/patches/patch-third__party_threads_threads__posix.c
index 2bb3c8d134..4414abd863 100644
--- a/waffle/patches/patch-third__party_threads_threads__posix.c
+++ b/waffle/patches/patch-third__party_threads_threads__posix.c
@@ -2,14 +2,14 @@ $NetBSD: patch-third__party_threads_threads__posix.c,v 1.1 2015/09/19 14:51:52 t
 
 We don't have pthread_mutex_timedlock.
 
---- third_party/threads/threads_posix.c.orig	2015-08-25 21:05:10.000000000 +0000
+--- third_party/threads/threads_posix.c.orig	2021-03-07 20:51:15.000000000 +0000
 +++ third_party/threads/threads_posix.c
-@@ -42,7 +42,7 @@ Configuration macro:
+@@ -45,7 +45,7 @@ Configuration macro:
      Use pthread_mutex_timedlock() for `mtx_timedlock()'
      Otherwise use mtx_trylock() + *busy loop* emulation.
  */
--#if !defined(__CYGWIN__) && !defined(ANDROID)
-+#if !defined(__CYGWIN__) && !defined(ANDROID) && !defined(__NetBSD__)
+-#if !defined(__CYGWIN__) && !defined(ANDROID) && !defined(__APPLE__)
++#if !defined(__CYGWIN__) && !defined(ANDROID) && !defined(__APPLE__) && !defined(__NetBSD__)
  #define EMULATED_THREADS_USE_NATIVE_TIMEDLOCK
  #endif