commit: 2b13b180b08764e6bf5f7c26eca5cd11c2724dbf Author: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com> AuthorDate: Sun Mar 2 14:41:23 2025 +0000 Commit: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com> CommitDate: Sun Mar 2 14:58:42 2025 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2b13b180
games-action/blackvoxel: fix DEPEND and optimization flags Bug: https://bugs.gentoo.org/932450 Closes: https://bugs.gentoo.org/887667 Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com> games-action/blackvoxel/blackvoxel-2.50.ebuild | 12 +++--- games-action/blackvoxel/blackvoxel-9999.ebuild | 12 +++--- .../files/blackvoxel-2.50-makefile.patch | 50 +++++++++++++++++++++- 3 files changed, 58 insertions(+), 16 deletions(-) diff --git a/games-action/blackvoxel/blackvoxel-2.50.ebuild b/games-action/blackvoxel/blackvoxel-2.50.ebuild index 8c0bc0818..5150244fe 100644 --- a/games-action/blackvoxel/blackvoxel-2.50.ebuild +++ b/games-action/blackvoxel/blackvoxel-2.50.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020-2022 Gentoo Authors +# Copyright 2020-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -16,12 +16,10 @@ SLOT="0" KEYWORDS="~amd64" DEPEND=" - dev-libs/expat - media-libs/alsa-lib - media-libs/glew - media-libs/libsdl - x11-libs/libX11 - virtual/opengl + media-libs/glew:0= + media-libs/glu + media-libs/libglvnd[X] + media-libs/libsdl[sound] " RDEPEND="${DEPEND}" diff --git a/games-action/blackvoxel/blackvoxel-9999.ebuild b/games-action/blackvoxel/blackvoxel-9999.ebuild index f2cfbd40a..30801fc8a 100644 --- a/games-action/blackvoxel/blackvoxel-9999.ebuild +++ b/games-action/blackvoxel/blackvoxel-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2018-2021 Gentoo Authors +# Copyright 2018-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,12 +13,10 @@ LICENSE="GPL-3" SLOT="0" DEPEND=" - dev-libs/expat - media-libs/alsa-lib - media-libs/glew:0 - media-libs/libsdl - x11-libs/libX11 - virtual/opengl + media-libs/glew:0= + media-libs/glu + media-libs/libglvnd[X] + media-libs/libsdl[sound] " RDEPEND="${DEPEND}" diff --git a/games-action/blackvoxel/files/blackvoxel-2.50-makefile.patch b/games-action/blackvoxel/files/blackvoxel-2.50-makefile.patch index 2a634d05c..5f21cb744 100644 --- a/games-action/blackvoxel/files/blackvoxel-2.50-makefile.patch +++ b/games-action/blackvoxel/files/blackvoxel-2.50-makefile.patch @@ -1,3 +1,5 @@ +https://bugs.gentoo.org/887667 +Respect user FLAGS. diff --git a/Makefile b/Makefile2 index 3e5933a..c8787d8 100644 --- a/Makefile @@ -109,14 +111,58 @@ index 08fb2ef..8cc1cbc 100644 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) ++ $(CXX) -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) ++ $(CXX) -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) +diff --git a/src/sc_Squirrel3/sqstdlib/Makefile b/src/sc_Squirrel3/sqstdlib/Makefile +index 41ee3f7..7b74586 100644 +--- a/src/sc_Squirrel3/sqstdlib/Makefile ++++ b/src/sc_Squirrel3/sqstdlib/Makefile +@@ -26,7 +26,7 @@ SRCS= \ + + + sq32: +- $(CC) -O2 -fno-exceptions -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) ++ $(CC) -fno-exceptions -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) + $(AR) rc $(OUT) *.o + rm *.o + +@@ -36,7 +36,7 @@ sqprof: + rm *.o + + sq64: +- $(CC) -O2 -m64 -fno-exceptions -D_SQ64 -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) ++ $(CC) -m64 -fno-exceptions -D_SQ64 -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) + $(AR) rc $(OUT) *.o + rm *.o + +diff --git a/src/sc_Squirrel3/squirrel/Makefile b/src/sc_Squirrel3/squirrel/Makefile +index be2c281..30bc48b 100644 +--- a/src/sc_Squirrel3/squirrel/Makefile ++++ b/src/sc_Squirrel3/squirrel/Makefile +@@ -37,7 +37,7 @@ SRCS= \ + + + sq32: +- $(CC) -O2 -fno-exceptions -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) ++ $(CC) -fno-exceptions -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) + $(AR) rc $(OUT) *.o + rm *.o + +@@ -47,7 +47,7 @@ sqprof: + rm *.o + + sq64: +- $(CC) -O2 -m64 -D_SQ64 -fno-exceptions -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) ++ $(CC) -m64 -D_SQ64 -fno-exceptions -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) + $(AR) rc $(OUT) *.o + rm *.o +
