* [gentoo-commits] repo/proj/guru:dev commit in: games-action/blackvoxel/files/, games-action/blackvoxel/
@ 2021-04-29 20:20 Samuel Bauer
0 siblings, 0 replies; 3+ messages in thread
From: Samuel Bauer @ 2021-04-29 20:20 UTC (permalink / raw
To: gentoo-commits
commit: 3476a3262beada5fd1f938c649228e0a6fb09b07
Author: Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Thu Apr 29 20:18:56 2021 +0000
Commit: Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Thu Apr 29 20:18:56 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3476a326
games-action/blackvoxel: new ebuild
Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>
games-action/blackvoxel/Manifest | 1 +
games-action/blackvoxel/blackvoxel-2.42.ebuild | 48 ++++++++++++++++++++++
games-action/blackvoxel/blackvoxel-9999.ebuild | 46 +++++++++++++++++++++
.../files/blackvoxel-2.42-makefile.patch | 30 ++++++++++++++
.../blackvoxel/files/blackvoxel-2.42-savedir.patch | 18 ++++++++
games-action/blackvoxel/metadata.xml | 8 ++++
6 files changed, 151 insertions(+)
diff --git a/games-action/blackvoxel/Manifest b/games-action/blackvoxel/Manifest
new file mode 100644
index 000000000..9493eb6ce
--- /dev/null
+++ b/games-action/blackvoxel/Manifest
@@ -0,0 +1 @@
+DIST blackvoxel-2.42.tar.bz2 18367949 BLAKE2B f45da57846370ae2109709cb28f3bb02fbd63ff208306705dd8da544737f84250542a4c58b3889e603f16ca898f9ee4458361c326fd28f68cb2a70f891de0f67 SHA512 275c7cb34c58bbd772bc1daf7beb26395c509d37341fe1c343f745bc3fa73223f9d36b275f0813a06908f258b39f94c1e4229f8e27fb822cf71881e66fccd3fb
diff --git a/games-action/blackvoxel/blackvoxel-2.42.ebuild b/games-action/blackvoxel/blackvoxel-2.42.ebuild
new file mode 100644
index 000000000..125773d8b
--- /dev/null
+++ b/games-action/blackvoxel/blackvoxel-2.42.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop eutils 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"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ dev-libs/expat
+ media-libs/alsa-lib
+ media-libs/glew:0
+ media-libs/libsdl
+ x11-libs/libX11
+ virtual/opengl
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}_source_${PV//./_}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-makefile.patch
+ "${FILESDIR}"/${P}-savedir.patch
+)
+
+src_compile() {
+ emake blackvoxeldatadir="/usr/share/${PN}" bindir="/usr/bin"
+}
+
+src_install() {
+ dodoc Contributors.txt
+ doman blackvoxel.6
+ newicon -s 16 Icons/blackvoxel-16x16.png blackvoxel.png
+ newicon -s 32 Icons/blackvoxel-32x32.png blackvoxel.png
+ newicon -s 128 Icons/blackvoxel_128x128.png blackvoxel.png
+
+ dobin blackvoxel
+ insinto "/usr/share/${PN}"
+ doins -r Misc Sound VoxelTypes gui randomnum.dat
+}
diff --git a/games-action/blackvoxel/blackvoxel-9999.ebuild b/games-action/blackvoxel/blackvoxel-9999.ebuild
new file mode 100644
index 000000000..6e3d11256
--- /dev/null
+++ b/games-action/blackvoxel/blackvoxel-9999.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils git-r3
+
+DESCRIPTION="Blackvoxel Video Game"
+HOMEPAGE="https://www.blackvoxel.com/"
+EGIT_REPO_URI="https://github.com/Blackvoxel/Blackvoxel"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+DEPEND="
+ dev-libs/expat
+ media-libs/alsa-lib
+ media-libs/glew:0
+ media-libs/libsdl
+ x11-libs/libX11
+ virtual/opengl
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ sed -i -e '/COMPILEOPTION_SAVEFOLDERNAME/s:Blackvoxel:.local/share/blackvoxel:' \
+ src/ACompileSettings.h || die
+ sed -i -e 's/LDFLAGS=/LDFLAGS+= /' -e 's/LDFLAGS/s/-s //' \
+ -e '/(CPU_BITS)/ { s/; make //; s/cd/+make -C/}' \
+ -e '/CFLAGS+/d' -e 's/CFLAGS=/CFLAGS+=/' Makefile || die
+ default
+}
+
+src_compile() {
+ emake blackvoxeldatadir="/usr/share/${PN}" bindir="/usr/bin"
+}
+
+src_install() {
+ dodoc Contributors.txt README.md
+
+ dobin blackvoxel
+ insinto "/usr/share/${PN}"
+ doins -r Misc Sound VoxelTypes gui randomnum.dat
+}
diff --git a/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch b/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch
new file mode 100644
index 000000000..5ce5184b4
--- /dev/null
+++ b/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch
@@ -0,0 +1,30 @@
+--- a/Makefile
++++ b/Makefile
+@@ -11,7 +11,7 @@
+ CC=g++
+ LD=g++
+ PROGNAME=blackvoxel
+-CFLAGS=-I "src/sc_Squirrel3/include" -DCOMPILEOPTION_DEMO=0 -DDEVELOPPEMENT_ON=0 -DCOMPILEOPTION_SPECIAL=0 -DCOMPILEOPTION_DATAFILESPATH="\"$(blackvoxeldatadir)\""
++CFLAGS+=-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)
+
+@@ -28,8 +28,7 @@
+ 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
++ LDFLAGS+= -zrelro -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib
+ else ifeq ($(KERNELNAME), FreeBSD)
+ # To be done...
+ CFLAGS+= -O3 -c -fmessage-length=0
+@@ -57,7 +56,7 @@
+
+
+ squirrel:
+- cd src/sc_Squirrel3 ; make sq$(CPU_BITS)
++ +make -C src/sc_Squirrel3 sq$(CPU_BITS)
+
+ clean:
+ @rm -rf obj
diff --git a/games-action/blackvoxel/files/blackvoxel-2.42-savedir.patch b/games-action/blackvoxel/files/blackvoxel-2.42-savedir.patch
new file mode 100644
index 000000000..d5bad7b21
--- /dev/null
+++ b/games-action/blackvoxel/files/blackvoxel-2.42-savedir.patch
@@ -0,0 +1,18 @@
+--- 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"
diff --git a/games-action/blackvoxel/metadata.xml b/games-action/blackvoxel/metadata.xml
new file mode 100644
index 000000000..ffffe4022
--- /dev/null
+++ b/games-action/blackvoxel/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+ <name>mazes-80</name>
+ <email>mazes-80@none.org</email>
+</maintainer>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: games-action/blackvoxel/files/, games-action/blackvoxel/
@ 2021-05-03 1:29 Ronny Gutbrod
0 siblings, 0 replies; 3+ messages in thread
From: Ronny Gutbrod @ 2021-05-03 1:29 UTC (permalink / raw
To: gentoo-commits
commit: e2ea6e4b2f789206d798e4f909b21dc6d8c6dfa1
Author: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea <DOT> de>
AuthorDate: Mon May 3 00:19:00 2021 +0000
Commit: Ronny Gutbrod <gentoo <AT> tastytea <DOT> de>
CommitDate: Mon May 3 01:27:00 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e2ea6e4b
games-action/blackvoxel: Remove hardcoded tools, set CXX, CC and AR.
Changes proposed upstream:
<https://github.com/Blackvoxel/Blackvoxel/pull/35>.
Closes: https://bugs.gentoo.org/787074
Signed-off-by: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea.de>
games-action/blackvoxel/blackvoxel-2.42.ebuild | 8 +-
.../files/blackvoxel-2.42-makefile.patch | 179 +++++++++++++++++++--
2 files changed, 172 insertions(+), 15 deletions(-)
diff --git a/games-action/blackvoxel/blackvoxel-2.42.ebuild b/games-action/blackvoxel/blackvoxel-2.42.ebuild
index aac110c09..8c2a6db25 100644
--- a/games-action/blackvoxel/blackvoxel-2.42.ebuild
+++ b/games-action/blackvoxel/blackvoxel-2.42.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit desktop xdg
+inherit desktop toolchain-funcs xdg
DESCRIPTION="Blackvoxel Video Game"
HOMEPAGE="https://www.blackvoxel.com/"
@@ -32,6 +32,10 @@ PATCHES=(
)
src_compile() {
+ export CXX="$(tc-getCXX)"
+ export CC="$(tc-getCC)"
+ export AR="$(tc-getAR)"
+
emake blackvoxeldatadir="/usr/share/${PN}" bindir="/usr/bin"
}
diff --git a/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch b/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch
index c8e826c68..f6f857212 100644
--- a/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch
+++ b/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch
@@ -1,30 +1,183 @@
+From a4fbc416e1c9884353f743f84ca98207f792b502 Mon Sep 17 00:00:00 2001
+From: tastytea <tastytea@tastytea.de>
+Date: Mon, 3 May 2021 02:26:12 +0200
+Subject: [PATCH] Don't overwrite build-flags, replace hardcoded tools with
+ variables.
+
+---
+ Makefile | 29 ++++++++++++++---------------
+ src/sc_Squirrel3/sq/Makefile | 8 ++++----
+ src/sc_Squirrel3/sqstdlib/Makefile | 16 ++++++++--------
+ src/sc_Squirrel3/squirrel/Makefile | 16 ++++++++--------
+ 4 files changed, 34 insertions(+), 35 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 3fac7f3..a85dd7e 100644
--- a/Makefile
+++ b/Makefile
-@@ -11,7 +11,7 @@
- CC=g++
- LD=g++
+@@ -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)\""
-+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)
-@@ -28,8 +28,7 @@
+@@ -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,31 +27,31 @@ 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
-+ LDFLAGS+= -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib
++ CXXFLAGS+= -O3 -c -fmessage-length=0
++ LDFLAGS+=-s -zrelro -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib
else ifeq ($(KERNELNAME), FreeBSD)
# To be done...
- CFLAGS+= -O3 -c -fmessage-length=0
-@@ -57,7 +56,7 @@
+- 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
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: games-action/blackvoxel/files/, games-action/blackvoxel/
@ 2021-05-03 1:29 Ronny Gutbrod
0 siblings, 0 replies; 3+ messages in thread
From: Ronny Gutbrod @ 2021-05-03 1:29 UTC (permalink / raw
To: gentoo-commits
commit: e3d04544b9a85ca5600f66387312bc49755999d2
Author: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea <DOT> de>
AuthorDate: Mon May 3 00:53:01 2021 +0000
Commit: Ronny Gutbrod <gentoo <AT> tastytea <DOT> de>
CommitDate: Mon May 3 01:28:56 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e3d04544
games-action/blackvoxel: Don't strip files.
Signed-off-by: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea.de>
games-action/blackvoxel/blackvoxel-2.42.ebuild | 1 +
.../files/blackvoxel-2.42-dont-strip-files.patch | 69 ++++++++++++++++++++++
2 files changed, 70 insertions(+)
diff --git a/games-action/blackvoxel/blackvoxel-2.42.ebuild b/games-action/blackvoxel/blackvoxel-2.42.ebuild
index 8c2a6db25..4216d47ce 100644
--- a/games-action/blackvoxel/blackvoxel-2.42.ebuild
+++ b/games-action/blackvoxel/blackvoxel-2.42.ebuild
@@ -29,6 +29,7 @@ S="${WORKDIR}/${PN}_source_${PV//./_}"
PATCHES=(
"${FILESDIR}"/${P}-makefile.patch
"${FILESDIR}"/${P}-savedir.patch
+ "${FILESDIR}"/${P}-dont-strip-files.patch
)
src_compile() {
diff --git a/games-action/blackvoxel/files/blackvoxel-2.42-dont-strip-files.patch b/games-action/blackvoxel/files/blackvoxel-2.42-dont-strip-files.patch
new file mode 100644
index 000000000..7be84fbbf
--- /dev/null
+++ b/games-action/blackvoxel/files/blackvoxel-2.42-dont-strip-files.patch
@@ -0,0 +1,69 @@
+From b6baebbd17479d9b6f6083797fa4eb63741fa52b Mon Sep 17 00:00:00 2001
+From: tastytea <tastytea@tastytea.de>
+Date: Mon, 3 May 2021 03:05:19 +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 a85dd7e..51cb0fd 100644
+--- a/Makefile
++++ b/Makefile
+@@ -19,7 +19,7 @@ OBJ= $(SRC:src/%.cpp=obj/%.o)
+ ifeq ($(OS),Windows_NT)
+ CPU_BITS=32
+ 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
++ LDFLAGS+= -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,18 +28,18 @@ else
+
+ ifeq ($(KERNELNAME),Linux)
+ CXXFLAGS+= -O3 -c -fmessage-length=0
+- LDFLAGS+=-s -zrelro -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib
++ LDFLAGS+=-zrelro -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
+ 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
++ LDFLAGS+=-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
+ 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
+ endif
+ endif
+
+diff --git a/src/sc_Squirrel3/sq/Makefile b/src/sc_Squirrel3/sq/Makefile
+index 08fb2ef..8cc1cbc 100644
+--- a/src/sc_Squirrel3/sq/Makefile
++++ b/src/sc_Squirrel3/sq/Makefile
+@@ -12,13 +12,13 @@ SRCS= sq.c
+
+
+ sq32:
+- $(CXX) -O2 -s -fno-exceptions -fno-rtti -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
++ $(CXX) -O2 -fno-exceptions -fno-rtti -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
+
+ sqprof:
+ $(CXX) -O2 -pg -fno-exceptions -fno-rtti -pie -gstabs -g3 -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
+
+ sq64:
+- $(CXX) -O2 -s -m64 -fno-exceptions -fno-rtti -D_SQ64 -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
++ $(CXX) -O2 -m64 -fno-exceptions -fno-rtti -D_SQ64 -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
+
+ sq64d:
+ $(CXX) -O0 -g3 -m64 -fno-exceptions -fno-rtti -D_SQ64 -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
+--
+2.26.3
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-05-03 1:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-29 20:20 [gentoo-commits] repo/proj/guru:dev commit in: games-action/blackvoxel/files/, games-action/blackvoxel/ Samuel Bauer
-- strict thread matches above, loose matches on Subject: below --
2021-05-03 1:29 Ronny Gutbrod
2021-05-03 1:29 Ronny Gutbrod
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox