diff --git a/games/hyperrogue/Makefile b/games/hyperrogue/Makefile index 95f72f076939..1fd6767cece3 100644 --- a/games/hyperrogue/Makefile +++ b/games/hyperrogue/Makefile @@ -1,49 +1,49 @@ PORTNAME= hyperrogue -PORTVERSION= 13.0t +PORTVERSION= 13.0v DISTVERSIONPREFIX= v CATEGORIES= games MAINTAINER= amdmi3@FreeBSD.org COMMENT= Roguelike in a non-euclidean world WWW= https://roguetemple.com/z/hyper/ \ https://github.com/zenorogue/hyperrogue LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpng.so:graphics/png USES= compiler:c++14-lang gl gmake localbase:ldflags sdl xorg USE_GITHUB= yes GH_ACCOUNT= zenorogue USE_SDL= sdl mixer gfx ttf USE_GL= gl glew ALL_TARGET= hyperrogue CXXFLAGS+= -DFHS -DHYPERPATH="\\\"${DATADIR}/\\\"" MAKE_ENV= HYPERROGUE_USE_PNG=1 HYPERROGUE_USE_GLEW=1 PORTDOCS= README.md PORTDATA= * PLIST_FILES= bin/hyperrogue share/pixmaps/hyperrogue.ico DESKTOP_ENTRIES="HyperRogue" \ "" \ "${PREFIX}/share/pixmaps/${PORTNAME}.ico" \ "${PORTNAME}" \ "Game;RolePlaying;" \ "" OPTIONS_DEFINE= DOCS do-install: ${INSTALL_PROGRAM} ${WRKSRC}/hyperrogue ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_DATA} ${WRKSRC}/hr-icon.ico ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.ico @cd ${WRKSRC} && ${COPYTREE_SHARE} "*.ttf hyperrogue-music.txt sounds music" \ ${STAGEDIR}${DATADIR} post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}/ .include diff --git a/games/hyperrogue/distinfo b/games/hyperrogue/distinfo index 6c79b59c0b55..fa46aaca0eae 100644 --- a/games/hyperrogue/distinfo +++ b/games/hyperrogue/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1722255794 -SHA256 (zenorogue-hyperrogue-v13.0t_GH0.tar.gz) = 45c5e69cc67d1ded8edc8859d6a8011a38cf5b1aa715de5758bf385b42188e4f -SIZE (zenorogue-hyperrogue-v13.0t_GH0.tar.gz) = 88640590 +TIMESTAMP = 1729002006 +SHA256 (zenorogue-hyperrogue-v13.0v_GH0.tar.gz) = e02a4ada30c9167be9de723a46e83c45b0d2f0f37150dc5fcdef206b21e28303 +SIZE (zenorogue-hyperrogue-v13.0v_GH0.tar.gz) = 99838868 diff --git a/games/hyperrogue/files/patch-Makefile b/games/hyperrogue/files/patch-Makefile index 67d04332dad2..46a4acff6459 100644 --- a/games/hyperrogue/files/patch-Makefile +++ b/games/hyperrogue/files/patch-Makefile @@ -1,55 +1,57 @@ ---- Makefile.orig 2022-07-05 12:02:51 UTC +--- Makefile.orig 2024-10-12 08:44:24 UTC +++ Makefile -@@ -42,7 +42,6 @@ endif +@@ -50,8 +50,7 @@ endif ## Begin customization points for each OS and TOOLCHAIN we support. -ifeq (${OS},linux) - CXXFLAGS_EARLY += -DLINUX +- CXXFLAGS_EARLY += -DLINUX -I /usr/include/SDL ++ CXXFLAGS_EARLY += -DLINUX EXE_EXTENSION := LDFLAGS_GL := -lGL -@@ -51,7 +50,6 @@ ifeq (${OS},linux) + LDFLAGS_GLEW := -lGLEW +@@ -59,7 +58,6 @@ ifeq (${OS},linux) LDFLAGS_SDL := -lSDL -lSDL_gfx -lSDL_mixer -lSDL_ttf -lpthread -lz OBJ_EXTENSION := .o hyper_RES := -endif ifeq (${OS},mingw) - CXXFLAGS_EARLY += -DWINDOWS -mwindows -D_A_VOLID=8 -@@ -140,19 +138,19 @@ override CXXFLAGS := $(CXXFLAGS_STD) $(CXXFLAGS_EARLY) + CXXFLAGS_EARLY += -DWINDOWS -mwindows -D_A_VOLID=8 -I/ucrt64/include/SDL +@@ -153,19 +151,19 @@ hyperrogue$(EXE_EXTENSION): $(hyper_OBJS) $(hyper_RES) override LDFLAGS := $(LDFLAGS_EARLY) $(LDFLAGS) ${EXTRA_LDFLAGS} hyperrogue$(EXE_EXTENSION): $(hyper_OBJS) $(hyper_RES) - $(CXX) $(CXXFLAGS) $(hyper_OBJS) $(hyper_RES) $(LDFLAGS) $(hyper_LDFLAGS) -o $@ + $(CXX) $(hyper_OBJS) $(hyper_RES) $(LDFLAGS) $(hyper_LDFLAGS) -o $@ hyper$(OBJ_EXTENSION): *.cpp language-data.cpp autohdr.h - $(CXX) -O2 $(CXXFLAGS) $(hyper_CXXFLAGS) -c hyper.cpp -o $@ + $(CXX) $(CXXFLAGS) -O0 $(hyper_CXXFLAGS) -c hyper.cpp -o $@ # without O0 clang takes gigabytes of memory hyper.res: hyper.rc hr-icon.ico windres hyper.rc -O coff -o hyper.res langen$(EXE_EXTENSION): langen.cpp language-??.cpp language-ptbr.cpp - $(CXX) -O0 $(CXXFLAGS) $(langen_CXXFLAGS) langen.cpp $(LDFLAGS) -o $@ + $(CXX) $(CXXFLAGS) $(langen_CXXFLAGS) langen.cpp $(LDFLAGS) -o $@ makeh$(EXE_EXTENSION): makeh.cpp - $(CXX) -O2 makeh.cpp -o $@ + $(CXX) $(CXXFLAGS) makeh.cpp $(LDFLAGS) -o $@ autohdr.h: makeh$(EXE_EXTENSION) language-data.cpp *.cpp - ./makeh classes.cpp locations.cpp colors.cpp hyperpoint.cpp geometry.cpp goldberg.cpp init.cpp floorshapes.cpp cell.cpp multi.cpp shmup.cpp pattern2.cpp mapeditor.cpp graph.cpp textures.cpp hprint.cpp language.cpp util.cpp complex.cpp multigame.cpp *.cpp > autohdr.h -@@ -161,10 +159,10 @@ language-data.cpp: langen$(EXE_EXTENSION) + ./makeh classes.cpp locations.cpp colors.cpp hyperpoint.cpp geometry.cpp embeddings.cpp goldberg.cpp init.cpp floorshapes.cpp cell.cpp multi.cpp shmup.cpp pattern2.cpp mapeditor.cpp graph.cpp textures.cpp hprint.cpp language.cpp util.cpp complex.cpp multigame.cpp arbitrile.cpp rulegen.cpp *.cpp > autohdr.h +@@ -174,10 +172,10 @@ savepng$(OBJ_EXTENSION): savepng.cpp ./langen > language-data.cpp savepng$(OBJ_EXTENSION): savepng.cpp - $(CXX) -O2 $(CXXFLAGS) -c savepng.cpp -o $@ + $(CXX) $(CXXFLAGS) -c savepng.cpp -o $@ mymake$(EXE_EXTENSION): mymake.cpp - $(CXX) -O2 $(CXXFLAGS) mymake.cpp -pthread -o $@ + $(CXX) $(CXXFLAGS) mymake.cpp $(LDFLAGS) -pthread -o $@ emscripten: hyper.html