* [gentoo-commits] repo/gentoo:master commit in: games-fps/qudos/, games-fps/qudos/files/, profiles/
@ 2022-11-24 6:37 Jakov Smolić
0 siblings, 0 replies; only message in thread
From: Jakov Smolić @ 2022-11-24 6:37 UTC (permalink / raw
To: gentoo-commits
commit: 448d6666a37161bad5cea78c890e83dbbca49a00
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 24 06:34:22 2022 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Thu Nov 24 06:36:47 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=448d6666
games-fps/qudos: treeclean
Closes: https://bugs.gentoo.org/791604
Closes: https://bugs.gentoo.org/874486
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
games-fps/qudos/Manifest | 2 -
games-fps/qudos/files/qudos-0.40.1-gnusource.patch | 12 --
.../qudos/files/qudos-0.40.1-libjpeg-clash.patch | 25 ---
games-fps/qudos/files/qudos-0.40.1-libpng.patch | 30 ----
.../qudos/files/qudos-0.40.1-no-bits-nan.patch | 12 --
.../qudos/files/qudos-0.40.1-respect-cc.patch | 15 --
.../qudos/files/qudos-0.40.1-respect-libdir.patch | 53 ------
.../qudos/files/qudos-0.40.1-use-pkg-config.patch | 30 ----
.../qudos/files/qudos-0.40.1-zlib-build.patch | 12 --
games-fps/qudos/metadata.xml | 17 --
games-fps/qudos/qudos-0.40.1-r1.ebuild | 184 ---------------------
profiles/package.mask | 5 -
12 files changed, 397 deletions(-)
diff --git a/games-fps/qudos/Manifest b/games-fps/qudos/Manifest
deleted file mode 100644
index 7670e0050d3f..000000000000
--- a/games-fps/qudos/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST QuDos-0.40.1-src.tar.bz2 2031636 BLAKE2B 4940f589cc6239e1489bb81f2e0c0afd6efb36930595c57131927b777913c904ada04883eb5f12f9aaf0ba06d687bf4be8b03f369dd9684fe21d7b1068240599 SHA512 97b9c6bac0d09c060ab33174604deb2781f0ebdc48b00bd0bc402523fb04cdf84edd8abc18507bba8c7e616f6d460a1de6debc96ec39bb5562b20a7f06eea734
-DIST QuDos-0.40.1.pk3 4210489 BLAKE2B 98e07682368e52f4c318e7b9ab98d01b0363986bfea54edff3b13f7f2f4cad20de0146eb498569d024d22200830b341b02f135bf50df4a317915429bb1437439 SHA512 19c3c6b3d17cbd9642320d8eb7a83d667afeafd0ee5eb818e9f07be71e2ab69182474c1f529ecbcfcfa59590bafedb0de3c70dfff10e4bc7a6e07a1546f27d4b
diff --git a/games-fps/qudos/files/qudos-0.40.1-gnusource.patch b/games-fps/qudos/files/qudos-0.40.1-gnusource.patch
deleted file mode 100644
index b82a276b012c..000000000000
--- a/games-fps/qudos/files/qudos-0.40.1-gnusource.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/unix/qsh_unix.c
-+++ b/src/unix/qsh_unix.c
-@@ -17,6 +17,9 @@
- * Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- */
-+#if !defined(_GNU_SOURCE)
-+ #define _GNU_SOURCE
-+#endif
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/time.h>
diff --git a/games-fps/qudos/files/qudos-0.40.1-libjpeg-clash.patch b/games-fps/qudos/files/qudos-0.40.1-libjpeg-clash.patch
deleted file mode 100644
index 944c1aff856c..000000000000
--- a/games-fps/qudos/files/qudos-0.40.1-libjpeg-clash.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From c657cd54baee3bdfe7a92c9b91536bb5c3ddcdd8 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Mon, 24 Oct 2022 17:50:17 +0100
-Subject: [PATCH 2/5] Fix clash with libjpeg
-
---- a/src/ref_gl/gl_image.c
-+++ b/src/ref_gl/gl_image.c
-@@ -912,7 +912,7 @@ jpg_skip_input_data(j_decompress_ptr cinfo, long num_bytes)
- }
-
- void
--jpeg_mem_src(j_decompress_ptr cinfo, byte * mem, int len)
-+qudos_jpeg_mem_src(j_decompress_ptr cinfo, byte * mem, int len)
- {
- cinfo->src = (struct jpeg_source_mgr *)(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, sizeof(struct jpeg_source_mgr));
- cinfo->src->init_source = jpg_null;
-@@ -956,7 +956,7 @@ LoadJPG(char *filename, byte ** pic, int *width, int *height)
- jpeg_create_decompress(&cinfo);
-
- /* Feed JPEG memory into the libJpeg Object */
-- jpeg_mem_src(&cinfo, rawdata, rawsize);
-+ qudos_jpeg_mem_src(&cinfo, rawdata, rawsize);
-
- /* Process JPEG header */
- jpeg_read_header(&cinfo, true);
diff --git a/games-fps/qudos/files/qudos-0.40.1-libpng.patch b/games-fps/qudos/files/qudos-0.40.1-libpng.patch
deleted file mode 100644
index 78fb4cdb7bd5..000000000000
--- a/games-fps/qudos/files/qudos-0.40.1-libpng.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/src/ref_gl/gl_local.h
-+++ b/src/ref_gl/gl_local.h
-@@ -29,6 +29,7 @@
- #include <GL/glu.h>
- #include <GL/glext.h>
-
-+#include <zlib.h> /* Z_DEFAULT_COMPRESSION */
- #include <png.h>
- #include <jpeglib.h>
-
-Subject: [PATCH] Fix build with libpng 1.4.0
-
-From the 1.4.0 release notes:
-```
- m. The function png_set_gray_1_2_4_to_8() was removed. It has been
- deprecated since libpng-1.0.18 and 1.2.9, when it was replaced with
- png_set_expand_gray_1_2_4_to_8() because the former function also
- expanded palette images.
-```
---- a/src/ref_gl/gl_image.c
-+++ b/src/ref_gl/gl_image.c
-@@ -1186,7 +1186,7 @@ LoadPNG(char *filename, byte ** pic, int *width, int *height)
- if (my_png->ColorType == PNG_COLOR_TYPE_PALETTE)
- png_set_palette_to_rgb(png);
- if (my_png->ColorType == PNG_COLOR_TYPE_GRAY && my_png->BitDepth < 8)
-- png_set_gray_1_2_4_to_8(png);
-+ png_set_expand_gray_1_2_4_to_8(png);
-
- /* Add alpha channel if present */
- if (png_get_valid(png, pnginfo, PNG_INFO_tRNS))
diff --git a/games-fps/qudos/files/qudos-0.40.1-no-bits-nan.patch b/games-fps/qudos/files/qudos-0.40.1-no-bits-nan.patch
deleted file mode 100644
index adcffef23c40..000000000000
--- a/games-fps/qudos/files/qudos-0.40.1-no-bits-nan.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/mods/rogue/g_local.h
-+++ b/src/mods/rogue/g_local.h
-@@ -26,9 +26,6 @@
- //==================================================================
-
- #ifndef _WIN32
--#ifdef __linux__
--#include <bits/nan.h>
--#endif
- #define min(a,b) ((a) < (b) ? (a) : (b))
- #define max(a,b) ((a) > (b) ? (a) : (b))
- #ifdef __sun__
diff --git a/games-fps/qudos/files/qudos-0.40.1-respect-cc.patch b/games-fps/qudos/files/qudos-0.40.1-respect-cc.patch
deleted file mode 100644
index 92c7028e1890..000000000000
--- a/games-fps/qudos/files/qudos-0.40.1-respect-cc.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-From 76aef29111d0b8c5e5fffe80833d0c227cca1127 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Mon, 24 Oct 2022 17:54:38 +0100
-Subject: [PATCH 4/5] Respect CC
-
---- a/Makefile
-+++ b/Makefile
-@@ -60,7 +60,6 @@ PREFIX?= $(LOCALBASE)
- DATADIR?= $(LOCALBASE)/share/quake2
- LIBDIR?= $(LOCALBASE)/lib/QuDos
-
--CC?= gcc
- TYPE?= release
-
- OGG_LDFLAGS= -lvorbisfile -lvorbis -logg
diff --git a/games-fps/qudos/files/qudos-0.40.1-respect-libdir.patch b/games-fps/qudos/files/qudos-0.40.1-respect-libdir.patch
deleted file mode 100644
index b3e0cdc5a2f7..000000000000
--- a/games-fps/qudos/files/qudos-0.40.1-respect-libdir.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 1dc6681ee4eea2d1b6e7edd04cf84fd10c407d28 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Mon, 24 Oct 2022 17:54:12 +0100
-Subject: [PATCH 3/5] Respect libdir
-
---- a/Makefile
-+++ b/Makefile
-@@ -55,7 +55,6 @@ WITH_XMMS?=YES # Enable XMMS support (thanks AprQ2).
-
- # General variables.
- LOCALBASE?= /usr/local
--X11BASE?= /usr/X11R6
- PREFIX?= $(LOCALBASE)
-
- DATADIR?= $(LOCALBASE)/share/quake2
-@@ -98,34 +97,19 @@ GAME_NAME= game$(ARCH).$(SHLIB_EXT)
- endif
-
- # Compilation flags.
--CFLAGS+= -I/usr/include -I$(LOCALBASE)/include -I$(X11BASE)/include \
-+CFLAGS+= -I/usr/include -I$(LOCALBASE)/include \
- -DGAME_NAME='"$(GAME_NAME)"' -DQUDOS_VERSION='"$(VERSION)"'
-
- WARNS= -Wshadow -Wpointer-arith -Wcast-align -Waggregate-return -Wstrict-prototypes -Wredundant-decls -Wnested-externs
-
--ifeq ($(TYPE),debug)
--CFLAGS+= -Wall -Werror -g -ggdb -DDEBUGGING # $(WARNS)
--else
-- ifeq ($(TYPE),profile)
--CFLAGS+= -pg
-- else
--CFLAGS+= -O3 -ffast-math -funroll-loops -fomit-frame-pointer \
-- -fexpensive-optimizations
-- ifeq ($(ARCH),i386)
--CFLAGS+= -falign-loops=2 -falign-jumps=2 -falign-functions=2 \
-- -fno-strict-aliasing
-- endif
-- endif
--endif
--
- # Linker flags.
--LDFLAGS+= -L/usr/lib -L$(LOCALBASE)/lib -L$(X11BASE)/lib -lm
-+LDFLAGS+= -lm
-
- ifeq ($(OSTYPE),Linux)
- LDFLAGS+= -ldl
- endif
-
--REF_LDFLAGS= -L/usr/X11R6/lib -lX11 -lXext -lXxf86vm -lGLU -ljpeg -lpng
-+REF_LDFLAGS= -lX11 -lXext -lXxf86vm -lGLU -ljpeg -lpng
-
- ifeq ($(strip $(WITH_DGA_MOUSE)),YES)
- REF_LDFLAGS+= -lXxf86dga
diff --git a/games-fps/qudos/files/qudos-0.40.1-use-pkg-config.patch b/games-fps/qudos/files/qudos-0.40.1-use-pkg-config.patch
deleted file mode 100644
index c2aae64e2b32..000000000000
--- a/games-fps/qudos/files/qudos-0.40.1-use-pkg-config.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 372cfdd9c81043667451fc46bcb8daaa5a5e3620 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Mon, 24 Oct 2022 17:56:14 +0100
-Subject: [PATCH 5/5] Use pkg-config
-
---- a/Makefile
-+++ b/Makefile
-@@ -64,9 +64,9 @@ TYPE?= release
-
- OGG_LDFLAGS= -lvorbisfile -lvorbis -logg
-
--SDL_CONFIG?= sdl-config
--SDL_CFLAGS= $(shell $(SDL_CONFIG) --cflags)
--SDL_LDFLAGS= $(shell $(SDL_CONFIG) --libs)
-+PKG_CONFIG?= pkg-config
-+SDL_CFLAGS= $(shell ${PKG_CONFIG} --cflags sdl)
-+SDL_LDFLAGS= $(shell ${PKG_CONFIG} --libs sdl)
-
- ifeq ($(OSTYPE),Linux)
- ALSA_LDFLAGS= -lasound
-@@ -96,8 +95,7 @@ GAME_NAME= game$(ARCH).$(SHLIB_EXT)
- endif
-
- # Compilation flags.
--CFLAGS+= -I/usr/include -I$(LOCALBASE)/include \
-- -DGAME_NAME='"$(GAME_NAME)"' -DQUDOS_VERSION='"$(VERSION)"'
-+CFLAGS+= -DGAME_NAME='"$(GAME_NAME)"' -DQUDOS_VERSION='"$(VERSION)"'
-
- WARNS= -Wshadow -Wpointer-arith -Wcast-align -Waggregate-return -Wstrict-prototypes -Wredundant-decls -Wnested-externs
-
diff --git a/games-fps/qudos/files/qudos-0.40.1-zlib-build.patch b/games-fps/qudos/files/qudos-0.40.1-zlib-build.patch
deleted file mode 100644
index d2e1474f2d7b..000000000000
--- a/games-fps/qudos/files/qudos-0.40.1-zlib-build.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-From bdd75315feed9fbaaf9dcf87f9a7e5eb18ca0b8b Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Mon, 24 Oct 2022 17:50:02 +0100
-Subject: [PATCH 1/5] Fix zlib build
-
---- a/src/qcommon/unzip/ioapi.h
-+++ b/src/qcommon/unzip/ioapi.h
-@@ -1,3 +1,4 @@
-+#define OF(x) x
- /*
- * ioapi.h -- IO base function header for compress/uncompress .zip files
- * using zlib + zip or unzip API
diff --git a/games-fps/qudos/metadata.xml b/games-fps/qudos/metadata.xml
deleted file mode 100644
index 2d486853b2db..000000000000
--- a/games-fps/qudos/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>games@gentoo.org</email>
- <name>Gentoo Games Project</name>
- </maintainer>
- <use>
- <flag name="demo">Install the demo files (quake2-demodata) and configure for use</flag>
- <flag name="mods">Build support for the quake2 mission packs</flag>
- <flag name="qmax">Build the pretty version (quake max)</flag>
- <flag name="textures">Install the enhanced textures (quake2-textures)</flag>
- </use>
- <upstream>
- <remote-id type="github">ZwS/qudos</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/games-fps/qudos/qudos-0.40.1-r1.ebuild b/games-fps/qudos/qudos-0.40.1-r1.ebuild
deleted file mode 100644
index 4084c1e427b6..000000000000
--- a/games-fps/qudos/qudos-0.40.1-r1.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop flag-o-matic toolchain-funcs
-
-FILE_STEM="QuDos-${PV}-src"
-PK3_FILE="QuDos-${PV}.pk3"
-MY_PN="quake2"
-
-DESCRIPTION="Enhanced Quake 2 engine"
-HOMEPAGE="https://github.com/ZwS/qudos"
-SRC_URI="mirror://gentoo/${FILE_STEM}.tar.bz2
- https://github.com/ZwS/qudos/raw/master/quake2/baseq2/qudos.pk3 -> ${PK3_FILE}"
-S="${WORKDIR}"/${FILE_STEM}
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cdinstall debug dedicated demo dga ipv6 joystick mods opengl qmax oss sdl textures"
-
-DEPEND="
- media-libs/libogg
- media-libs/libjpeg-turbo
- media-libs/libpng
- media-libs/libvorbis
- sys-libs/zlib
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXxf86dga
- x11-libs/libXxf86vm
- opengl? (
- virtual/opengl
- virtual/glu
- )
- sdl? (
- media-libs/libsdl[joystick?,opengl,sound,video]
- virtual/opengl
- virtual/glu
- )
-"
-RDEPEND="
- ${DEPEND}
- cdinstall? ( games-fps/quake2-data )
- demo? ( games-fps/quake2-demodata[symlink] )
- textures? ( games-fps/quake2-textures )
-"
-BDEPEND="virtual/pkgconfig"
-
-dir=usr/share/${MY_PN}
-
-PATCHES=(
- "${FILESDIR}"/${P}-libpng.patch
- "${FILESDIR}"/${P}-gnusource.patch
- "${FILESDIR}"/${P}-zlib-build.patch
- "${FILESDIR}"/${P}-libjpeg-clash.patch
- "${FILESDIR}"/${P}-respect-libdir.patch
- "${FILESDIR}"/${P}-respect-cc.patch
- "${FILESDIR}"/${P}-use-pkg-config.patch
- "${FILESDIR}"/${P}-no-bits-nan.patch
-)
-
-default_client() {
- if use opengl || use sdl || ! use dedicated ; then
- # Build default client
- return 0
- fi
- return 1
-}
-
-pkg_setup() {
- if ! use qmax && $( use opengl || use sdl ) ; then
- elog "The 'qmax' graphical improvements are recommended."
- echo
- fi
-
- if use debug ; then
- ewarn "The 'debug' USE flag may cause compilation to fail with:"
- ewarn
- ewarn "src/qcommon/cmd.c:364: warning: dereferencing type-punned"
- ewarn "pointer will break strict-aliasing rules."
- echo
- fi
-
- # Determine the default sound driver, in order of preference
- # snd_drv is not a local variable
- snd_drv=""
- [[ -z "${snd_drv}" ]] && use oss && snd_drv="oss"
- [[ -z "${snd_drv}" ]] && use sdl && snd_drv="sdl"
- # Default if nothing else chosen
- [[ -z "${snd_drv}" ]] && snd_drv="oss"
-
- if default_client ; then
- elog "Selected the ${snd_drv} sound driver as the default."
- fi
-}
-
-src_prepare() {
- rm docs/gnu.txt || die
-
- default
-
- # Change default sound driver and its location
- sed -i \
- -e "s:\"oss\":\"${snd_drv}\":" \
- -e "s:\"\./snd:\"/usr/$(get_libdir)/${PN}/snd:" \
- src/client/snd_dma.c || die
-}
-
-src_configure() {
- append-cflags -fcommon
- default
-}
-
-src_compile() {
- yesno() {
- usex ${1} YES NO
- }
-
- local client="YES"
- default_client || client="NO"
-
- local type="release"
- use debug && type="debug"
-
- local myemakeargs=(
- BUILD_QUAKE2="${client}"
- BUILD_DEDICATED=$(yesno dedicated)
- BUILD_GLX=$(yesno opengl)
- BUILD_SDLGL=$(yesno sdl)
- BUILD_ALSA_SND=NO
- BUILD_SDL_SND=$(yesno sdl)
- BUILD_OSS_SND=$(yesno oss)
- WITH_XMMS=NO
- WITH_DGA_MOUSE=$(yesno dga)
- WITH_JOYSTICK=$(yesno joystick)
- TYPE="${type}"
- DATADIR="${dir}"
- LOCALBASE=/usr
- LIBDIR="/usr/$(get_libdir)"/${PN}
- WITH_QMAX=$(yesno qmax)
- BUILD_3ZB2=$(yesno mods)
- BUILD_CTF=$(yesno mods)
- BUILD_JABOT=$(yesno mods)
- BUILD_ROGUE=$(yesno mods)
- BUILD_XATRIX=$(yesno mods)
- BUILD_ZAERO=$(yesno mods)
- WITH_BOTS=$(yesno mods)
- HAVE_IPV6=$(yesno ipv6)
- CC="$(tc-getCC)"
- WITH_X86_ASM=NO
- WITH_DATADIR=YES
- WITH_LIBDIR=YES
- BUILD_DEBUG_DIR=release
- BUILD_RELEASE_DIR=release
- )
-
- emake "${myemakeargs[@]}"
-}
-
-src_install() {
- if default_client ; then
- newbin ${MY_PN}/QuDos ${PN}
-
- # Change from gif to png in next version?
- newicon docs/q2_orig/quake2.gif ${PN}.gif
-
- make_desktop_entry ${PN} "QuDos" ${PN}.gif
- fi
-
- if use dedicated ; then
- newbin ${MY_PN}/QuDos-ded ${PN}-ded
- fi
-
- insinto "/usr/$(get_libdir)"/${PN}
- doins -r ${MY_PN}/*
- rm "${ED}/usr/$(get_libdir)"/${PN}/QuDos || die
-
- insinto "/usr/$(get_libdir)"/${PN}/baseq2
- newins "${DISTDIR}/${PK3_FILE}" qudos.pk3
-
- dodoc $(find docs -name \*.txt) docs/q2_orig/README*
-}
diff --git a/profiles/package.mask b/profiles/package.mask
index 216767bdbfae..1ecd2b9bbe53 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -423,11 +423,6 @@ app-misc/tpconfig
dev-util/sgb
sci-misc/gt-itm
-# Sam James <sam@gentoo.org> (2022-10-24)
-# Fails to build with Clang 16 (code quality issues), no upstream activity
-# in 7 years. Removal on 2022-11-23. bug #874486, bug #791604.
-games-fps/qudos
-
# John Helmert III <ajak@gentoo.org> (2022-10-16)
# <OpenSSL-1.1.1 are EOL and contain known vulnerabilities. Users should
# migrate to a newer branch.
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2022-11-24 6:37 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-11-24 6:37 [gentoo-commits] repo/gentoo:master commit in: games-fps/qudos/, games-fps/qudos/files/, profiles/ Jakov Smolić
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox