pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/games/flightgear
Module Name: pkgsrc
Committed By: nia
Date: Tue Dec 4 03:56:27 UTC 2018
Modified Files:
pkgsrc/games/flightgear: Makefile PLIST distinfo
Added Files:
pkgsrc/games/flightgear/patches:
patch-3rdparty_hts__engine__API_lib_HTS__misc.c
patch-3rdparty_iaxclient_lib_libiax2_src_iax.c
patch-3rdparty_joystick_jsNone.cxx
Removed Files:
pkgsrc/games/flightgear/patches: patch-CMakeModules_FindPLIB_cmake
patch-src_Canvas_ShivaVG_src_shConfig_h
patch-src_Canvas_ShivaVG_src_shDefs.h
patch-src_FDM_JSBSim_FGFDMExec.cpp
patch-src_FDM_JSBSim_input__output_FGScript.cpp
patch-src_FDM_JSBSim_models_FGInput.cpp
patch-src_FDM_JSBSim_models_propulsion_FGEngine.cpp
patch-src_Main_locale_cxx patch-src_Network_ATC-Inputs_cxx
patch-src_Network_ATC-Outputs_cxx
patch-utils_TerraSync_terrasync_cxx
Log Message:
flightgear: Update to 2018.2.2
To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 pkgsrc/games/flightgear/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/games/flightgear/PLIST
cvs rdiff -u -r1.8 -r1.9 pkgsrc/games/flightgear/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/games/flightgear/patches/patch-3rdparty_hts__engine__API_lib_HTS__misc.c \
pkgsrc/games/flightgear/patches/patch-3rdparty_iaxclient_lib_libiax2_src_iax.c \
pkgsrc/games/flightgear/patches/patch-3rdparty_joystick_jsNone.cxx
cvs rdiff -u -r1.1 -r0 \
pkgsrc/games/flightgear/patches/patch-CMakeModules_FindPLIB_cmake \
pkgsrc/games/flightgear/patches/patch-src_Canvas_ShivaVG_src_shConfig_h \
pkgsrc/games/flightgear/patches/patch-src_Canvas_ShivaVG_src_shDefs.h \
pkgsrc/games/flightgear/patches/patch-src_FDM_JSBSim_FGFDMExec.cpp \
pkgsrc/games/flightgear/patches/patch-src_FDM_JSBSim_input__output_FGScript.cpp \
pkgsrc/games/flightgear/patches/patch-src_FDM_JSBSim_models_FGInput.cpp \
pkgsrc/games/flightgear/patches/patch-src_FDM_JSBSim_models_propulsion_FGEngine.cpp \
pkgsrc/games/flightgear/patches/patch-src_Main_locale_cxx \
pkgsrc/games/flightgear/patches/patch-src_Network_ATC-Inputs_cxx \
pkgsrc/games/flightgear/patches/patch-src_Network_ATC-Outputs_cxx \
pkgsrc/games/flightgear/patches/patch-utils_TerraSync_terrasync_cxx
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/games/flightgear/Makefile
diff -u pkgsrc/games/flightgear/Makefile:1.78 pkgsrc/games/flightgear/Makefile:1.79
--- pkgsrc/games/flightgear/Makefile:1.78 Mon Dec 3 08:35:30 2018
+++ pkgsrc/games/flightgear/Makefile Tue Dec 4 03:56:27 2018
@@ -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 @@ LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1
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
+
+BUILDLINK_TRANSFORM+= l:glut:freeglut
-.include "../../mk/jpeg.buildlink3.mk"
-.include "../../audio/freealut/buildlink3.mk"
.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"
Index: pkgsrc/games/flightgear/PLIST
diff -u pkgsrc/games/flightgear/PLIST:1.3 pkgsrc/games/flightgear/PLIST:1.4
--- pkgsrc/games/flightgear/PLIST:1.3 Sun Sep 30 10:04:33 2012
+++ pkgsrc/games/flightgear/PLIST Tue Dec 4 03:56:27 2018
@@ -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
Index: pkgsrc/games/flightgear/distinfo
diff -u pkgsrc/games/flightgear/distinfo:1.8 pkgsrc/games/flightgear/distinfo:1.9
--- pkgsrc/games/flightgear/distinfo:1.8 Wed Feb 8 00:03:30 2017
+++ pkgsrc/games/flightgear/distinfo Tue Dec 4 03:56:27 2018
@@ -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
Added files:
Index: pkgsrc/games/flightgear/patches/patch-3rdparty_hts__engine__API_lib_HTS__misc.c
diff -u /dev/null pkgsrc/games/flightgear/patches/patch-3rdparty_hts__engine__API_lib_HTS__misc.c:1.1
--- /dev/null Tue Dec 4 03:56:27 2018
+++ pkgsrc/games/flightgear/patches/patch-3rdparty_hts__engine__API_lib_HTS__misc.c Tue Dec 4 03:56:27 2018
@@ -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__ */
Index: pkgsrc/games/flightgear/patches/patch-3rdparty_iaxclient_lib_libiax2_src_iax.c
diff -u /dev/null pkgsrc/games/flightgear/patches/patch-3rdparty_iaxclient_lib_libiax2_src_iax.c:1.1
--- /dev/null Tue Dec 4 03:56:27 2018
+++ pkgsrc/games/flightgear/patches/patch-3rdparty_iaxclient_lib_libiax2_src_iax.c Tue Dec 4 03:56:27 2018
@@ -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>
Index: pkgsrc/games/flightgear/patches/patch-3rdparty_joystick_jsNone.cxx
diff -u /dev/null pkgsrc/games/flightgear/patches/patch-3rdparty_joystick_jsNone.cxx:1.1
--- /dev/null Tue Dec 4 03:56:27 2018
+++ pkgsrc/games/flightgear/patches/patch-3rdparty_joystick_jsNone.cxx Tue Dec 4 03:56:27 2018
@@ -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;
+ }
Home |
Main Index |
Thread Index |
Old Index