Index: head/devel/simgear/Makefile =================================================================== --- head/devel/simgear/Makefile (revision 424557) +++ head/devel/simgear/Makefile (revision 424558) @@ -1,29 +1,30 @@ # $FreeBSD$ PORTNAME= simgear PORTVERSION= 2016.3.1 +PORTREVISION= 1 CATEGORIES= devel games MASTER_SITES= SF/flightgear/release-${PORTVERSION:R} MAINTAINER= martymac@FreeBSD.org COMMENT= Toolkit for 3D games and simulations 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/osg USE_XORG= ice sm x11 xext xi xmu xt USE_GL= gl glu glut USES= alias cmake compiler cpe jpeg openal:al,alut tar:bzip2 .include # When building with Gcc, needs Gcc 4.6+ .if ${COMPILER_TYPE} == gcc && ${COMPILER_VERSION} < 46 USE_GCC= yes .endif .include Index: head/devel/simgear/files/patch-simgear-sound-soundmgr_openal.cxx =================================================================== --- head/devel/simgear/files/patch-simgear-sound-soundmgr_openal.cxx (nonexistent) +++ head/devel/simgear/files/patch-simgear-sound-soundmgr_openal.cxx (revision 424558) @@ -0,0 +1,26 @@ +Backport commits b9deeb and a97c14 from upstream + +--- simgear/sound/soundmgr_openal.cxx.orig 2016-10-21 11:49:23.424814177 +0000 ++++ simgear/sound/soundmgr_openal.cxx 2016-10-21 11:49:47.078812408 +0000 +@@ -757,14 +757,14 @@ + bool SGSoundMgr::is_sample_stopped(SGSoundSample *sample) + { + #ifdef ENABLE_SOUND +- assert(sample->is_valid_source()); +- unsigned int source = sample->get_source(); +- int result; +- alGetSourcei( source, AL_SOURCE_STATE, &result ); +- return (result == AL_STOPPED); +-#else +- return true; ++ if ( sample->is_valid_source() ) { ++ ALint source = sample->get_source(); ++ ALint result; ++ alGetSourcei( source, AL_SOURCE_STATE, &result ); ++ return (result == AL_STOPPED); ++ } + #endif ++ return true; + } + + void SGSoundMgr::update_sample_config( SGSoundSample *sample, SGVec3d& position, SGVec3f& orientation, SGVec3f& velocity ) Property changes on: head/devel/simgear/files/patch-simgear-sound-soundmgr_openal.cxx ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/games/flightgear/Makefile =================================================================== --- head/games/flightgear/Makefile (revision 424557) +++ head/games/flightgear/Makefile (revision 424558) @@ -1,59 +1,60 @@ # Created by: Brian Buchanan # $FreeBSD$ PORTNAME= flightgear PORTVERSION= 2016.3.1 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF/flightgear/release-${PORTVERSION:R} MAINTAINER= martymac@FreeBSD.org COMMENT= The FlightGear flight simulator LICENSE= GPLv2 LIB_DEPENDS= libpng.so:graphics/png \ libboost_thread.so:devel/boost-libs \ libfltk.so:x11-toolkits/fltk \ libosg.so:graphics/osg \ libspeex.so:audio/speex \ libspeexdsp.so:audio/speexdsp \ libcurl.so:ftp/curl BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib \ ${LOCALBASE}/lib/libSimGearCore.a:devel/simgear RUN_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib \ ${LOCALBASE}/lib/libSimGearCore.a:devel/simgear \ ${LOCALBASE}/share/flightgear/version:games/flightgear-data USE_XORG= ice sm x11 xext xft xi xinerama xmu xt USE_GL= gl glu glut USE_QT5= core buildtools gui qmake widgets USES= alias cmake compiler cpe dos2unix jpeg openal:al,alut sqlite \ tar:bzip2 DOS2UNIX_REGEX= .*\.(c|h|cxx|cpp|hxx|hpp) CMAKE_ARGS+= -DENABLE_JS_SERVER:BOOL=ON \ -DSYSTEM_SQLITE:BOOL=ON \ -DFG_DATA_DIR:PATH=${LOCALBASE}/share/${PORTNAME} \ -DCMAKE_INSTALL_MANDIR:PATH=${MANPREFIX}/man \ -DFGCOM_DATA_PATH:PATH=${DATADIR} LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= DBUS OPTIONS_DEFAULT= DBUS DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus DBUS_USES= pkgconfig DBUS_CMAKE_ON= -DUSE_DBUS:BOOL=ON DBUS_CMAKE_OFF= -DUSE_DBUS:BOOL=OFF .include # Chase devel/simgear compiler version .if ${COMPILER_TYPE} == gcc && ${COMPILER_VERSION} < 46 USE_GCC= yes .endif post-install: ${INSTALL_PROGRAM} ${WRKSRC}/utils/js_server/js_server \ ${STAGEDIR}${PREFIX}/bin .include