Date: Wed, 30 Sep 2015 15:18:06 +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: r398218 - head/games/ioquake3/files Message-ID: <201509301518.t8UFI6Zw051186@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: novel Date: Wed Sep 30 15:18:06 2015 New Revision: 398218 URL: https://svnweb.freebsd.org/changeset/ports/398218 Log: Fix build when system libspeex is installed The build system uses incorrect include order and it picks system libspeex headers instead of bundled one so build fails because of the interface difference. Fix that by forcing including bundled libspeex. This also fixes build of iourbanterror build. PR: 201926 Modified: head/games/ioquake3/files/patch-Makefile Modified: head/games/ioquake3/files/patch-Makefile ============================================================================== --- head/games/ioquake3/files/patch-Makefile Wed Sep 30 15:04:22 2015 (r398217) +++ head/games/ioquake3/files/patch-Makefile Wed Sep 30 15:18:06 2015 (r398218) @@ -1,5 +1,5 @@ ---- Makefile.orig 2009-04-22 20:54:48.000000000 +0200 -+++ Makefile 2011-11-04 20:42:56.000000000 +0100 +--- Makefile.orig 2009-04-22 22:54:48.000000000 +0400 ++++ Makefile 2015-09-28 20:24:27.956819000 +0300 @@ -187,6 +187,8 @@ # FIXME: introduce CLIENT_CFLAGS SDL_CFLAGS=$(shell pkg-config --cflags sdl|sed 's/-Dmain=SDL_main//') @@ -131,6 +131,15 @@ else # ifeq freebsd ############################################################################# +@@ -831,7 +846,7 @@ + ifeq ($(USE_VOIP),1) + BASE_CFLAGS += -DUSE_VOIP + ifeq ($(USE_INTERNAL_SPEEX),1) +- BASE_CFLAGS += -DFLOATING_POINT -DUSE_ALLOCA -I$(SPEEXDIR)/include ++ BASE_CFLAGS := -I$(SPEEXDIR)/include -DFLOATING_POINT -DUSE_ALLOCA $(BASE_CFLAGS) + else + CLIENT_LIBS += -lspeex + endif @@ -1442,6 +1457,9 @@ ifeq ($(ARCH),x86_64) Q3OBJ += $(B)/client/vm_x86_64.o $(B)/client/vm_x86_64_assembler.o
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509301518.t8UFI6Zw051186>