diff --git a/games/endless-sky-high-dpi/Makefile b/games/endless-sky-high-dpi/Makefile index 09a47f50d344..931c73973840 100644 --- a/games/endless-sky-high-dpi/Makefile +++ b/games/endless-sky-high-dpi/Makefile @@ -1,27 +1,27 @@ PORTNAME= endless-sky-high-dpi -PORTVERSION= 0.9.12 +PORTVERSION= 0.9.14 DISTVERSIONPREFIX= v CATEGORIES= games MAINTAINER= amdmi3@FreeBSD.org COMMENT= High-DPI graphics for Endless Sky LICENSE= CC-BY-3.0 CC-BY-SA-3.0 CC-BY-SA-4.0 PD LICENSE_COMB= multi RUN_DEPENDS= endless-sky:games/endless-sky USE_GITHUB= yes GH_ACCOUNT= endless-sky DATADIR= ${PREFIX}/share/endless-sky/plugins/${PORTNAME} NO_BUILD= yes NO_ARCH= yes PORTDATA= * do-install: @cd ${WRKSRC} && ${COPYTREE_SHARE} "images" ${STAGEDIR}${DATADIR} .include diff --git a/games/endless-sky-high-dpi/distinfo b/games/endless-sky-high-dpi/distinfo index d405a2eb7f4a..34f40c17476f 100644 --- a/games/endless-sky-high-dpi/distinfo +++ b/games/endless-sky-high-dpi/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1588440492 -SHA256 (endless-sky-endless-sky-high-dpi-v0.9.12_GH0.tar.gz) = 89fac28682b3dd3292f29436b6f99be6834c30b844a6bb543922e1152ba7e1b9 -SIZE (endless-sky-endless-sky-high-dpi-v0.9.12_GH0.tar.gz) = 223188648 +TIMESTAMP = 1626090056 +SHA256 (endless-sky-endless-sky-high-dpi-v0.9.14_GH0.tar.gz) = df1105b58968cf33d9c61861b9eea4e8ada0712d0495acd72a694a39592a12f4 +SIZE (endless-sky-endless-sky-high-dpi-v0.9.14_GH0.tar.gz) = 272544229 diff --git a/games/endless-sky/Makefile b/games/endless-sky/Makefile index 14258949acb9..a756530ff61a 100644 --- a/games/endless-sky/Makefile +++ b/games/endless-sky/Makefile @@ -1,36 +1,35 @@ PORTNAME= endless-sky -PORTVERSION= 0.9.12 +PORTVERSION= 0.9.14 DISTVERSIONPREFIX= v -PORTREVISION= 1 CATEGORIES= games MAINTAINER= amdmi3@FreeBSD.org COMMENT= Space exploration and combat game similar to Escape Velocity LICENSE= GPLv3+ CC-BY-4.0 CC-BY-SA-3.0 CC-BY-SA-4.0 PD LICENSE_COMB= multi LICENSE_FILE_GPLv3+ = ${WRKSRC}/license.txt LIB_DEPENDS= libpng.so:graphics/png \ libmad.so:audio/libmad USE_GITHUB= yes USES= compiler:c++11-lang gl gnome jpeg localbase:ldflags openal scons sdl xorg USE_SDL= sdl2 USE_GL= gl glew INSTALLS_ICONS= yes LDFLAGS_i386= -Wl,-znotext PORTDATA= * post-build: @${REINPLACE_CMD} -e 's|/usr/local/|${PREFIX}/|; s|share/games|share|' \ ${WRKSRC}/source/Files.cpp post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} @${LN} -s ../icons/hicolor/32x32/apps/endless-sky.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png .include diff --git a/games/endless-sky/distinfo b/games/endless-sky/distinfo index 8c682f87455f..4152db6effe0 100644 --- a/games/endless-sky/distinfo +++ b/games/endless-sky/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1588440467 -SHA256 (endless-sky-endless-sky-v0.9.12_GH0.tar.gz) = 31f76ac11666415478678d924174d43a620a7fd1093e95131776aed12b912eb4 -SIZE (endless-sky-endless-sky-v0.9.12_GH0.tar.gz) = 103105695 +TIMESTAMP = 1626090017 +SHA256 (endless-sky-endless-sky-v0.9.14_GH0.tar.gz) = 6c22571b5398a18297aa7410890c319b5cb292a833889b4e7c0cd94d831f29af +SIZE (endless-sky-endless-sky-v0.9.14_GH0.tar.gz) = 124358153 diff --git a/games/endless-sky/files/patch-SConstruct b/games/endless-sky/files/patch-SConstruct index a4d377cde855..d57c07c2aea0 100644 --- a/games/endless-sky/files/patch-SConstruct +++ b/games/endless-sky/files/patch-SConstruct @@ -1,37 +1,41 @@ ---- SConstruct.orig 2020-02-24 15:50:12 UTC +--- SConstruct.orig 2021-07-11 20:56:35 UTC +++ SConstruct -@@ -24,7 +24,7 @@ Help(opts.GenerateHelpText(env)) - - flags = ["-std=c++11", "-Wall"] +@@ -46,10 +46,9 @@ Help(opts.GenerateHelpText(env)) + # $ CXXFLAGS=-msse3 scons + # $ CXXFLAGS=-march=native scons + # or modify the `flags` variable: +-flags = ["-std=c++11", "-Wall", "-Werror", "-Wold-style-cast"] ++flags = ["-std=c++11", "-Wall", "-Wold-style-cast"] if env["mode"] != "debug": -- flags += ["-O3"] +- flags += ["-O3", "-flto"] +- env.Append(LINKFLAGS = ["-O3", "-flto"]) + pass if env["mode"] == "debug": flags += ["-g"] - if env["mode"] == "profile": -@@ -59,7 +59,7 @@ sky = env.Program("endless-sky", Glob(buildDirectory + + elif env["mode"] == "profile": +@@ -157,7 +156,7 @@ env.AlwaysBuild("test") # Install the binary: -env.Install("$DESTDIR$PREFIX/games", sky) +env.Install("$DESTDIR$PREFIX/bin", sky) # Install the desktop file: env.Install("$DESTDIR$PREFIX/share/applications", "endless-sky.desktop") -@@ -100,11 +100,11 @@ def RecursiveInstall(env, target, source): - RecursiveInstall(env, os.path.join(target, name), node.abspath) +@@ -198,11 +197,11 @@ def RecursiveInstall(env, target, source): + RecursiveInstall(env, pathjoin(target, name), node.abspath) else: env.Install(target, node) -RecursiveInstall(env, "$DESTDIR$PREFIX/share/games/endless-sky/data", "data") -RecursiveInstall(env, "$DESTDIR$PREFIX/share/games/endless-sky/images", "images") -RecursiveInstall(env, "$DESTDIR$PREFIX/share/games/endless-sky/sounds", "sounds") -env.Install("$DESTDIR$PREFIX/share/games/endless-sky", "credits.txt") -env.Install("$DESTDIR$PREFIX/share/games/endless-sky", "keys.txt") +RecursiveInstall(env, "$DESTDIR$PREFIX/share/endless-sky/data", "data") +RecursiveInstall(env, "$DESTDIR$PREFIX/share/endless-sky/images", "images") +RecursiveInstall(env, "$DESTDIR$PREFIX/share/endless-sky/sounds", "sounds") +env.Install("$DESTDIR$PREFIX/share/endless-sky", "credits.txt") +env.Install("$DESTDIR$PREFIX/share/endless-sky", "keys.txt") # Make the word "install" in the command line do an installation. env.Alias("install", "$DESTDIR$PREFIX")