* [gentoo-commits] repo/gentoo:master commit in: games-fps/quakeforge/, games-fps/quakeforge/files/
@ 2016-01-18 7:27 Michael Sterrett
0 siblings, 0 replies; 4+ messages in thread
From: Michael Sterrett @ 2016-01-18 7:27 UTC (permalink / raw
To: gentoo-commits
commit: 499ea7a1d56b5f2f262612111c004bc21c0e851c
Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 18 07:15:46 2016 +0000
Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Mon Jan 18 07:27:24 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=499ea7a1
games-fps/quakeforge: clean old
Package-Manager: portage-2.2.26
games-fps/quakeforge/Manifest | 1 -
games-fps/quakeforge/files/0.5.5-ipv6.patch | 10 -
.../quakeforge/files/quakeforge-0.5.5-amd64.patch | 14 -
.../quakeforge/files/quakeforge-0.5.5-gcc41.patch | 342 ---------------------
.../quakeforge/files/quakeforge-0.5.5-gcc46.patch | 174 -----------
.../quakeforge/files/quakeforge-0.5.5-keys.patch | 103 -------
.../quakeforge/files/quakeforge-0.5.5-libc.patch | 17 -
.../files/quakeforge-0.5.5-no-page-size.patch | 15 -
.../files/quakeforge-0.5.5-noWerror.patch | 65 ----
.../files/quakeforge-0.5.5-zlib-1.2.6.patch | 14 -
games-fps/quakeforge/quakeforge-0.5.5-r2.ebuild | 141 ---------
11 files changed, 896 deletions(-)
diff --git a/games-fps/quakeforge/Manifest b/games-fps/quakeforge/Manifest
index 21e1c55..4be1382 100644
--- a/games-fps/quakeforge/Manifest
+++ b/games-fps/quakeforge/Manifest
@@ -1,2 +1 @@
-DIST quakeforge-0.5.5.tar.bz2 1954072 SHA256 9ff29340f571fc26d19992a32f58e767e1b811248688f383083bc2ccb263ec6a SHA512 0e81fbe2ef4fd1f491e2b46f222807eaa1b1dadf1e5200d3cd4609146050664a68c801c48418a3632a5ad0798ea9ec4eed70da03c2f90abb5fd1291adc95399c WHIRLPOOL 7442e2f2f8641b41cfbfb4206605faadc6f738bf9151c033ca8b39110428621b19e158ea185d4236069165738027a104dc939944bfb758021dbd85809276430c
DIST quakeforge-0.7.2.tar.bz2 2887823 SHA256 1ddc8c963b23bd648d94af48062ab0448345761defeceaef7c62be55c4a28d7a SHA512 d296e10b86466aee0a4be527a5fea7a44bae60ebef52ad86381744dc96e2bed2ad14d3b790b4514a5c59ac897662e91b80a9d49c822910930742a1d2b8a2ec55 WHIRLPOOL 11a4465435f42ba866806d4d4ede34a4a4e6b42b9e4fd6696c10e55bba4182762dc890ddff463bd9ad00b937d36dbde269886683f6f85b639a0ea6a30f5f6e4a
diff --git a/games-fps/quakeforge/files/0.5.5-ipv6.patch b/games-fps/quakeforge/files/0.5.5-ipv6.patch
deleted file mode 100644
index 96b9277..0000000
--- a/games-fps/quakeforge/files/0.5.5-ipv6.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libs/net/nc/net_udp6.c.orig 2004-05-16 04:21:18.334083592 -0400
-+++ libs/net/nc/net_udp6.c 2004-05-16 04:21:31.513080080 -0400
-@@ -123,6 +123,7 @@
-
- netadr_t net_from;
- netadr_t net_local_adr;
-+netadr_t net_loopback_adr;
- int net_socket;
-
- static sizebuf_t _net_message_message;
diff --git a/games-fps/quakeforge/files/quakeforge-0.5.5-amd64.patch b/games-fps/quakeforge/files/quakeforge-0.5.5-amd64.patch
deleted file mode 100644
index ed33e45..0000000
--- a/games-fps/quakeforge/files/quakeforge-0.5.5-amd64.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur quakeforge-0.5.5/libs/video/renderer/sw/Makefile.in quakeforge-0.5.5-modified/libs/video/renderer/sw/Makefile.in
---- quakeforge-0.5.5/libs/video/renderer/sw/Makefile.in 2004-05-02 16:52:12.000000000 -0400
-+++ quakeforge-0.5.5-modified/libs/video/renderer/sw/Makefile.in 2007-06-24 22:29:59.000000000 -0400
-@@ -403,8 +403,8 @@
- target_vendor = @target_vendor@
- vid_libs = @vid_libs@
- AUTOMAKE_OPTIONS = foreign
--AM_CFLAGS = @PREFER_NON_PIC@
--AM_CCASFLAGS = @PREFER_NON_PIC@
-+AM_CFLAGS = -fPIC
-+AM_CCASFLAGS = -fPIC
- INCLUDES = -I$(top_srcdir)/include
- @ASM_ARCH_FALSE@asm =
- @ASM_ARCH_TRUE@asm = libasm.la
diff --git a/games-fps/quakeforge/files/quakeforge-0.5.5-gcc41.patch b/games-fps/quakeforge/files/quakeforge-0.5.5-gcc41.patch
deleted file mode 100644
index a609c50..0000000
--- a/games-fps/quakeforge/files/quakeforge-0.5.5-gcc41.patch
+++ /dev/null
@@ -1,342 +0,0 @@
-diff -burN quakeforge-0.5.5/libs/audio/cd/cd_file.c quakeforge-new/libs/audio/cd/cd_file.c
---- quakeforge-0.5.5/libs/audio/cd/cd_file.c 2004-02-07 21:39:44.000000000 -0500
-+++ quakeforge-new/libs/audio/cd/cd_file.c 2006-03-28 14:50:26.000000000 -0500
-@@ -84,7 +84,7 @@
- static int current_track; // current track, used when pausing
- static plitem_t *tracklist = NULL; // parsed tracklist, dictionary format
-
--static cvar_t *bgmvolume; // volume cvar
-+cvar_t *bgmvolume; // volume cvar
- static cvar_t *mus_ogglist; // tracklist cvar
-
-
-diff -burN quakeforge-0.5.5/libs/audio/cd/cd_linux.c quakeforge-new/libs/audio/cd/cd_linux.c
---- quakeforge-0.5.5/libs/audio/cd/cd_linux.c 2004-02-07 00:35:15.000000000 -0500
-+++ quakeforge-new/libs/audio/cd/cd_linux.c 2006-03-28 14:50:40.000000000 -0500
-@@ -79,7 +79,7 @@
- static int cdfile = -1;
-
- static cvar_t *mus_cddevice;
--static cvar_t *bgmvolume;
-+cvar_t *bgmvolume;
-
-
- static void
-diff -burN quakeforge-0.5.5/libs/audio/cd/cd_sdl.c quakeforge-new/libs/audio/cd/cd_sdl.c
---- quakeforge-0.5.5/libs/audio/cd/cd_sdl.c 2004-03-20 23:59:02.000000000 -0500
-+++ quakeforge-new/libs/audio/cd/cd_sdl.c 2006-03-28 14:50:52.000000000 -0500
-@@ -65,7 +65,7 @@
- static SDL_CD *cd_id;
- static float cdvolume = 1.0;
-
--static cvar_t *bgmvolume;
-+ cvar_t *bgmvolume;
-
-
- static void
-diff -burN quakeforge-0.5.5/libs/audio/cd/cd_sgi.c quakeforge-new/libs/audio/cd/cd_sgi.c
---- quakeforge-0.5.5/libs/audio/cd/cd_sgi.c 2004-02-07 00:35:15.000000000 -0500
-+++ quakeforge-new/libs/audio/cd/cd_sgi.c 2006-03-28 14:51:01.000000000 -0500
-@@ -65,7 +65,7 @@
- static char cd_dev[] = "/dev/cdrom";
-
- static CDPLAYER *cdp = NULL;
--static cvar_t *bgmvolume;
-+cvar_t *bgmvolume;
-
- static void
- I_SGI_Eject (void)
-diff -burN quakeforge-0.5.5/libs/audio/cd/cd_win.c quakeforge-new/libs/audio/cd/cd_win.c
---- quakeforge-0.5.5/libs/audio/cd/cd_win.c 2004-02-07 00:35:15.000000000 -0500
-+++ quakeforge-new/libs/audio/cd/cd_win.c 2006-03-28 14:51:07.000000000 -0500
-@@ -68,7 +68,7 @@
- static void I_CDAudio_Play (int track, qboolean looping);
- static void I_CDAudio_Stop (void);
-
--static cvar_t *bgmvolume;
-+cvar_t *bgmvolume;
-
-
- static void
-diff -burN quakeforge-0.5.5/libs/audio/renderer/snd_dma.c quakeforge-new/libs/audio/renderer/snd_dma.c
---- quakeforge-0.5.5/libs/audio/renderer/snd_dma.c 2004-03-01 06:51:01.000000000 -0500
-+++ quakeforge-new/libs/audio/renderer/snd_dma.c 2006-03-28 14:54:03.000000000 -0500
-@@ -72,17 +72,17 @@
- static channel_t *static_channels[MAX_CHANNELS];
- static int num_statics;
-
--static qboolean snd_initialized = false;
--static int snd_blocked = 0;
-+qboolean snd_initialized = false;
-+int snd_blocked = 0;
- static qboolean snd_ambient = 1;
-
--static vec3_t listener_origin;
--static vec3_t listener_forward;
--static vec3_t listener_right;
--static vec3_t listener_up;
--static vec_t sound_nominal_clip_dist = 1000.0;
-+vec3_t listener_origin;
-+vec3_t listener_forward;
-+vec3_t listener_right;
-+vec3_t listener_up;
-+vec_t sound_nominal_clip_dist = 1000.0;
-
--static unsigned soundtime; // sample PAIRS
-+unsigned soundtime; // sample PAIRS
-
- #define MAX_SFX 512
- static sfx_t *known_sfx; // hunk allocated [MAX_SFX]
-@@ -97,7 +97,7 @@
- static cvar_t *ambient_level;
- static cvar_t *nosound;
- static cvar_t *precache;
--static cvar_t *snd_mixahead;
-+cvar_t *snd_mixahead;
- static cvar_t *snd_noextraupdate;
- static cvar_t *snd_phasesep;
- static cvar_t *snd_show;
-@@ -122,7 +122,7 @@
- // isolating performance in the renderer. The fakedma_updates is
- // number of times s_update() is called per second.
-
--static qboolean fakedma = false;
-+qboolean fakedma = false;
- //static int fakedma_updates = 15;
-
-
-diff -burN quakeforge-0.5.5/libs/audio/targets/snd_alsa.c quakeforge-new/libs/audio/targets/snd_alsa.c
---- quakeforge-0.5.5/libs/audio/targets/snd_alsa.c 2004-04-28 21:13:37.000000000 -0400
-+++ quakeforge-new/libs/audio/targets/snd_alsa.c 2006-03-28 14:52:01.000000000 -0500
-@@ -43,7 +43,7 @@
- #include "QF/sys.h"
-
- static int snd_inited;
--static int snd_blocked = 0;
-+int snd_blocked = 0;
- static volatile dma_t sn;
- static snd_pcm_uframes_t buffer_size;
-
-@@ -59,10 +59,10 @@
- static snd_output_data_t plugin_info_snd_output_data;
- static snd_output_funcs_t plugin_info_snd_output_funcs;
-
--static cvar_t *snd_bits;
--static cvar_t *snd_device;
--static cvar_t *snd_rate;
--static cvar_t *snd_stereo;
-+cvar_t *snd_bits;
-+cvar_t *snd_device;
-+cvar_t *snd_rate;
-+cvar_t *snd_stereo;
-
- #define QF_ALSA_NEED(ret, func, params) \
- static ret (*qf##func) params;
-diff -burN quakeforge-0.5.5/libs/audio/targets/snd_disk.c quakeforge-new/libs/audio/targets/snd_disk.c
---- quakeforge-0.5.5/libs/audio/targets/snd_disk.c 2004-01-07 22:46:11.000000000 -0500
-+++ quakeforge-new/libs/audio/targets/snd_disk.c 2006-03-28 14:51:31.000000000 -0500
-@@ -55,7 +55,7 @@
-
- static int snd_inited;
- static QFile *snd_file;
--static int snd_blocked = 0;
-+int snd_blocked = 0;
- static volatile dma_t sn;
-
- static plugin_t plugin_info;
-diff -burN quakeforge-0.5.5/libs/audio/targets/snd_oss.c quakeforge-new/libs/audio/targets/snd_oss.c
---- quakeforge-0.5.5/libs/audio/targets/snd_oss.c 2004-01-15 21:50:26.000000000 -0500
-+++ quakeforge-new/libs/audio/targets/snd_oss.c 2006-03-28 14:52:24.000000000 -0500
-@@ -85,10 +85,10 @@
-
- static int tryrates[] = { 11025, 22050, 22051, 44100, 8000 };
-
--static cvar_t *snd_stereo;
--static cvar_t *snd_rate;
--static cvar_t *snd_device;
--static cvar_t *snd_bits;
-+cvar_t *snd_stereo;
-+cvar_t *snd_rate;
-+cvar_t *snd_device;
-+cvar_t *snd_bits;
- static cvar_t *snd_oss_mmaped;
-
- static plugin_t plugin_info;
-diff -burN quakeforge-0.5.5/libs/audio/targets/snd_sdl.c quakeforge-new/libs/audio/targets/snd_sdl.c
---- quakeforge-0.5.5/libs/audio/targets/snd_sdl.c 2004-01-07 22:46:11.000000000 -0500
-+++ quakeforge-new/libs/audio/targets/snd_sdl.c 2006-03-28 14:52:38.000000000 -0500
-@@ -51,7 +51,7 @@
-
- static dma_t sn;
- static int snd_inited;
--static int snd_blocked = 0;
-+int snd_blocked = 0;
-
- static int desired_speed = 11025;
- static int desired_bits = 16;
-diff -burN quakeforge-0.5.5/libs/console/client.c quakeforge-new/libs/console/client.c
---- quakeforge-0.5.5/libs/console/client.c 2004-03-01 22:55:17.000000000 -0500
-+++ quakeforge-new/libs/console/client.c 2006-03-28 14:56:43.000000000 -0500
-@@ -84,7 +84,7 @@
-
- static cvar_t *con_notifytime; // seconds
- static cvar_t *con_alpha;
--static cvar_t *con_size;
-+cvar_t *con_size;
- static cvar_t *con_speed;
- static cvar_t *cl_chatmode;
-
-diff -burN quakeforge-0.5.5/libs/console/server.c quakeforge-new/libs/console/server.c
---- quakeforge-0.5.5/libs/console/server.c 2004-01-27 00:23:36.000000000 -0500
-+++ quakeforge-new/libs/console/server.c 2006-03-28 14:56:31.000000000 -0500
-@@ -70,7 +70,7 @@
-
- #include "compat.h"
-
--static console_data_t con_data;
-+console_data_t con_data;
-
- static QFile *log_file;
- static cvar_t *sv_logfile;
-diff -burN quakeforge-0.5.5/libs/gib/gib_classes.c quakeforge-new/libs/gib/gib_classes.c
---- quakeforge-0.5.5/libs/gib/gib_classes.c 2003-11-28 21:01:31.000000000 -0500
-+++ quakeforge-new/libs/gib/gib_classes.c 2006-03-28 14:57:41.000000000 -0500
-@@ -192,7 +192,7 @@
- unsigned int size;
- unsigned int i = 0;
-
-- static qboolean
-+ qboolean
- iterator (gib_class_t *class, void *unused)
- {
- reply[i++] = class->name;
-@@ -610,13 +610,13 @@
- gib_classdesc_t desc;
- enum {CLASS, INSTANCE} mode = INSTANCE;
-
-- static void
-+ void
- mtabfree (void *mtab, void *unused)
- {
- free (mtab);
- }
-
-- static const char *
-+ const char *
- fname (const char *str)
- {
- if (mode == INSTANCE)
-diff -burN quakeforge-0.5.5/libs/gib/gib_function.c quakeforge-new/libs/gib/gib_function.c
---- quakeforge-0.5.5/libs/gib/gib_function.c 2004-04-09 14:18:19.000000000 -0400
-+++ quakeforge-new/libs/gib/gib_function.c 2006-03-28 14:58:10.000000000 -0500
-@@ -169,7 +169,7 @@
- gib_var_t *var;
- static char argss[] = "args";
-
-- static qboolean
-+ qboolean
- iterate (char *arg, llist_node_t *node)
- {
- var = GIB_Var_Get_Complex (&GIB_DATA(cbuf)->locals, &zero,
-@@ -207,7 +207,7 @@
- gib_var_t *var;
- static char argss[] = "args";
-
-- static qboolean
-+ qboolean
- iterate (char *arg, llist_node_t *node)
- {
- var = GIB_Var_Get_Complex (&GIB_DATA(cbuf)->locals, &zero,
-diff -burN quakeforge-0.5.5/libs/gib/gib_thread.c quakeforge-new/libs/gib/gib_thread.c
---- quakeforge-0.5.5/libs/gib/gib_thread.c 2003-09-11 02:03:10.000000000 -0400
-+++ quakeforge-new/libs/gib/gib_thread.c 2006-03-28 14:58:26.000000000 -0500
-@@ -89,7 +89,7 @@
- void
- GIB_Thread_Execute (void)
- {
-- static qboolean iterator (cbuf_t *cbuf, llist_node_t *node)
-+ qboolean iterator (cbuf_t *cbuf, llist_node_t *node)
- {
- if (GIB_DATA(cbuf)->program)
- Cbuf_Execute_Stack (cbuf);
-diff -burN quakeforge-0.5.5/qw/source/cl_chat.c quakeforge-new/qw/source/cl_chat.c
---- quakeforge-0.5.5/qw/source/cl_chat.c 2003-07-18 02:27:26.000000000 -0400
-+++ quakeforge-new/qw/source/cl_chat.c 2006-03-28 15:01:54.000000000 -0500
-@@ -66,7 +66,7 @@
- static void
- CL_Ignore_Sanity_Check (void)
- {
-- static qboolean iterator (ignore_t *ig, llist_node_t *node)
-+ qboolean iterator (ignore_t *ig, llist_node_t *node)
- {
- if (cl.players[ig->slot].userid != ig->uid) // We got out of sync somehow
- llist_remove (node);
-@@ -80,12 +80,12 @@
- {
- CL_Ignore_Sanity_Check ();
- if (Cmd_Argc () == 1) {
-- static qboolean live_iterator (ignore_t *ig, llist_node_t *node)
-+ qboolean live_iterator (ignore_t *ig, llist_node_t *node)
- {
- Sys_Printf ("%5i - %s\n", ig->uid, Info_ValueForKey (cl.players[ig->slot].userinfo, "name"));
- return true;
- }
-- static qboolean dead_iterator (ignore_t *ig, llist_node_t *node)
-+ qboolean dead_iterator (ignore_t *ig, llist_node_t *node)
- {
- Sys_Printf ("%s\n", ig->lastname);
- return true;
-@@ -145,7 +145,7 @@
- dstring_t *test = dstring_newstr ();
- qboolean allowed = true;
-
-- static qboolean iterator (ignore_t *ig, llist_node_t *node)
-+ qboolean iterator (ignore_t *ig, llist_node_t *node)
- {
- if (cl.players[ig->slot].userid != ig->uid) { // We got out of sync somehow
- llist_remove (node);
-@@ -183,7 +183,7 @@
- {
- ignore_t *found = 0;
-
-- static qboolean iterator (ignore_t *ig, llist_node_t *node)
-+ qboolean iterator (ignore_t *ig, llist_node_t *node)
- {
- if (!strcmp (ig->lastname, name)) {
- found = ig;
-diff -burN quakeforge-0.5.5/tools/qfcc/source/method.c quakeforge-new/tools/qfcc/source/method.c
---- quakeforge-0.5.5/tools/qfcc/source/method.c 2004-02-16 19:39:21.000000000 -0500
-+++ quakeforge-new/tools/qfcc/source/method.c 2006-03-28 15:04:18.000000000 -0500
-@@ -61,7 +61,7 @@
- #include "struct.h"
- #include "type.h"
-
--static hashtab_t *known_methods;
-+hashtab_t *known_methods;
-
- static const char *
- method_get_key (void *meth, void *unused)
-diff -burN quakeforge-0.5.5/libs/video/targets/context_x11.c quakeforge-new/libs/video/targets/context_x11.c
---- quakeforge-0.5.5/libs/video/targets/context_x11.c 2006-03-29 15:29:07.000000000 -0500
-+++ quakeforge-new/libs/video/targets/context_x11.c 2006-03-29 15:29:49.000000000 -0500
-@@ -97,7 +97,7 @@
- static XF86VidModeModeInfo **vidmodes;
- static int nummodes;
- static int original_mode = 0;
--static vec3_t x_gamma = {-1, -1, -1};
-+vec3_t x_gamma = {-1, -1, -1};
- static qboolean vidmode_avail = false;
- #endif
-
-diff -burN quakeforge-0.5.5/libs/video/targets/vid_x11.c quakeforge-new/libs/video/targets/vid_x11.c
---- quakeforge-0.5.5/libs/video/targets/vid_x11.c 2006-03-29 15:29:07.000000000 -0500
-+++ quakeforge-new/libs/video/targets/vid_x11.c 2006-03-29 15:30:15.000000000 -0500
-@@ -86,7 +86,7 @@
- static Colormap x_cmap;
- static GC x_gc;
-
--static qboolean doShm;
-+qboolean doShm;
- static XShmSegmentInfo x_shminfo[2];
-
- static int current_framebuffer;
diff --git a/games-fps/quakeforge/files/quakeforge-0.5.5-gcc46.patch b/games-fps/quakeforge/files/quakeforge-0.5.5-gcc46.patch
deleted file mode 100644
index 9ce5533..0000000
--- a/games-fps/quakeforge/files/quakeforge-0.5.5-gcc46.patch
+++ /dev/null
@@ -1,174 +0,0 @@
---- libs/audio/cd/Makefile.am.old 2011-04-18 11:40:51.058924897 +0200
-+++ libs/audio/cd/Makefile.am 2011-04-18 12:24:29.486917778 +0200
-@@ -5,13 +5,12 @@
- SDL_LIBS= @SDL_LIBS@
- XMMS_LIBS= @XMMS_LIBS@
- plugin_version= 1:0:0
--plugin_ldflags= @plugin_ldflags@
-+plugin_ldflags= @plugin_ldflags@ -module
- plugin_libadd= @plugin_libadd@
- EXEEXT=
-
--plugin_PROGRAMS= @CD_PLUGIN_TARGETS@
--noinst_PROGRAMS= @CD_PLUGIN_STATIC@
--EXTRA_PROGRAMS= cd_file.la cd_linux.la cd_sdl.la cd_sgi.la cd_win.la cd_xmms.la
-+plugin_LTLIBRARIES= @CD_PLUGIN_TARGETS@
-+EXTRA_LTLIBRARIES= cd_file.la cd_linux.la cd_sdl.la cd_sgi.la cd_win.la cd_xmms.la
-
- cd_file_la_LDFLAGS= $(plugin_ldflags)
- cd_file_la_SOURCES= cd_file.c
-@@ -20,19 +19,19 @@
- cd_linux_la_SOURCES= cd_linux.c
-
- cd_sdl_la_LDFLAGS= $(plugin_ldflags)
--cd_sdl_la_LDADD= $(SDL_LIBS) $(plugin_libadd)
-+cd_sdl_la_LIBADD= $(SDL_LIBS) $(plugin_libadd)
- cd_sdl_la_CFLAGS= $(SDL_CFLAGS)
- cd_sdl_la_SOURCES= cd_sdl.c
-
- cd_sgi_la_LDFLAGS= $(plugin_ldflags)
--cd_sgi_la_LDADD= $(SGI_CD_LIBS)
-+cd_sgi_la_LIBADD= $(SGI_CD_LIBS)
- cd_sgi_la_SOURCES= cd_sgi.c
-
- cd_win_la_LDFLAGS= $(plugin_ldflags)
--cd_win_la_LDADD= $(plugin_libadd)
-+cd_win_la_LIBADD= $(plugin_libadd)
- cd_win_la_SOURCES= cd_win.c
-
- cd_xmms_la_LDFLAGS= $(plugin_ldflags)
--cd_xmms_la_LDADD= $(XMMS_LIBS)
-+cd_xmms_la_LIBADD= $(XMMS_LIBS)
- cd_xmms_la_CFLAGS= $(XMMS_CFLAGS)
- cd_xmms_la_SOURCES= cd_xmms.c
---- libs/audio/targets/Makefile.am.old 2011-04-18 12:50:20.674846930 +0200
-+++ libs/audio/targets/Makefile.am 2011-04-18 12:53:22.220844800 +0200
-@@ -4,39 +4,38 @@
- INCLUDES= -I$(top_srcdir)/include
- SDL_LIBS = @SDL_LIBS@
- plugin_version= 1:0:0
--plugin_ldflags= @plugin_ldflags@
-+plugin_ldflags= @plugin_ldflags@ -module
- plugin_libadd= @plugin_libadd@
- EXEEXT=
-
--plugin_PROGRAMS= @SND_PLUGIN_TARGETS@
--noinst_PROGRAMS= @SND_PLUGIN_STATIC@
--EXTRA_PROGRAMS= \
-+plugin_LTLIBRARIES= @SND_PLUGIN_TARGETS@
-+EXTRA_LTLIBRARIES= \
- snd_output_sdl.la snd_output_alsa.la snd_output_alsa0_9.la\
- snd_output_oss.la snd_output_sgi.la snd_output_sun.la \
- snd_output_win.la snd_output_dx.la snd_output_disk.la
-
- snd_output_sdl_la_LDFLAGS= $(plugin_ldflags)
--snd_output_sdl_la_LDADD= $(SDL_LIBS) $(plugin_libadd)
-+snd_output_sdl_la_LIBADD= $(SDL_LIBS) $(plugin_libadd)
- snd_output_sdl_la_CFLAGS= $(SDL_CFLAGS)
- snd_output_sdl_la_SOURCES= snd_sdl.c
-
- snd_output_alsa_la_LDFLAGS= $(plugin_ldflags)
--snd_output_alsa_la_LDADD=
-+snd_output_alsa_la_LIBADD=
- snd_output_alsa_la_CFLAGS= $(ALSA_CFLAGS)
- snd_output_alsa_la_SOURCES= snd_alsa.c
-
- snd_output_alsa0_9_la_LDFLAGS= $(plugin_ldflags)
--snd_output_alsa0_9_la_LDADD=
-+snd_output_alsa0_9_la_LIBADD=
- snd_output_alsa0_9_la_CFLAGS= $(ALSA_CFLAGS)
- snd_output_alsa0_9_la_SOURCES= snd_alsa_0_9.c
-
- snd_output_oss_la_LDFLAGS= $(plugin_ldflags)
--snd_output_oss_la_LDADD= $(OSS_LIBS)
-+snd_output_oss_la_LIBADD= $(OSS_LIBS)
- snd_output_oss_la_CFLAGS= $(OSS_CFLAGS)
- snd_output_oss_la_SOURCES= snd_oss.c
-
- snd_output_sgi_la_LDFLAGS= $(plugin_ldflags)
--snd_output_sgi_la_LDADD= $(SGISND_LIBS)
-+snd_output_sgi_la_LIBADD= $(SGISND_LIBS)
- snd_output_sgi_la_CFLAGS= $(SGISND_CFLAGS)
- snd_output_sgi_la_SOURCES= snd_sgi.c
-
-@@ -45,16 +44,16 @@
- snd_output_sun_la_SOURCES= snd_sun.c
-
- snd_output_win_la_LDFLAGS= $(plugin_ldflags)
--snd_output_win_la_LDADD= $(WINSND_LIBS) $(plugin_libadd)
-+snd_output_win_la_LIBADD= $(WINSND_LIBS) $(plugin_libadd)
- snd_output_win_la_CFLAGS= $(WIN32SND_CFLAGS)
- snd_output_win_la_SOURCES= snd_win.c
-
- snd_output_dx_la_LDFLAGS= $(plugin_ldflags)
--snd_output_dx_la_LDADD= $(WINSND_LIBS) $(plugin_libadd)
-+snd_output_dx_la_LIBADD= $(WINSND_LIBS) $(plugin_libadd)
- snd_output_dx_la_CFLAGS= $(WIN32SND_CFLAGS)
- snd_output_dx_la_SOURCES= snd_dx.c
-
- snd_output_disk_la_LDFLAGS= $(plugin_ldflags)
--snd_output_disk_la_LDADD= $(plugin_libadd)
-+snd_output_disk_la_LIBADD= $(plugin_libadd)
- snd_output_disk_la_CFLAGS=
- snd_output_disk_la_SOURCES= snd_disk.c
---- libs/audio/renderer/Makefile.am.old 2011-04-18 12:54:32.560697490 +0200
-+++ libs/audio/renderer/Makefile.am 2011-04-18 12:55:21.157363865 +0200
-@@ -3,21 +3,19 @@
- AM_CFLAGS= @PREFER_PIC@ @VORBIS_CFLAGS@ @OGG_CFLAGS@
- INCLUDES= -I$(top_srcdir)/include
- plugin_version= 1:0:0
--plugin_ldflags= @plugin_ldflags@
-+plugin_ldflags= @plugin_ldflags@ -module
- plugin_libadd= @plugin_libadd@
- EXEEXT=
-
--plugin_PROGRAMS= @SND_REND_TARGETS@
--EXTRA_PROGRAMS= snd_render_default.la
--
--noinst_PROGRAMS= @SND_REND_STATIC@
-+plugin_LTLIBRARIES= @SND_REND_TARGETS@
-+EXTRA_LTLIBRARIES= snd_render_default.la
-
- snd_render_default_la_LDFLAGS= $(plugin_ldflags)
- snd_render_default_la_SOURCES= snd_dma.c snd_mem.c snd_mix.c vorbis.c wav.c midi.c
- if ASM_ARCH
--snd_render_default_la_LDADD= $(VORBISFILE_LIBS) $(VORBIS_LIBS) $(OGG_LIBS) $(WM_LIBS)
-+snd_render_default_la_LIBADD= $(VORBISFILE_LIBS) $(VORBIS_LIBS) $(OGG_LIBS) $(WM_LIBS)
- snd_render_default_la_DEPENDENCIES=
- else
--snd_render_default_la_LDADD= $(VORBISFILE_LIBS) $(VORBIS_LIBS) $(OGG_LIBS) $(WM_LIBS)
-+snd_render_default_la_LIBADD= $(VORBISFILE_LIBS) $(VORBIS_LIBS) $(OGG_LIBS) $(WM_LIBS)
- snd_render_default_la_DEPENDENCIES=
- endif
---- libs/console/Makefile.am.old 2011-04-18 12:56:29.253106265 +0200
-+++ libs/console/Makefile.am 2011-04-18 12:57:28.784383855 +0200
-@@ -3,14 +3,13 @@
- AM_CFLAGS= @PREFER_PIC@
- INCLUDES= -I$(top_srcdir)/include
- plugin_version= 1:0:0
--plugin_ldflags= @plugin_ldflags@
-+plugin_ldflags= @plugin_ldflags@ -module
- plugin_libadd= @plugin_libadd@
- EXEEXT=
-
- lib_LTLIBRARIES= libQFconsole.la
--plugin_PROGRAMS= @SERVER_PLUGIN_TARGETS@ @CLIENT_PLUGIN_TARGETS@
--noinst_PROGRAMS= @SERVER_PLUGIN_STATIC@ @CLIENT_PLUGIN_STATIC@
--EXTRA_PROGRAMS= console_server.la console_client.la
-+plugin_LTLIBRARIES= @SERVER_PLUGIN_TARGETS@ @CLIENT_PLUGIN_TARGETS@
-+EXTRA_LTLIBRARIES= console_server.la console_client.la
-
- common_sources= \
- buffer.c complete.c console.c inputline.c list.c filelist.c view.c
-@@ -22,9 +21,9 @@
- libQFconsole_la_SOURCES= $(common_sources)
-
- console_client_la_LDFLAGS= $(plugin_ldflags)
--console_client_la_LDADD= $(plugin_libadd)
-+console_client_la_LIBADD= $(plugin_libadd)
- console_client_la_SOURCES= $(client_sources)
-
- console_server_la_LDFLAGS= $(plugin_ldflags)
--console_server_la_LDADD= $(CURSES_LIBS) $(plugin_libadd)
-+console_server_la_LIBADD= $(CURSES_LIBS) $(plugin_libadd)
- console_server_la_SOURCES= $(server_sources)
diff --git a/games-fps/quakeforge/files/quakeforge-0.5.5-keys.patch b/games-fps/quakeforge/files/quakeforge-0.5.5-keys.patch
deleted file mode 100644
index fb027dd..0000000
--- a/games-fps/quakeforge/files/quakeforge-0.5.5-keys.patch
+++ /dev/null
@@ -1,103 +0,0 @@
---- nq/source/sys_sdl.c.old 2007-01-14 12:34:48.000000000 +0100
-+++ nq/source/sys_sdl.c 2007-01-14 12:35:43.000000000 +0100
-@@ -63,6 +63,7 @@
- #include "QF/console.h"
- #include "QF/qargs.h"
- #include "QF/sys.h"
-+#include "QF/progs.h"
-
- #include "client.h"
- #include "compat.h"
-@@ -107,6 +108,9 @@
- #endif
- }
-
-+extern void Key_Progs_Init (progs_t *pr);
-+void (*x)() = Key_Progs_Init;
-+
- #ifndef SDL_main
- # define SDL_main main
- #endif
---- qw/source/cl_sys_sdl.c.old 2007-01-14 12:29:25.000000000 +0100
-+++ qw/source/cl_sys_sdl.c 2007-01-14 12:30:50.000000000 +0100
-@@ -63,6 +63,7 @@
- #include "QF/console.h"
- #include "QF/qargs.h"
- #include "QF/sys.h"
-+#include "QF/progs.h"
-
- #include "client.h"
- #include "compat.h"
-@@ -108,6 +109,9 @@
- #endif
- }
-
-+extern void Key_Progs_Init (progs_t *pr);
-+void (*x)() = Key_Progs_Init;
-+
- #ifndef SDL_main
- # define SDL_main main
- #endif
---- qw/source/cl_sys_unix.c.old 2007-01-14 12:33:15.000000000 +0100
-+++ qw/source/cl_sys_unix.c 2007-01-14 12:34:02.000000000 +0100
-@@ -56,6 +56,7 @@
- #include "QF/console.h"
- #include "QF/qargs.h"
- #include "QF/sys.h"
-+#include "QF/progs.h"
-
- #include "host.h"
- #include "netchan.h"
-@@ -73,6 +74,9 @@
-
- int skipframes;
-
-+extern void Key_Progs_Init (progs_t *pr);
-+void (*x)() = Key_Progs_Init;
-+
- int
- main (int c, const char *v[])
- {
---- nq/source/sys_unix.c.old 2007-01-14 13:01:20.000000000 +0100
-+++ nq/source/sys_unix.c 2007-01-14 13:01:38.000000000 +0100
-@@ -69,6 +69,9 @@
- fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~O_NONBLOCK);
- }
-
-+extern void Key_Progs_Init (progs_t *pr);
-+void (*x)() = Key_Progs_Init;
-+
- int
- main (int c, const char *v[])
- {
---- configure.old 2007-01-14 14:06:22.000000000 +0100
-+++ configure 2007-01-14 14:06:43.000000000 +0100
-@@ -22733,7 +22733,7 @@
- int
- main ()
- {
--void *(*foo)(size_t) = alloca;
-+void *foo = alloca(sizeof(void));
- ;
- return 0;
- }
-@@ -32304,7 +32304,7 @@
-
-
- if test "x$BUILD_SW" = xyes; then
-- VID_REND_NOINST_TARGETS="$VID_REND_NOINST_TARGETS libQFrenderer_sw.la"
-+ VID_REND_TARGETS="$VID_REND_TARGETS libQFrenderer_sw.la"
- VID_MODEL_TARGETS="$VID_MODEL_TARGETS libQFmodels_sw.la"
- fi
- if test "x$BUILD_SW32" = xyes; then
---- libs/video/renderer/Makefile.in.old 2007-01-14 15:00:14.000000000 +0100
-+++ libs/video/renderer/Makefile.in 2007-01-14 15:02:08.000000000 +0100
-@@ -409,7 +409,7 @@
- libQFrenderer_gl_la_LIBADD = gl/libgl.la
- libQFrenderer_gl_la_SOURCES = $(common_sources)
- libQFrenderer_gl_la_DEPENDENCIES = gl/libgl.la
--libQFrenderer_sw_la_LDFLAGS = @STATIC@
-+libQFrenderer_sw_la_LDFLAGS = -version-info 1:0:0 -rpath $(libdir)
- libQFrenderer_sw_la_LIBADD = sw/libsw.la
- libQFrenderer_sw_la_SOURCES = $(common_sources)
- libQFrenderer_sw_la_DEPENDENCIES = sw/libsw.la
diff --git a/games-fps/quakeforge/files/quakeforge-0.5.5-libc.patch b/games-fps/quakeforge/files/quakeforge-0.5.5-libc.patch
deleted file mode 100644
index 0161c60..0000000
--- a/games-fps/quakeforge/files/quakeforge-0.5.5-libc.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-http://quake.git.sourceforge.net/git/gitweb.cgi?p=quake/quakeforge;a=commit;h=cdf5ef256583dea6caa34464f6a82222cc43d2fd
-
---- libs/net/nc/net_udp6.c
-+++ libs/net/nc/net_udp6.c
-@@ -111,10 +111,10 @@ static __attribute__ ((used)) const char rcsid[] =
- # define MAXHOSTNAMELEN 512
- #endif
-
--#ifdef __GLIBC__ // glibc macro
-+#if defined(__GLIBC__) && !defined(s6_addr32) // glibc macro
- # define s6_addr32 in6_u.u6_addr32
- # if ! __GLIBC_PREREQ (2,2)
--# define ss_family __ss_family
-+# define ss_family __ss_family
- # endif
- #endif
-
diff --git a/games-fps/quakeforge/files/quakeforge-0.5.5-no-page-size.patch b/games-fps/quakeforge/files/quakeforge-0.5.5-no-page-size.patch
deleted file mode 100644
index c18ec17..0000000
--- a/games-fps/quakeforge/files/quakeforge-0.5.5-no-page-size.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-do not use kernel headers' asm/page.h
-
-http://bugs.gentoo.org/187083
-
---- libs/video/targets/vid_fbdev.c
-+++ libs/video/targets/vid_fbdev.c
-@@ -58,7 +58,7 @@
- #include <signal.h>
- #include <stdio.h>
- #include <stdlib.h>
--#include <asm/page.h>
-+#define PAGE_MASK sysconf(_SC_PAGE_SIZE)
- #include <linux/kd.h>
- #include <linux/vt.h>
- #include <sys/stat.h>
diff --git a/games-fps/quakeforge/files/quakeforge-0.5.5-noWerror.patch b/games-fps/quakeforge/files/quakeforge-0.5.5-noWerror.patch
deleted file mode 100644
index 5f36741..0000000
--- a/games-fps/quakeforge/files/quakeforge-0.5.5-noWerror.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- tools/qwaq/Makefile.am.old 2009-11-20 15:10:00.000000000 +0100
-+++ tools/qwaq/Makefile.am 2009-11-20 15:10:22.000000000 +0100
-@@ -6,7 +6,7 @@
-
- QFCC_DEP=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
- QFCC=$(top_builddir)/tools/qfcc/source/qfcc
--QCFLAGS=-qq -g -Werror --advanced
-+QCFLAGS=-qq -g --advanced
-
- if BUILD_QWAQ
- qwaq=qwaq
---- ruamoko/lib/Makefile.am.old 2009-11-20 15:12:00.000000000 +0100
-+++ ruamoko/lib/Makefile.am 2009-11-20 15:12:17.000000000 +0100
-@@ -3,7 +3,7 @@
- pkglibdir=$(libdir)/ruamoko
-
- QFCC=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
--QCFLAGS=-qq -g -Werror
-+QCFLAGS=-qq -g
- QCPPFLAGS=$(INCLUDES)
- PAK=$(top_builddir)/tools/pak/pak$(EXEEXT)
- RANLIB=touch
---- ruamoko/game/Makefile.am.old 2009-11-20 15:13:05.000000000 +0100
-+++ ruamoko/game/Makefile.am 2009-11-20 15:13:21.000000000 +0100
-@@ -7,7 +7,7 @@
-
- QFCC_DEP=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
- QFCC=$(QFCC_DEP)
--QCFLAGS=-qq -g -Werror
-+QCFLAGS=-qq -g
- QCPPFLAGS=-I. -I$(srcdir) -I$(top_builddir)/ruamoko/include -I$(top_srcdir)/ruamoko/include
- GZIP=if echo $@ | grep -q .gz; then gzip -f `basename $@ .gz`; if test -f `basename $@ .dat.gz`.sym; then gzip -f `basename $@ .dat.gz`.sym; fi; fi
- if HAVE_ZLIB
---- ruamoko/gui/Makefile.am.old 2009-11-20 15:13:52.000000000 +0100
-+++ ruamoko/gui/Makefile.am 2009-11-20 15:14:09.000000000 +0100
-@@ -3,7 +3,7 @@
- pkglibdir=$(libdir)/ruamoko
-
- QFCC=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
--QCFLAGS=-qq -g -Werror
-+QCFLAGS=-qq -g
- QCPPFLAGS=$(INCLUDES)
- PAK=$(top_builddir)/tools/pak/pak$(EXEEXT)
- RANLIB=touch
---- ruamoko/cl_menu/Makefile.am.old 2009-11-20 15:14:37.000000000 +0100
-+++ ruamoko/cl_menu/Makefile.am 2009-11-20 15:15:03.000000000 +0100
-@@ -5,7 +5,7 @@
-
- QFCC_DEP=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
- QFCC=$(QFCC_DEP)
--QCFLAGS=-qq -g -Werror
-+QCFLAGS=-qq -g
- QCPPFLAGS=-I. -I$(srcdir) -I$(top_builddir)/ruamoko/include -I$(top_srcdir)/ruamoko/include -I$(top_builddir)/include -I$(top_srcdir)/include
- GZIP=if echo $@ | grep -q .gz; then gzip -f `basename $@ .gz`; if test -f `basename $@ .dat.gz`.sym; then gzip -f `basename $@ .dat.gz`.sym; fi; fi
- if HAVE_ZLIB
---- configure.ac.old 2009-11-20 15:15:35.000000000 +0100
-+++ configure.ac 2009-11-20 15:16:04.000000000 +0100
-@@ -92,6 +92,7 @@
- AC_PROG_RANLIB
- AC_LIBTOOL_WIN32_DLL
- AM_PROG_LIBTOOL
-+AM_PROG_AS
-
- AC_PROG_YACC
- if echo $YACC | grep -v bison > /dev/null; then
diff --git a/games-fps/quakeforge/files/quakeforge-0.5.5-zlib-1.2.6.patch b/games-fps/quakeforge/files/quakeforge-0.5.5-zlib-1.2.6.patch
deleted file mode 100644
index eae1e1e..0000000
--- a/games-fps/quakeforge/files/quakeforge-0.5.5-zlib-1.2.6.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://bugs.gentoo.org/421547
-http://quake.git.sourceforge.net/git/gitweb.cgi?p=quake/quakeforge;a=commit;h=d8a37bc7910366904ef4559bef3b13feec378113
-
---- libs/util/quakeio.c
-+++ libs/util/quakeio.c
-@@ -80,7 +80,7 @@ static __attribute__ ((used)) const char rcsid[] =
- struct QFile_s {
- FILE *file;
- #ifdef HAVE_ZLIB
-- gzFile *gzfile;
-+ gzFile gzfile;
- #endif
- off_t size;
- off_t start;
diff --git a/games-fps/quakeforge/quakeforge-0.5.5-r2.ebuild b/games-fps/quakeforge/quakeforge-0.5.5-r2.ebuild
deleted file mode 100644
index c02158d..0000000
--- a/games-fps/quakeforge/quakeforge-0.5.5-r2.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-inherit base eutils autotools games
-
-DESCRIPTION="A new 3d engine based off of id Softwares's legendary Quake and QuakeWorld game engine"
-HOMEPAGE="http://www.quakeforge.net/"
-SRC_URI="mirror://sourceforge/quake/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE="cdinstall debug fbcon opengl sdl svga X ncurses vorbis zlib ipv6 xv dga alsa oss"
-RESTRICT="userpriv"
-
-RDEPEND="
- opengl? ( virtual/opengl )
- sdl? ( media-libs/libsdl )
- svga? ( media-libs/svgalib )
- X? (
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXxf86vm
- )
- ncurses? ( sys-libs/ncurses )
- vorbis? ( media-libs/libogg media-libs/libvorbis )
- zlib? ( sys-libs/zlib )
- xv? (
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXxf86vm
- )
- dga? ( x11-libs/libXxf86dga )
- alsa? ( media-libs/alsa-lib )"
-DEPEND="${RDEPEND}
- cdinstall? ( games-fps/quake1-data )
- sys-devel/bison
- sys-devel/flex"
-
-PATCHES=(
- "${FILESDIR}"/${P}-no-page-size.patch
- "${FILESDIR}"/${PV}-ipv6.patch
- "${FILESDIR}"/${P}-gcc41.patch
- "${FILESDIR}"/${P}-keys.patch
- "${FILESDIR}"/${P}-amd64.patch
- "${FILESDIR}"/${P}-noWerror.patch
- "${FILESDIR}"/${P}-gcc46.patch
- "${FILESDIR}"/${P}-zlib-1.2.6.patch
- "${FILESDIR}"/${P}-libc.patch
-)
-
-src_prepare() {
- base_src_prepare
- eautoreconf
-}
-
-src_configure() {
- #i should do this at some point :x ... i guess if you disable all shared stuff
- #and enable all the static options explicitly, static works ... (or so ive been told)
- #if ! use static ; then
- # myconf="${myconf} --enable-shared=yes --enable-static=no"
- #else
- # myconf="${myconf} --enable-shared=no --enable-static=yes"
- #fi
-
- local debugopts
- use debug \
- && debugopts="--enable-debug --disable-optimize --enable-profile" \
- || debugopts="--disable-debug --disable-profile"
-
- local clients=${QF_CLIENTS}
- use fbcon && clients="${clients},fbdev"
- use opengl && clients="${clients},glx"
- use sdl && clients="${clients},sdl,sdl32"
- use sdl && use opengl && clients="${clients},sgl"
- use svga && clients="${clients},svga"
- use X && clients="${clients},x11"
- use X && use opengl && clients="${clients},wgl"
- [ "${clients:0:1}" == "," ] && clients=${clients:1}
-
- local servers=${QF_SERVERS:-master,nq,qw,qtv}
-
- local tools=${QF_TOOLS:-all}
-
- local svgaconf # use old school way for broken conf opts
- use svga \
- && svgaconf="--with-svga=/usr" \
- || svgaconf="--without-svga"
-
- addpredict "$(games_get_libdir)"
- egamesconf \
- $(use_enable ncurses curses) \
- $(use_enable vorbis) \
- $(use_enable zlib) \
- $(use_with ipv6) \
- $(use_with fbcon fbdev) \
- ${svgaconf} \
- $(use_with X x) \
- $(use_enable xv vidmode) \
- $(use_enable dga) \
- $(use_enable sdl) \
- --disable-xmms \
- $(use_enable alsa) \
- $(use_enable oss) \
- --enable-sound \
- --disable-optimize \
- ${debugopts} \
- --with-global-cfg="${GAMES_SYSCONFDIR}"/quakeforge.conf \
- --with-sharepath="${GAMES_DATADIR}"/quake1 \
- --with-clients=${clients} \
- --with-servers=${servers} \
- --with-tools=${tools}
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "install failed"
- mv "${D}/${GAMES_PREFIX}"/include "${D}"/usr/
- dodoc ChangeLog NEWS TODO doc/*txt
- prepgamesdirs
-}
-
-pkg_postinst() {
- # same warning used in quake1 / quakeforge / nprquake-sdl
- games_pkg_postinst
- echo
- elog "Before you can play, you must make sure"
- elog "${PN} can find your Quake .pak files"
- elog
- elog "You have 2 choices to do this"
- elog "1 Copy pak*.pak files to ${GAMES_DATADIR}/quake1/id1"
- elog "2 Symlink pak*.pak files in ${GAMES_DATADIR}/quake1/id1"
- elog
- elog "Example:"
- elog "my pak*.pak files are in /mnt/secondary/Games/Quake/Id1/"
- elog "ln -s /mnt/secondary/Games/Quake/Id1/pak0.pak ${GAMES_DATADIR}/quake1/id1/pak0.pak"
- elog
- elog "You only need pak0.pak to play the demo version,"
- elog "the others are needed for registered version"
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/quakeforge/, games-fps/quakeforge/files/
@ 2017-02-09 17:37 Austin English
0 siblings, 0 replies; 4+ messages in thread
From: Austin English @ 2017-02-09 17:37 UTC (permalink / raw
To: gentoo-commits
commit: ee09b63d6dc5dd3408983d0f9b01477af3d9aed4
Author: Austin English <wizardedit <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 8 18:13:15 2017 +0000
Commit: Austin English <wizardedit <AT> gentoo <DOT> org>
CommitDate: Thu Feb 9 17:35:52 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee09b63d
games-fps/quakeforge: remove deprecated games eclass
Also update to EAPI 6
Gentoo-Bug: https://bugs.gentoo.org/574082
Package-Manager: Portage-2.3.2, Repoman-2.3.1
.../quakeforge/files/quakeforge-0.7.2-gentoo.patch | 12 +-
games-fps/quakeforge/quakeforge-0.7.2-r1.ebuild | 127 +++++++++++++++++++++
2 files changed, 133 insertions(+), 6 deletions(-)
diff --git a/games-fps/quakeforge/files/quakeforge-0.7.2-gentoo.patch b/games-fps/quakeforge/files/quakeforge-0.7.2-gentoo.patch
index 396d7322b4..38fb0c1876 100644
--- a/games-fps/quakeforge/files/quakeforge-0.7.2-gentoo.patch
+++ b/games-fps/quakeforge/files/quakeforge-0.7.2-gentoo.patch
@@ -1,5 +1,5 @@
---- nq/source/Makefile.am.old 2012-11-18 16:57:56.658388682 +0100
-+++ nq/source/Makefile.am 2012-11-18 16:58:11.470268607 +0100
+--- a/nq/source/Makefile.am 2012-11-18 16:57:56.658388682 +0100
++++ b/nq/source/Makefile.am 2012-11-18 16:58:11.470268607 +0100
@@ -138,7 +138,7 @@
nq_x11_SOURCES= sys_unix.c
nq_x11_LDADD= $(nq_x11_libs) \
@@ -9,8 +9,8 @@
nq_x11_LDFLAGS= $(common_ldflags)
nq_x11_DEPENDENCIES= $(nq_x11_libs)
---- qw/source/Makefile.am.old 2012-11-18 17:10:59.148172332 +0100
-+++ qw/source/Makefile.am 2012-11-18 17:11:55.866876762 +0100
+--- a/qw/source/Makefile.am 2012-11-18 17:10:59.148172332 +0100
++++ b/qw/source/Makefile.am 2012-11-18 17:11:55.866876762 +0100
@@ -168,7 +168,7 @@
qw_client_x11_SOURCES= cl_sys_unix.c
qw_client_x11_LDADD= $(qw_client_x11_libs) \
@@ -20,8 +20,8 @@
qw_client_x11_LDFLAGS= $(common_ldflags)
qw_client_x11_DEPENDENCIES= $(qw_client_x11_libs)
---- tools/qwaq/Makefile.am.old 2012-11-18 17:15:16.024714317 +0100
-+++ tools/qwaq/Makefile.am 2012-11-18 17:15:41.955749660 +0100
+--- a/tools/qwaq/Makefile.am 2012-11-18 17:15:16.024714317 +0100
++++ b/tools/qwaq/Makefile.am 2012-11-18 17:15:41.955749660 +0100
@@ -38,7 +38,7 @@
qwaq_x11_SOURCES=qwaq.c qwaq-bi.c
qwaq_x11_LDADD= $(qwaq_x11_libs) $(QWAQ_LIBS) \
diff --git a/games-fps/quakeforge/quakeforge-0.7.2-r1.ebuild b/games-fps/quakeforge/quakeforge-0.7.2-r1.ebuild
new file mode 100644
index 0000000000..5762daa8e5
--- /dev/null
+++ b/games-fps/quakeforge/quakeforge-0.7.2-r1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils flag-o-matic autotools
+
+DESCRIPTION="New 3d engine based off of id Softwares's Quake and QuakeWorld game engine"
+HOMEPAGE="http://www.quakeforge.net/"
+SRC_URI="mirror://sourceforge/quake/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="alsa cdinstall debug dga fbcon flac ipv6 ncurses oss png sdl vorbis wildmidi X xdg xv zlib"
+RESTRICT="userpriv"
+
+RDEPEND="
+ media-libs/libsamplerate
+ net-misc/curl
+ virtual/opengl
+ alsa? ( media-libs/alsa-lib )
+ dga? ( x11-libs/libXxf86dga )
+ flac? ( media-libs/flac )
+ ncurses? ( sys-libs/ncurses:0 )
+ png? ( media-libs/libpng:0 )
+ sdl? ( media-libs/libsdl[video] )
+ vorbis? (
+ media-libs/libogg
+ media-libs/libvorbis
+ )
+ wildmidi? ( media-sound/wildmidi )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXxf86vm
+ )
+ xv? (
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXxf86vm
+ )
+ zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+ cdinstall? ( games-fps/quake1-data )
+ >=sys-devel/bison-2.6
+ sys-devel/flex
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-gentoo.patch
+)
+
+src_prepare() {
+ default
+ eautoreconf
+ append-cflags -std=gnu89 # build with gcc5 (bug #570392)
+}
+
+src_configure() {
+ local debugopts
+ use debug \
+ && debugopts="--enable-debug --disable-optimize --enable-profile" \
+ || debugopts="--disable-debug --disable-profile"
+
+ local clients=${QF_CLIENTS}
+ use fbcon && clients="${clients},fbdev"
+ use sdl && clients="${clients},sdl"
+ use X && clients="${clients},x11"
+ [ "${clients:0:1}" == "," ] && clients=${clients:1}
+
+ local servers=${QF_SERVERS:-master,nq,qw,qtv}
+
+ local tools=${QF_TOOLS:-all}
+
+ econf \
+ --enable-dependency-tracking \
+ $(use_enable ncurses curses) \
+ $(use_enable vorbis) \
+ $(use_enable png) \
+ $(use_enable zlib) \
+ $(use_with ipv6) \
+ $(use_with fbcon fbdev) \
+ $(use_with X x) \
+ $(use_enable xv vidmode) \
+ $(use_enable dga) \
+ $(use_enable sdl) \
+ --disable-xmms \
+ $(use_enable alsa) \
+ $(use_enable flac) \
+ $(use_enable oss) \
+ $(use_enable xdg) \
+ $(use_enable wildmidi) \
+ --enable-sound \
+ --disable-optimize \
+ --disable-Werror \
+ --without-svga \
+ ${debugopts} \
+ --with-global-cfg=/etc/quakeforge.conf \
+ --with-sharepath=/usr/share/quake1 \
+ --with-clients=${clients} \
+ --with-servers=${servers} \
+ --with-tools=${tools}
+}
+
+src_install() {
+ emake -j1 DESTDIR="${D}" install
+ dodoc ChangeLog NEWS TODO
+}
+
+pkg_postinst() {
+ # same warning used in quake1 / quakeforge / nprquake-sdl
+ echo
+ elog "Before you can play, you must make sure"
+ elog "${PN} can find your Quake .pak files"
+ elog
+ elog "You have 2 choices to do this"
+ elog "1 Copy pak*.pak files to /usr/share/quake1/id1"
+ elog "2 Symlink pak*.pak files in /usr/share/quake1/id1"
+ elog
+ elog "Example:"
+ elog "my pak*.pak files are in /mnt/secondary/Games/Quake/Id1/"
+ elog "ln -s /mnt/secondary/Games/Quake/Id1/pak0.pak /usr/share/quake1/id1/pak0.pak"
+ elog
+ elog "You only need pak0.pak to play the demo version,"
+ elog "the others are needed for registered version"
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/quakeforge/, games-fps/quakeforge/files/
@ 2021-06-07 8:21 Ionen Wolkens
0 siblings, 0 replies; 4+ messages in thread
From: Ionen Wolkens @ 2021-06-07 8:21 UTC (permalink / raw
To: gentoo-commits
commit: 143bb008da03175efdefb08a1fe6c62377c4865e
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 7 07:02:08 2021 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Jun 7 08:17:40 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=143bb008
games-fps/quakeforge: add 0.7.2_p20210601 snapshot
Previous version (from 2013) didn't build for a long time and,
even if get it to build, is prone to segfaults. New snapshot
improves several aspects but still rather fragile.
ebuild is not based on the old one and focuses on what still works
while providing a wall-of-text so it's at least remotely usable for
a first time user without their ready made Quake folder.
Should fix all old bugs.
Closes: https://bugs.gentoo.org/438826
Closes: https://bugs.gentoo.org/577112
Closes: https://bugs.gentoo.org/629600
Closes: https://bugs.gentoo.org/637408
Closes: https://bugs.gentoo.org/649088
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
games-fps/quakeforge/Manifest | 1 +
.../quakeforge-0.7.2_p20210601-png-stub.patch | 9 ++
.../quakeforge-0.7.2_p20210601-skipped-tests.patch | 15 ++
games-fps/quakeforge/metadata.xml | 3 +-
.../quakeforge/quakeforge-0.7.2_p20210601.ebuild | 173 +++++++++++++++++++++
5 files changed, 200 insertions(+), 1 deletion(-)
diff --git a/games-fps/quakeforge/Manifest b/games-fps/quakeforge/Manifest
index e34227e6aee..a4707ca31d2 100644
--- a/games-fps/quakeforge/Manifest
+++ b/games-fps/quakeforge/Manifest
@@ -1 +1,2 @@
DIST quakeforge-0.7.2.tar.bz2 2887823 BLAKE2B 27526b0e5491cc9a052f70c387c46b0d5518c0d63264f799cac81e471a87b978c9edcf22f4a68db25b8c05b7b51371504459e8ba5de450719e92aae712940cc7 SHA512 d296e10b86466aee0a4be527a5fea7a44bae60ebef52ad86381744dc96e2bed2ad14d3b790b4514a5c59ac897662e91b80a9d49c822910930742a1d2b8a2ec55
+DIST quakeforge-0.7.2_p20210601.tar.gz 3140318 BLAKE2B 4359c2e92a52bc314bca82dcf6f90aebe2fb7260e9c2e1444d3ca239c53adf1ca912093c5c0ccacb4cf9375e199c244f1b8787196c2f8f3bbc7eb00962b0d8da SHA512 a27e4317b3c01f129f1f32209c02b86abf7148c3e0b2e39306324d6b4758d9165883c169ebfde03fc7350b499088cd685991483911b5ae57ccb9b80baaefa733
diff --git a/games-fps/quakeforge/files/quakeforge-0.7.2_p20210601-png-stub.patch b/games-fps/quakeforge/files/quakeforge-0.7.2_p20210601-png-stub.patch
new file mode 100644
index 00000000000..d32fab57b7e
--- /dev/null
+++ b/games-fps/quakeforge/files/quakeforge-0.7.2_p20210601-png-stub.patch
@@ -0,0 +1,9 @@
+Fix stub definition for USE=-png
+https://github.com/quakeforge/quakeforge/issues/14
+--- a/libs/image/png.c
++++ b/libs/image/png.c
+@@ -320,3 +320,3 @@
+ VISIBLE tex_t *
+-LoadPNG (QFile *infile)
++LoadPNG (QFile *infile, int load)
+ {
diff --git a/games-fps/quakeforge/files/quakeforge-0.7.2_p20210601-skipped-tests.patch b/games-fps/quakeforge/files/quakeforge-0.7.2_p20210601-skipped-tests.patch
new file mode 100644
index 00000000000..5b25af47ac2
--- /dev/null
+++ b/games-fps/quakeforge/files/quakeforge-0.7.2_p20210601-skipped-tests.patch
@@ -0,0 +1,15 @@
+These are only failing at high precision and
+should not affect normal usage.
+ quat/simd: fails with -mavx
+ sebvf: random failure, sometimes pass
+--- a/libs/util/test/Makemodule.am
++++ b/libs/util/test/Makemodule.am
+@@ -15,8 +15,5 @@
+ libs/util/test/test-qfs \
+- libs/util/test/test-quat \
+ libs/util/test/test-seb \
+- libs/util/test/test-sebvf \
+ libs/util/test/test-seg \
+ libs/util/test/test-set \
+- libs/util/test/test-simd \
+ libs/util/test/test-txtbuffer \
diff --git a/games-fps/quakeforge/metadata.xml b/games-fps/quakeforge/metadata.xml
index e686e2fbeaa..120ffed3507 100644
--- a/games-fps/quakeforge/metadata.xml
+++ b/games-fps/quakeforge/metadata.xml
@@ -30,8 +30,9 @@ features, and improving the OpenGL renderer. And QuakeForge is still the
most portable source tree based on the id Software code.
</longdescription>
<use>
- <flag name="wildmidi">enable libWildMidi support</flag>
<flag name="xdg">enable XDG support</flag>
+ <flag name="client">Build Normal and QuakeWorld clients alongside the servers</flag>
+ <flag name="wildmidi">Use <pkg>media-sound/wildmidi</pkg> for midi support</flag>
</use>
<upstream>
<remote-id type="github">quakeforge/quakeforge</remote-id>
diff --git a/games-fps/quakeforge/quakeforge-0.7.2_p20210601.ebuild b/games-fps/quakeforge/quakeforge-0.7.2_p20210601.ebuild
new file mode 100644
index 00000000000..504324b8b2b
--- /dev/null
+++ b/games-fps/quakeforge/quakeforge-0.7.2_p20210601.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic readme.gentoo-r1 toolchain-funcs
+
+MY_COMMIT="53b553e89234306dc0111b107308fb42998e522b"
+
+DESCRIPTION="3D engine based on id Software's Quake and QuakeWorld game engines"
+HOMEPAGE="http://www.quakeforge.net/"
+SRC_URI="https://github.com/quakeforge/quakeforge/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa +client custom-cflags debug doc flac ipv6 jack ncurses oss png sdl vorbis wildmidi zlib"
+
+RDEPEND="
+ client? (
+ media-libs/libsamplerate
+ net-misc/curl
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXxf86vm
+ alsa? ( media-libs/alsa-lib )
+ flac? ( media-libs/flac )
+ jack? ( virtual/jack )
+ sdl? ( media-libs/libsdl[sound] )
+ vorbis? ( media-libs/libvorbis )
+ wildmidi? ( media-sound/wildmidi )
+ )
+ ncurses? ( sys-libs/ncurses:= )
+ png? ( media-libs/libpng:= )
+ zlib? ( sys-libs/zlib:= )"
+DEPEND="
+ ${RDEPEND}
+ client? (
+ virtual/opengl
+ x11-base/xorg-proto
+ )"
+BDEPEND="
+ sys-devel/bison
+ sys-devel/flex
+ virtual/pkgconfig
+ doc? (
+ app-doc/doxygen[dot]
+ media-gfx/transfig
+ )"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-png-stub.patch
+ "${FILESDIR}"/${P}-skipped-tests.patch
+)
+
+src_prepare() {
+ default
+
+ echo ${PV} > .tarball-version || die
+
+ eautoreconf
+}
+
+src_configure() {
+ if ! use custom-cflags; then
+ # package does a lot of fragile micro-optimizations
+ strip-flags
+
+ # nq-x11 segfaults starting a new game with -O2+ and gcc11
+ # https://github.com/quakeforge/quakeforge/issues/12
+ tc-is-gcc && [[ $(gcc-major-version) -ge 11 ]] && replace-flags '-O[2-9]*' -Os
+ fi
+
+ append-ldflags -Wl,-z,noexecstack
+
+ qf_client() {
+ echo $(usex client $(use_enable ${1}) --disable-${1})
+ }
+
+ local econfargs=(
+ $(qf_client alsa)
+ $(qf_client flac)
+ $(qf_client jack)
+ $(qf_client oss)
+ $(qf_client sdl)
+ $(qf_client vorbis)
+ # vulkan is work-in-progress and currently needs <=vulkan-headers-1.2.169
+ # https://github.com/quakeforge/quakeforge/issues/13
+ --disable-vulkan # $(qf_client vulkan)
+ $(qf_client wildmidi)
+ $(use_enable client sound)
+ $(use_enable client vidmode)
+ $(use_enable debug)
+ $(use_enable ncurses curses)
+ $(use_enable png)
+ $(use_enable zlib)
+ $(use_with client x)
+ $(use_with ipv6)
+ --disable-Werror
+ --disable-dga
+ --disable-static
+ --enable-xdg
+ # non-x11 clients are mostly abandoned/broken (SDL1 still useful for pulseaudio)
+ --with-clients=$(usex client x11 '')
+ --with-cpp="$(tc-getCPP) -x c %u %d %s -o %o %i" # see config.d/qfcc.m4
+ --with-global-cfg="${EPREFIX}"/etc/quakeforge.conf
+ --with-sharepath="${EPREFIX}"/usr/share/quake1
+ )
+
+ # Jack audio is special (need a different method to enable), and an
+ # issue prevents it from being usable without another audio output.
+ # https://github.com/quakeforge/quakeforge/issues/16
+ # Given hopefully temporary, not relying on REQUIRED_USE.
+ use alsa || use oss || use sdl || econfargs+=( --enable-oss )
+
+ econf "${econfargs[@]}"
+}
+
+src_compile() {
+ default
+
+ use doc && emake doc
+}
+
+src_install() {
+ use doc && local HTML_DOCS=( doxygen/html/. )
+
+ emake -j1 DESTDIR="${D}" install
+
+ find "${ED}" -name '*.la' -delete || die
+
+ local DISABLE_AUTOFORMATTING="yes"
+ local DOC_CONTENTS=\
+"Before you can play (using nq-x11 or qw-client-x11), you must ensure
+that ${PN} can find your Quake pak0.pak (and optionally pak1.pak)
+at one of these locations with lowercase filenames:
+ - '~/.local/share/${PN}/id1/pak0.pak'
+ - '${EPREFIX}/usr/share/quake1/id1/pak0.pak'
+
+You can add them yourself or use either of:
+ - games-fps/quake1-data: install from a Quake CD-ROM
+ - games-fps/quake1-demodata: pak0.pak only (limited demo)
+
+Key binds notes:
+ Defaults ('imt_mod' table) expect you to set key binds manually in:
+ - '~/.local/share/${PN}/id1/autoexec.cfg' (or '${EPREFIX}/usr/share/quake1/id1')
+ For the in-game bind menu to be usable ('imt_0' table), bring up the
+ console with backtick \`, and run 'imt imt_0' (only needed once).
+ A mouse-grab bind ('toggle in_grab') and using freelook is recommended.
+
+Audio/Video notes:
+ Can add settings in:
+ - '~/.config/${PN}/${PN}.conf' (or '${EPREFIX}/etc/${PN}.conf')
+ Examples:
+ - set vid_width 800
+ - set vid_height 600
+ - set snd_output sdl (or alsa, oss)
+ - setrom vid_render gl (or sw for software rendering)
+ - setrom snd_render default (specially set jack here for JACK audio)"
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+
+ if [[ ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -le 0.7.2-r1; then
+ elog "Migration may be needed for ${PN}'s home paths, now using:"
+ elog " ~/.${PN}rc -> ~/.config/${PN}/${PN}.conf"
+ elog " ~/.${PN}/ -> ~/.local/share/${PN}/"
+ elog "Also, nq-sdl / qw-client-sdl are no longer available (use -x11 instead)."
+ fi
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/quakeforge/, games-fps/quakeforge/files/
@ 2021-07-25 1:36 Ionen Wolkens
0 siblings, 0 replies; 4+ messages in thread
From: Ionen Wolkens @ 2021-07-25 1:36 UTC (permalink / raw
To: gentoo-commits
commit: 51bace7b8f0ee05bebb0c854d85fcf6857320aad
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 25 00:48:10 2021 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Jul 25 01:35:09 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51bace7b
games-fps/quakeforge: drop 0.7.2_p20210601
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
games-fps/quakeforge/Manifest | 1 -
.../quakeforge-0.7.2_p20210601-png-stub.patch | 9 --
.../quakeforge-0.7.2_p20210601-skipped-tests.patch | 15 --
.../quakeforge/quakeforge-0.7.2_p20210601.ebuild | 173 ---------------------
4 files changed, 198 deletions(-)
diff --git a/games-fps/quakeforge/Manifest b/games-fps/quakeforge/Manifest
index c2890dce25b..8b9eb11acfb 100644
--- a/games-fps/quakeforge/Manifest
+++ b/games-fps/quakeforge/Manifest
@@ -1,2 +1 @@
-DIST quakeforge-0.7.2_p20210601.tar.gz 3140318 BLAKE2B 4359c2e92a52bc314bca82dcf6f90aebe2fb7260e9c2e1444d3ca239c53adf1ca912093c5c0ccacb4cf9375e199c244f1b8787196c2f8f3bbc7eb00962b0d8da SHA512 a27e4317b3c01f129f1f32209c02b86abf7148c3e0b2e39306324d6b4758d9165883c169ebfde03fc7350b499088cd685991483911b5ae57ccb9b80baaefa733
DIST quakeforge-0.7.2_p20210722.tar.gz 3157720 BLAKE2B 9757ed10a5f78d9b5f09029c149c3fc121daf4bef2cc5a1687d00d2d85c36065663407318478c801a4ae62dee03713e35009c91f590d1686678756da1aab7824 SHA512 1c3778ff73cffbb5cadc33e0b544935f822a0f983ed67945dbbd7f6624752b68e3da46f1836f38f22cbae9a9ac191eeacc256ca5da540c5448dfc1fb56b68aa4
diff --git a/games-fps/quakeforge/files/quakeforge-0.7.2_p20210601-png-stub.patch b/games-fps/quakeforge/files/quakeforge-0.7.2_p20210601-png-stub.patch
deleted file mode 100644
index d32fab57b7e..00000000000
--- a/games-fps/quakeforge/files/quakeforge-0.7.2_p20210601-png-stub.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-Fix stub definition for USE=-png
-https://github.com/quakeforge/quakeforge/issues/14
---- a/libs/image/png.c
-+++ b/libs/image/png.c
-@@ -320,3 +320,3 @@
- VISIBLE tex_t *
--LoadPNG (QFile *infile)
-+LoadPNG (QFile *infile, int load)
- {
diff --git a/games-fps/quakeforge/files/quakeforge-0.7.2_p20210601-skipped-tests.patch b/games-fps/quakeforge/files/quakeforge-0.7.2_p20210601-skipped-tests.patch
deleted file mode 100644
index 5b25af47ac2..00000000000
--- a/games-fps/quakeforge/files/quakeforge-0.7.2_p20210601-skipped-tests.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-These are only failing at high precision and
-should not affect normal usage.
- quat/simd: fails with -mavx
- sebvf: random failure, sometimes pass
---- a/libs/util/test/Makemodule.am
-+++ b/libs/util/test/Makemodule.am
-@@ -15,8 +15,5 @@
- libs/util/test/test-qfs \
-- libs/util/test/test-quat \
- libs/util/test/test-seb \
-- libs/util/test/test-sebvf \
- libs/util/test/test-seg \
- libs/util/test/test-set \
-- libs/util/test/test-simd \
- libs/util/test/test-txtbuffer \
diff --git a/games-fps/quakeforge/quakeforge-0.7.2_p20210601.ebuild b/games-fps/quakeforge/quakeforge-0.7.2_p20210601.ebuild
deleted file mode 100644
index 504324b8b2b..00000000000
--- a/games-fps/quakeforge/quakeforge-0.7.2_p20210601.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic readme.gentoo-r1 toolchain-funcs
-
-MY_COMMIT="53b553e89234306dc0111b107308fb42998e522b"
-
-DESCRIPTION="3D engine based on id Software's Quake and QuakeWorld game engines"
-HOMEPAGE="http://www.quakeforge.net/"
-SRC_URI="https://github.com/quakeforge/quakeforge/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_COMMIT}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa +client custom-cflags debug doc flac ipv6 jack ncurses oss png sdl vorbis wildmidi zlib"
-
-RDEPEND="
- client? (
- media-libs/libsamplerate
- net-misc/curl
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXxf86vm
- alsa? ( media-libs/alsa-lib )
- flac? ( media-libs/flac )
- jack? ( virtual/jack )
- sdl? ( media-libs/libsdl[sound] )
- vorbis? ( media-libs/libvorbis )
- wildmidi? ( media-sound/wildmidi )
- )
- ncurses? ( sys-libs/ncurses:= )
- png? ( media-libs/libpng:= )
- zlib? ( sys-libs/zlib:= )"
-DEPEND="
- ${RDEPEND}
- client? (
- virtual/opengl
- x11-base/xorg-proto
- )"
-BDEPEND="
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
- doc? (
- app-doc/doxygen[dot]
- media-gfx/transfig
- )"
-
-PATCHES=(
- "${FILESDIR}"/${P}-png-stub.patch
- "${FILESDIR}"/${P}-skipped-tests.patch
-)
-
-src_prepare() {
- default
-
- echo ${PV} > .tarball-version || die
-
- eautoreconf
-}
-
-src_configure() {
- if ! use custom-cflags; then
- # package does a lot of fragile micro-optimizations
- strip-flags
-
- # nq-x11 segfaults starting a new game with -O2+ and gcc11
- # https://github.com/quakeforge/quakeforge/issues/12
- tc-is-gcc && [[ $(gcc-major-version) -ge 11 ]] && replace-flags '-O[2-9]*' -Os
- fi
-
- append-ldflags -Wl,-z,noexecstack
-
- qf_client() {
- echo $(usex client $(use_enable ${1}) --disable-${1})
- }
-
- local econfargs=(
- $(qf_client alsa)
- $(qf_client flac)
- $(qf_client jack)
- $(qf_client oss)
- $(qf_client sdl)
- $(qf_client vorbis)
- # vulkan is work-in-progress and currently needs <=vulkan-headers-1.2.169
- # https://github.com/quakeforge/quakeforge/issues/13
- --disable-vulkan # $(qf_client vulkan)
- $(qf_client wildmidi)
- $(use_enable client sound)
- $(use_enable client vidmode)
- $(use_enable debug)
- $(use_enable ncurses curses)
- $(use_enable png)
- $(use_enable zlib)
- $(use_with client x)
- $(use_with ipv6)
- --disable-Werror
- --disable-dga
- --disable-static
- --enable-xdg
- # non-x11 clients are mostly abandoned/broken (SDL1 still useful for pulseaudio)
- --with-clients=$(usex client x11 '')
- --with-cpp="$(tc-getCPP) -x c %u %d %s -o %o %i" # see config.d/qfcc.m4
- --with-global-cfg="${EPREFIX}"/etc/quakeforge.conf
- --with-sharepath="${EPREFIX}"/usr/share/quake1
- )
-
- # Jack audio is special (need a different method to enable), and an
- # issue prevents it from being usable without another audio output.
- # https://github.com/quakeforge/quakeforge/issues/16
- # Given hopefully temporary, not relying on REQUIRED_USE.
- use alsa || use oss || use sdl || econfargs+=( --enable-oss )
-
- econf "${econfargs[@]}"
-}
-
-src_compile() {
- default
-
- use doc && emake doc
-}
-
-src_install() {
- use doc && local HTML_DOCS=( doxygen/html/. )
-
- emake -j1 DESTDIR="${D}" install
-
- find "${ED}" -name '*.la' -delete || die
-
- local DISABLE_AUTOFORMATTING="yes"
- local DOC_CONTENTS=\
-"Before you can play (using nq-x11 or qw-client-x11), you must ensure
-that ${PN} can find your Quake pak0.pak (and optionally pak1.pak)
-at one of these locations with lowercase filenames:
- - '~/.local/share/${PN}/id1/pak0.pak'
- - '${EPREFIX}/usr/share/quake1/id1/pak0.pak'
-
-You can add them yourself or use either of:
- - games-fps/quake1-data: install from a Quake CD-ROM
- - games-fps/quake1-demodata: pak0.pak only (limited demo)
-
-Key binds notes:
- Defaults ('imt_mod' table) expect you to set key binds manually in:
- - '~/.local/share/${PN}/id1/autoexec.cfg' (or '${EPREFIX}/usr/share/quake1/id1')
- For the in-game bind menu to be usable ('imt_0' table), bring up the
- console with backtick \`, and run 'imt imt_0' (only needed once).
- A mouse-grab bind ('toggle in_grab') and using freelook is recommended.
-
-Audio/Video notes:
- Can add settings in:
- - '~/.config/${PN}/${PN}.conf' (or '${EPREFIX}/etc/${PN}.conf')
- Examples:
- - set vid_width 800
- - set vid_height 600
- - set snd_output sdl (or alsa, oss)
- - setrom vid_render gl (or sw for software rendering)
- - setrom snd_render default (specially set jack here for JACK audio)"
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-
- if [[ ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -le 0.7.2-r1; then
- elog "Migration may be needed for ${PN}'s home paths, now using:"
- elog " ~/.${PN}rc -> ~/.config/${PN}/${PN}.conf"
- elog " ~/.${PN}/ -> ~/.local/share/${PN}/"
- elog "Also, nq-sdl / qw-client-sdl are no longer available (use -x11 instead)."
- fi
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-07-25 1:36 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-02-09 17:37 [gentoo-commits] repo/gentoo:master commit in: games-fps/quakeforge/, games-fps/quakeforge/files/ Austin English
-- strict thread matches above, loose matches on Subject: below --
2021-07-25 1:36 Ionen Wolkens
2021-06-07 8:21 Ionen Wolkens
2016-01-18 7:27 Michael Sterrett
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox