From owner-svn-ports-all@freebsd.org Fri Mar 5 01:27:11 2021 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 93824561A7F; Fri, 5 Mar 2021 01:27:11 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ds97z3nFDz3CXd; Fri, 5 Mar 2021 01:27:11 +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 7497127373; Fri, 5 Mar 2021 01:27:11 +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 1251RBIt011084; Fri, 5 Mar 2021 01:27:11 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 1251RAVF011081; Fri, 5 Mar 2021 01:27:10 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <202103050127.1251RAVF011081@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Fri, 5 Mar 2021 01:27:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r567352 - in branches/2021Q1/games/zdoom: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: in branches/2021Q1/games/zdoom: . files X-SVN-Commit-Revision: 567352 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: Fri, 05 Mar 2021 01:27:11 -0000 Author: pkubaj Date: Fri Mar 5 01:27:10 2021 New Revision: 567352 URL: https://svnweb.freebsd.org/changeset/ports/567352 Log: MFH: r567351 games/zdoom: fix build on non-x86 gme needs the same patching as for other ports. p_spec.cpp uses chars, which are unsigned on ARM and POWER by default. Approved by: tier 2 blanket Added: branches/2021Q1/games/zdoom/files/patch-game-music-emu_gme_blargg__endian.h - copied unchanged from r567351, head/games/zdoom/files/patch-game-music-emu_gme_blargg__endian.h branches/2021Q1/games/zdoom/files/patch-src_p__spec.cpp - copied unchanged from r567351, head/games/zdoom/files/patch-src_p__spec.cpp Modified: branches/2021Q1/games/zdoom/Makefile Directory Properties: branches/2021Q1/ (props changed) Modified: branches/2021Q1/games/zdoom/Makefile ============================================================================== --- branches/2021Q1/games/zdoom/Makefile Fri Mar 5 01:26:26 2021 (r567351) +++ branches/2021Q1/games/zdoom/Makefile Fri Mar 5 01:27:10 2021 (r567352) @@ -19,8 +19,6 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libsndfile.so:audio/libsndfile -BROKEN_powerpc64= fails to compile: invokes x86 assembly - USE_GITHUB= yes GH_ACCOUNT= rheit @@ -28,7 +26,8 @@ PORTSCOUT= limit:^.+\.[1-9]{1,3}[1-8]?$$ DATADIR= ${DMDIR}/${PORTNAME} -USES= cmake gettext gnome jpeg openal pkgconfig sdl +USES= cmake dos2unix gettext gnome jpeg openal pkgconfig sdl +DOS2UNIX_FILES= src/p_spec.cpp USE_GNOME= atk cairo gdkpixbuf2 gtk20 pango USE_SDL= sdl2 CMAKE_ARGS= -DNO_FMOD:BOOL=ON Copied: branches/2021Q1/games/zdoom/files/patch-game-music-emu_gme_blargg__endian.h (from r567351, head/games/zdoom/files/patch-game-music-emu_gme_blargg__endian.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2021Q1/games/zdoom/files/patch-game-music-emu_gme_blargg__endian.h Fri Mar 5 01:27:10 2021 (r567352, copy of r567351, head/games/zdoom/files/patch-game-music-emu_gme_blargg__endian.h) @@ -0,0 +1,13 @@ +--- game-music-emu/gme/blargg_endian.h.orig 2021-02-10 16:11:06 UTC ++++ game-music-emu/gme/blargg_endian.h +@@ -33,9 +33,7 @@ + #if defined (LSB_FIRST) || defined (__LITTLE_ENDIAN__) || BLARGG_CPU_X86 || \ + (defined (LITTLE_ENDIAN) && LITTLE_ENDIAN+0 != 1234) + #define BLARGG_LITTLE_ENDIAN 1 +-#endif +- +-#if defined (MSB_FIRST) || defined (__BIG_ENDIAN__) || defined (WORDS_BIGENDIAN) || \ ++#elif defined (MSB_FIRST) || defined (__BIG_ENDIAN__) || defined (WORDS_BIGENDIAN) || \ + defined (__sparc__) || BLARGG_CPU_POWERPC || \ + (defined (BIG_ENDIAN) && BIG_ENDIAN+0 != 4321) + #define BLARGG_BIG_ENDIAN 1 Copied: branches/2021Q1/games/zdoom/files/patch-src_p__spec.cpp (from r567351, head/games/zdoom/files/patch-src_p__spec.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2021Q1/games/zdoom/files/patch-src_p__spec.cpp Fri Mar 5 01:27:10 2021 (r567352, copy of r567351, head/games/zdoom/files/patch-src_p__spec.cpp) @@ -0,0 +1,11 @@ +--- src/p_spec.cpp.orig 2021-03-05 01:22:24 UTC ++++ src/p_spec.cpp +@@ -1269,7 +1269,7 @@ void P_InitSectorSpecial(sector_t *sector, int special + if (sector->special >= Scroll_North_Slow && + sector->special <= Scroll_SouthWest_Fast) + { // Hexen scroll special +- static const char hexenScrollies[24][2] = ++ static const signed char hexenScrollies[24][2] = + { + { 0, 1 }, { 0, 2 }, { 0, 4 }, + { -1, 0 }, { -2, 0 }, { -4, 0 },