CVS commit: pkgsrc/graphics/freeglut

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Wed May  3 15:20:41 UTC 2023

Modified Files:
        pkgsrc/graphics/freeglut: Makefile PLIST buildlink3.mk distinfo
Removed Files:
        pkgsrc/graphics/freeglut/patches: patch-src_fg__joystick.c
            patch-src_x11_fg__joystick__x11.c

Log Message:
freeglut: Update to 3.4.0

pkgsrc changes:
---------------
  * Remove patches which have been merged upstream.
  * Apply recommandations of pkglint for tests on PKG_BUILD_OPTIONS.

upstream changes:
-----------------
        * Add GLUT_ACTIVE_SUPER modifier, and corresponding GLUT_KEY_SUPER_L
                and GLUT_KEY_SUPER_R special keys. These map to Windows/Command keys.
        * Fix RGB mode (GLUT_RGBA) colors on 8bpp displays on windows
          (construct default RGB332 palette).
        * Fix indexed color context creation on X11 and windows (GLUT_INDEX).
        * Add missing colormap management functions for X11 and windows
          (glutSetColor, glutGetColor).
        * Fix crash when calling glutTimerFuncUcall.
        * Fix FreeBSD build by essentially disabling the joystick code for
          newer FreeBSD versions. It will eventually need to be replaced/fixed.
        * Add fallbacks for the old GLX (<1.3) context creation API
                (glXChooseVisual/glXCreateContext), makes us compatible with IRIX 5.x and
    other old UNIX systems.
        * Add fallbacks for OpenGL 1.0 (no vertex arrays/client state).
        * Use nanosleep instead of usleep on UNIX, which is more widely
          supported on old UNIX systems.
        * Fix build on X11 if GL_SAMPLES is not defined.
        * Fix overly strict context version checking on Android leading to
          context creation failure in some cases.
        * Fix GLUT_CURSOR_INFO on windows, should be IDC_HAND, not IDC_HELP.
        * Fix mismatched font declarations on X11.
        * Add alternative simple ways to build freeglut with native tools only,
          without having to use cmake.
        * Fix build on windows with cmake 3.0.0. Explicitly link with gdi32.
        * Fix build on MSVC 2005.
        * Fix build on MacOS X. Link with all the necessary X libraries.
        * Fix build on SGI IRIX.
        * Fix build on Android (mismatched function prototypes and missing
          glutCreateMenuUcall).
        * Add support for the ninja multi-config generator.
        * Removed spurious dependency on a C++ compiler. One of the demos was
          being compiled as C++ for no reason.
        * Silence unnecessary warnings when VBOs or GLSL are not available.
        * New demo programs: 3dview, keyboard, joystick.
        * Documentation: added MacOS X build instructions.
        * Made it possible to eventually support building freeglut as a single
          compilation unit, by avoiding name conflicts on static variables.
        * Other minor fixes.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/graphics/freeglut/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/graphics/freeglut/PLIST
cvs rdiff -u -r1.17 -r1.18 pkgsrc/graphics/freeglut/buildlink3.mk
cvs rdiff -u -r1.18 -r1.19 pkgsrc/graphics/freeglut/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/graphics/freeglut/patches/patch-src_fg__joystick.c
cvs rdiff -u -r1.4 -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.34 pkgsrc/graphics/freeglut/Makefile:1.35
--- pkgsrc/graphics/freeglut/Makefile:1.34      Tue Jan 24 18:36:26 2023
+++ pkgsrc/graphics/freeglut/Makefile   Wed May  3 15:20:41 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2023/01/24 18:36:26 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2023/05/03 15:20:41 triaxx Exp $
 
-DISTNAME=      freeglut-3.2.2
-PKGREVISION=   1
+DISTNAME=      freeglut-3.4.0
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=freeglut/}
 
@@ -14,6 +13,7 @@ USE_LANGUAGES=        c c++
 USE_LIBTOOL=   yes
 
 CMAKE_ARGS+=   -DCMAKE_BUILD_TYPE="Release"
+CMAKE_ARGS+=   -DFREEGLUT_BUILD_DEMOS=OFF
 CMAKE_ARGS+=   -DFREEGLUT_REPLACE_GLUT=ON
 
 PKGCONFIG_OVERRIDE=    freeglut.pc.in

Index: pkgsrc/graphics/freeglut/PLIST
diff -u pkgsrc/graphics/freeglut/PLIST:1.10 pkgsrc/graphics/freeglut/PLIST:1.11
--- pkgsrc/graphics/freeglut/PLIST:1.10 Tue May 17 21:54:50 2022
+++ pkgsrc/graphics/freeglut/PLIST      Wed May  3 15:20:41 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2022/05/17 21:54:50 nia Exp $
+@comment $NetBSD: PLIST,v 1.11 2023/05/03 15:20:41 triaxx Exp $
 include/GL/freeglut.h
 include/GL/freeglut_ext.h
 include/GL/freeglut_std.h
@@ -11,6 +11,6 @@ lib/cmake/FreeGLUT/FreeGLUTTargets.cmake
 lib/libglut.a
 lib/libglut.so
 lib/libglut.so.3
-lib/libglut.so.3.11.1
+lib/libglut.so.3.12.0
 lib/pkgconfig/freeglut.pc
 lib/pkgconfig/glut.pc

Index: pkgsrc/graphics/freeglut/buildlink3.mk
diff -u pkgsrc/graphics/freeglut/buildlink3.mk:1.17 pkgsrc/graphics/freeglut/buildlink3.mk:1.18
--- pkgsrc/graphics/freeglut/buildlink3.mk:1.17 Thu Aug 11 05:08:40 2022
+++ pkgsrc/graphics/freeglut/buildlink3.mk      Wed May  3 15:20:41 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2022/08/11 05:08:40 gutteridge Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2023/05/03 15:20:41 triaxx Exp $
 
 BUILDLINK_TREE+=       freeglut
 
@@ -16,11 +16,11 @@ pkgbase:=   freeglut
 
 .include "../../mk/pkg-build-options.mk"
 
-.if !empty(PKG_BUILD_OPTIONS.freeglut:Mwayland)
+.if ${PKG_BUILD_OPTIONS.freeglut:Mwayland}
 .  include "../../devel/wayland/buildlink3.mk"
 .endif
 
-.if !empty(PKG_BUILD_OPTIONS.freeglut:Mx11)
+.if ${PKG_BUILD_OPTIONS.freeglut:Mx11}
 .  include "../../x11/libXi/buildlink3.mk"
 .  include "../../x11/libXrandr/buildlink3.mk"
 .  include "../../x11/libXxf86vm/buildlink3.mk"

Index: pkgsrc/graphics/freeglut/distinfo
diff -u pkgsrc/graphics/freeglut/distinfo:1.18 pkgsrc/graphics/freeglut/distinfo:1.19
--- pkgsrc/graphics/freeglut/distinfo:1.18      Tue May 17 21:54:50 2022
+++ pkgsrc/graphics/freeglut/distinfo   Wed May  3 15:20:41 2023
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.18 2022/05/17 21:54:50 nia Exp $
+$NetBSD: distinfo,v 1.19 2023/05/03 15:20:41 triaxx Exp $
 
-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_x11_fg__joystick__x11.c) = c48f1651f136c7fe45385dfe9d03ae5a0517a938
+BLAKE2s (freeglut-3.4.0.tar.gz) = 710aa8aa2705736bfd941e0b94c4503235f82d1b687a40d891fd0c727b4b5fb7
+SHA512 (freeglut-3.4.0.tar.gz) = 4bb6d6c086bac7a9c0ec78062dce58987555785abe6375f462ee249f65210a964a28fb10ba7ee8a42d7fafb00eb8d196eb403d65d255f02f88467369c187228b
+Size (freeglut-3.4.0.tar.gz) = 413389 bytes