| 1 |
commit: 60effe55d68f471ac8e6501f9fb343faf95c423c |
| 2 |
Author: Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr> |
| 3 |
AuthorDate: Fri Jan 21 03:54:04 2022 +0000 |
| 4 |
Commit: Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr> |
| 5 |
CommitDate: Fri Jan 21 03:54:04 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=60effe55 |
| 7 |
|
| 8 |
games-action/blackvoxel: version bump |
| 9 |
|
| 10 |
Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr> |
| 11 |
|
| 12 |
games-action/blackvoxel/Manifest | 2 +- |
| 13 |
...ackvoxel-2.42.ebuild => blackvoxel-2.50.ebuild} | 7 +- |
| 14 |
.../files/blackvoxel-2.42-makefile.patch | 190 --------------------- |
| 15 |
.../blackvoxel/files/blackvoxel-2.42-savedir.patch | 18 -- |
| 16 |
...-files.patch => blackvoxel-2.50-makefile.patch} | 93 ++++++++-- |
| 17 |
.../blackvoxel/files/blackvoxel-2.50-savedir.patch | 31 ++++ |
| 18 |
6 files changed, 110 insertions(+), 231 deletions(-) |
| 19 |
|
| 20 |
diff --git a/games-action/blackvoxel/Manifest b/games-action/blackvoxel/Manifest |
| 21 |
index 9493eb6ce..71958ecdb 100644 |
| 22 |
--- a/games-action/blackvoxel/Manifest |
| 23 |
+++ b/games-action/blackvoxel/Manifest |
| 24 |
@@ -1 +1 @@ |
| 25 |
-DIST blackvoxel-2.42.tar.bz2 18367949 BLAKE2B f45da57846370ae2109709cb28f3bb02fbd63ff208306705dd8da544737f84250542a4c58b3889e603f16ca898f9ee4458361c326fd28f68cb2a70f891de0f67 SHA512 275c7cb34c58bbd772bc1daf7beb26395c509d37341fe1c343f745bc3fa73223f9d36b275f0813a06908f258b39f94c1e4229f8e27fb822cf71881e66fccd3fb |
| 26 |
+DIST blackvoxel-2.50.tar.bz2 20766720 BLAKE2B 879b1cadeec85f6a38cfeca422c416bed844907dc45757cd66669fe9a2d78628cc07db14571e2c4afa3236cc3e69e86b36f48814c2dfb2b0d9698255949fd4cf SHA512 76b22288f280360926110f0d09a778246970f94a466447f892574057aabe1c068854c2e1131baa3f9b5a0edf183679717eb4794af42672701146b185b610332c |
| 27 |
|
| 28 |
diff --git a/games-action/blackvoxel/blackvoxel-2.42.ebuild b/games-action/blackvoxel/blackvoxel-2.50.ebuild |
| 29 |
similarity index 84% |
| 30 |
rename from games-action/blackvoxel/blackvoxel-2.42.ebuild |
| 31 |
rename to games-action/blackvoxel/blackvoxel-2.50.ebuild |
| 32 |
index 4216d47ce..900d25e7c 100644 |
| 33 |
--- a/games-action/blackvoxel/blackvoxel-2.42.ebuild |
| 34 |
+++ b/games-action/blackvoxel/blackvoxel-2.50.ebuild |
| 35 |
@@ -1,13 +1,13 @@ |
| 36 |
# Copyright 2020-2021 Gentoo Authors |
| 37 |
# Distributed under the terms of the GNU General Public License v2 |
| 38 |
|
| 39 |
-EAPI=7 |
| 40 |
+EAPI=8 |
| 41 |
|
| 42 |
inherit desktop toolchain-funcs xdg |
| 43 |
|
| 44 |
DESCRIPTION="Blackvoxel Video Game" |
| 45 |
HOMEPAGE="https://www.blackvoxel.com/" |
| 46 |
-SRC_URI="https://www.blackvoxel.com/dm_download.php?file=163&key=1 -> ${P}.tar.bz2" |
| 47 |
+SRC_URI="https://www.blackvoxel.com/dm_download.php?file=170&key=1 -> ${P}.tar.bz2" |
| 48 |
|
| 49 |
LICENSE="GPL-3" |
| 50 |
SLOT="0" |
| 51 |
@@ -29,7 +29,6 @@ S="${WORKDIR}/${PN}_source_${PV//./_}" |
| 52 |
PATCHES=( |
| 53 |
"${FILESDIR}"/${P}-makefile.patch |
| 54 |
"${FILESDIR}"/${P}-savedir.patch |
| 55 |
- "${FILESDIR}"/${P}-dont-strip-files.patch |
| 56 |
) |
| 57 |
|
| 58 |
src_compile() { |
| 59 |
@@ -37,7 +36,7 @@ src_compile() { |
| 60 |
export CC="$(tc-getCC)" |
| 61 |
export AR="$(tc-getAR)" |
| 62 |
|
| 63 |
- emake blackvoxeldatadir="/usr/share/${PN}" bindir="/usr/bin" |
| 64 |
+ emake BV_DATA_LOCATION_DIR="/usr/share/${PN}" |
| 65 |
} |
| 66 |
|
| 67 |
src_install() { |
| 68 |
|
| 69 |
diff --git a/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch b/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch |
| 70 |
deleted file mode 100644 |
| 71 |
index ba800e827..000000000 |
| 72 |
--- a/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch |
| 73 |
+++ /dev/null |
| 74 |
@@ -1,190 +0,0 @@ |
| 75 |
-From 18ae2cca1ef8b9e04b463719d03b021245ecfeec Mon Sep 17 00:00:00 2001 |
| 76 |
-From: tastytea <tastytea@××××××××.de> |
| 77 |
-Date: Mon, 3 May 2021 21:21:25 +0200 |
| 78 |
-Subject: [PATCH] Don't overwrite build-flags, replace hardcoded tools with |
| 79 |
- variables. |
| 80 |
- |
| 81 |
-Also remove -zrelro from LDFLAGS. |
| 82 |
---- |
| 83 |
- Makefile | 31 +++++++++++++++--------------- |
| 84 |
- src/sc_Squirrel3/sq/Makefile | 8 ++++---- |
| 85 |
- src/sc_Squirrel3/sqstdlib/Makefile | 16 +++++++-------- |
| 86 |
- src/sc_Squirrel3/squirrel/Makefile | 16 +++++++-------- |
| 87 |
- 4 files changed, 35 insertions(+), 36 deletions(-) |
| 88 |
- |
| 89 |
-diff --git a/Makefile b/Makefile |
| 90 |
-index 3fac7f3..d1104e7 100644 |
| 91 |
---- a/Makefile |
| 92 |
-+++ b/Makefile |
| 93 |
-@@ -8,10 +8,9 @@ ifndef bindir |
| 94 |
- endif |
| 95 |
- |
| 96 |
- # Base options |
| 97 |
--CC=g++ |
| 98 |
--LD=g++ |
| 99 |
-+CXX?=g++ |
| 100 |
- PROGNAME=blackvoxel |
| 101 |
--CFLAGS=-I "src/sc_Squirrel3/include" -DCOMPILEOPTION_DEMO=0 -DDEVELOPPEMENT_ON=0 -DCOMPILEOPTION_SPECIAL=0 -DCOMPILEOPTION_DATAFILESPATH="\"$(blackvoxeldatadir)\"" |
| 102 |
-+CXXFLAGS+=-I "src/sc_Squirrel3/include" -DCOMPILEOPTION_DEMO=0 -DDEVELOPPEMENT_ON=0 -DCOMPILEOPTION_SPECIAL=0 -DCOMPILEOPTION_DATAFILESPATH="\"$(blackvoxeldatadir)\"" |
| 103 |
- SRC= $(wildcard src/*.cpp) $(wildcard src/z/*.cpp) |
| 104 |
- OBJ= $(SRC:src/%.cpp=obj/%.o) |
| 105 |
- |
| 106 |
-@@ -19,8 +18,8 @@ OBJ= $(SRC:src/%.cpp=obj/%.o) |
| 107 |
- |
| 108 |
- ifeq ($(OS),Windows_NT) |
| 109 |
- CPU_BITS=32 |
| 110 |
-- CFLAGS+= -O3 -c -fmessage-length=0 -march=i686 |
| 111 |
-- LDFLAGS= -s -Xlinker --large-address-aware -mwindows -L"src/sc_Squirrel3/lib" -lmingw32 -lSDLmain -lSDL -llibglew32 -lglu32 -lopengl32 -llibglut -lsquirrel -lsqstdlib |
| 112 |
-+ CXXFLAGS+= -O3 -c -fmessage-length=0 -march=i686 |
| 113 |
-+ LDFLAGS+= -s -Xlinker --large-address-aware -mwindows -L"src/sc_Squirrel3/lib" -lmingw32 -lSDLmain -lSDL -llibglew32 -lglu32 -lopengl32 -llibglut -lsquirrel -lsqstdlib |
| 114 |
- else |
| 115 |
- # Unix like operating systems |
| 116 |
- CPU_BITS= $(shell getconf LONG_BIT) |
| 117 |
-@@ -28,36 +27,36 @@ else |
| 118 |
- KERNELNAME =$(shell uname -s) |
| 119 |
- |
| 120 |
- ifeq ($(KERNELNAME),Linux) |
| 121 |
-- CFLAGS+= -O3 -c -fmessage-length=0 |
| 122 |
-- LDFLAGS=-s -zrelro -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib |
| 123 |
-+ CXXFLAGS+= -O3 -c -fmessage-length=0 |
| 124 |
-+ LDFLAGS+=-s -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib |
| 125 |
- else ifeq ($(KERNELNAME), FreeBSD) |
| 126 |
- # To be done... |
| 127 |
-- CFLAGS+= -O3 -c -fmessage-length=0 |
| 128 |
-- LDFLAGS=-s -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib |
| 129 |
-+ CXXFLAGS+= -O3 -c -fmessage-length=0 |
| 130 |
-+ LDFLAGS+=-s -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib |
| 131 |
- else ifeq ($(KERNELNAME), Darwin) |
| 132 |
-- CFLAGS+= -O3 -c -fmessage-length=0 |
| 133 |
-- LDFLAGS=-s -L"src/sc_Squirrel3/lib" -L"/usr/local/Cellar/glew" -L"/usr/local/Cellar/sdl" -I"/usr/local/Cellar/glew" -I"/usr/local/Cellar/sdl" -framework Cocoa -framework OpenGL -lSDLmain -lSDL -lGLEW -lsquirrel -lsqstdlib |
| 134 |
-+ CXXFLAGS+= -O3 -c -fmessage-length=0 |
| 135 |
-+ LDFLAGS+=-s -L"src/sc_Squirrel3/lib" -L"/usr/local/Cellar/glew" -L"/usr/local/Cellar/sdl" -I"/usr/local/Cellar/glew" -I"/usr/local/Cellar/sdl" -framework Cocoa -framework OpenGL -lSDLmain -lSDL -lGLEW -lsquirrel -lsqstdlib |
| 136 |
- else |
| 137 |
- # Unknow kernel... trying default flags |
| 138 |
-- CFLAGS+= -O3 -c -fmessage-length=0 |
| 139 |
-- LDFLAGS=-s -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib |
| 140 |
-+ CXXFLAGS+= -O3 -c -fmessage-length=0 |
| 141 |
-+ LDFLAGS+=-s -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib |
| 142 |
- endif |
| 143 |
- endif |
| 144 |
- |
| 145 |
- |
| 146 |
- obj/%.o: src/%.cpp |
| 147 |
- @mkdir -p obj/z |
| 148 |
-- $(CC) -o $@ -c $< $(CFLAGS) |
| 149 |
-+ $(CXX) -o $@ -c $< $(CXXFLAGS) |
| 150 |
- |
| 151 |
- all: $(PROGNAME) |
| 152 |
- |
| 153 |
- $(PROGNAME): $(OBJ) squirrel |
| 154 |
-- $(LD) -o $(PROGNAME) $(OBJ) $(LDFLAGS) |
| 155 |
-+ $(CXX) -o $(PROGNAME) $(OBJ) $(LDFLAGS) |
| 156 |
- |
| 157 |
- |
| 158 |
- |
| 159 |
- squirrel: |
| 160 |
-- cd src/sc_Squirrel3 ; make sq$(CPU_BITS) |
| 161 |
-+ +make -C src/sc_Squirrel3 sq$(CPU_BITS) |
| 162 |
- |
| 163 |
- clean: |
| 164 |
- @rm -rf obj |
| 165 |
-diff --git a/src/sc_Squirrel3/sq/Makefile b/src/sc_Squirrel3/sq/Makefile |
| 166 |
-index c2cfc7e..08fb2ef 100644 |
| 167 |
---- a/src/sc_Squirrel3/sq/Makefile |
| 168 |
-+++ b/src/sc_Squirrel3/sq/Makefile |
| 169 |
-@@ -12,16 +12,16 @@ SRCS= sq.c |
| 170 |
- |
| 171 |
- |
| 172 |
- sq32: |
| 173 |
-- g++ -O2 -s -fno-exceptions -fno-rtti -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB) |
| 174 |
-+ $(CXX) -O2 -s -fno-exceptions -fno-rtti -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB) |
| 175 |
- |
| 176 |
- sqprof: |
| 177 |
-- g++ -O2 -pg -fno-exceptions -fno-rtti -pie -gstabs -g3 -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB) |
| 178 |
-+ $(CXX) -O2 -pg -fno-exceptions -fno-rtti -pie -gstabs -g3 -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB) |
| 179 |
- |
| 180 |
- sq64: |
| 181 |
-- g++ -O2 -s -m64 -fno-exceptions -fno-rtti -D_SQ64 -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB) |
| 182 |
-+ $(CXX) -O2 -s -m64 -fno-exceptions -fno-rtti -D_SQ64 -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB) |
| 183 |
- |
| 184 |
- sq64d: |
| 185 |
-- g++ -O0 -g3 -m64 -fno-exceptions -fno-rtti -D_SQ64 -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB) |
| 186 |
-+ $(CXX) -O0 -g3 -m64 -fno-exceptions -fno-rtti -D_SQ64 -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB) |
| 187 |
- |
| 188 |
- .PHONY: clean mrproper |
| 189 |
- |
| 190 |
-diff --git a/src/sc_Squirrel3/sqstdlib/Makefile b/src/sc_Squirrel3/sqstdlib/Makefile |
| 191 |
-index 643d7fc..41ee3f7 100644 |
| 192 |
---- a/src/sc_Squirrel3/sqstdlib/Makefile |
| 193 |
-+++ b/src/sc_Squirrel3/sqstdlib/Makefile |
| 194 |
-@@ -26,23 +26,23 @@ SRCS= \ |
| 195 |
- |
| 196 |
- |
| 197 |
- sq32: |
| 198 |
-- gcc -O2 -fno-exceptions -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) |
| 199 |
-- ar rc $(OUT) *.o |
| 200 |
-+ $(CC) -O2 -fno-exceptions -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) |
| 201 |
-+ $(AR) rc $(OUT) *.o |
| 202 |
- rm *.o |
| 203 |
- |
| 204 |
- sqprof: |
| 205 |
-- gcc -O2 -pg -fno-exceptions -fno-rtti -pie -gstabs -g3 -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) |
| 206 |
-- ar rc $(OUT) *.o |
| 207 |
-+ $(CC) -O2 -pg -fno-exceptions -fno-rtti -pie -gstabs -g3 -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) |
| 208 |
-+ $(AR) rc $(OUT) *.o |
| 209 |
- rm *.o |
| 210 |
- |
| 211 |
- sq64: |
| 212 |
-- gcc -O2 -m64 -fno-exceptions -D_SQ64 -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) |
| 213 |
-- ar rc $(OUT) *.o |
| 214 |
-+ $(CC) -O2 -m64 -fno-exceptions -D_SQ64 -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) |
| 215 |
-+ $(AR) rc $(OUT) *.o |
| 216 |
- rm *.o |
| 217 |
- |
| 218 |
- sq64d: |
| 219 |
-- gcc -O0 -g3 -m64 -fno-exceptions -D_SQ64 -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) |
| 220 |
-- ar rc $(OUT) *.o |
| 221 |
-+ $(CC) -O0 -g3 -m64 -fno-exceptions -D_SQ64 -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) |
| 222 |
-+ $(AR) rc $(OUT) *.o |
| 223 |
- |
| 224 |
- .PHONY: clean mrproper |
| 225 |
- |
| 226 |
-diff --git a/src/sc_Squirrel3/squirrel/Makefile b/src/sc_Squirrel3/squirrel/Makefile |
| 227 |
-index b03257b..be2c281 100644 |
| 228 |
---- a/src/sc_Squirrel3/squirrel/Makefile |
| 229 |
-+++ b/src/sc_Squirrel3/squirrel/Makefile |
| 230 |
-@@ -37,23 +37,23 @@ SRCS= \ |
| 231 |
- |
| 232 |
- |
| 233 |
- sq32: |
| 234 |
-- gcc -O2 -fno-exceptions -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) |
| 235 |
-- ar rc $(OUT) *.o |
| 236 |
-+ $(CC) -O2 -fno-exceptions -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) |
| 237 |
-+ $(AR) rc $(OUT) *.o |
| 238 |
- rm *.o |
| 239 |
- |
| 240 |
- sqprof: |
| 241 |
-- gcc -O2 -pg -fno-exceptions -fno-rtti -pie -gstabs -g3 -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) |
| 242 |
-- ar rc $(OUT) *.o |
| 243 |
-+ $(CC) -O2 -pg -fno-exceptions -fno-rtti -pie -gstabs -g3 -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) |
| 244 |
-+ $(AR) rc $(OUT) *.o |
| 245 |
- rm *.o |
| 246 |
- |
| 247 |
- sq64: |
| 248 |
-- gcc -O2 -m64 -D_SQ64 -fno-exceptions -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) |
| 249 |
-- ar rc $(OUT) *.o |
| 250 |
-+ $(CC) -O2 -m64 -D_SQ64 -fno-exceptions -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) |
| 251 |
-+ $(AR) rc $(OUT) *.o |
| 252 |
- rm *.o |
| 253 |
- |
| 254 |
- sq64d: |
| 255 |
-- gcc -O0 -g3 -m64 -D_SQ64 -fno-exceptions -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) |
| 256 |
-- ar rc $(OUT) *.o |
| 257 |
-+ $(CC) -O0 -g3 -m64 -D_SQ64 -fno-exceptions -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) |
| 258 |
-+ $(AR) rc $(OUT) *.o |
| 259 |
- |
| 260 |
- .PHONY: clean mrproper |
| 261 |
- |
| 262 |
--- |
| 263 |
-2.26.3 |
| 264 |
- |
| 265 |
|
| 266 |
diff --git a/games-action/blackvoxel/files/blackvoxel-2.42-savedir.patch b/games-action/blackvoxel/files/blackvoxel-2.42-savedir.patch |
| 267 |
deleted file mode 100644 |
| 268 |
index d5bad7b21..000000000 |
| 269 |
--- a/games-action/blackvoxel/files/blackvoxel-2.42-savedir.patch |
| 270 |
+++ /dev/null |
| 271 |
@@ -1,18 +0,0 @@ |
| 272 |
---- a/src/ACompileSettings.h |
| 273 |
-+++ b/src/ACompileSettings.h |
| 274 |
-@@ -129,13 +129,11 @@ |
| 275 |
- |
| 276 |
- #ifdef __linux__ |
| 277 |
- |
| 278 |
-- #define COMPILEOPTION_SAVEFOLDERNAME "Blackvoxel" |
| 279 |
-+ #define COMPILEOPTION_SAVEFOLDERNAME ".local/share/blackvoxel" |
| 280 |
- #define COMPILEOPTION_USEHOMEDIRSTORAGE 1 |
| 281 |
- #define COMPILEOPTION_WINXPTIMECOMPUTING 0 |
| 282 |
- |
| 283 |
-- #if DEVELOPPEMENT_ON == 1 |
| 284 |
-- #define COMPILEOPTION_DATAFILESPATH "" |
| 285 |
-- #else |
| 286 |
-+ #if DEVELOPPEMENT_ON == 0 |
| 287 |
- #ifndef COMPILEOPTION_DATAFILESPATH |
| 288 |
- #if COMPILEOPTION_ONLYSCHOOLMODE |
| 289 |
- #define COMPILEOPTION_DATAFILESPATH "/usr/share/blackvoxel_school" |
| 290 |
|
| 291 |
diff --git a/games-action/blackvoxel/files/blackvoxel-2.42-dont-strip-files.patch b/games-action/blackvoxel/files/blackvoxel-2.50-makefile.patch |
| 292 |
similarity index 57% |
| 293 |
rename from games-action/blackvoxel/files/blackvoxel-2.42-dont-strip-files.patch |
| 294 |
rename to games-action/blackvoxel/files/blackvoxel-2.50-makefile.patch |
| 295 |
index 85f2b1290..8bad61a75 100644 |
| 296 |
--- a/games-action/blackvoxel/files/blackvoxel-2.42-dont-strip-files.patch |
| 297 |
+++ b/games-action/blackvoxel/files/blackvoxel-2.50-makefile.patch |
| 298 |
@@ -1,18 +1,8 @@ |
| 299 |
-From a68c7c2d10bed88a5148828b6f8f02175af696ca Mon Sep 17 00:00:00 2001 |
| 300 |
-From: tastytea <tastytea@××××××××.de> |
| 301 |
-Date: Mon, 3 May 2021 21:25:36 +0200 |
| 302 |
-Subject: [PATCH] Don't strip files. |
| 303 |
- |
| 304 |
---- |
| 305 |
- Makefile | 10 +++++----- |
| 306 |
- src/sc_Squirrel3/sq/Makefile | 4 ++-- |
| 307 |
- 2 files changed, 7 insertions(+), 7 deletions(-) |
| 308 |
- |
| 309 |
diff --git a/Makefile b/Makefile |
| 310 |
-index 62c50cb..57f27d4 100644 |
| 311 |
+index 3e5933a..840d26a 100644 |
| 312 |
--- a/Makefile |
| 313 |
+++ b/Makefile |
| 314 |
-@@ -19,7 +19,7 @@ OBJ= $(SRC:src/%.cpp=obj/%.o) |
| 315 |
+@@ -56,7 +56,7 @@ OBJ= $(SRC:src/%.cpp=obj/%.o) |
| 316 |
ifeq ($(OS),Windows_NT) |
| 317 |
CPU_BITS=32 |
| 318 |
CXXFLAGS+= -O3 -c -fmessage-length=0 -march=i686 |
| 319 |
@@ -21,17 +11,17 @@ index 62c50cb..57f27d4 100644 |
| 320 |
else |
| 321 |
# Unix like operating systems |
| 322 |
CPU_BITS= $(shell getconf LONG_BIT) |
| 323 |
-@@ -28,18 +28,18 @@ else |
| 324 |
+@@ -65,18 +65,18 @@ else |
| 325 |
|
| 326 |
ifeq ($(KERNELNAME),Linux) |
| 327 |
CXXFLAGS+= -O3 -c -fmessage-length=0 |
| 328 |
-- LDFLAGS+=-s -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib |
| 329 |
+- LDFLAGS+=-s -zrelro -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib |
| 330 |
+ LDFLAGS+=-L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib |
| 331 |
else ifeq ($(KERNELNAME), FreeBSD) |
| 332 |
# To be done... |
| 333 |
CXXFLAGS+= -O3 -c -fmessage-length=0 |
| 334 |
- LDFLAGS+=-s -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib |
| 335 |
-+ LDFLAGS+= -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib |
| 336 |
++ LDFLAGS+=-L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib |
| 337 |
else ifeq ($(KERNELNAME), Darwin) |
| 338 |
CXXFLAGS+= -O3 -c -fmessage-length=0 |
| 339 |
- LDFLAGS+=-s -L"src/sc_Squirrel3/lib" -L"/usr/local/Cellar/glew" -L"/usr/local/Cellar/sdl" -I"/usr/local/Cellar/glew" -I"/usr/local/Cellar/sdl" -framework Cocoa -framework OpenGL -lSDLmain -lSDL -lGLEW -lsquirrel -lsqstdlib |
| 340 |
@@ -44,6 +34,76 @@ index 62c50cb..57f27d4 100644 |
| 341 |
endif |
| 342 |
endif |
| 343 |
|
| 344 |
+@@ -94,11 +94,11 @@ installable: BV_DATA_LOCATION_DIR=$(BV_DATA_INSTALL_DIR) |
| 345 |
+ installable: all |
| 346 |
+ |
| 347 |
+ squirrel: |
| 348 |
+- cd src/sc_Squirrel3 ; $(MAKE) sq$(CPU_BITS) |
| 349 |
++ $(MAKE) -C src/sc_Squirrel3 sq$(CPU_BITS) |
| 350 |
+ |
| 351 |
+ clean: |
| 352 |
+ @rm -rf obj |
| 353 |
+- @cd src/sc_Squirrel3 ; $(MAKE) clean |
| 354 |
++ @$(MAKE) -C src/sc_Squirrel3 clean |
| 355 |
+ @rm -f $(PROGNAME) |
| 356 |
+ |
| 357 |
+ mrproper: clean |
| 358 |
+diff --git a/src/sc_Squirrel3/Makefile b/src/sc_Squirrel3/Makefile |
| 359 |
+index 8bc76c8..fb396eb 100644 |
| 360 |
+--- a/src/sc_Squirrel3/Makefile |
| 361 |
++++ b/src/sc_Squirrel3/Makefile |
| 362 |
+@@ -2,33 +2,33 @@ |
| 363 |
+ SQUIRREL=. |
| 364 |
+ |
| 365 |
+ sq32: |
| 366 |
+- cd squirrel; $(MAKE) |
| 367 |
+- cd sqstdlib; $(MAKE) |
| 368 |
+- cd sq; $(MAKE) |
| 369 |
++ $(MAKE) -C squirrel |
| 370 |
++ $(MAKE) -C sqstdlib |
| 371 |
++ $(MAKE) -C sq |
| 372 |
+ |
| 373 |
+ sqprof: |
| 374 |
+- cd squirrel; $(MAKE) sqprof |
| 375 |
+- cd sqstdlib; $(MAKE) sqprof |
| 376 |
+- cd sq; $(MAKE) sqprof |
| 377 |
++ $(MAKE) -C squirrel sqprof |
| 378 |
++ $(MAKE) -C sqstdlib sqprof |
| 379 |
++ $(MAKE) -C sq sqprof |
| 380 |
+ |
| 381 |
+ sq64: |
| 382 |
+- cd squirrel; $(MAKE) sq64 |
| 383 |
+- cd sqstdlib; $(MAKE) sq64 |
| 384 |
+- cd sq; $(MAKE) sq64 |
| 385 |
++ $(MAKE) -C squirrel sq64 |
| 386 |
++ $(MAKE) -C sqstdlib sq64 |
| 387 |
++ $(MAKE) -C sq sq64 |
| 388 |
+ |
| 389 |
+ sq64d: |
| 390 |
+- cd squirrel; $(MAKE) sq64d |
| 391 |
+- cd sqstdlib; $(MAKE) sq64d |
| 392 |
+- cd sq; $(MAKE) sq64d |
| 393 |
++ $(MAKE) -C squirrel sq64d |
| 394 |
++ $(MAKE) -C sqstdlib sq64d |
| 395 |
++ $(MAKE) -C sq sq64d |
| 396 |
+ |
| 397 |
+ .PHONY: clean mrproper |
| 398 |
+ |
| 399 |
+ clean: |
| 400 |
+- cd squirrel; $(MAKE) clean |
| 401 |
+- cd sqstdlib; $(MAKE) clean |
| 402 |
+- cd sq; $(MAKE) clean |
| 403 |
++ $(MAKE) -C squirrel clean |
| 404 |
++ $(MAKE) -C sqstdlib clean |
| 405 |
++ $(MAKE) -C sq clean |
| 406 |
+ |
| 407 |
+ mrproper: |
| 408 |
+- cd squirrel; $(MAKE) mrproper |
| 409 |
+- cd sqstdlib; $(MAKE) mrproper |
| 410 |
+- cd sq; $(MAKE) mrproper |
| 411 |
++ $(MAKE) -C squirrel mrproper |
| 412 |
++ $(MAKE) -C sqstdlib mrproper |
| 413 |
++ $(MAKE) -C sq mrproper |
| 414 |
diff --git a/src/sc_Squirrel3/sq/Makefile b/src/sc_Squirrel3/sq/Makefile |
| 415 |
index 08fb2ef..8cc1cbc 100644 |
| 416 |
--- a/src/sc_Squirrel3/sq/Makefile |
| 417 |
@@ -64,6 +124,3 @@ index 08fb2ef..8cc1cbc 100644 |
| 418 |
|
| 419 |
sq64d: |
| 420 |
$(CXX) -O0 -g3 -m64 -fno-exceptions -fno-rtti -D_SQ64 -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB) |
| 421 |
--- |
| 422 |
-2.26.3 |
| 423 |
- |
| 424 |
|
| 425 |
diff --git a/games-action/blackvoxel/files/blackvoxel-2.50-savedir.patch b/games-action/blackvoxel/files/blackvoxel-2.50-savedir.patch |
| 426 |
new file mode 100644 |
| 427 |
index 000000000..e367917e9 |
| 428 |
--- /dev/null |
| 429 |
+++ b/games-action/blackvoxel/files/blackvoxel-2.50-savedir.patch |
| 430 |
@@ -0,0 +1,31 @@ |
| 431 |
+diff --git a/src/ACompileSettings.h b/src/ACompileSettings.h |
| 432 |
+index 20c31c9..17907ab 100644 |
| 433 |
+--- a/src/ACompileSettings.h |
| 434 |
++++ b/src/ACompileSettings.h |
| 435 |
+@@ -129,7 +129,7 @@ |
| 436 |
+ |
| 437 |
+ #ifdef __linux__ |
| 438 |
+ |
| 439 |
+- #define COMPILEOPTION_SAVEFOLDERNAME "Blackvoxel" |
| 440 |
++ #define COMPILEOPTION_SAVEFOLDERNAME ".local/share/blackvoxel" |
| 441 |
+ #define COMPILEOPTION_USEHOMEDIRSTORAGE 1 |
| 442 |
+ #define COMPILEOPTION_WINXPTIMECOMPUTING 0 |
| 443 |
+ |
| 444 |
+@@ -149,7 +149,7 @@ |
| 445 |
+ |
| 446 |
+ #elif _WIN32 |
| 447 |
+ |
| 448 |
+- #define COMPILEOPTION_SAVEFOLDERNAME "Blackvoxel" |
| 449 |
++ #define COMPILEOPTION_SAVEFOLDERNAME ".local/share/blackvoxel" |
| 450 |
+ #define COMPILEOPTION_USEHOMEDIRSTORAGE 1 |
| 451 |
+ #define COMPILEOPTION_DATAFILESPATH "" |
| 452 |
+ #define COMPILEOPTION_WINXPTIMECOMPUTING 1 |
| 453 |
+@@ -166,7 +166,7 @@ |
| 454 |
+ |
| 455 |
+ #elif __APPLE__ && __MACH__ |
| 456 |
+ |
| 457 |
+- #define COMPILEOPTION_SAVEFOLDERNAME "Blackvoxel" |
| 458 |
++ #define COMPILEOPTION_SAVEFOLDERNAME ".local/share/blackvoxel" |
| 459 |
+ #define COMPILEOPTION_USEHOMEDIRSTORAGE 1 |
| 460 |
+ #define COMPILEOPTION_DATAFILESPATH "" |
| 461 |
+ #define COMPILEOPTION_WINXPTIMECOMPUTING 0 |
Archives