diff options
author | nia <nia@pkgsrc.org> | 2020-01-09 23:34:57 +0000 |
---|---|---|
committer | nia <nia@pkgsrc.org> | 2020-01-09 23:34:57 +0000 |
commit | 3bd523266bbda2d4bd26d9ebd8cbca0162df2831 (patch) | |
tree | 8245233e3ad038fb0f25b971003106e7b4a77d65 /graphics | |
parent | 4c7d10f19558630507f9c8916f8fa044144462c2 (diff) | |
download | pkgsrc-3bd523266bbda2d4bd26d9ebd8cbca0162df2831.tar.gz |
freeglut: Resolve "undefined symbol fghJoystickRawRead" on SunOS
From OpenIndiana:
https://github.com/OpenIndiana/oi-userland/commit/ee89e22bb41ce7ac2a00065b85cf2c7f415543d2
Bump PKGREVISION
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/freeglut/Makefile | 3 | ||||
-rw-r--r-- | graphics/freeglut/distinfo | 4 | ||||
-rw-r--r-- | graphics/freeglut/patches/patch-src_fg__joystick.c | 18 | ||||
-rw-r--r-- | graphics/freeglut/patches/patch-src_x11_fg__joystick__x11.c | 17 |
4 files changed, 40 insertions, 2 deletions
diff --git a/graphics/freeglut/Makefile b/graphics/freeglut/Makefile index 973f07082d2..f054db7c1a3 100644 --- a/graphics/freeglut/Makefile +++ b/graphics/freeglut/Makefile @@ -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/} diff --git a/graphics/freeglut/distinfo b/graphics/freeglut/distinfo index 641f2b0d473..c9d1832c496 100644 --- a/graphics/freeglut/distinfo +++ b/graphics/freeglut/distinfo @@ -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 diff --git a/graphics/freeglut/patches/patch-src_fg__joystick.c b/graphics/freeglut/patches/patch-src_fg__joystick.c new file mode 100644 index 00000000000..2484b89b5d7 --- /dev/null +++ b/graphics/freeglut/patches/patch-src_fg__joystick.c @@ -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; + diff --git a/graphics/freeglut/patches/patch-src_x11_fg__joystick__x11.c b/graphics/freeglut/patches/patch-src_x11_fg__joystick__x11.c new file mode 100644 index 00000000000..d89c1015078 --- /dev/null +++ b/graphics/freeglut/patches/patch-src_x11_fg__joystick__x11.c @@ -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 */ |