freeglut: Update to 3.2.0

No changelog.

8 files changed, 75 insertions, 110 deletions

diff --git a/graphics/freeglut/Makefile b/graphics/freeglut/Makefile
index 7c59a7e45d5..4312578b98c 100644
--- a/graphics/freeglut/Makefile
+++ b/graphics/freeglut/Makefile
@@ -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"
diff --git a/graphics/freeglut/PLIST b/graphics/freeglut/PLIST
index 38e7ac406ef..4f80a1421c0 100644
--- a/graphics/freeglut/PLIST
+++ b/graphics/freeglut/PLIST
@@ -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
diff --git a/graphics/freeglut/buildlink3.mk b/graphics/freeglut/buildlink3.mk
index c8436468bd1..63f846374e3 100644
--- a/graphics/freeglut/buildlink3.mk
+++ b/graphics/freeglut/buildlink3.mk
@@ -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?=		../../graphics/freeglut
 
 .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
diff --git a/graphics/freeglut/distinfo b/graphics/freeglut/distinfo
index 6fbef4a9e6f..0aa24824643 100644
--- a/graphics/freeglut/distinfo
+++ b/graphics/freeglut/distinfo
@@ -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
diff --git a/graphics/freeglut/options.mk b/graphics/freeglut/options.mk
new file mode 100644
index 00000000000..ae804e1aaf1
--- /dev/null
+++ b/graphics/freeglut/options.mk
@@ -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
diff --git a/graphics/freeglut/patches/patch-CMakeLists.txt b/graphics/freeglut/patches/patch-CMakeLists.txt
new file mode 100644
index 00000000000..fc956803053
--- /dev/null
+++ b/graphics/freeglut/patches/patch-CMakeLists.txt
@@ -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()
diff --git a/graphics/freeglut/patches/patch-src_freeglut__joystick.c b/graphics/freeglut/patches/patch-src_freeglut__joystick.c
deleted file mode 100644
index cbf631bf26e..00000000000
--- a/graphics/freeglut/patches/patch-src_freeglut__joystick.c
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-src_freeglut__joystick.c,v 1.3 2017/04/25 11:42:42 wiz Exp $
-
-Fix usb.h include for NetBSD.
-https://github.com/dcnieho/FreeGLUT/pull/53
-
---- src/fg_joystick.c.orig	2014-10-20 15:27:04.000000000 +0000
-+++ src/fg_joystick.c
-@@ -46,21 +46,20 @@
- 
- #    ifdef HAVE_USB_JS
- #        if defined(__NetBSD__)
--/* XXX The below hack is done until freeglut's autoconf is updated. */
--#            define HAVE_USBHID_H 1
- #            ifdef HAVE_USBHID_H
- #                include <usbhid.h>
- #            else
- #                include <usb.h>
- #            endif
-+#            include <dev/usb/usb.h>
- #        elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- #            ifdef HAVE_USBHID_H
- #                include <usbhid.h>
- #            else
- #                include <libusbhid.h>
- #            endif
-+#            include <legacy/dev/usb/usb.h>
- #        endif
--#        include <legacy/dev/usb/usb.h>
- #        include <dev/usb/usbhid.h>
- 
- /* Compatibility with older usb.h revisions */
diff --git a/graphics/freeglut/patches/patch-src_x11_fg__joystick__x11.c b/graphics/freeglut/patches/patch-src_x11_fg__joystick__x11.c
deleted file mode 100644
index 2cc6de0f4ae..00000000000
--- a/graphics/freeglut/patches/patch-src_x11_fg__joystick__x11.c
+++ /dev/null
@@ -1,52 +0,0 @@
-$NetBSD: patch-src_x11_fg__joystick__x11.c,v 1.2 2017/04/25 11:42:42 wiz Exp $
-
-This code does not work on NetBSD, remove wrong ifdefs.
-https://github.com/dcnieho/FreeGLUT/pull/53
-
---- src/x11/fg_joystick_x11.c.orig	2014-12-02 05:22:12.000000000 +0000
-+++ src/x11/fg_joystick_x11.c
-@@ -50,7 +50,7 @@ void fgPlatformJoystickRawRead( SFG_Joys
- {
-     int status;
- 
--#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-     int len;
- 
-     if ( joy->pJoystick.os->is_analog )
-@@ -215,7 +215,7 @@ void fgPlatformJoystickRawRead( SFG_Joys
- 
- void fgPlatformJoystickOpen( SFG_Joystick* joy )
- {
--#if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ )
-+#if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__)
- 	int i = 0;
-        char *cp;
- #endif
-@@ -229,7 +229,7 @@ void fgPlatformJoystickOpen( SFG_Joystic
- #  endif
- #endif
- 
--#if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ )
-+#if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__)
-     for( i = 0; i < _JS_MAX_AXES; i++ )
-         joy->pJoystick.os->cache_axes[ i ] = 0.0f;
- 
-@@ -409,7 +409,7 @@ void fgPlatformJoystickOpen( SFG_Joystic
- 
- void fgPlatformJoystickInit( SFG_Joystick *fgJoystick[], int ident )
- {
--#if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ )
-+#if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__)
-     fgJoystick[ ident ]->id = ident;
-     fgJoystick[ ident ]->error = GL_FALSE;
- 
-@@ -436,7 +436,7 @@ void fgPlatformJoystickInit( SFG_Joystic
- 
- void fgPlatformJoystickClose ( int ident )
- {
--#if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ )
-+#if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__)
-     if( fgJoystick[ident]->pJoystick.os )
-     {
-         if( ! fgJoystick[ ident ]->error )