Date: Sun, 31 May 2020 09:49:06 +0000 (UTC) From: Ganael LAPLANCHE <martymac@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r537144 - in head: devel/simgear devel/simgear/files games/flightgear games/flightgear-data games/flightgear-terragear games/flightgear/files Message-ID: <202005310949.04V9n6mB031328@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: martymac Date: Sun May 31 09:49:05 2020 New Revision: 537144 URL: https://svnweb.freebsd.org/changeset/ports/537144 Log: Update Simgear & Flightgear to 2020.1.2 Changelog: http://wiki.flightgear.org/Changelog_2020.1 Added: head/devel/simgear/files/patch-simgear-misc-sg_path.cxx (contents, props changed) head/devel/simgear/files/patch-simgear-nasal-cppbind-CMakeLists.txt (contents, props changed) head/games/flightgear/files/patch-3rdparty-joystick-jsBSD.cxx (contents, props changed) head/games/flightgear/files/patch-src-Input-fgjs.cxx (contents, props changed) Deleted: head/games/flightgear/files/patch-PLIB-3rdparty-joystick-jsBSD.cxx head/games/flightgear/files/patch-src-Input-FGLinuxEventInput.cxx Modified: head/devel/simgear/Makefile head/devel/simgear/distinfo head/devel/simgear/files/patch-simgear-package-md5.h head/devel/simgear/pkg-plist head/games/flightgear-data/Makefile head/games/flightgear-data/distinfo head/games/flightgear-terragear/Makefile head/games/flightgear/Makefile head/games/flightgear/distinfo Modified: head/devel/simgear/Makefile ============================================================================== --- head/devel/simgear/Makefile Sun May 31 09:39:20 2020 (r537143) +++ head/devel/simgear/Makefile Sun May 31 09:49:05 2020 (r537144) @@ -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 Modified: head/devel/simgear/distinfo ============================================================================== --- head/devel/simgear/distinfo Sun May 31 09:39:20 2020 (r537143) +++ head/devel/simgear/distinfo Sun May 31 09:49:05 2020 (r537144) @@ -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 Added: head/devel/simgear/files/patch-simgear-misc-sg_path.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/simgear/files/patch-simgear-misc-sg_path.cxx Sun May 31 09:49:05 2020 (r537144) @@ -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> Added: head/devel/simgear/files/patch-simgear-nasal-cppbind-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/simgear/files/patch-simgear-nasal-cppbind-CMakeLists.txt Sun May 31 09:49:05 2020 (r537144) @@ -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 Modified: head/devel/simgear/files/patch-simgear-package-md5.h ============================================================================== --- head/devel/simgear/files/patch-simgear-package-md5.h Sun May 31 09:39:20 2020 (r537143) +++ head/devel/simgear/files/patch-simgear-package-md5.h Sun May 31 09:49:05 2020 (r537144) @@ -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 -+ Modified: head/devel/simgear/pkg-plist ============================================================================== --- head/devel/simgear/pkg-plist Sun May 31 09:39:20 2020 (r537143) +++ head/devel/simgear/pkg-plist Sun May 31 09:49:05 2020 (r537144) @@ -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 Modified: head/games/flightgear-data/Makefile ============================================================================== --- head/games/flightgear-data/Makefile Sun May 31 09:39:20 2020 (r537143) +++ head/games/flightgear-data/Makefile Sun May 31 09:49:05 2020 (r537144) @@ -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 Modified: head/games/flightgear-data/distinfo ============================================================================== --- head/games/flightgear-data/distinfo Sun May 31 09:39:20 2020 (r537143) +++ head/games/flightgear-data/distinfo Sun May 31 09:49:05 2020 (r537144) @@ -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 Modified: head/games/flightgear-terragear/Makefile ============================================================================== --- head/games/flightgear-terragear/Makefile Sun May 31 09:39:20 2020 (r537143) +++ head/games/flightgear-terragear/Makefile Sun May 31 09:49:05 2020 (r537144) @@ -2,7 +2,7 @@ PORTNAME= flightgear-terragear PORTVERSION= 20171007 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= games MAINTAINER= ports@FreeBSD.org Modified: head/games/flightgear/Makefile ============================================================================== --- head/games/flightgear/Makefile Sun May 31 09:39:20 2020 (r537143) +++ head/games/flightgear/Makefile Sun May 31 09:49:05 2020 (r537144) @@ -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} Modified: head/games/flightgear/distinfo ============================================================================== --- head/games/flightgear/distinfo Sun May 31 09:39:20 2020 (r537143) +++ head/games/flightgear/distinfo Sun May 31 09:49:05 2020 (r537144) @@ -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 Added: head/games/flightgear/files/patch-3rdparty-joystick-jsBSD.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/flightgear/files/patch-3rdparty-joystick-jsBSD.cxx Sun May 31 09:49:05 2020 (r537144) @@ -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> Added: head/games/flightgear/files/patch-src-Input-fgjs.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/flightgear/files/patch-src-Input-fgjs.cxx Sun May 31 09:49:05 2020 (r537144) @@ -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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005310949.04V9n6mB031328>