Date: Fri, 5 Mar 2021 01:26:26 +0000 (UTC) From: Piotr Kubaj <pkubaj@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r567351 - in head/games/zdoom: . files Message-ID: <202103050126.1251QQAI010893@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pkubaj Date: Fri Mar 5 01:26:26 2021 New Revision: 567351 URL: https://svnweb.freebsd.org/changeset/ports/567351 Log: 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 MFH: 2021Q1 Added: head/games/zdoom/files/patch-game-music-emu_gme_blargg__endian.h - copied, changed from r566819, head/audio/libgme/files/patch-gme_blargg__endian.h head/games/zdoom/files/patch-src_p__spec.cpp (contents, props changed) Modified: head/games/zdoom/Makefile Modified: head/games/zdoom/Makefile ============================================================================== --- head/games/zdoom/Makefile Fri Mar 5 00:08:50 2021 (r567350) +++ head/games/zdoom/Makefile Fri Mar 5 01:26:26 2021 (r567351) @@ -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 and modified: head/games/zdoom/files/patch-game-music-emu_gme_blargg__endian.h (from r566819, head/audio/libgme/files/patch-gme_blargg__endian.h) ============================================================================== --- head/audio/libgme/files/patch-gme_blargg__endian.h Sun Feb 28 21:33:38 2021 (r566819, copy source) +++ head/games/zdoom/files/patch-game-music-emu_gme_blargg__endian.h Fri Mar 5 01:26:26 2021 (r567351) @@ -1,5 +1,5 @@ ---- gme/blargg_endian.h.orig 2021-02-10 16:11:06 UTC -+++ gme/blargg_endian.h +--- 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) Added: head/games/zdoom/files/patch-src_p__spec.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/zdoom/files/patch-src_p__spec.cpp Fri Mar 5 01:26:26 2021 (r567351) @@ -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 },
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103050126.1251QQAI010893>