CVS commit: pkgsrc/graphics/glu

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Aug 24 11:35:49 UTC 2023

Modified Files:
        pkgsrc/graphics/glu: Makefile PLIST builtin.mk distinfo
Added Files:
        pkgsrc/graphics/glu/patches: patch-meson.build

Log Message:
glu: update to 9.0.3.

glu 9.0.3
drop autotools
Remove deprecated register in C++17
apple: Fix compatibility version and current version of meson build to be...
pkgconfig: meson build should match autotools requires
pkgconfig: Drop unneeded lines from autotools build
pkgconfig: Depend on opengl when built with libglvnd


To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 pkgsrc/graphics/glu/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/graphics/glu/PLIST
cvs rdiff -u -r1.17 -r1.18 pkgsrc/graphics/glu/builtin.mk
cvs rdiff -u -r1.22 -r1.23 pkgsrc/graphics/glu/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/glu/patches/patch-meson.build

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

Modified files:

Index: pkgsrc/graphics/glu/Makefile
diff -u pkgsrc/graphics/glu/Makefile:1.69 pkgsrc/graphics/glu/Makefile:1.70
--- pkgsrc/graphics/glu/Makefile:1.69   Wed Aug 11 20:40:55 2021
+++ pkgsrc/graphics/glu/Makefile        Thu Aug 24 11:35:49 2023
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.69 2021/08/11 20:40:55 nia Exp $
+# $NetBSD: Makefile,v 1.70 2023/08/24 11:35:49 wiz Exp $
 
-DISTNAME=      glu-9.0.2
+DISTNAME=      glu-9.0.3
 CATEGORIES=    graphics
 MASTER_SITES=  https://mesa.freedesktop.org/archive/glu/
 EXTRACT_SUFX=  .tar.xz
@@ -10,13 +10,13 @@ HOMEPAGE=   https://gitlab.freedesktop.org
 COMMENT=       OpenGL Utility Library
 LICENSE=       sgi-free-software-b-v2.0
 
-GNU_CONFIGURE= yes
-USE_LIBTOOL=   yes
 USE_TOOLS+=    pkg-config
 USE_LANGUAGES= c c++
 
-PKGCONFIG_OVERRIDE+=   glu.pc.in
+PKGCONFIG_OVERRIDE_STAGE=      pre-install
+PKGCONFIG_OVERRIDE+=           output/meson-private/glu.pc
 
+.include "../../devel/meson/build.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"

Index: pkgsrc/graphics/glu/PLIST
diff -u pkgsrc/graphics/glu/PLIST:1.19 pkgsrc/graphics/glu/PLIST:1.20
--- pkgsrc/graphics/glu/PLIST:1.19      Wed Aug 11 20:40:55 2021
+++ pkgsrc/graphics/glu/PLIST   Thu Aug 24 11:35:49 2023
@@ -1,4 +1,7 @@
-@comment $NetBSD: PLIST,v 1.19 2021/08/11 20:40:55 nia Exp $
+@comment $NetBSD: PLIST,v 1.20 2023/08/24 11:35:49 wiz Exp $
 include/GL/glu.h
-lib/libGLU.la
+lib/libGLU.a
+lib/libGLU.so
+lib/libGLU.so.1
+lib/libGLU.so.1.3.1
 lib/pkgconfig/glu.pc

Index: pkgsrc/graphics/glu/builtin.mk
diff -u pkgsrc/graphics/glu/builtin.mk:1.17 pkgsrc/graphics/glu/builtin.mk:1.18
--- pkgsrc/graphics/glu/builtin.mk:1.17 Sat Nov  2 22:37:58 2019
+++ pkgsrc/graphics/glu/builtin.mk      Thu Aug 24 11:35:49 2023
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.17 2019/11/02 22:37:58 rillig Exp $
+# $NetBSD: builtin.mk,v 1.18 2023/08/24 11:35:49 wiz Exp $
 
 BUILTIN_PKG:=  glu
 
@@ -28,7 +28,7 @@ MAKEVARS+=    IS_BUILTIN.glu
 ### a package name to represent the built-in package.
 ###
 .if !defined(BUILTIN_PKG.glu) && \
-    !empty(IS_BUILTIN.glu:M[yY][eE][sS])
+    ${IS_BUILTIN.glu:tl} == yes
 .  if empty(PC_GLU:M__nonexistent__)
 BUILTIN_VERSION.Mesa!= ${SED} -n -e 's/Version: //p' ${PC_GLU}
 .  elif empty(H_GLU:M__nonexistent__)
@@ -51,10 +51,10 @@ USE_BUILTIN.glu=    no
 .  else
 USE_BUILTIN.glu=       ${IS_BUILTIN.glu}
 .    if defined(BUILTIN_PKG.glu) && \
-        !empty(IS_BUILTIN.glu:M[yY][eE][sS])
+        ${IS_BUILTIN.glu:tl} == yes
 USE_BUILTIN.glu=       yes
 .      for dep in ${BUILDLINK_API_DEPENDS.glu}
-.        if !empty(USE_BUILTIN.glu:M[yY][eE][sS])
+.        if ${USE_BUILTIN.glu:tl} == yes
 USE_BUILTIN.glu!=                                                      \
        if ${PKG_ADMIN} pmatch ${dep:Q} ${BUILTIN_PKG.glu}; then        \
                ${ECHO} yes;                                            \
@@ -76,9 +76,9 @@ MAKEVARS+=            USE_BUILTIN.glu
 .include "../../mk/x11.builtin.mk"
 
 CHECK_BUILTIN.glu?=    no
-.if !empty(CHECK_BUILTIN.glu:M[nN][oO])
+.if ${CHECK_BUILTIN.glu:tl} == no
 
-.  if !empty(USE_BUILTIN.glu:M[nN][oO])
+.  if ${USE_BUILTIN.glu:tl} == no
 BUILDLINK_API_DEPENDS.glu+=    glu>=6.0
 .  endif
 

Index: pkgsrc/graphics/glu/distinfo
diff -u pkgsrc/graphics/glu/distinfo:1.22 pkgsrc/graphics/glu/distinfo:1.23
--- pkgsrc/graphics/glu/distinfo:1.22   Tue Oct 26 10:46:13 2021
+++ pkgsrc/graphics/glu/distinfo        Thu Aug 24 11:35:49 2023
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.22 2021/10/26 10:46:13 nia Exp $
+$NetBSD: distinfo,v 1.23 2023/08/24 11:35:49 wiz Exp $
 
-BLAKE2s (glu-9.0.2.tar.xz) = 04783d71960be5197293373ad6764f2a4903157cb5a448c5a8c11b2c5c18e639
-SHA512 (glu-9.0.2.tar.xz) = 2517d7406bb643d12c017a95dcb5d8716f307344332638bcbdf274a90752a7c22165d34745f1b082ed916bb07d40e62d1d1d67d96426225be63166f3480d6f64
-Size (glu-9.0.2.tar.xz) = 436176 bytes
+BLAKE2s (glu-9.0.3.tar.xz) = a864f6053e957d968ab8e3b90041686eb14e1972a6f52f871a845f8a4d288084
+SHA512 (glu-9.0.3.tar.xz) = b2781059c0e176192c3fc0d7244645020937a463311171efddb9f35fb94ee43faabcf627fa7f429d48fceaf6dd9c5adb69c86c7a21ec4ea490f4ab143d52e3ba
+Size (glu-9.0.3.tar.xz) = 218968 bytes
+SHA1 (patch-meson.build) = 128ffd78e850fbf846d640e0ebcc8c46d9bc9ecd
 SHA1 (patch-src_libtess_sweep.c) = b7f9ca4e1a83e0081b3cfa418f378e33392f7f65

Added files:

Index: pkgsrc/graphics/glu/patches/patch-meson.build
diff -u /dev/null pkgsrc/graphics/glu/patches/patch-meson.build:1.1
--- /dev/null   Thu Aug 24 11:35:49 2023
+++ pkgsrc/graphics/glu/patches/patch-meson.build       Thu Aug 24 11:35:49 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-meson.build,v 1.1 2023/08/24 11:35:49 wiz Exp $
+
+pkg-config file provided by MesaLib is called 'gl' not 'opengl'.
+
+--- meson.build.orig   2023-07-21 18:24:19.000000000 +0000
++++ meson.build
+@@ -16,7 +16,7 @@ endif
+ 
+ gl_provider = get_option('gl_provider')
+ if gl_provider == 'glvnd'
+-  gl_provider = 'opengl'
++  gl_provider = 'gl'
+ endif
+ dep_gl = dependency(gl_provider)
+