Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 28 Aug 2013 04:10:41 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r325502 - in head/games/zaz: . files
Message-ID:  <201308280410.r7S4AfYE006923@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Wed Aug 28 04:10:40 2013
New Revision: 325502
URL: http://svnweb.freebsd.org/changeset/ports/325502

Log:
  - Fix build with clang

Added:
  head/games/zaz/files/
  head/games/zaz/files/patch-src-mixer.cpp   (contents, props changed)
  head/games/zaz/files/patch-src-mixer.h   (contents, props changed)
Modified:
  head/games/zaz/Makefile

Modified: head/games/zaz/Makefile
==============================================================================
--- head/games/zaz/Makefile	Wed Aug 28 04:10:32 2013	(r325501)
+++ head/games/zaz/Makefile	Wed Aug 28 04:10:40 2013	(r325502)
@@ -26,16 +26,16 @@ CONFIGURE_ARGS=	--with-icondir="${PREFIX
 
 PORTDOCS=	*
 
-# Unconditially disable NLS for now: the game segfaults with 8bit locales
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
+# Unconditially disable NLS for now: the game segfaults with 8bit locales
+#.if ${PORT_OPTIONS:MNLS}
+#USES+=		gettext
+#PLIST_SUB+=	NLS=""
+#.else
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
-.endif
+#.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^zazdocdir =/ s|$${prefix}/doc|$${prefix}/share/doc|' \

Added: head/games/zaz/files/patch-src-mixer.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/zaz/files/patch-src-mixer.cpp	Wed Aug 28 04:10:40 2013	(r325502)
@@ -0,0 +1,11 @@
+--- src/mixer.cpp.orig	2010-01-31 06:55:48.000000000 +0300
++++ src/mixer.cpp	2013-08-28 03:29:50.975228551 +0400
+@@ -23,7 +23,7 @@
+ 
+ namespace Scenes
+ {
+-Mixer::Mixer(MixerMode mmode = Realtime)
++Mixer::Mixer(MixerMode mmode)
+         : mode(mmode), isPlaying(false)
+ {
+     mut_disposeList = SDL_CreateMutex();

Added: head/games/zaz/files/patch-src-mixer.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/zaz/files/patch-src-mixer.h	Wed Aug 28 04:10:40 2013	(r325502)
@@ -0,0 +1,11 @@
+--- src/mixer.h.orig	2010-05-12 00:21:41.000000000 +0400
++++ src/mixer.h	2013-08-28 03:29:59.607226307 +0400
+@@ -46,7 +46,7 @@
+     bool audioHWInitialized;
+ 
+ public:
+-    Mixer(MixerMode mmode);
++    Mixer(MixerMode mmode = Realtime);
+     ~Mixer();
+     void Play();
+     void Pause();



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308280410.r7S4AfYE006923>