svn commit: r424558 - in head: devel/simgear devel/simgear/files games/flightgear

[Ganael LAPLANCHE]

Author: martymac
Date: Mon Oct 24 10:13:49 2016
New Revision: 424558
URL: https://svnweb.freebsd.org/changeset/ports/424558

Log:
  Backport radio bug patch from upstream
  
  PR:		213650
  Submitted by:	russo at bogodyn.org

Added:
  head/devel/simgear/files/
  head/devel/simgear/files/patch-simgear-sound-soundmgr_openal.cxx   (contents, props changed)
Modified:
  head/devel/simgear/Makefile
  head/games/flightgear/Makefile

Modified: head/devel/simgear/Makefile
==============================================================================
--- head/devel/simgear/Makefile	Mon Oct 24 10:04:47 2016	(r424557)
+++ head/devel/simgear/Makefile	Mon Oct 24 10:13:49 2016	(r424558)
@@ -2,6 +2,7 @@
 
 PORTNAME=	simgear
 PORTVERSION=	2016.3.1
+PORTREVISION=	1
 CATEGORIES=	devel games
 MASTER_SITES=	SF/flightgear/release-${PORTVERSION:R}
 

Added: head/devel/simgear/files/patch-simgear-sound-soundmgr_openal.cxx
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/simgear/files/patch-simgear-sound-soundmgr_openal.cxx	Mon Oct 24 10:13:49 2016	(r424558)
@@ -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 )

Modified: head/games/flightgear/Makefile
==============================================================================
--- head/games/flightgear/Makefile	Mon Oct 24 10:04:47 2016	(r424557)
+++ head/games/flightgear/Makefile	Mon Oct 24 10:13:49 2016	(r424558)
@@ -3,6 +3,7 @@
 
 PORTNAME=	flightgear
 PORTVERSION=	2016.3.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF/flightgear/release-${PORTVERSION:R}