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

games-fps/quakespasm: fix RDEPEND and *FLAGS

Browse Source 
Closes: https://bugs.gentoo.org/795759
Closes: https://bugs.gentoo.org/810568
Closes: https://bugs.gentoo.org/887677
Closes: https://bugs.gentoo.org/932489
Signed-off-by: Takuya Wakazono <pastalian46@gmail.com>
This commit is contained in:
Takuya Wakazono
2024-10-16 23:06:16 +09:00
parent aef7c5f4a8
commit f6a75a2ad0
3 changed files with 44 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
games-fps/quakespasm/files/quakespasm-0.94.1-makefile.patch Normal file
View File

@@ -0,0 +1,20 @@
https://bugs.gentoo.org/795759
https://bugs.gentoo.org/887677
--- a/Quake/Makefile
+++ b/Quake/Makefile
@@ -49,7 +49,6 @@ STRIP ?= strip
PKG_CONFIG ?= pkg-config
CPUFLAGS=
-LDFLAGS =
DFLAGS ?=
CFLAGS ?= -Wall -Wno-trigraphs
CFLAGS += $(CPUFLAGS)
@@ -59,7 +58,6 @@ CFLAGS += -g
do_strip=
else
DFLAGS += -DNDEBUG
-CFLAGS += -O2
CFLAGS += $(call check_gcc,-fweb,)
CFLAGS += $(call check_gcc,-frename-registers,)
cmd_strip=$(STRIP) $(1)

21
games-fps/quakespasm/quakespasm-0.94.1.ebuild → games-fps/quakespasm/quakespasm-0.94.1-r1.ebuild
View File

@@ -1,13 +1,13 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
EAPI=8
if [[ "${PV}" == "9999" ]]; then
inherit git-r3
EGIT_REPO_URI="git://git.code.sf.net/p/quakespasm/quakespasm.git"
EGIT_REPO_URI="https://git.code.sf.net/p/quakespasm/quakespasm"
else
SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
SRC_URI="https://downloads.sourceforge.net/project/${PN}/Source/${P}.tar.gz"
KEYWORDS="~amd64"
fi
@@ -18,17 +18,20 @@ SLOT="0"
IUSE="sdl2"
DEPEND="
media-libs/libvorbis
media-libs/libogg
media-libs/libglvnd
media-libs/libmad
virtual/opengl
virtual/glu
sdl2? ( media-libs/libsdl2 )
!sdl2? ( media-libs/libsdl )
media-libs/libvorbis
sdl2? ( media-libs/libsdl2[opengl] )
!sdl2? ( media-libs/libsdl[opengl] )
"
RDEPEND="${DEPEND}"
DOCS=( Quakespasm.html Quakespasm-Music.txt Quakespasm.txt )
PATCHES=(
# bug 795759, 887677
"${FILESDIR}/${P}-makefile.patch"
)
src_compile() {
cd Quake || die
emake COMMON_LIBS="-lm -lOpenGL" USE_SDL2=$(usex sdl2 1 0) STRIP="/bin/true"

21
games-fps/quakespasm/quakespasm-9999.ebuild
View File

@@ -1,13 +1,13 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
EAPI=8
if [[ "${PV}" == "9999" ]]; then
inherit git-r3
EGIT_REPO_URI="git://git.code.sf.net/p/quakespasm/quakespasm.git"
EGIT_REPO_URI="https://git.code.sf.net/p/quakespasm/quakespasm"
else
SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
SRC_URI="https://downloads.sourceforge.net/project/${PN}/Source/${P}.tar.gz"
KEYWORDS="~amd64"
fi
@@ -18,17 +18,20 @@ SLOT="0"
IUSE="sdl2"
DEPEND="
media-libs/libvorbis
media-libs/libogg
media-libs/libglvnd
media-libs/libmad
virtual/opengl
virtual/glu
sdl2? ( media-libs/libsdl2 )
!sdl2? ( media-libs/libsdl )
media-libs/libvorbis
sdl2? ( media-libs/libsdl2[opengl] )
!sdl2? ( media-libs/libsdl[opengl] )
"
RDEPEND="${DEPEND}"
DOCS=( Quakespasm.html Quakespasm-Music.txt Quakespasm.txt )
src_prepare() {
sed -i '/^CFLAGS += -O2$/d' Quake/Makefile || die
default
}
src_compile() {
cd Quake || die
emake COMMON_LIBS="-lm -lOpenGL" USE_SDL2=$(usex sdl2 1 0) STRIP="/bin/true"