CVS commit: pkgsrc/graphics/freeglut

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Oct  3 11:17:51 UTC 2019

Modified Files:
        pkgsrc/graphics/freeglut: Makefile PLIST buildlink3.mk distinfo
Added Files:
        pkgsrc/graphics/freeglut: options.mk
        pkgsrc/graphics/freeglut/patches: patch-CMakeLists.txt
Removed Files:
        pkgsrc/graphics/freeglut/patches: patch-src_freeglut__joystick.c
            patch-src_x11_fg__joystick__x11.c

Log Message:
freeglut: Update to 3.2.0

No changelog.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/graphics/freeglut/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/graphics/freeglut/PLIST
cvs rdiff -u -r1.13 -r1.14 pkgsrc/graphics/freeglut/buildlink3.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/graphics/freeglut/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/freeglut/options.mk
cvs rdiff -u -r0 -r1.3 pkgsrc/graphics/freeglut/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.3 -r0 \
    pkgsrc/graphics/freeglut/patches/patch-src_freeglut__joystick.c
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/graphics/freeglut/patches/patch-src_x11_fg__joystick__x11.c

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

Modified files:

Index: pkgsrc/graphics/freeglut/Makefile
diff -u pkgsrc/graphics/freeglut/Makefile:1.23 pkgsrc/graphics/freeglut/Makefile:1.24
--- pkgsrc/graphics/freeglut/Makefile:1.23      Mon Sep 23 12:28:49 2019
+++ pkgsrc/graphics/freeglut/Makefile   Thu Oct  3 11:17:51 2019
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2019/09/23 12:28:49 nia Exp $
+# $NetBSD: Makefile,v 1.24 2019/10/03 11:17:51 nia Exp $
 
-DISTNAME=      freeglut-3.0.0
-PKGREVISION=   2
+DISTNAME=      freeglut-3.2.0
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=freeglut/}
 
@@ -14,22 +13,19 @@ USE_CMAKE=  yes
 USE_LANGUAGES= c c++
 USE_LIBTOOL=   yes
 
-CMAKE_ARGS+=   -DCMAKE_BUILD_TYPE=Release
+CMAKE_ARGS+=   -DCMAKE_BUILD_TYPE="Release"
+CMAKE_ARGS+=   -DFREEGLUT_REPLACE_GLUT=ON
 
 PKGCONFIG_OVERRIDE=    freeglut.pc.in
+PKGCONFIG_OVERRIDE=    glut.pc.in
 
-# Install glut.pc for compatibility.
+# Install freeglut.pc for compatibility.
 post-install:
-       ${INSTALL_DATA} ${DESTDIR}${PREFIX}/lib/pkgconfig/freeglut.pc \
-           ${DESTDIR}${PREFIX}/lib/pkgconfig/glut.pc
+       ${INSTALL_DATA} ${DESTDIR}${PREFIX}/lib/pkgconfig/glut.pc \
+           ${DESTDIR}${PREFIX}/lib/pkgconfig/freeglut.pc
 
+.include "options.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
-.include "../../x11/libXi/buildlink3.mk"
-.include "../../x11/libXrandr/buildlink3.mk"
-.include "../../x11/libXxf86vm/buildlink3.mk"
-.include "../../x11/libICE/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/freeglut/PLIST
diff -u pkgsrc/graphics/freeglut/PLIST:1.7 pkgsrc/graphics/freeglut/PLIST:1.8
--- pkgsrc/graphics/freeglut/PLIST:1.7  Mon Sep 23 12:28:49 2019
+++ pkgsrc/graphics/freeglut/PLIST      Thu Oct  3 11:17:51 2019
@@ -1,8 +1,13 @@
-@comment $NetBSD: PLIST,v 1.7 2019/09/23 12:28:49 nia Exp $
+@comment $NetBSD: PLIST,v 1.8 2019/10/03 11:17:51 nia Exp $
 include/GL/freeglut.h
 include/GL/freeglut_ext.h
 include/GL/freeglut_std.h
+include/GL/freeglut_ucall.h
 include/GL/glut.h
+lib/cmake/FreeGLUT/FreeGLUTConfig.cmake
+lib/cmake/FreeGLUT/FreeGLUTConfigVersion.cmake
+lib/cmake/FreeGLUT/FreeGLUTTargets-release.cmake
+lib/cmake/FreeGLUT/FreeGLUTTargets.cmake
 lib/libglut.a
 lib/libglut.so
 lib/libglut.so.3

Index: pkgsrc/graphics/freeglut/buildlink3.mk
diff -u pkgsrc/graphics/freeglut/buildlink3.mk:1.13 pkgsrc/graphics/freeglut/buildlink3.mk:1.14
--- pkgsrc/graphics/freeglut/buildlink3.mk:1.13 Mon Sep 23 11:53:48 2019
+++ pkgsrc/graphics/freeglut/buildlink3.mk      Thu Oct  3 11:17:51 2019
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2019/09/23 11:53:48 nia Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2019/10/03 11:17:51 nia Exp $
 
 BUILDLINK_TREE+=       freeglut
 
@@ -11,11 +11,21 @@ BUILDLINK_PKGSRCDIR.freeglut?=              ../../gr
 
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
-.include "../../x11/libXi/buildlink3.mk"
-.include "../../x11/libXrandr/buildlink3.mk"
-.include "../../x11/libXxf86vm/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../mk/dlopen.buildlink3.mk"
+
+pkgbase:=      freeglut
+
+.include "../../mk/pkg-build-options.mk"
+
+.  if !empty(PKG_BUILD_OPTIONS.freeglut:Mwayland)
+.    include "../../devel/wayland/buildlink3.mk"
+. endif
+
+.  if !empty(PKG_BUILD_OPTIONS.freeglut:Mx11)
+.    include "../../x11/libXi/buildlink3.mk"
+.    include "../../x11/libXrandr/buildlink3.mk"
+.    include "../../x11/libXxf86vm/buildlink3.mk"
+.    include "../../x11/libX11/buildlink3.mk"
+. endif
 .endif # FREEGLUT_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -freeglut

Index: pkgsrc/graphics/freeglut/distinfo
diff -u pkgsrc/graphics/freeglut/distinfo:1.10 pkgsrc/graphics/freeglut/distinfo:1.11
--- pkgsrc/graphics/freeglut/distinfo:1.10      Fri Aug 30 17:01:33 2019
+++ pkgsrc/graphics/freeglut/distinfo   Thu Oct  3 11:17:51 2019
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.10 2019/08/30 17:01:33 nia Exp $
+$NetBSD: distinfo,v 1.11 2019/10/03 11:17:51 nia Exp $
 
-SHA1 (freeglut-3.0.0.tar.gz) = fca52242f9344627a30f11487ee42002e6b0dacd
-RMD160 (freeglut-3.0.0.tar.gz) = ce4129a22199516ecf24491f0ed026f40c3f5dae
-SHA512 (freeglut-3.0.0.tar.gz) = 9c45d5b203b26a7ff92331b3e080a48e806c92fbbe7c65d9262dd18c39cd6efdad8a795a80f499a2d23df84b4909dbd7c1bab20d7dd3555d3d88782ce9dd15b0
-Size (freeglut-3.0.0.tar.gz) = 419095 bytes
-SHA1 (patch-src_freeglut__joystick.c) = fe4eda46e5aacbd81ba2946079131c7020a1fcd8
-SHA1 (patch-src_x11_fg__joystick__x11.c) = ae536397bfb000b0acb78c84b48c920c8774c4ba
+SHA1 (freeglut-3.2.0.tar.gz) = cc88845a3bfce41bbaa345d10038a1bcc6782af2
+RMD160 (freeglut-3.2.0.tar.gz) = 596644e5733aa7981643565bf1b49e7a8ee47b04
+SHA512 (freeglut-3.2.0.tar.gz) = 78da1eaa845607ddd97a6744f3a97ff26cdb562fdf990695c8ac97a60d9d692496e4bf3672acfc522add60823c2f3bc7435e19e8041fbbb5d95851c0b641a818
+Size (freeglut-3.2.0.tar.gz) = 443147 bytes
+SHA1 (patch-CMakeLists.txt) = 3e9d66bc13758777461e4bf7c6ccbe7eb0fb908d

Added files:

Index: pkgsrc/graphics/freeglut/options.mk
diff -u /dev/null pkgsrc/graphics/freeglut/options.mk:1.1
--- /dev/null   Thu Oct  3 11:17:51 2019
+++ pkgsrc/graphics/freeglut/options.mk Thu Oct  3 11:17:51 2019
@@ -0,0 +1,23 @@
+# $NetBSD: options.mk,v 1.1 2019/10/03 11:17:51 nia Exp $
+
+PKG_OPTIONS_VAR=               PKG_OPTIONS.freeglut
+PKG_OPTIONS_REQUIRED_GROUPS=   ui
+PKG_OPTIONS_GROUP.ui=          wayland x11
+PKG_SUGGESTED_OPTIONS=         x11
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mwayland)
+CMAKE_ARGS+=   -DFREEGLUT_WAYLAND=ON
+.include "../../devel/wayland/buildlink3.mk"
+.include "../../x11/libxkbcommon/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mx11)
+.include "../../x11/libXi/buildlink3.mk"
+.include "../../x11/libXrandr/buildlink3.mk"
+.include "../../x11/libXxf86vm/buildlink3.mk"
+.include "../../x11/libICE/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.endif

Index: pkgsrc/graphics/freeglut/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/graphics/freeglut/patches/patch-CMakeLists.txt:1.3
--- /dev/null   Thu Oct  3 11:17:51 2019
+++ pkgsrc/graphics/freeglut/patches/patch-CMakeLists.txt       Thu Oct  3 11:17:51 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-CMakeLists.txt,v 1.3 2019/10/03 11:17:51 nia Exp $
+
+Install glut.h compatibility header properly.
+
+--- CMakeLists.txt.orig        2019-03-26 18:55:42.000000000 +0000
++++ CMakeLists.txt
+@@ -73,7 +73,7 @@ SET(FREEGLUT_HEADERS
+     include/GL/freeglut_std.h
+ )
+ IF(FREEGLUT_REPLACE_GLUT)
+-    LIST(APPEND FREEGLUT_SRCS
++    LIST(APPEND FREEGLUT_HEADERS
+         include/GL/glut.h
+     )
+ ENDIF()