svn commit: r378866 - in head/games/stormbaancoureur: . files

[Jan Beich]

Author: jbeich
Date: Thu Feb 12 10:04:07 2015
New Revision: 378866
URL: https://svnweb.freebsd.org/changeset/ports/378866
QAT: https://qat.redports.org/buildarchive/r378866/

Log:
  - Update to 2.1.6
  - Enable sound via alsa-lib
  
  Differential Revision:	https://reviews.freebsd.org/D1670
  Reviewed by:	amdmi3
  Approved by:	amdmi3 (maintainer)
  Approved by:	bapt (mentor)
  
  ChangeLog:
  * Point to new leaderboard server
  * Make name resolve non-fatal
  * Debian patch for gcc-4.4 integrated

Added:
  head/games/stormbaancoureur/files/extra-patch-src-common-soundenginealsa.cxx
     - copied, changed from r378809, head/games/stormbaancoureur/files/patch-src-common-soundenginealsa.cxx
  head/games/stormbaancoureur/files/extra-patch-src-common-soundenginealsa.h
     - copied unchanged from r378809, head/games/stormbaancoureur/files/patch-src-common-soundenginealsa.h
Deleted:
  head/games/stormbaancoureur/files/patch-src-common-soundenginealsa.cxx
  head/games/stormbaancoureur/files/patch-src-common-soundenginealsa.h
Modified:
  head/games/stormbaancoureur/Makefile
  head/games/stormbaancoureur/distinfo
  head/games/stormbaancoureur/files/patch-src-stormbaancoureur-Makefile
  head/games/stormbaancoureur/pkg-descr

Modified: head/games/stormbaancoureur/Makefile
==============================================================================
--- head/games/stormbaancoureur/Makefile	Thu Feb 12 09:23:27 2015	(r378865)
+++ head/games/stormbaancoureur/Makefile	Thu Feb 12 10:04:07 2015	(r378866)
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	stormbaancoureur
-PORTVERSION=	2.1.5
-PORTREVISION=	5
+PORTVERSION=	2.1.6
 CATEGORIES=	games
-MASTER_SITES=	http://bram.creative4vision.nl/stormbaancoureur/download/ \
+MASTER_SITES=	http://www.stolk.org/stormbaancoureur/download/ \
 		http://mirror.amdmi3.ru/distfiles/
 
 MAINTAINER=	amdmi3 at FreeBSD.org
@@ -25,7 +24,14 @@ PLIST_FILES=	bin/${PORTNAME}
 PORTDOCS=	*
 PORTDATA=	*
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	ALSA DOCS
+OPTIONS_DEFAULT=ALSA
+
+ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins
+ALSA_MAKE_ENV=		ALSA_LIBS="-lasound"
+ALSA_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-src-common-soundenginealsa.cxx \
+			${FILESDIR}/extra-patch-src-common-soundenginealsa.h
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|__DATADIR|"${DATADIR}"|' \

Modified: head/games/stormbaancoureur/distinfo
==============================================================================
--- head/games/stormbaancoureur/distinfo	Thu Feb 12 09:23:27 2015	(r378865)
+++ head/games/stormbaancoureur/distinfo	Thu Feb 12 10:04:07 2015	(r378866)
@@ -1,2 +1,2 @@
-SHA256 (stormbaancoureur-2.1.5.tar.gz) = cd18ec1bf68db37cb5e77081fdc2863da4f921a69438a274a62e61ab42b94be0
-SIZE (stormbaancoureur-2.1.5.tar.gz) = 3976376
+SHA256 (stormbaancoureur-2.1.6.tar.gz) = c6bd67695734fd430ce8e8d744710531ed4dae1bc78d5cd0529af930144e7903
+SIZE (stormbaancoureur-2.1.6.tar.gz) = 3976459

Copied and modified: head/games/stormbaancoureur/files/extra-patch-src-common-soundenginealsa.cxx (from r378809, head/games/stormbaancoureur/files/patch-src-common-soundenginealsa.cxx)
==============================================================================
--- head/games/stormbaancoureur/files/patch-src-common-soundenginealsa.cxx	Tue Feb 10 22:37:24 2015	(r378809, copy source)
+++ head/games/stormbaancoureur/files/extra-patch-src-common-soundenginealsa.cxx	Thu Feb 12 10:04:07 2015	(r378866)
@@ -189,7 +189,7 @@
 -  if (delay < (int) buffersz)
 -  {
 -    int todo = buffersz - delay;
--#if 0
+-#if 1
 -    int cnt  = (todo + periodsz-1) / periodsz; // Use this with pulse audio (fedora)
 -#else
 -    int cnt  = todo / periodsz; // Use this with all other alsa implementations

Copied: head/games/stormbaancoureur/files/extra-patch-src-common-soundenginealsa.h (from r378809, head/games/stormbaancoureur/files/patch-src-common-soundenginealsa.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/stormbaancoureur/files/extra-patch-src-common-soundenginealsa.h	Thu Feb 12 10:04:07 2015	(r378866, copy of r378809, head/games/stormbaancoureur/files/patch-src-common-soundenginealsa.h)
@@ -0,0 +1,21 @@
+--- src-common/soundenginealsa.h.orig	2008-01-03 07:29:23.000000000 +0300
++++ src-common/soundenginealsa.h	2008-02-09 00:52:09.000000000 +0300
+@@ -2,8 +2,6 @@
+ #ifndef SOUNDENGINE_ALSA_H
+ #define SOUNDENGINE_ALSA_H
+ 
+-#include <alsa/asoundlib.h>
+-
+ class SoundClip;
+ class SoundFeed;
+ class SoundFeedSimple;
+@@ -29,9 +27,6 @@
+     SoundFeedModulated *modulatedfeed;
+     SoundFeedEngine    *enginefeed;
+     SoundFeed          *activefeed;
+-    snd_pcm_t *handle;
+-    snd_pcm_uframes_t periodsz; // in frames
+-    snd_pcm_uframes_t buffersz; // in frames
+     int batchsize; // in periods
+     int framelag; // in frames
+     float lpfilter;

Modified: head/games/stormbaancoureur/files/patch-src-stormbaancoureur-Makefile
==============================================================================
--- head/games/stormbaancoureur/files/patch-src-stormbaancoureur-Makefile	Thu Feb 12 09:23:27 2015	(r378865)
+++ head/games/stormbaancoureur/files/patch-src-stormbaancoureur-Makefile	Thu Feb 12 10:04:07 2015	(r378866)
@@ -37,7 +37,7 @@
 +  $(LOCALBASE)/lib/libode.a \
    -lplibssgaux -lplibssg -lplibsg -lplibpu -lplibfnt -lplibul \
 -  -lglut -lGLU -lGL -lasound
-+  -lglut -lGLU -lGL
++  -lglut -lGLU -lGL $(ALSA_LIBS)
  
  
  all: stormbaancoureur

Modified: head/games/stormbaancoureur/pkg-descr
==============================================================================
--- head/games/stormbaancoureur/pkg-descr	Thu Feb 12 09:23:27 2015	(r378865)
+++ head/games/stormbaancoureur/pkg-descr	Thu Feb 12 10:04:07 2015	(r378866)
@@ -6,4 +6,4 @@ try to have the laws of physics work wit
 
 Stormbaan Coureur is a game by Bram Stolk.
 
-WWW: http://bram.creative4vision.nl/stormbaancoureur/
+WWW: http://www.stolk.org/stormbaancoureur/