mirrors/guru
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/guru.git synced 2026-07-08 22:52:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

games-action/blackvoxel: version bump

Browse Source 
Signed-off-by: Samuel Bauer <samuel.bauer@yahoo.fr>
This commit is contained in:
Samuel Bauer
2022-01-21 04:54:04 +01:00
parent 9bb6cd8cb6
commit 60effe55d6
6 changed files with 110 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
games-action/blackvoxel/Manifest
View File

@@ -1 +1 @@
DIST blackvoxel-2.42.tar.bz2 18367949 BLAKE2B f45da57846370ae2109709cb28f3bb02fbd63ff208306705dd8da544737f84250542a4c58b3889e603f16ca898f9ee4458361c326fd28f68cb2a70f891de0f67 SHA512 275c7cb34c58bbd772bc1daf7beb26395c509d37341fe1c343f745bc3fa73223f9d36b275f0813a06908f258b39f94c1e4229f8e27fb822cf71881e66fccd3fb
DIST blackvoxel-2.50.tar.bz2 20766720 BLAKE2B 879b1cadeec85f6a38cfeca422c416bed844907dc45757cd66669fe9a2d78628cc07db14571e2c4afa3236cc3e69e86b36f48814c2dfb2b0d9698255949fd4cf SHA512 76b22288f280360926110f0d09a778246970f94a466447f892574057aabe1c068854c2e1131baa3f9b5a0edf183679717eb4794af42672701146b185b610332c

7
games-action/blackvoxel/blackvoxel-2.42.ebuild → games-action/blackvoxel/blackvoxel-2.50.ebuild
View File

@@ -1,13 +1,13 @@
# Copyright 2020-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
EAPI=8
inherit desktop toolchain-funcs xdg
DESCRIPTION="Blackvoxel Video Game"
HOMEPAGE="https://www.blackvoxel.com/"
SRC_URI="https://www.blackvoxel.com/dm_download.php?file=163&key=1 -> ${P}.tar.bz2"
SRC_URI="https://www.blackvoxel.com/dm_download.php?file=170&key=1 -> ${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
@@ -29,7 +29,6 @@ S="${WORKDIR}/${PN}_source_${PV//./_}"
PATCHES=(
"${FILESDIR}"/${P}-makefile.patch
"${FILESDIR}"/${P}-savedir.patch
"${FILESDIR}"/${P}-dont-strip-files.patch
)
src_compile() {
@@ -37,7 +36,7 @@ src_compile() {
export CC="$(tc-getCC)"
export AR="$(tc-getAR)"
emake blackvoxeldatadir="/usr/share/${PN}" bindir="/usr/bin"
emake BV_DATA_LOCATION_DIR="/usr/share/${PN}"
}
src_install() {

190
games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch
View File

@@ -1,190 +0,0 @@
From 18ae2cca1ef8b9e04b463719d03b021245ecfeec Mon Sep 17 00:00:00 2001
From: tastytea <tastytea@tastytea.de>
Date: Mon, 3 May 2021 21:21:25 +0200
Subject: [PATCH] Don't overwrite build-flags, replace hardcoded tools with
variables.
Also remove -zrelro from LDFLAGS.
---
Makefile | 31 +++++++++++++++---------------
src/sc_Squirrel3/sq/Makefile | 8 ++++----
src/sc_Squirrel3/sqstdlib/Makefile | 16 +++++++--------
src/sc_Squirrel3/squirrel/Makefile | 16 +++++++--------
4 files changed, 35 insertions(+), 36 deletions(-)
diff --git a/Makefile b/Makefile
index 3fac7f3..d1104e7 100644
--- a/Makefile
+++ b/Makefile
@@ -8,10 +8,9 @@ ifndef bindir
endif
# Base options
-CC=g++
-LD=g++
+CXX?=g++
PROGNAME=blackvoxel
-CFLAGS=-I "src/sc_Squirrel3/include" -DCOMPILEOPTION_DEMO=0 -DDEVELOPPEMENT_ON=0 -DCOMPILEOPTION_SPECIAL=0 -DCOMPILEOPTION_DATAFILESPATH="\"$(blackvoxeldatadir)\""
+CXXFLAGS+=-I "src/sc_Squirrel3/include" -DCOMPILEOPTION_DEMO=0 -DDEVELOPPEMENT_ON=0 -DCOMPILEOPTION_SPECIAL=0 -DCOMPILEOPTION_DATAFILESPATH="\"$(blackvoxeldatadir)\""
SRC= $(wildcard src/*.cpp) $(wildcard src/z/*.cpp)
OBJ= $(SRC:src/%.cpp=obj/%.o)
@@ -19,8 +18,8 @@ OBJ= $(SRC:src/%.cpp=obj/%.o)
ifeq ($(OS),Windows_NT)
CPU_BITS=32
- CFLAGS+= -O3 -c -fmessage-length=0 -march=i686
- LDFLAGS= -s -Xlinker --large-address-aware -mwindows -L"src/sc_Squirrel3/lib" -lmingw32 -lSDLmain -lSDL -llibglew32 -lglu32 -lopengl32 -llibglut -lsquirrel -lsqstdlib
+ CXXFLAGS+= -O3 -c -fmessage-length=0 -march=i686
+ LDFLAGS+= -s -Xlinker --large-address-aware -mwindows -L"src/sc_Squirrel3/lib" -lmingw32 -lSDLmain -lSDL -llibglew32 -lglu32 -lopengl32 -llibglut -lsquirrel -lsqstdlib
else
# Unix like operating systems
CPU_BITS= $(shell getconf LONG_BIT)
@@ -28,36 +27,36 @@ else
KERNELNAME =$(shell uname -s)
ifeq ($(KERNELNAME),Linux)
- CFLAGS+= -O3 -c -fmessage-length=0
- LDFLAGS=-s -zrelro -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib
+ CXXFLAGS+= -O3 -c -fmessage-length=0
+ LDFLAGS+=-s -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib
else ifeq ($(KERNELNAME), FreeBSD)
# To be done...
- CFLAGS+= -O3 -c -fmessage-length=0
- LDFLAGS=-s -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib
+ CXXFLAGS+= -O3 -c -fmessage-length=0
+ LDFLAGS+=-s -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib
else ifeq ($(KERNELNAME), Darwin)
- CFLAGS+= -O3 -c -fmessage-length=0
- 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
+ CXXFLAGS+= -O3 -c -fmessage-length=0
+ 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
else
# Unknow kernel... trying default flags
- CFLAGS+= -O3 -c -fmessage-length=0
- LDFLAGS=-s -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib
+ CXXFLAGS+= -O3 -c -fmessage-length=0
+ LDFLAGS+=-s -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib
endif
endif
obj/%.o: src/%.cpp
@mkdir -p obj/z
- $(CC) -o $@ -c $< $(CFLAGS)
+ $(CXX) -o $@ -c $< $(CXXFLAGS)
all: $(PROGNAME)
$(PROGNAME): $(OBJ) squirrel
- $(LD) -o $(PROGNAME) $(OBJ) $(LDFLAGS)
+ $(CXX) -o $(PROGNAME) $(OBJ) $(LDFLAGS)
squirrel:
- cd src/sc_Squirrel3 ; make sq$(CPU_BITS)
+ +make -C src/sc_Squirrel3 sq$(CPU_BITS)
clean:
@rm -rf obj
diff --git a/src/sc_Squirrel3/sq/Makefile b/src/sc_Squirrel3/sq/Makefile
index c2cfc7e..08fb2ef 100644
--- a/src/sc_Squirrel3/sq/Makefile
+++ b/src/sc_Squirrel3/sq/Makefile
@@ -12,16 +12,16 @@ SRCS= sq.c
sq32:
- g++ -O2 -s -fno-exceptions -fno-rtti -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
+ $(CXX) -O2 -s -fno-exceptions -fno-rtti -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
sqprof:
- g++ -O2 -pg -fno-exceptions -fno-rtti -pie -gstabs -g3 -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
+ $(CXX) -O2 -pg -fno-exceptions -fno-rtti -pie -gstabs -g3 -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
sq64:
- g++ -O2 -s -m64 -fno-exceptions -fno-rtti -D_SQ64 -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
+ $(CXX) -O2 -s -m64 -fno-exceptions -fno-rtti -D_SQ64 -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
sq64d:
- g++ -O0 -g3 -m64 -fno-exceptions -fno-rtti -D_SQ64 -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
+ $(CXX) -O0 -g3 -m64 -fno-exceptions -fno-rtti -D_SQ64 -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
.PHONY: clean mrproper
diff --git a/src/sc_Squirrel3/sqstdlib/Makefile b/src/sc_Squirrel3/sqstdlib/Makefile
index 643d7fc..41ee3f7 100644
--- a/src/sc_Squirrel3/sqstdlib/Makefile
+++ b/src/sc_Squirrel3/sqstdlib/Makefile
@@ -26,23 +26,23 @@ SRCS= \
sq32:
- gcc -O2 -fno-exceptions -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ)
- ar rc $(OUT) *.o
+ $(CC) -O2 -fno-exceptions -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ)
+ $(AR) rc $(OUT) *.o
rm *.o
sqprof:
- gcc -O2 -pg -fno-exceptions -fno-rtti -pie -gstabs -g3 -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ)
- ar rc $(OUT) *.o
+ $(CC) -O2 -pg -fno-exceptions -fno-rtti -pie -gstabs -g3 -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ)
+ $(AR) rc $(OUT) *.o
rm *.o
sq64:
- gcc -O2 -m64 -fno-exceptions -D_SQ64 -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ)
- ar rc $(OUT) *.o
+ $(CC) -O2 -m64 -fno-exceptions -D_SQ64 -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ)
+ $(AR) rc $(OUT) *.o
rm *.o
sq64d:
- gcc -O0 -g3 -m64 -fno-exceptions -D_SQ64 -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ)
- ar rc $(OUT) *.o
+ $(CC) -O0 -g3 -m64 -fno-exceptions -D_SQ64 -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ)
+ $(AR) rc $(OUT) *.o
.PHONY: clean mrproper
diff --git a/src/sc_Squirrel3/squirrel/Makefile b/src/sc_Squirrel3/squirrel/Makefile
index b03257b..be2c281 100644
--- a/src/sc_Squirrel3/squirrel/Makefile
+++ b/src/sc_Squirrel3/squirrel/Makefile
@@ -37,23 +37,23 @@ SRCS= \
sq32:
- gcc -O2 -fno-exceptions -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS)
- ar rc $(OUT) *.o
+ $(CC) -O2 -fno-exceptions -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS)
+ $(AR) rc $(OUT) *.o
rm *.o
sqprof:
- gcc -O2 -pg -fno-exceptions -fno-rtti -pie -gstabs -g3 -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS)
- ar rc $(OUT) *.o
+ $(CC) -O2 -pg -fno-exceptions -fno-rtti -pie -gstabs -g3 -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS)
+ $(AR) rc $(OUT) *.o
rm *.o
sq64:
- gcc -O2 -m64 -D_SQ64 -fno-exceptions -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS)
- ar rc $(OUT) *.o
+ $(CC) -O2 -m64 -D_SQ64 -fno-exceptions -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS)
+ $(AR) rc $(OUT) *.o
rm *.o
sq64d:
- gcc -O0 -g3 -m64 -D_SQ64 -fno-exceptions -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS)
- ar rc $(OUT) *.o
+ $(CC) -O0 -g3 -m64 -D_SQ64 -fno-exceptions -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS)
+ $(AR) rc $(OUT) *.o
.PHONY: clean mrproper
--
2.26.3

18
games-action/blackvoxel/files/blackvoxel-2.42-savedir.patch
View File

@@ -1,18 +0,0 @@
--- a/src/ACompileSettings.h
+++ b/src/ACompileSettings.h
@@ -129,13 +129,11 @@
#ifdef __linux__
- #define COMPILEOPTION_SAVEFOLDERNAME "Blackvoxel"
+ #define COMPILEOPTION_SAVEFOLDERNAME ".local/share/blackvoxel"
#define COMPILEOPTION_USEHOMEDIRSTORAGE 1
#define COMPILEOPTION_WINXPTIMECOMPUTING 0
- #if DEVELOPPEMENT_ON == 1
- #define COMPILEOPTION_DATAFILESPATH ""
- #else
+ #if DEVELOPPEMENT_ON == 0
#ifndef COMPILEOPTION_DATAFILESPATH
#if COMPILEOPTION_ONLYSCHOOLMODE
#define COMPILEOPTION_DATAFILESPATH "/usr/share/blackvoxel_school"

93
games-action/blackvoxel/files/blackvoxel-2.42-dont-strip-files.patch → games-action/blackvoxel/files/blackvoxel-2.50-makefile.patch
View File

@@ -1,18 +1,8 @@
From a68c7c2d10bed88a5148828b6f8f02175af696ca Mon Sep 17 00:00:00 2001
From: tastytea <tastytea@tastytea.de>
Date: Mon, 3 May 2021 21:25:36 +0200
Subject: [PATCH] Don't strip files.
---
Makefile | 10 +++++-----
src/sc_Squirrel3/sq/Makefile | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile
index 62c50cb..57f27d4 100644
index 3e5933a..840d26a 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ OBJ= $(SRC:src/%.cpp=obj/%.o)
@@ -56,7 +56,7 @@ OBJ= $(SRC:src/%.cpp=obj/%.o)
ifeq ($(OS),Windows_NT)
CPU_BITS=32
CXXFLAGS+= -O3 -c -fmessage-length=0 -march=i686
@@ -21,17 +11,17 @@ index 62c50cb..57f27d4 100644
else
# Unix like operating systems
CPU_BITS= $(shell getconf LONG_BIT)
@@ -28,18 +28,18 @@ else
@@ -65,18 +65,18 @@ else
ifeq ($(KERNELNAME),Linux)
CXXFLAGS+= -O3 -c -fmessage-length=0
- LDFLAGS+=-s -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib
- LDFLAGS+=-s -zrelro -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib
+ LDFLAGS+=-L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib
else ifeq ($(KERNELNAME), FreeBSD)
# To be done...
CXXFLAGS+= -O3 -c -fmessage-length=0
- LDFLAGS+=-s -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib
+ LDFLAGS+= -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib
+ LDFLAGS+=-L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib
else ifeq ($(KERNELNAME), Darwin)
CXXFLAGS+= -O3 -c -fmessage-length=0
- 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
@@ -44,6 +34,76 @@ index 62c50cb..57f27d4 100644
endif
endif
@@ -94,11 +94,11 @@ installable: BV_DATA_LOCATION_DIR=$(BV_DATA_INSTALL_DIR)
installable: all
squirrel:
- cd src/sc_Squirrel3 ; $(MAKE) sq$(CPU_BITS)
+ $(MAKE) -C src/sc_Squirrel3 sq$(CPU_BITS)
clean:
@rm -rf obj
- @cd src/sc_Squirrel3 ; $(MAKE) clean
+ @$(MAKE) -C src/sc_Squirrel3 clean
@rm -f $(PROGNAME)
mrproper: clean
diff --git a/src/sc_Squirrel3/Makefile b/src/sc_Squirrel3/Makefile
index 8bc76c8..fb396eb 100644
--- a/src/sc_Squirrel3/Makefile
+++ b/src/sc_Squirrel3/Makefile
@@ -2,33 +2,33 @@
SQUIRREL=.
sq32:
- cd squirrel; $(MAKE)
- cd sqstdlib; $(MAKE)
- cd sq; $(MAKE)
+ $(MAKE) -C squirrel
+ $(MAKE) -C sqstdlib
+ $(MAKE) -C sq
sqprof:
- cd squirrel; $(MAKE) sqprof
- cd sqstdlib; $(MAKE) sqprof
- cd sq; $(MAKE) sqprof
+ $(MAKE) -C squirrel sqprof
+ $(MAKE) -C sqstdlib sqprof
+ $(MAKE) -C sq sqprof
sq64:
- cd squirrel; $(MAKE) sq64
- cd sqstdlib; $(MAKE) sq64
- cd sq; $(MAKE) sq64
+ $(MAKE) -C squirrel sq64
+ $(MAKE) -C sqstdlib sq64
+ $(MAKE) -C sq sq64
sq64d:
- cd squirrel; $(MAKE) sq64d
- cd sqstdlib; $(MAKE) sq64d
- cd sq; $(MAKE) sq64d
+ $(MAKE) -C squirrel sq64d
+ $(MAKE) -C sqstdlib sq64d
+ $(MAKE) -C sq sq64d
.PHONY: clean mrproper
clean:
- cd squirrel; $(MAKE) clean
- cd sqstdlib; $(MAKE) clean
- cd sq; $(MAKE) clean
+ $(MAKE) -C squirrel clean
+ $(MAKE) -C sqstdlib clean
+ $(MAKE) -C sq clean
mrproper:
- cd squirrel; $(MAKE) mrproper
- cd sqstdlib; $(MAKE) mrproper
- cd sq; $(MAKE) mrproper
+ $(MAKE) -C squirrel mrproper
+ $(MAKE) -C sqstdlib mrproper
+ $(MAKE) -C sq mrproper
diff --git a/src/sc_Squirrel3/sq/Makefile b/src/sc_Squirrel3/sq/Makefile
index 08fb2ef..8cc1cbc 100644
--- a/src/sc_Squirrel3/sq/Makefile
@@ -64,6 +124,3 @@ index 08fb2ef..8cc1cbc 100644
sq64d:
$(CXX) -O0 -g3 -m64 -fno-exceptions -fno-rtti -D_SQ64 -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
--
2.26.3

31
games-action/blackvoxel/files/blackvoxel-2.50-savedir.patch Normal file
View File

@@ -0,0 +1,31 @@
diff --git a/src/ACompileSettings.h b/src/ACompileSettings.h
index 20c31c9..17907ab 100644
--- a/src/ACompileSettings.h
+++ b/src/ACompileSettings.h
@@ -129,7 +129,7 @@
#ifdef __linux__
- #define COMPILEOPTION_SAVEFOLDERNAME "Blackvoxel"
+ #define COMPILEOPTION_SAVEFOLDERNAME ".local/share/blackvoxel"
#define COMPILEOPTION_USEHOMEDIRSTORAGE 1
#define COMPILEOPTION_WINXPTIMECOMPUTING 0
@@ -149,7 +149,7 @@
#elif _WIN32
- #define COMPILEOPTION_SAVEFOLDERNAME "Blackvoxel"
+ #define COMPILEOPTION_SAVEFOLDERNAME ".local/share/blackvoxel"
#define COMPILEOPTION_USEHOMEDIRSTORAGE 1
#define COMPILEOPTION_DATAFILESPATH ""
#define COMPILEOPTION_WINXPTIMECOMPUTING 1
@@ -166,7 +166,7 @@
#elif __APPLE__ && __MACH__
- #define COMPILEOPTION_SAVEFOLDERNAME "Blackvoxel"
+ #define COMPILEOPTION_SAVEFOLDERNAME ".local/share/blackvoxel"
#define COMPILEOPTION_USEHOMEDIRSTORAGE 1
#define COMPILEOPTION_DATAFILESPATH ""
#define COMPILEOPTION_WINXPTIMECOMPUTING 0