From owner-svn-ports-all@FreeBSD.ORG Thu Sep 5 05:46:48 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 52FE11F8; Thu, 5 Sep 2013 05:46:48 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 268172BD8; Thu, 5 Sep 2013 05:46:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r855kmXA057161; Thu, 5 Sep 2013 05:46:48 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r855klYJ057159; Thu, 5 Sep 2013 05:46:47 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201309050546.r855klYJ057159@svn.freebsd.org> From: Alexey Dokuchaev Date: Thu, 5 Sep 2013 05:46:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r326353 - in head/games/quake2max: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Sep 2013 05:46:48 -0000 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) + {