[gentoo-commits] repo/proj/guru:master commit in: games-action/blackvoxel/, games-action/blackvoxel/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/proj/guru:master commit in: games-action/blackvoxel/, games-action/blackvoxel/files/
@ 2021-04-30  7:45 Andrew Ammerlaan
  0 siblings, 0 replies; 4+ messages in thread
From: Andrew Ammerlaan @ 2021-04-30  7:45 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:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
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] 4+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: games-action/blackvoxel/, games-action/blackvoxel/files/
@ 2021-04-30  7:45 Andrew Ammerlaan
  0 siblings, 0 replies; 4+ messages in thread
From: Andrew Ammerlaan @ 2021-04-30  7:45 UTC (permalink / raw
  To: gentoo-commits

commit:     82d2ff05ea04217bfcd504e9066c902f0ce3a6f6
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Fri Apr 30 03:15:34 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Fri Apr 30 03:15:34 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=82d2ff05

games-action/blackvoxel: drop -zrelro ldflag

Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>

 games-action/blackvoxel/blackvoxel-9999.ebuild               | 5 +++--
 games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/games-action/blackvoxel/blackvoxel-9999.ebuild b/games-action/blackvoxel/blackvoxel-9999.ebuild
index b52f4b8b1..d20271cef 100644
--- a/games-action/blackvoxel/blackvoxel-9999.ebuild
+++ b/games-action/blackvoxel/blackvoxel-9999.ebuild
@@ -27,9 +27,10 @@ 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 //' \
+	sed -i -e 's/LDFLAGS=/LDFLAGS+= /' -e '/LDFLAGS/s/-s -zrelro //' \
 		-e '/(CPU_BITS)/ { s/; make //; s/cd/+make -C/}' \
-		-e '/CFLAGS+/d' -e 's/CFLAGS=/CFLAGS+=/' Makefile || die
+		-e '/CFLAGS+/d' -e 's/CFLAGS=/CFLAGS+=/' \
+		Makefile || die
 	default
 }
 

diff --git a/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch b/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch
index 5ce5184b4..c8e826c68 100644
--- a/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch
+++ b/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch
@@ -15,7 +15,7 @@
    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
++    LDFLAGS+= -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib
    else ifeq ($(KERNELNAME), FreeBSD)
      # To be done...
      CFLAGS+= -O3 -c -fmessage-length=0


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: games-action/blackvoxel/, games-action/blackvoxel/files/
@ 2022-01-21  9:14 Florian Schmaus
  0 siblings, 0 replies; 4+ messages in thread
From: Florian Schmaus @ 2022-01-21  9:14 UTC (permalink / raw
  To: gentoo-commits

commit:     60effe55d68f471ac8e6501f9fb343faf95c423c
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Fri Jan 21 03:54:04 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri Jan 21 03:54:04 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=60effe55

games-action/blackvoxel: version bump

Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>

 games-action/blackvoxel/Manifest                   |   2 +-
 ...ackvoxel-2.42.ebuild => blackvoxel-2.50.ebuild} |   7 +-
 .../files/blackvoxel-2.42-makefile.patch           | 190 ---------------------
 .../blackvoxel/files/blackvoxel-2.42-savedir.patch |  18 --
 ...-files.patch => blackvoxel-2.50-makefile.patch} |  93 ++++++++--
 .../blackvoxel/files/blackvoxel-2.50-savedir.patch |  31 ++++
 6 files changed, 110 insertions(+), 231 deletions(-)

diff --git a/games-action/blackvoxel/Manifest b/games-action/blackvoxel/Manifest
index 9493eb6ce..71958ecdb 100644
--- a/games-action/blackvoxel/Manifest
+++ b/games-action/blackvoxel/Manifest
@@ -1 +1 @@
-DIST blackvoxel-2.42.tar.bz2 18367949 BLAKE2B f45da57846370ae2109709cb28f3bb02fbd63ff208306705dd8da544737f84250542a4c58b3889e603f16ca898f9ee4458361c326fd28f68cb2a70f891de0f67 SHA512 275c7cb34c58bbd772bc1daf7beb26395c509d37341fe1c343f745bc3fa73223f9d36b275f0813a06908f258b39f94c1e4229f8e27fb822cf71881e66fccd3fb
+DIST blackvoxel-2.50.tar.bz2 20766720 BLAKE2B 879b1cadeec85f6a38cfeca422c416bed844907dc45757cd66669fe9a2d78628cc07db14571e2c4afa3236cc3e69e86b36f48814c2dfb2b0d9698255949fd4cf SHA512 76b22288f280360926110f0d09a778246970f94a466447f892574057aabe1c068854c2e1131baa3f9b5a0edf183679717eb4794af42672701146b185b610332c

diff --git a/games-action/blackvoxel/blackvoxel-2.42.ebuild b/games-action/blackvoxel/blackvoxel-2.50.ebuild
similarity index 84%
rename from games-action/blackvoxel/blackvoxel-2.42.ebuild
rename to games-action/blackvoxel/blackvoxel-2.50.ebuild
index 4216d47ce..900d25e7c 100644
--- a/games-action/blackvoxel/blackvoxel-2.42.ebuild
+++ b/games-action/blackvoxel/blackvoxel-2.50.ebuild
@@ -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() {

diff --git a/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch b/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch
deleted file mode 100644
index ba800e827..000000000
--- a/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch
+++ /dev/null
@@ -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
-

diff --git a/games-action/blackvoxel/files/blackvoxel-2.42-savedir.patch b/games-action/blackvoxel/files/blackvoxel-2.42-savedir.patch
deleted file mode 100644
index d5bad7b21..000000000
--- a/games-action/blackvoxel/files/blackvoxel-2.42-savedir.patch
+++ /dev/null
@@ -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"

diff --git a/games-action/blackvoxel/files/blackvoxel-2.42-dont-strip-files.patch b/games-action/blackvoxel/files/blackvoxel-2.50-makefile.patch
similarity index 57%
rename from games-action/blackvoxel/files/blackvoxel-2.42-dont-strip-files.patch
rename to games-action/blackvoxel/files/blackvoxel-2.50-makefile.patch
index 85f2b1290..8bad61a75 100644
--- a/games-action/blackvoxel/files/blackvoxel-2.42-dont-strip-files.patch
+++ b/games-action/blackvoxel/files/blackvoxel-2.50-makefile.patch
@@ -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
-

diff --git a/games-action/blackvoxel/files/blackvoxel-2.50-savedir.patch b/games-action/blackvoxel/files/blackvoxel-2.50-savedir.patch
new file mode 100644
index 000000000..e367917e9
--- /dev/null
+++ b/games-action/blackvoxel/files/blackvoxel-2.50-savedir.patch
@@ -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


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: games-action/blackvoxel/, games-action/blackvoxel/files/
@ 2024-10-22  9:31 David Roman
  0 siblings, 0 replies; 4+ messages in thread
From: David Roman @ 2024-10-22  9:31 UTC (permalink / raw
  To: gentoo-commits

commit:     37432fa0182129180bd122f31b85df320b5fa7d7
Author:     Abdelrahman Sarhan <abdulrahmanayman1 <AT> gmail <DOT> com>
AuthorDate: Mon Oct 21 22:06:21 2024 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Mon Oct 21 22:06:21 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=37432fa0

games-action/blackvoxel:-Werror=strict-aliasing & makeopts patch fix

Closes: https://bugs.gentoo.org/862780
Signed-off-by: Abdelrahman Sarhan <abdulrahmanayman1 <AT> gmail.com>

 games-action/blackvoxel/blackvoxel-2.50.ebuild                   | 2 +-
 ...ct-aliasing.patch => blackvoxel-2.50-backported-ltofix.patch} | 0
 games-action/blackvoxel/files/blackvoxel-2.50-makeopts.patch     | 9 +++++----
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/games-action/blackvoxel/blackvoxel-2.50.ebuild b/games-action/blackvoxel/blackvoxel-2.50.ebuild
index bb7e7e7fb..16a152193 100644
--- a/games-action/blackvoxel/blackvoxel-2.50.ebuild
+++ b/games-action/blackvoxel/blackvoxel-2.50.ebuild
@@ -29,7 +29,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-makefile.patch
 	"${FILESDIR}"/${P}-makeopts.patch
 	"${FILESDIR}"/${P}-savedir.patch
-	"${FILESDIR}"/${P}-strict-aliasing.patch
+	"${FILESDIR}"/${P}-backported-ltofix.patch #For ver. 2.50 Remove for next ver.
 )
 
 src_compile() {

diff --git a/games-action/blackvoxel/files/blackvoxel-2.50-strict-aliasing.patch b/games-action/blackvoxel/files/blackvoxel-2.50-backported-ltofix.patch
similarity index 100%
rename from games-action/blackvoxel/files/blackvoxel-2.50-strict-aliasing.patch
rename to games-action/blackvoxel/files/blackvoxel-2.50-backported-ltofix.patch

diff --git a/games-action/blackvoxel/files/blackvoxel-2.50-makeopts.patch b/games-action/blackvoxel/files/blackvoxel-2.50-makeopts.patch
index 05a14881c..078d3ce64 100644
--- a/games-action/blackvoxel/files/blackvoxel-2.50-makeopts.patch
+++ b/games-action/blackvoxel/files/blackvoxel-2.50-makeopts.patch
@@ -1,14 +1,15 @@
---- a/Makefile
-+++ b/Makefile
-@@ -64,7 +64,9 @@
+--- a/Makefile	2024-10-21 17:33:29.782931946 -0400
++++ b/Makefile	2024-10-21 17:35:55.202026636 -0400
+@@ -64,8 +64,10 @@
    KERNELNAME =$(shell uname -s)
  
    ifeq ($(KERNELNAME),Linux)
 -    CXXFLAGS+= -O3 -c -fmessage-length=0
+-    LDFLAGS+=-L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib
 +    UCXXFLAGS:= $(shell emerge --info | grep -w CXXFLAGS=".*" | cut -d '"' -f2)
 +    CXXFLAGS+= $(UCXXFLAGS) -c -fmessage-length=0 
 +    ULDFLAGS:= $(shell emerge --info | grep -w LDFLAGS=".*" | cut -d '"' -f2)
 +    LDFLAGS+= $(ULDFLAGS) -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


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2024-10-22  9:32 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-30  7:45 [gentoo-commits] repo/proj/guru:master commit in: games-action/blackvoxel/, games-action/blackvoxel/files/ Andrew Ammerlaan
  -- strict thread matches above, loose matches on Subject: below --
2024-10-22  9:31 David Roman
2022-01-21  9:14 Florian Schmaus
2021-04-30  7:45 Andrew Ammerlaan

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox