[gentoo-commits] repo/proj/guru:master commit in: games-fps/crispy-doom/, games-fps/crispy-doom/files/

[David Roman]

commit:     17d3645a5bfaacaddbdfd0e80b232f81257de843
Author:     Abdelrahman Sarhan <abdulrahmanayman1 <AT> gmail <DOT> com>
AuthorDate: Tue Oct 22 19:20:32 2024 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Tue Oct 22 19:30:20 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=17d3645a

games-fps/crispy-doom: Fixed CFLAGS bug
Fixed bug where CFLAGS doesn't respect make.conf settings.

Signed-off-by: Abdelrahman Sarhan <abdulrahmanayman1 <AT> gmail.com>

 games-fps/crispy-doom/crispy-doom-5.12.0.ebuild             |  4 ++++
 games-fps/crispy-doom/crispy-doom-6.0.ebuild                |  4 ++++
 games-fps/crispy-doom/files/crispy-doom-5.12.0-cflags.patch | 13 +++++++++++++
 games-fps/crispy-doom/files/crispy-doom-6.0-cflags.patch    | 11 +++++++++++
 4 files changed, 32 insertions(+)

diff --git a/games-fps/crispy-doom/crispy-doom-5.12.0.ebuild 
b/games-fps/crispy-doom/crispy-doom-5.12.0.ebuild
index 60823967d..51c528c4e 100644
--- a/games-fps/crispy-doom/crispy-doom-5.12.0.ebuild
+++ b/games-fps/crispy-doom/crispy-doom-5.12.0.ebuild
@@ -42,6 +42,10 @@ DOCS=(
        "README.Strife.md"
 )
 
+PATCHES=(
+       ${FILESDIR}/${P}-cflags.patch
+)
+
 src_prepare() {
        default
 

diff --git a/games-fps/crispy-doom/crispy-doom-6.0.ebuild 
b/games-fps/crispy-doom/crispy-doom-6.0.ebuild
index f4dfd0191..d10e6f1c3 100644
--- a/games-fps/crispy-doom/crispy-doom-6.0.ebuild
+++ b/games-fps/crispy-doom/crispy-doom-6.0.ebuild
@@ -43,6 +43,10 @@ DOCS=(
        "README.Strife.md"
 )
 
+PATCHES=(
+       ${FILESDIR}/${P}-cflags.patch
+)
+
 src_prepare() {
        default
 

diff --git a/games-fps/crispy-doom/files/crispy-doom-5.12.0-cflags.patch 
b/games-fps/crispy-doom/files/crispy-doom-5.12.0-cflags.patch
new file mode 100644
index 000000000..153be493f
--- /dev/null
+++ b/games-fps/crispy-doom/files/crispy-doom-5.12.0-cflags.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index e4614a1..5908e1a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -28,7 +28,7 @@ OPT_LEVEL=2
+ if test "$GCC" = "yes"
+ then
+         WARNINGS="-Wall -Wdeclaration-after-statement -Wredundant-decls"
++        CFLAGS="$WARNINGS $orig_CFLAGS"
+-        CFLAGS="-O$OPT_LEVEL -g $WARNINGS $orig_CFLAGS"
+ fi
+ 
+ PKG_CHECK_MODULES(SDL, [sdl2 >= 2.0.7])

diff --git a/games-fps/crispy-doom/files/crispy-doom-6.0-cflags.patch 
b/games-fps/crispy-doom/files/crispy-doom-6.0-cflags.patch
new file mode 100644
index 000000000..9d307220d
--- /dev/null
+++ b/games-fps/crispy-doom/files/crispy-doom-6.0-cflags.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac     2024-10-22 14:32:01.009784223 -0400
++++ b/configure.ac     2024-10-22 14:38:40.706790279 -0400
+@@ -28,7 +28,7 @@
+ if test "$GCC" = "yes"
+ then
+         WARNINGS="-Wall -Wdeclaration-after-statement -Wredundant-decls"
+-        CFLAGS="-O$OPT_LEVEL -g $WARNINGS $orig_CFLAGS"
++        CFLAGS="$WARNINGS $orig_CFLAGS"
+ fi
+ 
+ PKG_CHECK_MODULES(SDL, [sdl2 >= 2.0.7])