diff options
author | adam <adam@pkgsrc.org> | 2010-08-27 06:11:50 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2010-08-27 06:11:50 +0000 |
commit | 07a44308c030eee645d39aa0b1177a567f99d8ae (patch) | |
tree | 5ae9b3edf3613efac455ce938e4084ab1091b365 /games | |
parent | 2417243f39c8d315be50af5283910953924a758e (diff) | |
download | pkgsrc-07a44308c030eee645d39aa0b1177a567f99d8ae.tar.gz |
Changes 2.0.0:
* No changelog available.
Diffstat (limited to 'games')
-rw-r--r-- | games/simgear/Makefile | 31 | ||||
-rw-r--r-- | games/simgear/PLIST | 117 | ||||
-rw-r--r-- | games/simgear/buildlink3.mk | 4 | ||||
-rw-r--r-- | games/simgear/distinfo | 20 | ||||
-rw-r--r-- | games/simgear/patches/patch-aa | 52 | ||||
-rw-r--r-- | games/simgear/patches/patch-ab | 16 | ||||
-rw-r--r-- | games/simgear/patches/patch-ac | 21 | ||||
-rw-r--r-- | games/simgear/patches/patch-ad | 31 | ||||
-rw-r--r-- | games/simgear/patches/patch-ae | 6 | ||||
-rw-r--r-- | games/simgear/patches/patch-af | 8 | ||||
-rw-r--r-- | games/simgear/patches/patch-ag | 6 |
11 files changed, 176 insertions, 136 deletions
diff --git a/games/simgear/Makefile b/games/simgear/Makefile index c3414332e5e..353dbe60cb1 100644 --- a/games/simgear/Makefile +++ b/games/simgear/Makefile @@ -1,29 +1,30 @@ -# $NetBSD: Makefile,v 1.9 2010/01/18 09:58:53 wiz Exp $ -# +# $NetBSD: Makefile,v 1.10 2010/08/27 06:11:50 adam Exp $ -DISTNAME= SimGear-1.0.0 -PKGNAME= ${DISTNAME:S/SimGear/simgear/} -PKGREVISION= 2 -CATEGORIES= devel -MASTER_SITES= ftp://ftp.de.simgear.org/pub/simgear/Source/ +DISTNAME= SimGear-2.0.0 +PKGNAME= ${DISTNAME:tl} +CATEGORIES= games devel +MASTER_SITES= ftp://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/ \ + ftp://ftp.goflyflightgear.com/simgear/ -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.simgear.org/ -COMMENT= Simulator Construction Tools +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= http://simgear.sourceforge.net/ +COMMENT= Simulator Construction Tools PKG_DESTDIR_SUPPORT= user-destdir -MAKE_JOBS_SAFE= no - +USE_LANGUAGES= c c++ USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes -USE_LANGUAGES= c c++ +CONFIGURE_ARGS+= --with-jpeg-factory + +BUILDLINK_API_DEPENDS.plib+= plib>=1.8.4 -.include "../../audio/openal/buildlink3.mk" .include "../../audio/freealut/buildlink3.mk" +.include "../../audio/openal/buildlink3.mk" +.include "../../devel/boost-headers/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" -BUILDLINK_API_DEPENDS.plib+= plib>=1.8.4 .include "../../games/plib/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" +.include "../../graphics/osg/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/simgear/PLIST b/games/simgear/PLIST index 82ea1c56c1d..cc56c26d60c 100644 --- a/games/simgear/PLIST +++ b/games/simgear/PLIST @@ -1,10 +1,11 @@ -@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:56:56 joerg Exp $ +@comment $NetBSD: PLIST,v 1.4 2010/08/27 06:11:50 adam Exp $ include/simgear/bucket/newbucket.hxx include/simgear/compiler.h include/simgear/constants.h include/simgear/debug/debug_types.h include/simgear/debug/logstream.hxx include/simgear/environment/metar.hxx +include/simgear/environment/precipitation.hxx include/simgear/environment/visual_enviro.hxx include/simgear/ephemeris/celestialBody.hxx include/simgear/ephemeris/ephemeris.hxx @@ -25,28 +26,41 @@ include/simgear/io/sg_file.hxx include/simgear/io/sg_serial.hxx include/simgear/io/sg_socket.hxx include/simgear/io/sg_socket_udp.hxx +include/simgear/magvar/coremag.hxx include/simgear/magvar/magvar.hxx +include/simgear/math/Math.hxx +include/simgear/math/SGBox.hxx include/simgear/math/SGCMath.hxx include/simgear/math/SGGeoc.hxx include/simgear/math/SGGeod.hxx include/simgear/math/SGGeodesy.hxx +include/simgear/math/SGGeometry.hxx +include/simgear/math/SGGeometryFwd.hxx +include/simgear/math/SGIntersect.hxx include/simgear/math/SGLimits.hxx +include/simgear/math/SGLineSegment.hxx include/simgear/math/SGMath.hxx include/simgear/math/SGMathFwd.hxx include/simgear/math/SGMatrix.hxx include/simgear/math/SGMisc.hxx +include/simgear/math/SGPlane.hxx include/simgear/math/SGQuat.hxx +include/simgear/math/SGRay.hxx +include/simgear/math/SGSphere.hxx +include/simgear/math/SGTriangle.hxx +include/simgear/math/SGVec2.hxx include/simgear/math/SGVec3.hxx include/simgear/math/SGVec4.hxx +include/simgear/math/beziercurve.hxx include/simgear/math/interpolater.hxx include/simgear/math/leastsqs.hxx include/simgear/math/point3d.hxx include/simgear/math/polar3d.hxx include/simgear/math/sg_geodesy.hxx -include/simgear/math/sg_memory.h include/simgear/math/sg_random.h include/simgear/math/sg_types.hxx include/simgear/math/vector.hxx +include/simgear/misc/PathOptions.hxx include/simgear/misc/interpolator.hxx include/simgear/misc/sg_path.hxx include/simgear/misc/sgstream.hxx @@ -58,24 +72,62 @@ include/simgear/misc/texcoord.hxx include/simgear/misc/zfstream.hxx include/simgear/nasal/naref.h include/simgear/nasal/nasal.h +include/simgear/props/AtomicChangeListener.hxx +include/simgear/props/ExtendedPropertyAdapter.hxx include/simgear/props/condition.hxx include/simgear/props/props.hxx include/simgear/props/props_io.hxx include/simgear/route/route.hxx include/simgear/route/waypoint.hxx +include/simgear/scene/bvh/BVHBoundingBoxVisitor.hxx +include/simgear/scene/bvh/BVHDebugCollectVisitor.hxx +include/simgear/scene/bvh/BVHGroup.hxx +include/simgear/scene/bvh/BVHLineGeometry.hxx +include/simgear/scene/bvh/BVHLineSegmentVisitor.hxx +include/simgear/scene/bvh/BVHMotionTransform.hxx +include/simgear/scene/bvh/BVHNearestPointVisitor.hxx +include/simgear/scene/bvh/BVHNode.hxx +include/simgear/scene/bvh/BVHStaticBinary.hxx +include/simgear/scene/bvh/BVHStaticData.hxx +include/simgear/scene/bvh/BVHStaticGeometry.hxx +include/simgear/scene/bvh/BVHStaticGeometryBuilder.hxx +include/simgear/scene/bvh/BVHStaticLeaf.hxx +include/simgear/scene/bvh/BVHStaticNode.hxx +include/simgear/scene/bvh/BVHStaticTriangle.hxx +include/simgear/scene/bvh/BVHSubTreeCollector.hxx +include/simgear/scene/bvh/BVHTransform.hxx +include/simgear/scene/bvh/BVHVisitor.hxx +include/simgear/scene/material/Effect.hxx +include/simgear/scene/material/EffectBuilder.hxx +include/simgear/scene/material/EffectCullVisitor.hxx +include/simgear/scene/material/EffectGeode.hxx +include/simgear/scene/material/GLPredicate.hxx +include/simgear/scene/material/Pass.hxx +include/simgear/scene/material/Technique.hxx +include/simgear/scene/material/TextureBuilder.hxx include/simgear/scene/material/mat.hxx include/simgear/scene/material/matlib.hxx include/simgear/scene/material/matmodel.hxx +include/simgear/scene/model/CheckSceneryVisitor.hxx +include/simgear/scene/model/ModelRegistry.hxx +include/simgear/scene/model/SGClipGroup.hxx +include/simgear/scene/model/SGInteractionAnimation.hxx +include/simgear/scene/model/SGMaterialAnimation.hxx +include/simgear/scene/model/SGOffsetTransform.hxx +include/simgear/scene/model/SGPagedLOD.hxx +include/simgear/scene/model/SGReaderWriterXML.hxx +include/simgear/scene/model/SGReaderWriterXMLOptions.hxx +include/simgear/scene/model/SGRotateTransform.hxx +include/simgear/scene/model/SGScaleTransform.hxx +include/simgear/scene/model/SGText.hxx +include/simgear/scene/model/SGTranslateTransform.hxx include/simgear/scene/model/animation.hxx -include/simgear/scene/model/custtrans.hxx -include/simgear/scene/model/location.hxx include/simgear/scene/model/model.hxx include/simgear/scene/model/modellib.hxx -include/simgear/scene/model/personality.hxx +include/simgear/scene/model/particles.hxx include/simgear/scene/model/persparam.hxx include/simgear/scene/model/placement.hxx -include/simgear/scene/model/placementtrans.hxx -include/simgear/scene/model/shadowvolume.hxx +include/simgear/scene/sky/CloudShaderGeometry.hxx include/simgear/scene/sky/bbcache.hxx include/simgear/scene/sky/cloud.hxx include/simgear/scene/sky/cloudfield.hxx @@ -86,34 +138,73 @@ include/simgear/scene/sky/oursun.hxx include/simgear/scene/sky/sky.hxx include/simgear/scene/sky/sphere.hxx include/simgear/scene/sky/stars.hxx +include/simgear/scene/tgdb/GroundLightManager.hxx +include/simgear/scene/tgdb/ReaderWriterSTG.hxx +include/simgear/scene/tgdb/SGDirectionalLightBin.hxx +include/simgear/scene/tgdb/SGLightBin.hxx +include/simgear/scene/tgdb/SGOceanTile.hxx +include/simgear/scene/tgdb/SGReaderWriterBTG.hxx +include/simgear/scene/tgdb/SGReaderWriterBTGOptions.hxx +include/simgear/scene/tgdb/SGTexturedTriangleBin.hxx +include/simgear/scene/tgdb/SGTriangleBin.hxx +include/simgear/scene/tgdb/SGVasiDrawable.hxx +include/simgear/scene/tgdb/SGVertexArrayBin.hxx +include/simgear/scene/tgdb/ShaderGeometry.hxx +include/simgear/scene/tgdb/TileCache.hxx +include/simgear/scene/tgdb/TileEntry.hxx include/simgear/scene/tgdb/apt_signs.hxx -include/simgear/scene/tgdb/leaf.hxx include/simgear/scene/tgdb/obj.hxx include/simgear/scene/tgdb/pt_lights.hxx include/simgear/scene/tgdb/userdata.hxx -include/simgear/scene/tgdb/vasi.hxx +include/simgear/scene/util/CopyOp.hxx +include/simgear/scene/util/NodeAndDrawableVisitor.hxx +include/simgear/scene/util/PrimitiveUtils.hxx +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/SGNodeMasks.hxx +include/simgear/scene/util/SGPickCallback.hxx +include/simgear/scene/util/SGSceneFeatures.hxx +include/simgear/scene/util/SGSceneUserData.hxx +include/simgear/scene/util/SGStateAttributeVisitor.hxx +include/simgear/scene/util/SGTextureStateAttributeVisitor.hxx +include/simgear/scene/util/SGUpdateVisitor.hxx +include/simgear/scene/util/SplicingVisitor.hxx +include/simgear/scene/util/StateAttributeFactory.hxx +include/simgear/scene/util/UpdateOnceCallback.hxx +include/simgear/scene/util/VectorArrayAdapter.hxx include/simgear/screen/RenderTexture.h include/simgear/screen/colors.hxx include/simgear/screen/extensions.hxx +include/simgear/screen/jpgfactory.hxx include/simgear/screen/screen-dump.hxx include/simgear/screen/shader.h -include/simgear/screen/texture.hxx include/simgear/screen/tr.h include/simgear/serial/serial.hxx include/simgear/sg_inlines.h -include/simgear/sg_traits.hxx +include/simgear/sound/sample_group.hxx include/simgear/sound/sample_openal.hxx include/simgear/sound/soundmgr_openal.hxx include/simgear/sound/xmlsound.hxx +include/simgear/structure/OSGUtils.hxx +include/simgear/structure/OSGVersion.hxx +include/simgear/structure/SGAtomic.hxx +include/simgear/structure/SGBinding.hxx +include/simgear/structure/SGExpression.hxx include/simgear/structure/SGReferenced.hxx include/simgear/structure/SGSharedPtr.hxx include/simgear/structure/SGSmplhist.hxx include/simgear/structure/SGSmplstat.hxx +include/simgear/structure/SGWeakPtr.hxx +include/simgear/structure/SGWeakReferenced.hxx +include/simgear/structure/Singleton.hxx +include/simgear/structure/StringTable.hxx include/simgear/structure/callback.hxx include/simgear/structure/commands.hxx include/simgear/structure/event_mgr.hxx include/simgear/structure/exception.hxx -include/simgear/structure/ssgSharedPtr.hxx +include/simgear/structure/intern.hxx include/simgear/structure/subsystem_mgr.hxx include/simgear/threads/SGGuard.hxx include/simgear/threads/SGQueue.hxx @@ -126,6 +217,7 @@ include/simgear/timing/timezone.h include/simgear/version.h include/simgear/xml/easyxml.hxx lib/libsgbucket.a +lib/libsgbvh.a lib/libsgdebug.a lib/libsgenvironment.a lib/libsgephem.a @@ -146,4 +238,5 @@ lib/libsgstructure.a lib/libsgtgdb.a lib/libsgthreads.a lib/libsgtiming.a +lib/libsgutil.a lib/libsgxml.a diff --git a/games/simgear/buildlink3.mk b/games/simgear/buildlink3.mk index a562b3685e9..e01bad81859 100644 --- a/games/simgear/buildlink3.mk +++ b/games/simgear/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2010/01/18 09:58:53 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2010/08/27 06:11:50 adam Exp $ BUILDLINK_TREE+= simgear @@ -6,7 +6,7 @@ BUILDLINK_TREE+= simgear SIMGEAR_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.simgear+= simgear>=1.0.0 -BUILDLINK_ABI_DEPENDS.simgear?= simgear>=1.0.0nb2 +BUILDLINK_ABI_DEPENDS.simgear+= simgear>=1.0.0nb2 BUILDLINK_PKGSRCDIR.simgear?= ../../games/simgear BUILDLINK_DEPMETHOD.simgear?= build diff --git a/games/simgear/distinfo b/games/simgear/distinfo index 500630139a3..37f5728b82d 100644 --- a/games/simgear/distinfo +++ b/games/simgear/distinfo @@ -1,12 +1,10 @@ -$NetBSD: distinfo,v 1.3 2008/03/14 14:49:53 drochner Exp $ +$NetBSD: distinfo,v 1.4 2010/08/27 06:11:50 adam Exp $ -SHA1 (SimGear-1.0.0.tar.gz) = cad6cc8a205005731633d8dec994cfa299f90e8a -RMD160 (SimGear-1.0.0.tar.gz) = 62f260d55d621221076fafb703593f6c4e3c9d53 -Size (SimGear-1.0.0.tar.gz) = 769214 bytes -SHA1 (patch-aa) = 53ca007000b147e966d82317869b91dae8827c3a -SHA1 (patch-ab) = 9df1dbe00731e95e561d9d2e5a3eaaada79693ef -SHA1 (patch-ac) = 0c3b22ab6cd2e3093e66f2fafd1b2bfcb57fe425 -SHA1 (patch-ad) = ebe7a273a53a527299c44774ee989d99b780c6b0 -SHA1 (patch-ae) = 466b9ec8f8e7e41d389795b6d9f365cf4313ec5f -SHA1 (patch-af) = 47decffedf577d5b50166eec658c868d38f0c830 -SHA1 (patch-ag) = dbcba9fde4989560b9ee3df9ae07666758d12d18 +SHA1 (SimGear-2.0.0.tar.gz) = 38dfd5644903670bdf1405e771c73aca6d43b595 +RMD160 (SimGear-2.0.0.tar.gz) = 5e1488804053cfc9e205384997ddd788e9b5fe83 +Size (SimGear-2.0.0.tar.gz) = 1058343 bytes +SHA1 (patch-aa) = 654a1f8eb75c0f983d3284a1f68af5f7494cf85d +SHA1 (patch-ab) = 5bbb254eaa4b8224bf6a6cf8864419ab1a6f77fd +SHA1 (patch-ae) = 3ca2e00721a4ec3c36e64190e127b745833cb9eb +SHA1 (patch-af) = df17bc401501493e4130a0be7a3e73380396dfa8 +SHA1 (patch-ag) = 1815edcd98cbcbbce2390faa2dd0aae665676e4d diff --git a/games/simgear/patches/patch-aa b/games/simgear/patches/patch-aa index 56441b85b29..8db530b5e71 100644 --- a/games/simgear/patches/patch-aa +++ b/games/simgear/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.3 2008/03/14 14:49:53 drochner Exp $ +$NetBSD: patch-aa,v 1.4 2010/08/27 06:11:50 adam Exp $ ---- configure.orig 2008-01-21 16:52:07.000000000 +0200 -+++ configure 2008-01-21 16:58:07.000000000 +0200 -@@ -2249,7 +2249,7 @@ +--- configure.orig 2010-02-17 16:05:40.000000000 +0000 ++++ configure +@@ -2477,7 +2477,7 @@ if test "${with_cxx+set}" = set; then ## CFLAGS= ;; esac @@ -11,20 +11,20 @@ $NetBSD: patch-aa,v 1.3 2008/03/14 14:49:53 drochner Exp $ CXX_DEBUG_FLAGS="-g +K0" ;; esac -@@ -7064,9 +7064,9 @@ +@@ -7483,9 +7483,9 @@ $as_echo "$ac_cv_header_pthread_h" >&6; fi --{ echo "$as_me:$LINENO: checking for library containing pthread_exit" >&5 --echo $ECHO_N "checking for library containing pthread_exit... $ECHO_C" >&6; } +-{ $as_echo "$as_me:$LINENO: checking for library containing pthread_exit" >&5 +-$as_echo_n "checking for library containing pthread_exit... " >&6; } -if test "${ac_cv_search_pthread_exit+set}" = set; then -+{ echo "$as_me:$LINENO: checking for library containing pthread_create" >&5 -+echo $ECHO_N "checking for library containing pthread_create... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for library containing pthread_create" >&5 ++$as_echo_n "checking for library containing pthread_create... " >&6; } +if test "${ac_cv_search_pthread_create+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS -@@ -7083,11 +7083,11 @@ +@@ -7502,11 +7502,11 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif @@ -38,18 +38,18 @@ $NetBSD: patch-aa,v 1.3 2008/03/14 14:49:53 drochner Exp $ ; return 0; } -@@ -7133,7 +7133,7 @@ - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +@@ -7539,7 +7539,7 @@ $as_echo "$ac_try_echo") >&5 + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then - ac_cv_search_pthread_exit=$ac_res + ac_cv_search_pthread_create=$ac_res else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -@@ -7143,21 +7143,21 @@ - - rm -f core conftest.err conftest.$ac_objext \ +@@ -7550,21 +7550,21 @@ fi + rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext - if test "${ac_cv_search_pthread_exit+set}" = set; then + if test "${ac_cv_search_pthread_create+set}" = set; then @@ -66,16 +66,16 @@ $NetBSD: patch-aa,v 1.3 2008/03/14 14:49:53 drochner Exp $ rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi --{ echo "$as_me:$LINENO: result: $ac_cv_search_pthread_exit" >&5 --echo "${ECHO_T}$ac_cv_search_pthread_exit" >&6; } +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_pthread_exit" >&5 +-$as_echo "$ac_cv_search_pthread_exit" >&6; } -ac_res=$ac_cv_search_pthread_exit -+{ echo "$as_me:$LINENO: result: $ac_cv_search_pthread_create" >&5 -+echo "${ECHO_T}$ac_cv_search_pthread_create" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_pthread_create" >&5 ++$as_echo "$ac_cv_search_pthread_create" >&6; } +ac_res=$ac_cv_search_pthread_create if test "$ac_res" != no; then test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -@@ -7167,7 +7167,7 @@ +@@ -7574,7 +7574,7 @@ if test "x$ac_cv_header_pthread_h" = "xy CXXFLAGS="$CXXFLAGS -D_REENTRANT" CFLAGS="$CFLAGS -D_REENTRANT" @@ -84,7 +84,7 @@ $NetBSD: patch-aa,v 1.3 2008/03/14 14:49:53 drochner Exp $ CXXFLAGS="-pthread $CXXFLAGS" CFLAGS="-pthread $CFLAGS" fi -@@ -9233,7 +9233,7 @@ +@@ -9724,7 +9724,7 @@ fi esac @@ -93,7 +93,7 @@ $NetBSD: patch-aa,v 1.3 2008/03/14 14:49:53 drochner Exp $ echo echo "You *must* have the openal library installed on your system to build" echo "SimGear!" -@@ -9244,7 +9244,7 @@ +@@ -9735,7 +9735,7 @@ if test "$OPENAL_OK" == "no"; then exit fi diff --git a/games/simgear/patches/patch-ab b/games/simgear/patches/patch-ab index 93ed875304e..2a5492c4661 100644 --- a/games/simgear/patches/patch-ab +++ b/games/simgear/patches/patch-ab @@ -1,17 +1,17 @@ -$NetBSD: patch-ab,v 1.1.1.1 2007/07/12 19:56:14 drochner Exp $ +$NetBSD: patch-ab,v 1.2 2010/08/27 06:11:50 adam Exp $ ---- simgear/scene/sky/cloud.cxx.orig 2007-07-12 19:52:40.000000000 +0200 +--- simgear/scene/sky/cloud.cxx.orig 2010-02-17 15:39:21.000000000 +0000 +++ simgear/scene/sky/cloud.cxx -@@ -27,7 +27,7 @@ - #include <simgear/compiler.h> +@@ -28,7 +28,7 @@ + + #include <sstream> - // #include <stdio.h> -#include <math.h> +#include <cmath> - #include <plib/sg.h> - #include <plib/ssg.h> -@@ -724,7 +724,7 @@ bool SGCloudLayer::reposition( sgVec3 p, + #include <simgear/structure/OSGVersion.hxx> + #include <osg/AlphaFunc> +@@ -695,7 +695,7 @@ bool SGCloudLayer::reposition( const SGV // this happens, lets just use the last known good course. // This is a hack, and it would probably be better to make // calc_gc_course_dist() more robust. diff --git a/games/simgear/patches/patch-ac b/games/simgear/patches/patch-ac deleted file mode 100644 index 323d864a380..00000000000 --- a/games/simgear/patches/patch-ac +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 2007/07/12 19:56:14 drochner Exp $ - ---- simgear/scene/sky/cloudfield.cxx.orig 2007-07-12 19:58:48.000000000 +0200 -+++ simgear/scene/sky/cloudfield.cxx -@@ -34,6 +34,7 @@ - - #include STL_ALGORITHM - #include <vector> -+#include <cmath> - - SG_USING_STD(vector); - -@@ -175,7 +176,7 @@ void SGCloudField::reposition( sgVec3 p, - // this happens, lets just use the last known good course. - // This is a hack, and it would probably be better to make - // calc_gc_course_dist() more robust. -- if ( isnan(course) ) { -+ if ( std::isnan(course) ) { - course = last_course; - } else { - last_course = course; diff --git a/games/simgear/patches/patch-ad b/games/simgear/patches/patch-ad deleted file mode 100644 index 4974282bb5f..00000000000 --- a/games/simgear/patches/patch-ad +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-ad,v 1.1.1.1 2007/07/12 19:56:14 drochner Exp $ - ---- simgear/sound/soundmgr_openal.cxx.orig 2007-07-12 20:01:48.000000000 +0200 -+++ simgear/sound/soundmgr_openal.cxx -@@ -37,6 +37,8 @@ - # include <AL/alc.h> - #endif - -+#include <cmath> -+ - #if defined (__APPLE__) - # ifdef __GNUC__ - # if ( __GNUC__ >= 3 ) && ( __GNUC_MINOR__ >= 3 ) -@@ -310,7 +312,7 @@ bool SGSoundMgr::stop( const string& ref - - // set source position of all managed sounds - void SGSoundMgr::set_source_pos_all( ALfloat *pos ) { -- if ( isnan(pos[0]) || isnan(pos[1]) || isnan(pos[2]) ) { -+ if ( std::isnan(pos[0]) || std::isnan(pos[1]) || std::isnan(pos[2]) ) { - // bail if a bad position is passed in - return; - } -@@ -326,7 +328,7 @@ void SGSoundMgr::set_source_pos_all( ALf - - // set source velocity of all managed sounds - void SGSoundMgr::set_source_vel_all( ALfloat *vel ) { -- if ( isnan(vel[0]) || isnan(vel[1]) || isnan(vel[2]) ) { -+ if ( std::isnan(vel[0]) || std::isnan(vel[1]) || std::isnan(vel[2]) ) { - // bail if a bad velocity is passed in - return; - } diff --git a/games/simgear/patches/patch-ae b/games/simgear/patches/patch-ae index 163fb210ecc..90c8018e796 100644 --- a/games/simgear/patches/patch-ae +++ b/games/simgear/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.1 2007/10/05 21:06:00 joerg Exp $ +$NetBSD: patch-ae,v 1.2 2010/08/27 06:11:50 adam Exp $ ---- configure.ac.orig 2007-10-05 20:03:36.000000000 +0000 +--- configure.ac.orig 2010-02-17 15:56:16.000000000 +0000 +++ configure.ac -@@ -163,12 +163,12 @@ dnl Checks for libraries. +@@ -200,12 +200,12 @@ dnl Checks for libraries. dnl Thread related checks AC_CHECK_HEADER(pthread.h) diff --git a/games/simgear/patches/patch-af b/games/simgear/patches/patch-af index 443e79df741..ec47344524a 100644 --- a/games/simgear/patches/patch-af +++ b/games/simgear/patches/patch-af @@ -1,9 +1,9 @@ -$NetBSD: patch-af,v 1.1 2007/10/05 21:06:01 joerg Exp $ +$NetBSD: patch-af,v 1.2 2010/08/27 06:11:50 adam Exp $ ---- simgear/screen/extensions.cxx.orig 2007-10-05 20:08:51.000000000 +0000 +--- simgear/screen/extensions.cxx.orig 2010-02-17 15:39:22.000000000 +0000 +++ simgear/screen/extensions.cxx -@@ -119,11 +119,7 @@ void *SGGetGLProcAddress(const char *fun - if (libHandle != NULL) { +@@ -145,11 +145,7 @@ void *SGGetGLProcAddress(const char *fun + } else if (libHandle != NULL) { fptr = dlsym(libHandle, func); -#if defined (__FreeBSD__) diff --git a/games/simgear/patches/patch-ag b/games/simgear/patches/patch-ag index 4e0a44b05fc..04fbec7ee1e 100644 --- a/games/simgear/patches/patch-ag +++ b/games/simgear/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.1 2008/03/14 14:49:53 drochner Exp $ +$NetBSD: patch-ag,v 1.2 2010/08/27 06:11:50 adam Exp $ ---- simgear/screen/extensions.hxx.orig 2008-03-11 18:46:27.000000000 +0100 +--- simgear/screen/extensions.hxx.orig 2010-02-17 15:39:22.000000000 +0000 +++ simgear/screen/extensions.hxx -@@ -415,6 +415,7 @@ typedef BOOL (APIENTRY * wglSetPbufferAt +@@ -409,6 +409,7 @@ typedef BOOL (APIENTRY * wglSetPbufferAt /* GLX pcific OpenGL extenstions */ #include <GL/glx.h> |