[pkgsrc/trunk]: pkgsrc/graphics/freeglut freeglut: Update to 3.2.2

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fa627dc77d17
branches:  trunk
changeset: 379486:fa627dc77d17
user:      nia <nia%pkgsrc.org@localhost>
date:      Tue May 17 21:54:50 2022 +0000

description:
freeglut: Update to 3.2.2

                                 freeglut 3.2.2

Changes

     * Fix netbsd/aarch64 build by including sys/joystick.h instead of
       machine/joystick.h.
     * Fix build with gcc >= 10 which made -fno-common the default by no
       longer relying on COMMON symbols for globals.
     * Fix android build (default to FREEGLUT_GLES, and check for debug
       flags).
     * Add flat shading option to the shapes demo.
     * Fix crash when calling primitive drawing functions without creating a
       window first.
     * Dropped really old and unmaintained doc directory from the source
       tree.

diffstat:

 graphics/freeglut/Makefile                                     |   5 +-
 graphics/freeglut/PLIST                                        |   4 +-
 graphics/freeglut/distinfo                                     |  10 +--
 graphics/freeglut/patches/patch-src_wayland_fg__internal__wl.h |  26 ----------
 graphics/freeglut/patches/patch-src_x11_fg__internal__x11.h    |  26 ----------
 5 files changed, 8 insertions(+), 63 deletions(-)

diffs (107 lines):

diff -r 98efc60b8d15 -r fa627dc77d17 graphics/freeglut/Makefile
--- a/graphics/freeglut/Makefile        Tue May 17 21:44:37 2022 +0000
+++ b/graphics/freeglut/Makefile        Tue May 17 21:54:50 2022 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.31 2021/12/08 16:02:08 adam Exp $
+# $NetBSD: Makefile,v 1.32 2022/05/17 21:54:50 nia Exp $
 
-DISTNAME=      freeglut-3.2.1
-PKGREVISION=   3
+DISTNAME=      freeglut-3.2.2
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=freeglut/}
 
diff -r 98efc60b8d15 -r fa627dc77d17 graphics/freeglut/PLIST
--- a/graphics/freeglut/PLIST   Tue May 17 21:44:37 2022 +0000
+++ b/graphics/freeglut/PLIST   Tue May 17 21:54:50 2022 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2019/10/04 14:21:40 nia Exp $
+@comment $NetBSD: PLIST,v 1.10 2022/05/17 21:54:50 nia Exp $
 include/GL/freeglut.h
 include/GL/freeglut_ext.h
 include/GL/freeglut_std.h
@@ -11,6 +11,6 @@
 lib/libglut.a
 lib/libglut.so
 lib/libglut.so.3
-lib/libglut.so.3.11.0
+lib/libglut.so.3.11.1
 lib/pkgconfig/freeglut.pc
 lib/pkgconfig/glut.pc
diff -r 98efc60b8d15 -r fa627dc77d17 graphics/freeglut/distinfo
--- a/graphics/freeglut/distinfo        Tue May 17 21:44:37 2022 +0000
+++ b/graphics/freeglut/distinfo        Tue May 17 21:54:50 2022 +0000
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.17 2021/10/26 10:46:08 nia Exp $
+$NetBSD: distinfo,v 1.18 2022/05/17 21:54:50 nia Exp $
 
-BLAKE2s (freeglut-3.2.1.tar.gz) = dbc214e87d838971946bb33f36063f3a53cf224b51cb1c463eabf325f40a7a13
-SHA512 (freeglut-3.2.1.tar.gz) = aced4bbcd36269ce6f4ee1982e0f9e3fffbf18c94f785d3215ac9f4809b992e166c7ada496ed6174e13d77c0f7ef3ca4c57d8a282e96cbbe6ff086339ade3b08
-Size (freeglut-3.2.1.tar.gz) = 440228 bytes
+BLAKE2s (freeglut-3.2.2.tar.gz) = fcb5d0377d725be35663dab97349ec6be137e1d0ab36ea7e5647745c6da40daf
+SHA512 (freeglut-3.2.2.tar.gz) = 190231951d314f854c244bd27f7c20488403bd0eecffc342097a2e3d1621cec87f6c209a77b4c153aabcf44697b4070227930e295ab74fb88953cbbf94fc81d9
+Size (freeglut-3.2.2.tar.gz) = 397203 bytes
 SHA1 (patch-src_fg__joystick.c) = 56a07514b89ff748d5a273f12eb756d475d9de0e
-SHA1 (patch-src_wayland_fg__internal__wl.h) = c1bc21cf6fa7fcb37395db172a805e60071cbbd6
-SHA1 (patch-src_x11_fg__internal__x11.h) = 3a7cfc4b274f5c8d6da2c3ce109877ffac6c0bfa
 SHA1 (patch-src_x11_fg__joystick__x11.c) = c48f1651f136c7fe45385dfe9d03ae5a0517a938
diff -r 98efc60b8d15 -r fa627dc77d17 graphics/freeglut/patches/patch-src_wayland_fg__internal__wl.h
--- a/graphics/freeglut/patches/patch-src_wayland_fg__internal__wl.h    Tue May 17 21:44:37 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-$NetBSD: patch-src_wayland_fg__internal__wl.h,v 1.1 2019/10/09 23:52:10 maya Exp $
-
-<sys/joystick.h> should work for all netbsd.
-(not all archs have a machine/joystick.h, and it just includes sys/joystick.h)
-
---- src/wayland/fg_internal_wl.h.orig  2015-04-04 18:43:27.000000000 +0000
-+++ src/wayland/fg_internal_wl.h
-@@ -105,17 +105,8 @@ struct tagSFG_PlatformWindowState
- /* XXX The below hack is done until freeglut's autoconf is updated. */
- #        define HAVE_USB_JS    1
- 
--#        if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+#        if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
- #            include <sys/joystick.h>
--#        else
--/*
-- * XXX NetBSD/amd64 systems may find that they have to steal the
-- * XXX /usr/include/machine/joystick.h from a NetBSD/i386 system.
-- * XXX I cannot comment whether that works for the interface, but
-- * XXX it lets you compile...(^&  I do not think that we can do away
-- * XXX with this header.
-- */
--#            include <machine/joystick.h>         /* For analog joysticks */
- #        endif
- #        define JS_DATA_TYPE joystick
- #        define JS_RETURN (sizeof(struct JS_DATA_TYPE))
diff -r 98efc60b8d15 -r fa627dc77d17 graphics/freeglut/patches/patch-src_x11_fg__internal__x11.h
--- a/graphics/freeglut/patches/patch-src_x11_fg__internal__x11.h       Tue May 17 21:44:37 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-$NetBSD: patch-src_x11_fg__internal__x11.h,v 1.1 2019/10/21 09:38:08 maya Exp $
-
-<sys/joystick.h> should work for all netbsd.
-(not all archs have a machine/joystick.h, and it just includes sys/joystick.h)
-
---- src/x11/fg_internal_x11.h.orig     2014-10-20 15:27:04.000000000 +0000
-+++ src/x11/fg_internal_x11.h
-@@ -139,17 +139,8 @@ struct tagSFG_PlatformWindowState
- /* XXX The below hack is done until freeglut's autoconf is updated. */
- #        define HAVE_USB_JS    1
- 
--#        if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+#        if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
- #            include <sys/joystick.h>
--#        else
--/*
-- * XXX NetBSD/amd64 systems may find that they have to steal the
-- * XXX /usr/include/machine/joystick.h from a NetBSD/i386 system.
-- * XXX I cannot comment whether that works for the interface, but
-- * XXX it lets you compile...(^&  I do not think that we can do away
-- * XXX with this header.
-- */
--#            include <machine/joystick.h>         /* For analog joysticks */
- #        endif
- #        define JS_DATA_TYPE joystick
- #        define JS_RETURN (sizeof(struct JS_DATA_TYPE))