Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 26 Oct 2015 16:42:13 +0000 (UTC)
From:      Roman Bogorodskiy <novel@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r400192 - head/games/ioquake3-devel/files
Message-ID:  <201510261642.t9QGgDPv034884@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: novel
Date: Mon Oct 26 16:42:13 2015
New Revision: 400192
URL: https://svnweb.freebsd.org/changeset/ports/400192

Log:
  games/ioquake3-devel: fix build with speex installed
  
  Adjust CFLAGS to pick bundled speex instead of one installed on the system, that is,
  apparently, incompatible with the bundled one.
  
  A similar fix was already done for games/ioquake3 in r398218.
  
  PR:		203389

Added:
  head/games/ioquake3-devel/files/
  head/games/ioquake3-devel/files/patch-Makefile   (contents, props changed)

Added: head/games/ioquake3-devel/files/patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/ioquake3-devel/files/patch-Makefile	Mon Oct 26 16:42:13 2015	(r400192)
@@ -0,0 +1,11 @@
+--- Makefile.orig	2015-10-25 13:13:52 UTC
++++ Makefile
+@@ -1043,7 +1043,7 @@ ifeq ($(USE_VOIP),1)
+   CLIENT_CFLAGS += -DUSE_VOIP
+   SERVER_CFLAGS += -DUSE_VOIP
+   ifeq ($(USE_INTERNAL_SPEEX),1)
+-    CLIENT_CFLAGS += -DFLOATING_POINT -DUSE_ALLOCA -I$(SPEEXDIR)/include
++    CLIENT_CFLAGS := -I$(SPEEXDIR)/include -DFLOATING_POINT -DUSE_ALLOCA $(CLIENT_CFLAGS)
+   else
+     CLIENT_LIBS += -lspeex -lspeexdsp
+   endif



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