From owner-svn-ports-head@freebsd.org Thu Sep 3 14:25:23 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 638519CA22C; Thu, 3 Sep 2015 14:25:23 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5410F397; Thu, 3 Sep 2015 14:25:23 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t83EPNSO082036; Thu, 3 Sep 2015 14:25:23 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t83EPMd3082033; Thu, 3 Sep 2015 14:25:22 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201509031425.t83EPMd3082033@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Thu, 3 Sep 2015 14:25:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r395961 - head/games/eduke32/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-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Sep 2015 14:25:23 -0000 Author: amdmi3 Date: Thu Sep 3 14:25:21 2015 New Revision: 395961 URL: https://svnweb.freebsd.org/changeset/ports/395961 Log: - Add forgotten patches, fixing build PR: 202544 Submitted by: pkubaj@riseup.net Added: head/games/eduke32/files/ head/games/eduke32/files/patch-Makefile.common (contents, props changed) head/games/eduke32/files/patch-build_src_baselayer.c (contents, props changed) head/games/eduke32/files/patch-build_src_engine.c (contents, props changed) Added: head/games/eduke32/files/patch-Makefile.common ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/eduke32/files/patch-Makefile.common Thu Sep 3 14:25:21 2015 (r395961) @@ -0,0 +1,21 @@ +--- Makefile.common.orig 2015-07-08 03:34:34 UTC ++++ Makefile.common +@@ -258,7 +258,6 @@ ifndef LTO + endif + endif + +-COMMONFLAGS=$(ARCH) + COMPILERFLAGS= + + ifeq ($(PACKAGE_REPOSITORY),0) +@@ -278,8 +277,8 @@ ifneq ($(RELEASE)$(DEBUGANYWAY),10) + OPTIMIZATIONS += $(DEBUGFLAG) + endif + +-CONLYFLAGS=-std=gnu99 -Wimplicit -Werror-implicit-function-declaration +-CPPONLYFLAGS= -fno-exceptions -fno-rtti -Wno-write-strings ++CONLYFLAGS=-std=gnu99 -Wimplicit ++CPPONLYFLAGS= -fno-exceptions -fno-rtti -fpermissive -Wno-write-strings + ASFORMAT=elf$(SYSBITS) + ASFLAGS=-s -f $(ASFORMAT) #-g + LINKERFLAGS= Added: head/games/eduke32/files/patch-build_src_baselayer.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/eduke32/files/patch-build_src_baselayer.c Thu Sep 3 14:25:21 2015 (r395961) @@ -0,0 +1,11 @@ +--- build/src/baselayer.c.orig 2015-07-25 17:23:17 UTC ++++ build/src/baselayer.c +@@ -219,7 +219,7 @@ void calc_ylookup(int32_t bpl, int32_t l + { + Baligned_free(ylookup); + +- ylookup = (intptr_t *)Xaligned_alloc(16, lastyidx * sizeof(intptr_t)); ++ posix_memalign(&ylookup, 16, lastyidx * sizeof(intptr_t)); + #if !defined(NOASM) && !defined(GEKKO) && !defined(__ANDROID__) + nx_unprotect((intptr_t)ylookup, (intptr_t)ylookup + (lastyidx * sizeof(intptr_t))); + #endif Added: head/games/eduke32/files/patch-build_src_engine.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/eduke32/files/patch-build_src_engine.c Thu Sep 3 14:25:21 2015 (r395961) @@ -0,0 +1,30 @@ +--- build/src/engine.c.orig 2015-08-02 08:40:39 UTC ++++ build/src/engine.c +@@ -5349,7 +5349,8 @@ static void drawalls(int32_t bunch) + static char fn[32], tmpbuf[80]; + char purple = getclosestcol(63, 0, 63); + char yellow = getclosestcol(63, 63, 0); +- char *bakframe = (char *)Xaligned_alloc(16, xdim*ydim); ++ char *bakframe; ++ posix_memalign(&bakframe, 16, xdim*ydim); + + begindrawing(); //{{{ + Bmemcpy(bakframe, (char *)frameplace, xdim*ydim); +@@ -8142,7 +8143,7 @@ static void dosetaspect(void) + if (xdimen != oxdimen && voxoff[0][0]) + { + if (distrecip == NULL) +- distrecip = (uint32_t *)Xaligned_alloc(16, DISTRECIPSIZ * sizeof(uint32_t)); ++ posix_memalign(&distrecip, 16, DISTRECIPSIZ * sizeof(uint32_t)); + + if (xdimen < 1 << 11) + { +@@ -11654,7 +11655,7 @@ static void initsmost(void) + if (*dynarray[i].ptr) + Baligned_free(*dynarray[i].ptr); + +- *dynarray[i].ptr = Xaligned_alloc(16, dynarray[i].size); ++ posix_memalign(dynarray[i].ptr, 16, dynarray[i].size); + } + + ysavecnt = YSAVES;