flightgear: Update to 2019.1.1

Release notes:
http://wiki.flightgear.org/Changelog_2019.1

8 files changed, 33 insertions, 44 deletions

diff --git a/games/flightgear-data/Makefile b/games/flightgear-data/Makefile
index 3b77f814456..f56fcf7b6c9 100644
--- a/games/flightgear-data/Makefile
+++ b/games/flightgear-data/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2019/06/24 10:59:42 nia Exp $
+# $NetBSD: Makefile,v 1.10 2019/11/26 22:40:06 nia Exp $
 
-VERSION=	2018.3.2
+VERSION=	2019.1.1
 DISTNAME=	FlightGear-${VERSION}-data
 PKGNAME=	flightgear-data-${VERSION}
 CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=flightgear/release-2018.3/}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=flightgear/release-${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/games/flightgear-data/distinfo b/games/flightgear-data/distinfo
index 451b3f84abc..758d5b54517 100644
--- a/games/flightgear-data/distinfo
+++ b/games/flightgear-data/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2019/03/14 18:13:19 nia Exp $
+$NetBSD: distinfo,v 1.6 2019/11/26 22:40:06 nia Exp $
 
-SHA1 (FlightGear-2018.3.2-data.tar.bz2) = fd8545cecdfd805fae7b94510100219961c81fc9
-RMD160 (FlightGear-2018.3.2-data.tar.bz2) = 93e969ad72368ca064ff6b0d7d8633e0fa1983ea
-SHA512 (FlightGear-2018.3.2-data.tar.bz2) = 64baa8a42d6a6e930cc2a14e62f6f3488f08cb3121973aece8818275b8f4934a94539e24b95646d7c5bb8bd5eef65ff91d63013c07dabf79f452908b749640bb
-Size (FlightGear-2018.3.2-data.tar.bz2) = 1744998558 bytes
+SHA1 (FlightGear-2019.1.1-data.tar.bz2) = 8c1d8f9455e56198e70f0fb82e96b978eaf0516c
+RMD160 (FlightGear-2019.1.1-data.tar.bz2) = a0f2ef8da8ccd8ebda3f4e2083ba76a979361a1f
+SHA512 (FlightGear-2019.1.1-data.tar.bz2) = e5697f587c272036d3f5cfd7dcc7464e3eae7251e41425a91c80eabccbf711a6416a4746b5bf39a2806dc3d4f6839359483a0165899eb4ec812308b2b5da060a
+Size (FlightGear-2019.1.1-data.tar.bz2) = 1748213475 bytes
diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile
index 3fee25d08e7..0ba427e7677 100644
--- a/games/flightgear/Makefile
+++ b/games/flightgear/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.98 2019/11/07 12:38:05 wiz Exp $
+# $NetBSD: Makefile,v 1.99 2019/11/26 22:40:07 nia Exp $
 
-DISTNAME=	flightgear-2018.3.2
-PKGREVISION=	14
+DISTNAME=	flightgear-2019.1.1
 CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=flightgear/release-2018.3/}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=flightgear/release-${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -30,7 +29,7 @@ pre-configure:
 .include "../../audio/openal-soft/buildlink3.mk"
 .include "../../devel/boost-headers/buildlink3.mk"
 .include "../../games/plib/buildlink3.mk"
-BUILDLINK_API_DEPENDS.simgear+=	simgear>=2018.3.0
+BUILDLINK_API_DEPENDS.simgear+=	simgear>=2019.1.1
 .include "../../games/simgear/buildlink3.mk"
 .include "../../graphics/freeglut/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
diff --git a/games/flightgear/distinfo b/games/flightgear/distinfo
index d926d537c43..7e90b4814f5 100644
--- a/games/flightgear/distinfo
+++ b/games/flightgear/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.10 2019/03/14 18:13:18 nia Exp $
+$NetBSD: distinfo,v 1.11 2019/11/26 22:40:07 nia Exp $
 
-SHA1 (flightgear-2018.3.2.tar.bz2) = d70865c66492c688b2c3870984cc7346171609dc
-RMD160 (flightgear-2018.3.2.tar.bz2) = 796fd556e7668e85c4d08112521ccac9b91ed4fc
-SHA512 (flightgear-2018.3.2.tar.bz2) = 76a127949351fe48d847a1471002ecbc3daa769952fef7a7a141e83031771e87f4e23c329e9d03ddd2e99b4b96fb6af2ebe5ab90ca50c0111217c62492cd516d
-Size (flightgear-2018.3.2.tar.bz2) = 8405351 bytes
+SHA1 (flightgear-2019.1.1.tar.bz2) = 3ea81afd23701ea3c08515acd0ef84efdace0ba3
+RMD160 (flightgear-2019.1.1.tar.bz2) = ff8c00d498f2a529bede7a4fe12e9cfdf29c70e1
+SHA512 (flightgear-2019.1.1.tar.bz2) = edcc464af0bde4766e61137211276d77a6bb297567b0168dfaf3b97fdb9a595e5e8a0b84232680fcc975cf195261b9751edb79ae73123333feb31ab3d7215d8c
+Size (flightgear-2019.1.1.tar.bz2) = 8440986 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 --git a/games/simgear/Makefile b/games/simgear/Makefile
index d8a989ed563..9648a392d09 100644
--- a/games/simgear/Makefile
+++ b/games/simgear/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.95 2019/11/07 12:38:03 wiz Exp $
+# $NetBSD: Makefile,v 1.96 2019/11/26 22:40:07 nia Exp $
 
-DISTNAME=	simgear-2018.3.2
-PKGREVISION=	11
+DISTNAME=	simgear-2019.1.1
 CATEGORIES=	games devel
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=flightgear/release-2018.3/}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=flightgear/release-${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://home.flightgear.org/
+HOMEPAGE=	https://www.flightgear.org/
 COMMENT=	Simulator Construction Tools
 LICENSE=	gnu-lgpl-v2
 
diff --git a/games/simgear/PLIST b/games/simgear/PLIST
index a258133b898..b435cf80fcc 100644
--- a/games/simgear/PLIST
+++ b/games/simgear/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2019/03/15 13:59:05 nia Exp $
+@comment $NetBSD: PLIST,v 1.9 2019/11/26 22:40:07 nia Exp $
 include/simgear/bucket/newbucket.hxx
 include/simgear/bvh/BVHBoundingBoxVisitor.hxx
 include/simgear/bvh/BVHGroup.hxx
@@ -270,6 +270,7 @@ include/simgear/scene/util/QuadTreeBuilder.hxx
 include/simgear/scene/util/RenderConstants.hxx
 include/simgear/scene/util/SGDebugDrawCallback.hxx
 include/simgear/scene/util/SGEnlargeBoundingBox.hxx
+include/simgear/scene/util/SGImageUtils.hxx
 include/simgear/scene/util/SGNodeMasks.hxx
 include/simgear/scene/util/SGPickCallback.hxx
 include/simgear/scene/util/SGReaderWriterOptions.hxx
@@ -285,6 +286,11 @@ 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/Compositor.hxx
+include/simgear/scene/viewer/CompositorBuffer.hxx
+include/simgear/scene/viewer/CompositorPass.hxx
+include/simgear/scene/viewer/CompositorUtil.hxx
 include/simgear/screen/colors.hxx
 include/simgear/screen/extensions.hxx
 include/simgear/screen/screen-dump.hxx
diff --git a/games/simgear/distinfo b/games/simgear/distinfo
index c94e44e7859..26e68bfffb9 100644
--- a/games/simgear/distinfo
+++ b/games/simgear/distinfo
@@ -1,14 +1,13 @@
-$NetBSD: distinfo,v 1.9 2019/03/14 18:13:18 nia Exp $
+$NetBSD: distinfo,v 1.10 2019/11/26 22:40:07 nia Exp $
 
-SHA1 (simgear-2018.3.2.tar.bz2) = 3a71172145fdf32681fabcc90ae24787e20f6424
-RMD160 (simgear-2018.3.2.tar.bz2) = 65f8ec00c52ff18bb8e140b6d046acaeb9afdcd7
-SHA512 (simgear-2018.3.2.tar.bz2) = 3f60df34f22ea84bdb3e0aa0e2c0b73b2fddf15d17ea985aee254bf4c269b7447976629a7e4b022c460c7c406940d0b2669b723c6b899499d064cfe91546f0ba
-Size (simgear-2018.3.2.tar.bz2) = 1329982 bytes
+SHA1 (simgear-2019.1.1.tar.bz2) = 1564d9952ae7b539f59294efbbe826c16dd1582e
+RMD160 (simgear-2019.1.1.tar.bz2) = a2d0e96d008d47ef413f9e1ad71e9d2fa581bc6f
+SHA512 (simgear-2019.1.1.tar.bz2) = 83fe4330cf27b9298719f53f2fccde2af77bacdc6f430cc22c8bdfb475fe9b6e01578c1225af21e4e1433c7d2f2b00427454064f942359ba4c1e9896e7fe05d2
+Size (simgear-2019.1.1.tar.bz2) = 1370523 bytes
 SHA1 (patch-simgear_canvas_ShivaVG_src_shConfig.h) = d9e8befec2e7ecb8c79a1edddf74bea4e759d656
 SHA1 (patch-simgear_canvas_ShivaVG_src_shDefs.h) = 0da1544fecec002fb874fcb7df1155ad2889ba4d
 SHA1 (patch-simgear_io_test__repository.cxx) = 4369ea0b3eab47bed5b2b08ba8a56f86f83f77a0
 SHA1 (patch-simgear_io_test__untar.cxx) = b3625254f9410411b30a8c3e30845c3d1509a993
 SHA1 (patch-simgear_io_untar.cxx) = 2cc21468bd0319aae012fb7c16e9e279888e34e3
 SHA1 (patch-simgear_misc_strutils.cxx) = a72f601803ca285c778ccf12bfe25ff886a182cb
-SHA1 (patch-simgear_nasal_cppbind_NasalHash.hxx) = f741a9c1bd7511723f8ea35ed4400b2648c7605d
 SHA1 (patch-simgear_package_md5.h) = 91dc8741ed547c26a6de8ab8bd25ee441e0e5e92
diff --git a/games/simgear/patches/patch-simgear_nasal_cppbind_NasalHash.hxx b/games/simgear/patches/patch-simgear_nasal_cppbind_NasalHash.hxx
deleted file mode 100644
index 8e68a0ffcfc..00000000000
--- a/games/simgear/patches/patch-simgear_nasal_cppbind_NasalHash.hxx
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-simgear_nasal_cppbind_NasalHash.hxx,v 1.1 2019/03/14 18:13:18 nia Exp $
-
-Uses enable_if - don't rely on indirect inclusion.
-
---- simgear/nasal/cppbind/NasalHash.hxx.orig	2019-01-29 13:17:36.000000000 +0000
-+++ simgear/nasal/cppbind/NasalHash.hxx
-@@ -23,6 +23,7 @@
- #include "to_nasal.hxx"
- 
- #include <simgear/structure/map.hxx>
-+#include <boost/core/enable_if.hpp>
- #include <boost/iterator/iterator_facade.hpp>
- 
- namespace nasal