From owner-svn-ports-all@freebsd.org Mon Nov 23 15:16:36 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8DF842EE387; Mon, 23 Nov 2020 15:16:36 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CfrN43Fgxz4Sv5; Mon, 23 Nov 2020 15:16:36 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5DC3D684B; Mon, 23 Nov 2020 15:16:36 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0ANFGali024733; Mon, 23 Nov 2020 15:16:36 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0ANFGaXS024732; Mon, 23 Nov 2020 15:16:36 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <202011231516.0ANFGaXS024732@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Mon, 23 Nov 2020 15:16:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r556111 - head/games/openarena/files X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: head/games/openarena/files X-SVN-Commit-Revision: 556111 X-SVN-Commit-Repository: ports 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.34 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: Mon, 23 Nov 2020 15:16:36 -0000 Author: pkubaj Date: Mon Nov 23 15:16:35 2020 New Revision: 556111 URL: https://svnweb.freebsd.org/changeset/ports/556111 Log: games/openarena: fix build on powerpc64 Fix powerpc64 detection on FreeBSD. MFH: 2020Q4 (fix build blanket) Added: head/games/openarena/files/patch-code_qcommon_q__platform.h (contents, props changed) Modified: head/games/openarena/files/patch-Makefile Modified: head/games/openarena/files/patch-Makefile ============================================================================== --- head/games/openarena/files/patch-Makefile Mon Nov 23 14:49:16 2020 (r556110) +++ head/games/openarena/files/patch-Makefile Mon Nov 23 15:16:35 2020 (r556111) @@ -1,6 +1,17 @@ --- Makefile.orig 2011-12-12 22:48:49 UTC +++ Makefile -@@ -205,6 +205,8 @@ ifneq ($(BUILD_CLIENT),0) +@@ -16,6 +16,10 @@ ifeq ($(COMPILE_PLATFORM),darwin) + # Apple does some things a little differently... + COMPILE_ARCH=$(shell uname -p | sed -e s/i.86/i386/) + endif ++ifeq ($(COMPILE_PLATFORM),freebsd) ++ # FreeBSD does some things a little differently... ++ COMPILE_ARCH=$(shell uname -p) ++endif + + ifeq ($(COMPILE_PLATFORM),mingw32) + ifeq ($(COMPILE_ARCH),i386) +@@ -205,6 +209,8 @@ ifneq ($(BUILD_CLIENT),0) OPENAL_LIBS=$(shell pkg-config --silence-errors --libs openal) SDL_CFLAGS=$(shell pkg-config --silence-errors --cflags sdl|sed 's/-Dmain=SDL_main//') SDL_LIBS=$(shell pkg-config --silence-errors --libs sdl) @@ -9,7 +20,7 @@ endif # Use sdl-config if all else fails ifeq ($(SDL_CFLAGS),) -@@ -570,9 +572,15 @@ else # ifeq mingw32 +@@ -570,9 +576,15 @@ else # ifeq mingw32 ifeq ($(PLATFORM),freebsd) @@ -25,7 +36,7 @@ -DUSE_ICON -DMAP_ANONYMOUS=MAP_ANON CLIENT_CFLAGS = $(SDL_CFLAGS) SERVER_CFLAGS = -@@ -595,27 +603,24 @@ ifeq ($(PLATFORM),freebsd) +@@ -595,29 +607,26 @@ ifeq ($(PLATFORM),freebsd) # optional features/libraries ifeq ($(USE_OPENAL),1) @@ -50,16 +61,18 @@ ifeq ($(USE_CODEC_VORBIS),1) - CLIENT_CFLAGS += -DUSE_CODEC_VORBIS -- endif -- -- ifeq ($(USE_CODEC_VORBIS),1) -- CLIENT_LIBS += -lvorbisfile -lvorbis -logg + CLIENT_CFLAGS += -DUSE_CODEC_VORBIS $(VORBIS_CFLAGS) + CLIENT_LIBS += $(VORBIS_LIBS) endif +- ifeq ($(USE_CODEC_VORBIS),1) +- CLIENT_LIBS += -lvorbisfile -lvorbis -logg +- endif +- # cross-compiling tweaks -@@ -897,7 +902,7 @@ ifeq ($(USE_VOIP),1) + ifeq ($(ARCH),i386) + ifeq ($(CROSS_COMPILING),1) +@@ -897,7 +906,7 @@ ifeq ($(USE_VOIP),1) CLIENT_CFLAGS += -DUSE_VOIP SERVER_CFLAGS += -DUSE_VOIP ifeq ($(USE_INTERNAL_SPEEX),1) @@ -68,3 +81,21 @@ else CLIENT_LIBS += -lspeex -lspeexdsp endif +@@ -1564,7 +1573,7 @@ ifeq ($(HAVE_VM_COMPILED),true) + ifeq ($(ARCH),ppc) + Q3OBJ += $(B)/client/vm_powerpc.o $(B)/client/vm_powerpc_asm.o + endif +- ifeq ($(ARCH),ppc64) ++ ifeq ($(COMPILE_ARCH),ppc64) + Q3OBJ += $(B)/client/vm_powerpc.o $(B)/client/vm_powerpc_asm.o + endif + ifeq ($(ARCH),sparc) +@@ -1732,7 +1741,7 @@ ifeq ($(HAVE_VM_COMPILED),true) + ifeq ($(ARCH),ppc) + Q3DOBJ += $(B)/ded/vm_powerpc.o $(B)/ded/vm_powerpc_asm.o + endif +- ifeq ($(ARCH),ppc64) ++ ifeq ($(COMPILE_ARCH),ppc64) + Q3DOBJ += $(B)/ded/vm_powerpc.o $(B)/ded/vm_powerpc_asm.o + endif + ifeq ($(ARCH),sparc) Added: head/games/openarena/files/patch-code_qcommon_q__platform.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/openarena/files/patch-code_qcommon_q__platform.h Mon Nov 23 15:16:35 2020 (r556111) @@ -0,0 +1,11 @@ +--- code/qcommon/q_platform.h.orig 2020-11-23 13:12:36 UTC ++++ code/qcommon/q_platform.h +@@ -235,6 +235,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + #define ARCH_STRING "amd64" + #elif defined __axp__ + #define ARCH_STRING "alpha" ++#elif defined __powerpc64__ ++#define ARCH_STRING "ppc64" + #endif + + #if BYTE_ORDER == BIG_ENDIAN