Update Simgear & Flightgear to 2020.1.2

Changelog: http://wiki.flightgear.org/Changelog_2020.1
svn path=/head/; revision=537144
2024-12-30 05:40:06 +00:00 · 2020-05-31 09:49:05 +00:00 · 2020-05-31 09:49:05 +00:00 · f2d46c2654 · 2021-03-31 03:12:20 +00:00
commit f2d46c2654
parent 26305f4689
15 changed files with 95 additions and 129 deletions
--- a/devel/simgear/Makefile
+++ b/devel/simgear/Makefile
@ -1,8 +1,7 @@
 # $FreeBSD$

 PORTNAME=	simgear
-PORTVERSION=	2019.1.1
-PORTREVISION=	2
+PORTVERSION=	2020.1.2
 CATEGORIES=	devel games
 MASTER_SITES=	SF/flightgear/release-${PORTVERSION:R}

@ -14,7 +13,7 @@ LICENSE=	GPLv2
 BUILD_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib
 RUN_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib
 LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
-		libosg.so:graphics/osg34 \
+		libosg.so:graphics/osg \
 		libexpat.so:textproc/expat2 \
 		libcurl.so:ftp/curl

--- a/devel/simgear/distinfo
+++ b/devel/simgear/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1566505056
-SHA256 (simgear-2019.1.1.tar.bz2) = 201ed4cc841aa99e1c84acb3035a95fa36a77dd96c0dca290c46d21a290a548b
-SIZE (simgear-2019.1.1.tar.bz2) = 1370523
+TIMESTAMP = 1590834603
+SHA256 (simgear-2020.1.2.tar.bz2) = afc5563c9bfe1ddafd6767017b05a851e896539d6da3316bd10cf20db0e07889
+SIZE (simgear-2020.1.2.tar.bz2) = 1393059
--- a/devel/simgear/files/patch-simgear-misc-sg_path.cxx
+++ b/devel/simgear/files/patch-simgear-misc-sg_path.cxx
@ -0,0 +1,12 @@
+Add missing include for unlink(2) call
+
+--- simgear/misc/sg_path.cxx.orig	2020-05-22 20:11:33 UTC
+++ simgear/misc/sg_path.cxx
+@@ -31,6 +31,7 @@
+ 
+ #include <cstring>
+ #include <stdio.h>
+#include <unistd.h>
+ #include <sys/stat.h>
+ #include <errno.h>
+ #include <fstream>
--- a/devel/simgear/files/patch-simgear-nasal-cppbind-CMakeLists.txt
+++ b/devel/simgear/files/patch-simgear-nasal-cppbind-CMakeLists.txt
@ -0,0 +1,26 @@
+Skip test failing to build with Clang on FreeBSD:
+
+In file included from /wrkdirs/usr/ports/devel/simgear/work/simgear-2020.1.1/simgear/nasal/cppbind/test/cppbind_test_ghost.cxx:4:
+In file included from /wrkdirs/usr/ports/devel/simgear/work/simgear-2020.1.1/simgear/nasal/cppbind/test/TestContext.hxx:23:
+In file included from /wrkdirs/usr/ports/devel/simgear/work/simgear-2020.1.1/simgear/nasal/cppbind/NasalContext.hxx:125:
+In file included from /wrkdirs/usr/ports/devel/simgear/work/simgear-2020.1.1/simgear/nasal/cppbind/from_nasal.hxx:23:
+In file included from /wrkdirs/usr/ports/devel/simgear/work/simgear-2020.1.1/simgear/nasal/cppbind/detail/from_nasal_helper.hxx:23:
+/wrkdirs/usr/ports/devel/simgear/work/simgear-2020.1.1/simgear/nasal/cppbind/detail/nasal_traits.hxx:148:14: error: call to function 'get_pointer' that is neither visible in the template definition nor found by argument-dependent lookup
+
+--- simgear/nasal/cppbind/CMakeLists.txt.orig	2020-05-22 20:11:33 UTC
+++ simgear/nasal/cppbind/CMakeLists.txt
+@@ -35,10 +35,10 @@ set(SOURCES
+ simgear_component(nasal/cppbind nasal/cppbind "${SOURCES}" "${HEADERS}")
+ simgear_component(nasal/cppbind/detail nasal/cppbind/detail "" "${DETAIL_HEADERS}")
+ 
+-add_boost_test(cppbind_ghost
+-  SOURCES test/cppbind_test_ghost.cxx
+-  LIBRARIES ${TEST_LIBS}
+-)
+#add_boost_test(cppbind_ghost
+#  SOURCES test/cppbind_test_ghost.cxx
+#  LIBRARIES ${TEST_LIBS}
+#)
+ 
+ add_boost_test(cppbind_misc
+   SOURCES test/cppbind_test.cxx
--- a/devel/simgear/files/patch-simgear-package-md5.h
+++ b/devel/simgear/files/patch-simgear-package-md5.h
@ -1,5 +1,5 @@
--- simgear/package/md5.h.orig	2016-11-22 11:03:23.506026000 +0000
-+++ simgear/package/md5.h	2016-11-22 11:08:06.727103000 +0000
+--- simgear/package/md5.h.orig	2020-05-22 20:11:33 UTC
+++ simgear/package/md5.h
@@ -23,6 +23,8 @@
 typedef unsigned char    u_int8_t;
 typedef unsigned int     u_int32_t;
@ -9,10 +9,3 @@
 #endif
      
 #define	MD5_BLOCK_LENGTH		64
-@@ -49,4 +51,4 @@
- 
-      
- 
- 
-\ No newline at end of file
-+ 
--- a/devel/simgear/pkg-plist
+++ b/devel/simgear/pkg-plist
@ -60,6 +60,13 @@ include/simgear/debug/logstream.hxx
 include/simgear/embedded_resources/EmbeddedResource.hxx
 include/simgear/embedded_resources/EmbeddedResourceManager.hxx
 include/simgear/embedded_resources/EmbeddedResourceProxy.hxx
+include/simgear/emesary/Emesary.hxx
+include/simgear/emesary/INotification.hxx
+include/simgear/emesary/IReceiver.hxx
+include/simgear/emesary/ITransmitter.hxx
+include/simgear/emesary/ReceiptStatus.hxx
+include/simgear/emesary/Transmitter.hxx
+include/simgear/emesary/notifications.hxx
 include/simgear/environment/metar.hxx
 include/simgear/environment/precipitation.hxx
 include/simgear/ephemeris/celestialBody.hxx
@ -75,9 +82,6 @@ include/simgear/ephemeris/star.hxx
 include/simgear/ephemeris/stardata.hxx
 include/simgear/ephemeris/uranus.hxx
 include/simgear/ephemeris/venus.hxx
-include/simgear/io/iostreams/gzcontainerfile.hxx
-include/simgear/io/iostreams/gzfstream.hxx
-include/simgear/io/iostreams/sgstream.hxx
 include/simgear/io/DNSClient.hxx
 include/simgear/io/HTTPClient.hxx
 include/simgear/io/HTTPFileRequest.hxx
@ -86,6 +90,9 @@ include/simgear/io/HTTPRepository.hxx
 include/simgear/io/HTTPRequest.hxx
 include/simgear/io/iochannel.hxx
 include/simgear/io/iostreams/CharArrayStream.hxx
+include/simgear/io/iostreams/gzcontainerfile.hxx
+include/simgear/io/iostreams/gzfstream.hxx
+include/simgear/io/iostreams/sgstream.hxx
 include/simgear/io/iostreams/zlibstream.hxx
 include/simgear/io/lowlevel.hxx
 include/simgear/io/raw_socket.hxx
@ -139,10 +146,12 @@ include/simgear/misc/SVGpreserveAspectRatio.hxx
 include/simgear/misc/SimpleMarkdown.hxx
 include/simgear/misc/argparse.hxx
 include/simgear/misc/interpolator.hxx
+include/simgear/misc/lru_cache.hxx
 include/simgear/misc/make_new.hxx
 include/simgear/misc/sg_dir.hxx
 include/simgear/misc/sg_hash.hxx
 include/simgear/misc/sg_path.hxx
+include/simgear/misc/simgear_optional.hxx
 include/simgear/misc/stdint.hxx
 include/simgear/misc/stopwatch.hxx
 include/simgear/misc/strutils.hxx
@ -152,16 +161,17 @@ include/simgear/misc/texcoord.hxx
 include/simgear/nasal/cppbind/Ghost.hxx
 include/simgear/nasal/cppbind/NasalCallContext.hxx
 include/simgear/nasal/cppbind/NasalContext.hxx
+include/simgear/nasal/cppbind/NasalEmesaryInterface.hxx
 include/simgear/nasal/cppbind/NasalHash.hxx
 include/simgear/nasal/cppbind/NasalMe.hxx
 include/simgear/nasal/cppbind/NasalMethodHolder.hxx
 include/simgear/nasal/cppbind/NasalObject.hxx
 include/simgear/nasal/cppbind/NasalObjectHolder.hxx
 include/simgear/nasal/cppbind/NasalString.hxx
+include/simgear/nasal/cppbind/cppbind_fwd.hxx
 include/simgear/nasal/cppbind/detail/from_nasal_helper.hxx
 include/simgear/nasal/cppbind/detail/nasal_traits.hxx
 include/simgear/nasal/cppbind/detail/to_nasal_helper.hxx
-include/simgear/nasal/cppbind/cppbind_fwd.hxx
 include/simgear/nasal/cppbind/from_nasal.hxx
 include/simgear/nasal/cppbind/to_nasal.hxx
 include/simgear/nasal/iolib.h
@ -207,6 +217,7 @@ include/simgear/scene/model/ModelRegistry.hxx
 include/simgear/scene/model/PrimitiveCollector.hxx
 include/simgear/scene/model/SGClipGroup.hxx
 include/simgear/scene/model/SGInteractionAnimation.hxx
+include/simgear/scene/model/SGLight.hxx
 include/simgear/scene/model/SGMaterialAnimation.hxx
 include/simgear/scene/model/SGOffsetTransform.hxx
 include/simgear/scene/model/SGPickAnimation.hxx
@ -285,7 +296,7 @@ include/simgear/scene/util/UpdateOnceCallback.hxx
 include/simgear/scene/util/VectorArrayAdapter.hxx
 include/simgear/scene/util/parse_color.hxx
 include/simgear/scene/util/project.hxx
-include/simgear/scene/viewer/ClusteredForward.hxx
+include/simgear/scene/viewer/ClusteredShading.hxx
 include/simgear/scene/viewer/Compositor.hxx
 include/simgear/scene/viewer/CompositorBuffer.hxx
 include/simgear/scene/viewer/CompositorPass.hxx
@ -343,6 +354,6 @@ lib/cmake/SimGear/SimGearConfigVersion.cmake
 lib/cmake/SimGear/SimGearTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/SimGear/SimGearTargets.cmake
 lib/libSimGearCore.so
-lib/libSimGearCore.so.2019.1.1
+lib/libSimGearCore.so.2020.1.2
 lib/libSimGearScene.so
-lib/libSimGearScene.so.2019.1.1
+lib/libSimGearScene.so.2020.1.2
--- a/games/flightgear-data/Makefile
+++ b/games/flightgear-data/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	flightgear-data
-PORTVERSION=	2019.1.1
+PORTVERSION=	2020.1.2
 CATEGORIES=	games
 MASTER_SITES=	SF/flightgear/release-${PORTVERSION:R}
 DISTNAME=	FlightGear-${PORTVERSION}-data
--- a/games/flightgear-data/distinfo
+++ b/games/flightgear-data/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1566506031
-SHA256 (FlightGear-2019.1.1-data.tar.bz2) = 0ee261a4f916554e47ccc2acf889e0825fc22e0cc3880399278a2da83f04f593
-SIZE (FlightGear-2019.1.1-data.tar.bz2) = 1748213475
+TIMESTAMP = 1590515680
+SHA256 (FlightGear-2020.1.2-data.tar.bz2) = d3f30f76abb74df6f2e4736aa480baa2716581e8c4116b604acba249ca92ba51
+SIZE (FlightGear-2020.1.2-data.tar.bz2) = 1954932485
--- a/games/flightgear-terragear/Makefile
+++ b/games/flightgear-terragear/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	flightgear-terragear
 PORTVERSION=	20171007
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	games

 MAINTAINER=	ports@FreeBSD.org
--- a/games/flightgear/Makefile
+++ b/games/flightgear/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	flightgear
-PORTVERSION=	2019.1.1
-PORTREVISION=	2
+PORTVERSION=	2020.1.2
 CATEGORIES=	games
 MASTER_SITES=	SF/flightgear/release-${PORTVERSION:R}

@ -17,7 +16,7 @@ LIB_DEPENDS=	libpng.so:graphics/png \
 		libboost_thread.so:devel/boost-libs \
 		libfltk.so:x11-toolkits/fltk \
 		libfreetype.so:print/freetype2 \
-		libosg.so:graphics/osg34 \
+		libosg.so:graphics/osg \
 		libspeex.so:audio/speex \
 		libspeexdsp.so:audio/speexdsp \
 		libcurl.so:ftp/curl \
@ -37,6 +36,7 @@ USE_GL=		gl glew glu glut

 DOS2UNIX_REGEX=	.*\.(c|h|cxx|cpp|hxx|hpp)
 CMAKE_ARGS+=	-DSYSTEM_SQLITE:BOOL=ON \
+		-DENABLE_HID_INPUT:BOOL=OFF \
 		-DFG_DATA_DIR:PATH=${LOCALBASE}/share/${PORTNAME} \
 		-DCMAKE_INSTALL_MANDIR:PATH=${MANPREFIX}/man \
 		-DFGCOM_DATA_PATH:PATH=${DATADIR}
--- a/games/flightgear/distinfo
+++ b/games/flightgear/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1566506228
-SHA256 (flightgear-2019.1.1.tar.bz2) = d1dff396b9ee96d454dbce8e9ab1aedee9829ced5fd57bcaf999a68b00553ca1
-SIZE (flightgear-2019.1.1.tar.bz2) = 8440986
+TIMESTAMP = 1590610973
+SHA256 (flightgear-2020.1.2.tar.bz2) = 6b5f7c19968da2ddcdca12596b3ef7a3ddaf59c2a127d54cd7e0fca3f89be09c
+SIZE (flightgear-2020.1.2.tar.bz2) = 8504580
--- a/games/flightgear/files/patch-3rdparty-joystick-jsBSD.cxx
+++ b/games/flightgear/files/patch-3rdparty-joystick-jsBSD.cxx
@ -0,0 +1,10 @@
+--- 3rdparty/joystick/jsBSD.cxx.orig	2020-05-28 21:56:43 UTC
+++ 3rdparty/joystick/jsBSD.cxx
+@@ -52,6 +52,7 @@
+ #include <sys/param.h>
+ #include <fcntl.h>
+ 
+#include <unistd.h>
+ #include <string.h>
+ #include <errno.h>
+ #include <sys/ioctl.h>
--- a/games/flightgear/files/patch-PLIB-3rdparty-joystick-jsBSD.cxx
+++ b/games/flightgear/files/patch-PLIB-3rdparty-joystick-jsBSD.cxx
@ -1,67 +0,0 @@
-Import extra patch from x11-toolkits/plib
-
--- 3rdparty/joystick/jsBSD.cxx.orig	2018-05-30 23:47:01.351096000 +0200
-+++ 3rdparty/joystick/jsBSD.cxx	2018-05-30 23:47:28.474434000 +0200
-@@ -64,6 +64,7 @@
- #  else
- #    define HAVE_USBHID_H 1
- #    include <usbhid.h>
-+#    include <dev/usb/usb_ioctl.h>
- #  endif
- }
- #endif
-@@ -116,54 +117,12 @@
- static char *
- walkusbdev(int f, char *dev, char *out, int outlen)
- {
-  struct usb_device_info di;
-  int i, a;
-  char *cp;
-
-  for (a = 1; a < USB_MAX_DEVICES; a++) {
-    di.udi_addr = a;
-    if (ioctl(f, USB_DEVICEINFO, &di) != 0)
-      return NULL;
-    for (i = 0; i < USB_MAX_DEVNAMES; i++)
-      if (di.udi_devnames[i][0] &&
-          strcmp(di.udi_devnames[i], dev) == 0) {
-        cp = new char[strlen(di.udi_vendor) + strlen(di.udi_product) + 2];
-        strcpy(cp, di.udi_vendor);
-        strcat(cp, " ");
-        strcat(cp, di.udi_product);
-        strncpy(out, cp, outlen - 1);
-	out[outlen - 1] = 0;
-	delete cp;
-        return out;
-      }
-  }
-   return NULL;
- }
- 
- static int
- findusbdev(char *name, char *out, int outlen)
- {
-  int i, f;
-  char buf[50];
-  char *cp;
-  static int protection_warned = 0;
-
-  for (i = 0; i < 16; i++) {
-    sprintf(buf, "%s%d", USBDEV, i);
-    f = open(buf, O_RDONLY);
-    if (f >= 0) {
-      cp = walkusbdev(f, name, out, outlen);
-      close(f);
-      if (cp)
-        return 1;
-    } else if (errno == EACCES) {
-      if (!protection_warned) {
-        fprintf(stderr, "Can't open %s for read!\n",
-          buf);
-        protection_warned = 1;
-      }
-    }
-  }
-   return 0;
- }
- 
--- a/games/flightgear/files/patch-src-Input-FGLinuxEventInput.cxx
+++ b/games/flightgear/files/patch-src-Input-FGLinuxEventInput.cxx
@ -1,29 +0,0 @@
-Avoid crashing when udev_device_get_parent() returns a NULL pointer
-
-Backport from commit 66e6afb
-
--- src/Input/FGLinuxEventInput.cxx.orig
-+++ src/Input/FGLinuxEventInput.cxx
-@@ -481,13 +481,15 @@ void FGLinuxEventInput::postinit()
-     struct udev_device *dev = udev_device_new_from_syspath(udev, path);
-     const char * node = udev_device_get_devnode(dev);
-  
-    dev = udev_device_get_parent( dev );
-    const char * name = udev_device_get_sysattr_value(dev,"name");
-    const char * serial = udev_device_get_sysattr_value(dev, "serial");
-    SG_LOG(SG_INPUT,SG_DEBUG, "name=" << (name?name:"<null>") << ", node=" << (node?node:"<null>"));
-    if( name && node ) {
-      std::string serialString = serial ? serial : std::string{};
-      AddDevice( new FGLinuxInputDevice(name, node, serialString) );
-+    struct udev_device * parent_dev = udev_device_get_parent( dev );
-+    if ( parent_dev != NULL ) {
-+      const char * name = udev_device_get_sysattr_value(parent_dev,"name");
-+      const char * serial = udev_device_get_sysattr_value(parent_dev, "serial");
-+      SG_LOG(SG_INPUT,SG_DEBUG, "name=" << (name?name:"<null>") << ", node=" << (node?node:"<null>"));
-+      if( name && node ) {
-+        std::string serialString = serial ? serial : std::string{};
-+        AddDevice( new FGLinuxInputDevice(name, node, serialString) );
-+      }
-     }
- 
-     udev_device_unref(dev);
--- a/games/flightgear/files/patch-src-Input-fgjs.cxx
+++ b/games/flightgear/files/patch-src-Input-fgjs.cxx
@ -0,0 +1,11 @@
+--- src/Input/fgjs.cxx.orig	2020-05-28 21:56:43 UTC
+++ src/Input/fgjs.cxx
+@@ -38,6 +38,8 @@
+ #include <fstream>
+ #include <string>
+ 
+#include <unistd.h>
+
+ using std::fstream;
+ using std::cout;
+ using std::cin;