pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/games/flightgear flightgear: Update to 2018.2.2



details:   https://anonhg.NetBSD.org/pkgsrc/rev/cb7683fefff9
branches:  trunk
changeset: 388334:cb7683fefff9
user:      nia <nia%pkgsrc.org@localhost>
date:      Tue Dec 04 03:56:27 2018 +0000

description:
flightgear: Update to 2018.2.2

diffstat:

 games/flightgear/Makefile                                                    |  26 ++++----
 games/flightgear/PLIST                                                       |  31 ++++++++-
 games/flightgear/distinfo                                                    |  24 ++-----
 games/flightgear/patches/patch-3rdparty_hts__engine__API_lib_HTS__misc.c     |  15 ++++
 games/flightgear/patches/patch-3rdparty_iaxclient_lib_libiax2_src_iax.c      |  15 ++++
 games/flightgear/patches/patch-3rdparty_joystick_jsNone.cxx                  |  30 +++++++++
 games/flightgear/patches/patch-CMakeModules_FindPLIB_cmake                   |  25 --------
 games/flightgear/patches/patch-src_Canvas_ShivaVG_src_shConfig_h             |  18 -----
 games/flightgear/patches/patch-src_Canvas_ShivaVG_src_shDefs.h               |  14 ----
 games/flightgear/patches/patch-src_FDM_JSBSim_FGFDMExec.cpp                  |  13 ----
 games/flightgear/patches/patch-src_FDM_JSBSim_input__output_FGScript.cpp     |  19 ------
 games/flightgear/patches/patch-src_FDM_JSBSim_models_FGInput.cpp             |  13 ----
 games/flightgear/patches/patch-src_FDM_JSBSim_models_propulsion_FGEngine.cpp |  22 -------
 games/flightgear/patches/patch-src_Main_locale_cxx                           |  15 ----
 games/flightgear/patches/patch-src_Network_ATC-Inputs_cxx                    |  23 -------
 games/flightgear/patches/patch-src_Network_ATC-Outputs_cxx                   |  23 -------
 games/flightgear/patches/patch-utils_TerraSync_terrasync_cxx                 |  15 ----
 17 files changed, 108 insertions(+), 233 deletions(-)

diffs (truncated from 443 to 300 lines):

diff -r b953af7ed066 -r cb7683fefff9 games/flightgear/Makefile
--- a/games/flightgear/Makefile Tue Dec 04 01:01:14 2018 +0000
+++ b/games/flightgear/Makefile Tue Dec 04 03:56:27 2018 +0000
@@ -1,11 +1,8 @@
-# $NetBSD: Makefile,v 1.78 2018/12/03 08:35:30 wiz Exp $
+# $NetBSD: Makefile,v 1.79 2018/12/04 03:56:27 nia Exp $
 
-DISTNAME=      flightgear-2.8.0
-PKGREVISION=   48
+DISTNAME=      flightgear-2018.2.2
 CATEGORIES=    games
-MASTER_SITES=  ftp://ftp.flightgear.org/pub/fgfs/Source/
-MASTER_SITES+= http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Source/
-MASTER_SITES+= ftp://ftp.kingmont.com/flightsims/flightgear/Source/
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=flightgear/release-2018.2/}
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -16,19 +13,22 @@
 USE_LANGUAGES=         c c++
 USE_PKGLOCALEDIR=      yes
 USE_CMAKE=             yes
-CMAKE_ARGS+=           -DJPEG_FACTORY:BOOL=ON
-CMAKE_ARGS+=           -DENABLE_LIBSVN:BOOL=OFF
-CMAKE_ARGS+=           -DENABLE_FGADMIN:BOOL=OFF
+LDFLAGS.NetBSD+=       -lexecinfo
 
-.include "../../mk/jpeg.buildlink3.mk"
-.include "../../audio/freealut/buildlink3.mk"
+BUILDLINK_TRANSFORM+=  l:glut:freeglut
+
 .include "../../audio/openal-soft/buildlink3.mk"
-.include "../../devel/SDL/buildlink3.mk"
 .include "../../devel/boost-headers/buildlink3.mk"
 .include "../../games/plib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.simgear+=        simgear>=2.0.0
 .include "../../games/simgear/buildlink3.mk"
-.include "../../graphics/glut/buildlink3.mk"
+.include "../../graphics/freeglut/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/glew/buildlink3.mk"
 .include "../../graphics/osg/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXi/buildlink3.mk"
+.include "../../x11/libXmu/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r b953af7ed066 -r cb7683fefff9 games/flightgear/PLIST
--- a/games/flightgear/PLIST    Tue Dec 04 01:01:14 2018 +0000
+++ b/games/flightgear/PLIST    Tue Dec 04 03:56:27 2018 +0000
@@ -1,19 +1,42 @@
-@comment $NetBSD: PLIST,v 1.3 2012/09/30 10:04:33 dholland Exp $
+@comment $NetBSD: PLIST,v 1.4 2018/12/04 03:56:27 nia Exp $
 bin/GPSsmooth
+bin/JSBSim
 bin/MIDGsmooth
 bin/UGsmooth
+bin/fgcom
+bin/fgelev
 bin/fgfs
 bin/fgjs
 bin/fgpanel
+bin/fgtraffic
 bin/fgviewer
 bin/js_demo
 bin/metar
-bin/terrasync
 bin/yasim
 bin/yasim-proptest
+man/it/man1/GPSsmooth.1
+man/it/man1/JSBSim.1
+man/it/man1/MIDGsmooth.1
+man/it/man1/UGsmooth.1
+man/it/man1/fgcom.1
+man/it/man1/fgelev.1
+man/it/man1/fgfs.1
+man/it/man1/fgjs.1
+man/it/man1/fgpanel.1
+man/it/man1/fgviewer.1
+man/it/man1/js_demo.1
+man/it/man1/metar.1
+man/it/man5/fgfsrc.5
+man/man1/GPSsmooth.1
+man/man1/JSBSim.1
+man/man1/MIDGsmooth.1
+man/man1/UGsmooth.1
+man/man1/fgcom.1
+man/man1/fgelev.1
 man/man1/fgfs.1
 man/man1/fgjs.1
 man/man1/fgpanel.1
-man/man1/gl-info.1
+man/man1/fgviewer.1
 man/man1/js_demo.1
-man/man1/terrasync.1
+man/man1/metar.1
+man/man5/fgfsrc.5
diff -r b953af7ed066 -r cb7683fefff9 games/flightgear/distinfo
--- a/games/flightgear/distinfo Tue Dec 04 01:01:14 2018 +0000
+++ b/games/flightgear/distinfo Tue Dec 04 03:56:27 2018 +0000
@@ -1,17 +1,9 @@
-$NetBSD: distinfo,v 1.8 2017/02/08 00:03:30 joerg Exp $
+$NetBSD: distinfo,v 1.9 2018/12/04 03:56:27 nia Exp $
 
-SHA1 (flightgear-2.8.0.tar.bz2) = fee4b2f1f6aca8e163ea018ae9897b99971c20bd
-RMD160 (flightgear-2.8.0.tar.bz2) = 97d8f572aeb186bfed27eb5b06803a0fa5213a61
-SHA512 (flightgear-2.8.0.tar.bz2) = 4d9b2584dd7c2fa4ad28d9769a9429809e420c7bf858967a5bb461f8ecb78dd079ff01c78febb95b7c3edce40dbf01e077bf7423324958e0b0a3cc74df12e1c1
-Size (flightgear-2.8.0.tar.bz2) = 2311023 bytes
-SHA1 (patch-CMakeModules_FindPLIB_cmake) = c5761d425743761f5f0c711ef2ca384a06f6d524
-SHA1 (patch-src_Canvas_ShivaVG_src_shConfig_h) = bd70a1e41a59196e31789e38ec67e65cef546edf
-SHA1 (patch-src_Canvas_ShivaVG_src_shDefs.h) = a71c8f03ccf871cda5bcc4c80a34a2df55c38b37
-SHA1 (patch-src_FDM_JSBSim_FGFDMExec.cpp) = 251d84aa2cfdd854f5b3061bbb5cff4ad382f5a8
-SHA1 (patch-src_FDM_JSBSim_input__output_FGScript.cpp) = e683fecdc1d01df3029c1d23923c3d63145ce29b
-SHA1 (patch-src_FDM_JSBSim_models_FGInput.cpp) = fa044c54b02c39857b5df183f183c04fdc2e2b11
-SHA1 (patch-src_FDM_JSBSim_models_propulsion_FGEngine.cpp) = 9c066364096452868194f84d8c853131aec83f80
-SHA1 (patch-src_Main_locale_cxx) = 327f4103ff3aea60f2394a2ed192c5f6af36f60b
-SHA1 (patch-src_Network_ATC-Inputs_cxx) = 08644c682ddddcefea48aa84fa538b8fd20289c0
-SHA1 (patch-src_Network_ATC-Outputs_cxx) = d5367f8536988b2705b2ba4f8d86e28576b04648
-SHA1 (patch-utils_TerraSync_terrasync_cxx) = 48855911a5052301f2c7a449ac8ff14ada9ae8ea
+SHA1 (flightgear-2018.2.2.tar.bz2) = 7bf06d3ad218ce4e99eede7aa250fbdf938eb7a3
+RMD160 (flightgear-2018.2.2.tar.bz2) = 1af2854949ab282c0bb0e19e79756b9ee54f25c6
+SHA512 (flightgear-2018.2.2.tar.bz2) = f845fcd24e14a4d3abba5f6011d6fe61d4c8ab587989b597c2ab16d75711e9dc6808d6c91e2ba56ff7d644278bc10e09c116e82ba0f6391b03c5bc84a546f440
+Size (flightgear-2018.2.2.tar.bz2) = 8346698 bytes
+SHA1 (patch-3rdparty_hts__engine__API_lib_HTS__misc.c) = 78de7201192e73f6f032ffcadd5ec2f63423390f
+SHA1 (patch-3rdparty_iaxclient_lib_libiax2_src_iax.c) = d6ae7b47253c1ba8f79e42cde27189d32e603eea
+SHA1 (patch-3rdparty_joystick_jsNone.cxx) = 4a662c71f97dd2d5093f09d4631d672e5278f082
diff -r b953af7ed066 -r cb7683fefff9 games/flightgear/patches/patch-3rdparty_hts__engine__API_lib_HTS__misc.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/games/flightgear/patches/patch-3rdparty_hts__engine__API_lib_HTS__misc.c  Tue Dec 04 03:56:27 2018 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-3rdparty_hts__engine__API_lib_HTS__misc.c,v 1.1 2018/12/04 03:56:27 nia Exp $
+
+Support NetBSD.
+
+--- 3rdparty/hts_engine_API/lib/HTS_misc.c.orig        2018-06-03 18:56:53.000000000 +0000
++++ 3rdparty/hts_engine_API/lib/HTS_misc.c
+@@ -247,6 +247,8 @@ size_t HTS_ftell(HTS_File * fp)
+       fgetpos((FILE *) fp->pointer, &pos);
+ #if defined(_WIN32) || defined(__CYGWIN__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__ANDROID__)
+       return (size_t) pos;
++#elif defined(__NetBSD__)
++      return (size_t) pos._pos;
+ #else
+       return (size_t) pos.__pos;
+ #endif                          /* _WIN32 || __CYGWIN__ || __APPLE__ || __ANDROID__ */
diff -r b953af7ed066 -r cb7683fefff9 games/flightgear/patches/patch-3rdparty_iaxclient_lib_libiax2_src_iax.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/games/flightgear/patches/patch-3rdparty_iaxclient_lib_libiax2_src_iax.c   Tue Dec 04 03:56:27 2018 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-3rdparty_iaxclient_lib_libiax2_src_iax.c,v 1.1 2018/12/04 03:56:27 nia Exp $
+
+Support NetBSD.
+
+--- 3rdparty/iaxclient/lib/libiax2/src/iax.c.orig      2018-06-03 18:56:53.000000000 +0000
++++ 3rdparty/iaxclient/lib/libiax2/src/iax.c
+@@ -73,7 +73,7 @@
+ #include <time.h>
+ 
+ // FlightGear: Modified to include FreeBSD
+-#if !defined(MACOSX) && !defined(__OpenBSD__) && !defined(__FreeBSD__)
++#if !defined(MACOSX) && !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__NetBSD__)
+ #include <malloc.h>
+ #if !defined(SOLARIS)
+ #include <error.h>
diff -r b953af7ed066 -r cb7683fefff9 games/flightgear/patches/patch-3rdparty_joystick_jsNone.cxx
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/games/flightgear/patches/patch-3rdparty_joystick_jsNone.cxx       Tue Dec 04 03:56:27 2018 +0000
@@ -0,0 +1,30 @@
+$NetBSD: patch-3rdparty_joystick_jsNone.cxx,v 1.1 2018/12/04 03:56:27 nia Exp $
+
+TRUE is undefined...
+
+--- 3rdparty/joystick/jsNone.cxx.orig  2018-06-03 18:56:53.000000000 +0000
++++ 3rdparty/joystick/jsNone.cxx
+@@ -27,20 +27,20 @@ struct os_specific_s ;
+ 
+ void jsJoystick::open ()
+ {
+-  error = TRUE ;
++  error = JS_TRUE ;
+   num_axes = num_buttons = 0 ;
+ }
+ 
+ 
+ void jsJoystick::close ()
+ {
+-  error = TRUE ;
++  error = JS_TRUE ;
+ }
+ 
+ 
+ jsJoystick::jsJoystick ( int ident )
+ {
+-  error = TRUE ;
++  error = JS_TRUE ;
+   num_axes = num_buttons = 0 ;
+   os = NULL;
+ }
diff -r b953af7ed066 -r cb7683fefff9 games/flightgear/patches/patch-CMakeModules_FindPLIB_cmake
--- a/games/flightgear/patches/patch-CMakeModules_FindPLIB_cmake        Tue Dec 04 01:01:14 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-$NetBSD: patch-CMakeModules_FindPLIB_cmake,v 1.1 2012/09/30 10:04:33 dholland Exp $
-
-Recognize BSDs other than FreeBSD.
-
---- CMakeModules/FindPLIB.cmake~       2012-08-16 14:20:57.000000000 +0000
-+++ CMakeModules/FindPLIB.cmake
-@@ -169,6 +169,18 @@ if(${haveJs} GREATER -1)
-         find_library(USBHID_LIBRARY usbhid)
-         # check_function_exists(hidinit)
-         set(JS_LIBS ${USBHID_LIBRARY})
-+    elseif(CMAKE_SYSTEM_NAME MATCHES "NetBSD")
-+        find_library(USBHID_LIBRARY usbhid)
-+        # check_function_exists(hidinit)
-+        set(JS_LIBS ${USBHID_LIBRARY})
-+    elseif(CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
-+        find_library(USBHID_LIBRARY usbhid)
-+        # check_function_exists(hidinit)
-+        set(JS_LIBS ${USBHID_LIBRARY})
-+    elseif(CMAKE_SYSTEM_NAME MATCHES "DragonFly")
-+        find_library(USBHID_LIBRARY usbhid)
-+        # check_function_exists(hidinit)
-+        set(JS_LIBS ${USBHID_LIBRARY})
-     else()
-         message(WARNING "Unsupported platform for PLIB JS libs")
-     endif()
diff -r b953af7ed066 -r cb7683fefff9 games/flightgear/patches/patch-src_Canvas_ShivaVG_src_shConfig_h
--- a/games/flightgear/patches/patch-src_Canvas_ShivaVG_src_shConfig_h  Tue Dec 04 01:01:14 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-$NetBSD: patch-src_Canvas_ShivaVG_src_shConfig_h,v 1.1 2012/09/30 10:04:33 dholland Exp $
-
-This sublibrary insists on being able to work out its OS type, and
-only knows a few, even though it uses the results for just about
-nothing. So give it some crayons to play with.
-
---- src/Canvas/ShivaVG/src/shConfig.h~ 2012-08-16 14:20:56.000000000 +0000
-+++ src/Canvas/ShivaVG/src/shConfig.h
-@@ -34,7 +34,8 @@
- #else
- 
-     // Unsupported system
--    #error This operating system is not supported by SFML library
-+    //#error This operating system is not supported by SFML library
-+    #define VG_API_OTHER
- 
- #endif
- 
diff -r b953af7ed066 -r cb7683fefff9 games/flightgear/patches/patch-src_Canvas_ShivaVG_src_shDefs.h
--- a/games/flightgear/patches/patch-src_Canvas_ShivaVG_src_shDefs.h    Tue Dec 04 01:01:14 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_Canvas_ShivaVG_src_shDefs.h,v 1.1 2016/05/07 09:56:57 joerg 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>
diff -r b953af7ed066 -r cb7683fefff9 games/flightgear/patches/patch-src_FDM_JSBSim_FGFDMExec.cpp
--- a/games/flightgear/patches/patch-src_FDM_JSBSim_FGFDMExec.cpp       Tue Dec 04 01:01:14 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_FDM_JSBSim_FGFDMExec.cpp,v 1.1 2017/02/08 00:03:30 joerg Exp $
-
---- src/FDM/JSBSim/FGFDMExec.cpp.orig  2017-01-09 15:19:01.104940701 +0000
-+++ src/FDM/JSBSim/FGFDMExec.cpp
-@@ -188,7 +188,7 @@ FGFDMExec::~FGFDMExec()
- 
-   PropertyCatalog.clear();
- 
--  if (FDMctr > 0) (*FDMctr)--;
-+  if (FDMctr) (*FDMctr)--;
- 
-   Debug(1);
- }
diff -r b953af7ed066 -r cb7683fefff9 games/flightgear/patches/patch-src_FDM_JSBSim_input__output_FGScript.cpp
--- a/games/flightgear/patches/patch-src_FDM_JSBSim_input__output_FGScript.cpp  Tue Dec 04 01:01:14 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-$NetBSD: patch-src_FDM_JSBSim_input__output_FGScript.cpp,v 1.1 2017/02/08 00:03:30 joerg Exp $
-
---- src/FDM/JSBSim/input_output/FGScript.cpp.orig      2017-01-09 15:19:43.879132741 +0000
-+++ src/FDM/JSBSim/input_output/FGScript.cpp
-@@ -185,12 +185,12 @@ bool FGScript::LoadScript(string script,
-   }
- 
-   // Now, read input spec if given.
--  if (input_element > 0) {
-+  if (input_element) {
-     FDMExec->GetInput()->Load(input_element);



Home | Main Index | Thread Index | Old Index