Wed May 11 15:34:28 2016 UTC ()
Pullup ticket #4984 - requested by joerg
games/flightgear: build fix

Revisions pulled up:
- games/flightgear/distinfo                                     1.7
- games/flightgear/patches/patch-src_Canvas_ShivaVG_src_shDefs.h 1.1

---
   Module Name:	pkgsrc
   Committed By:	joerg
   Date:		Sat May  7 09:56:57 UTC 2016

   Modified Files:
   	pkgsrc/games/flightgear: distinfo
   Added Files:
   	pkgsrc/games/flightgear/patches: patch-src_Canvas_ShivaVG_src_shDefs.h

   Log Message:
   Disable legacy request as it actually breaks with semi-modern Mesa
   version.


(bsiegert)
diff -r1.6 -r1.6.4.1 pkgsrc/games/flightgear/distinfo
diff -r0 -r1.1.2.2 pkgsrc/games/flightgear/patches/patch-src_Canvas_ShivaVG_src_shDefs.h
cvs diff -r1.6 -r1.6.4.1 pkgsrc/games/flightgear/distinfo (expand / switch to unified diff)

--- pkgsrc/games/flightgear/distinfo 2015/11/03 20:56:49 1.6
+++ pkgsrc/games/flightgear/distinfo 2016/05/11 15:34:27 1.6.4.1
@@ -1,13 +1,14 @@ @@ -1,13 +1,14 @@
1$NetBSD: distinfo,v 1.6 2015/11/03 20:56:49 agc Exp $ 1$NetBSD: distinfo,v 1.6.4.1 2016/05/11 15:34:27 bsiegert Exp $
2 2
3SHA1 (flightgear-2.8.0.tar.bz2) = fee4b2f1f6aca8e163ea018ae9897b99971c20bd 3SHA1 (flightgear-2.8.0.tar.bz2) = fee4b2f1f6aca8e163ea018ae9897b99971c20bd
4RMD160 (flightgear-2.8.0.tar.bz2) = 97d8f572aeb186bfed27eb5b06803a0fa5213a61 4RMD160 (flightgear-2.8.0.tar.bz2) = 97d8f572aeb186bfed27eb5b06803a0fa5213a61
5SHA512 (flightgear-2.8.0.tar.bz2) = 4d9b2584dd7c2fa4ad28d9769a9429809e420c7bf858967a5bb461f8ecb78dd079ff01c78febb95b7c3edce40dbf01e077bf7423324958e0b0a3cc74df12e1c1 5SHA512 (flightgear-2.8.0.tar.bz2) = 4d9b2584dd7c2fa4ad28d9769a9429809e420c7bf858967a5bb461f8ecb78dd079ff01c78febb95b7c3edce40dbf01e077bf7423324958e0b0a3cc74df12e1c1
6Size (flightgear-2.8.0.tar.bz2) = 2311023 bytes 6Size (flightgear-2.8.0.tar.bz2) = 2311023 bytes
7SHA1 (patch-CMakeModules_FindPLIB_cmake) = c5761d425743761f5f0c711ef2ca384a06f6d524 7SHA1 (patch-CMakeModules_FindPLIB_cmake) = c5761d425743761f5f0c711ef2ca384a06f6d524
8SHA1 (patch-src_Canvas_ShivaVG_src_shConfig_h) = bd70a1e41a59196e31789e38ec67e65cef546edf 8SHA1 (patch-src_Canvas_ShivaVG_src_shConfig_h) = bd70a1e41a59196e31789e38ec67e65cef546edf
 9SHA1 (patch-src_Canvas_ShivaVG_src_shDefs.h) = a71c8f03ccf871cda5bcc4c80a34a2df55c38b37
9SHA1 (patch-src_FDM_JSBSim_models_propulsion_FGEngine.cpp) = 9c066364096452868194f84d8c853131aec83f80 10SHA1 (patch-src_FDM_JSBSim_models_propulsion_FGEngine.cpp) = 9c066364096452868194f84d8c853131aec83f80
10SHA1 (patch-src_Main_locale_cxx) = 327f4103ff3aea60f2394a2ed192c5f6af36f60b 11SHA1 (patch-src_Main_locale_cxx) = 327f4103ff3aea60f2394a2ed192c5f6af36f60b
11SHA1 (patch-src_Network_ATC-Inputs_cxx) = 08644c682ddddcefea48aa84fa538b8fd20289c0 12SHA1 (patch-src_Network_ATC-Inputs_cxx) = 08644c682ddddcefea48aa84fa538b8fd20289c0
12SHA1 (patch-src_Network_ATC-Outputs_cxx) = d5367f8536988b2705b2ba4f8d86e28576b04648 13SHA1 (patch-src_Network_ATC-Outputs_cxx) = d5367f8536988b2705b2ba4f8d86e28576b04648
13SHA1 (patch-utils_TerraSync_terrasync_cxx) = 48855911a5052301f2c7a449ac8ff14ada9ae8ea 14SHA1 (patch-utils_TerraSync_terrasync_cxx) = 48855911a5052301f2c7a449ac8ff14ada9ae8ea
File Added: pkgsrc/games/flightgear/patches/Attic/patch-src_Canvas_ShivaVG_src_shDefs.h
$NetBSD: patch-src_Canvas_ShivaVG_src_shDefs.h,v 1.1.2.2 2016/05/11 15:34:27 bsiegert Exp $

On NetBSD7, glxext.h actually requires the typedefs from glext.h.

--- src/Canvas/ShivaVG/src/shDefs.h.orig	2016-05-06 14:28:17.000000000 +0000
+++ src/Canvas/ShivaVG/src/shDefs.h
@@ -167,7 +167,6 @@ SHfloat getMaxFloat();
     #include <GL/gl.h>
     #include <GL/glu.h>
 #else
-    #define GL_GLEXT_LEGACY /* don't include glext.h */
     #include <GL/gl.h>
     #include <GL/glu.h>
     #include <GL/glx.h>