CVS commit: pkgsrc/graphics/freeglut

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Jan  9 23:34:57 UTC 2020

Modified Files:
        pkgsrc/graphics/freeglut: Makefile distinfo
Added Files:
        pkgsrc/graphics/freeglut/patches: patch-src_fg__joystick.c
            patch-src_x11_fg__joystick__x11.c

Log Message:
freeglut: Resolve "undefined symbol fghJoystickRawRead" on SunOS

>From OpenIndiana:
https://github.com/OpenIndiana/oi-userland/commit/ee89e22bb41ce7ac2a00065b85cf2c7f415543d2

Bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/graphics/freeglut/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/graphics/freeglut/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/freeglut/patches/patch-src_fg__joystick.c
cvs rdiff -u -r0 -r1.4 \
    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.25 pkgsrc/graphics/freeglut/Makefile:1.26
--- pkgsrc/graphics/freeglut/Makefile:1.25      Fri Oct  4 14:21:40 2019
+++ pkgsrc/graphics/freeglut/Makefile   Thu Jan  9 23:34:57 2020
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2019/10/04 14:21:40 nia Exp $
+# $NetBSD: Makefile,v 1.26 2020/01/09 23:34:57 nia Exp $
 
 DISTNAME=      freeglut-3.2.1
+PKGREVISION=   1
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=freeglut/}
 

Index: pkgsrc/graphics/freeglut/distinfo
diff -u pkgsrc/graphics/freeglut/distinfo:1.14 pkgsrc/graphics/freeglut/distinfo:1.15
--- pkgsrc/graphics/freeglut/distinfo:1.14      Mon Oct 21 09:38:08 2019
+++ pkgsrc/graphics/freeglut/distinfo   Thu Jan  9 23:34:57 2020
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.14 2019/10/21 09:38:08 maya Exp $
+$NetBSD: distinfo,v 1.15 2020/01/09 23:34:57 nia Exp $
 
 SHA1 (freeglut-3.2.1.tar.gz) = 7a62e0d2caad92ff745bc5037592b2753f0b2f20
 RMD160 (freeglut-3.2.1.tar.gz) = c9b9d76f61ff56b153367817cfbc1fb5c0816c54
 SHA512 (freeglut-3.2.1.tar.gz) = aced4bbcd36269ce6f4ee1982e0f9e3fffbf18c94f785d3215ac9f4809b992e166c7ada496ed6174e13d77c0f7ef3ca4c57d8a282e96cbbe6ff086339ade3b08
 Size (freeglut-3.2.1.tar.gz) = 440228 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

Added files:

Index: pkgsrc/graphics/freeglut/patches/patch-src_fg__joystick.c
diff -u /dev/null pkgsrc/graphics/freeglut/patches/patch-src_fg__joystick.c:1.1
--- /dev/null   Thu Jan  9 23:34:57 2020
+++ pkgsrc/graphics/freeglut/patches/patch-src_fg__joystick.c   Thu Jan  9 23:34:57 2020
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_fg__joystick.c,v 1.1 2020/01/09 23:34:57 nia Exp $
+
+Resolve "undefined symbol fghJoystickRawRead" on SunOS
+
+From OpenIndiana:
+https://github.com/OpenIndiana/oi-userland/commit/ee89e22bb41ce7ac2a00065b85cf2c7f415543d2
+
+--- src/fg_joystick.c.orig     2017-07-31 20:49:26.000000000 +0000
++++ src/fg_joystick.c
+@@ -76,7 +76,7 @@ SFG_Joystick *fgJoystick [ MAX_NUM_JOYST
+ /*
+  * Read the raw joystick data
+  */
+-static void fghJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes )
++void fghJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes )
+ {
+     int i;
+ 

Index: pkgsrc/graphics/freeglut/patches/patch-src_x11_fg__joystick__x11.c
diff -u /dev/null pkgsrc/graphics/freeglut/patches/patch-src_x11_fg__joystick__x11.c:1.4
--- /dev/null   Thu Jan  9 23:34:57 2020
+++ pkgsrc/graphics/freeglut/patches/patch-src_x11_fg__joystick__x11.c  Thu Jan  9 23:34:57 2020
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_x11_fg__joystick__x11.c,v 1.4 2020/01/09 23:34:57 nia Exp $
+
+Resolve "undefined symbol fghJoystickRawRead" on SunOS
+
+From OpenIndiana:
+https://github.com/OpenIndiana/oi-userland/commit/ee89e22bb41ce7ac2a00065b85cf2c7f415543d2
+
+--- src/x11/fg_joystick_x11.c.orig     2019-09-11 13:24:28.000000000 +0000
++++ src/x11/fg_joystick_x11.c
+@@ -40,6 +40,7 @@
+ #endif
+ 
+ #include <fcntl.h>
++void fghJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes );
+ 
+ 
+ /* BSD defines from "jsBSD.cxx" around lines 42-270 */