CVS commit: pkgsrc/graphics/freeglut

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Mon Oct 21 09:38:08 UTC 2019

Modified Files:
        pkgsrc/graphics/freeglut: distinfo
Added Files:
        pkgsrc/graphics/freeglut/patches: patch-src_x11_fg__internal__x11.h

Log Message:
freeglut: patch away use of machine/joystick.h on netbsd, for the x11
code as well. meant to help aarch64 builds.

when machine/joystick.h exists, it just includes sys/joystick.h.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/graphics/freeglut/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/freeglut/patches/patch-src_x11_fg__internal__x11.h

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/distinfo
diff -u pkgsrc/graphics/freeglut/distinfo:1.13 pkgsrc/graphics/freeglut/distinfo:1.14
--- pkgsrc/graphics/freeglut/distinfo:1.13      Wed Oct  9 23:52:10 2019
+++ pkgsrc/graphics/freeglut/distinfo   Mon Oct 21 09:38:08 2019
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.13 2019/10/09 23:52:10 maya Exp $
+$NetBSD: distinfo,v 1.14 2019/10/21 09:38:08 maya 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_wayland_fg__internal__wl.h) = c1bc21cf6fa7fcb37395db172a805e60071cbbd6
+SHA1 (patch-src_x11_fg__internal__x11.h) = 3a7cfc4b274f5c8d6da2c3ce109877ffac6c0bfa

Added files:

Index: pkgsrc/graphics/freeglut/patches/patch-src_x11_fg__internal__x11.h
diff -u /dev/null pkgsrc/graphics/freeglut/patches/patch-src_x11_fg__internal__x11.h:1.1
--- /dev/null   Mon Oct 21 09:38:08 2019
+++ pkgsrc/graphics/freeglut/patches/patch-src_x11_fg__internal__x11.h  Mon Oct 21 09:38:08 2019
@@ -0,0 +1,26 @@
+$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))