Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 5 Sep 2013 05:46:47 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r326353 - in head/games/quake2max: . files
Message-ID:  <201309050546.r855klYJ057159@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: danfe
Date: Thu Sep  5 05:46:47 2013
New Revision: 326353
URL: http://svnweb.freebsd.org/changeset/ports/326353

Log:
  - Unbreak the build against Clang (non-void function should return a value)
  - Sound file loader in the engine already converts the data to host-endian,
    therefore the device must be open in host-endian mode, too
  - Convert obsolete USE_GMAKE while here
  
  Reported by:	pkg-fallout

Added:
  head/games/quake2max/files/patch-unix__snd_unix.c   (contents, props changed)
Modified:
  head/games/quake2max/Makefile

Modified: head/games/quake2max/Makefile
==============================================================================
--- head/games/quake2max/Makefile	Thu Sep  5 05:39:29 2013	(r326352)
+++ head/games/quake2max/Makefile	Thu Sep  5 05:46:47 2013	(r326353)
@@ -19,8 +19,8 @@ LICENSE=	GPLv2
 
 EXTRACT_DEPENDS=	unrar:${PORTSDIR}/archivers/unrar
 
+USES=		gmake
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 USE_XORG=	xxf86dga
 ALL_TARGET=	release
 WRKSRC=		${WRKDIR}/${DISTNAME:S/quake2max/Quake2maX/}
@@ -112,6 +112,9 @@ post-patch:
 # Resolve name collision with jpeg-8
 	@${REINPLACE_CMD} -e 's|jpeg_mem_src|local_&|' \
 		${WRKSRC}/ref_gl/gl_image.c
+# Pacify Clang (non-void function should return a value)
+	@${REINPLACE_CMD} -e '900s|return|& false|' \
+		${WRKSRC}/client/qmenu.c
 
 do-install:
 	@${MKDIR} ${LIBDIR}/baseq2

Added: head/games/quake2max/files/patch-unix__snd_unix.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/quake2max/files/patch-unix__snd_unix.c	Thu Sep  5 05:46:47 2013	(r326353)
@@ -0,0 +1,29 @@
+--- unix/snd_unix.c.orig	2006-01-01 20:46:30.000000000 +0800
++++ unix/snd_unix.c	2013-09-05 13:28:24.000000000 +0800
+@@ -59,7 +59,7 @@ qboolean SNDDMA_Init(void)
+ 	extern uid_t saved_euid;
+ 
+ 	if (snd_inited)
+-		return;
++		return 1;
+ 
+ 	if (!snddevice) {
+ 		sndbits = Cvar_Get("sndbits", "16", CVAR_ARCHIVE);
+@@ -115,7 +115,7 @@ qboolean SNDDMA_Init(void)
+ 	if (dma.samplebits != 16 && dma.samplebits != 8)
+     {
+         ioctl(audio_fd, SNDCTL_DSP_GETFMTS, &fmt);
+-        if (fmt & AFMT_S16_LE) dma.samplebits = 16;
++        if (fmt & AFMT_S16_NE) dma.samplebits = 16;
+         else if (fmt & AFMT_U8) dma.samplebits = 8;
+     }
+ 
+@@ -157,7 +157,7 @@ qboolean SNDDMA_Init(void)
+ 
+     if (dma.samplebits == 16)
+     {
+-        rc = AFMT_S16_LE;
++        rc = AFMT_S16_NE;
+         rc = ioctl(audio_fd, SNDCTL_DSP_SETFMT, &rc);
+         if (rc < 0)
+ 		{

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