pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/games/quakeforge quakeforge: Update to 0.7.2
details: https://anonhg.NetBSD.org/pkgsrc/rev/a4ad0ac4ea4e
branches: trunk
changeset: 397913:a4ad0ac4ea4e
user: nia <nia%pkgsrc.org@localhost>
date: Sat Jul 06 22:53:24 2019 +0000
description:
quakeforge: Update to 0.7.2
Drop most of the local patches.
Quake is now playable, however, the server still segfaults on launch
on NetBSD.
diffstat:
games/quakeforge/MESSAGE | 4 +-
games/quakeforge/Makefile | 31 +-
games/quakeforge/PLIST | 181 +++++++++------
games/quakeforge/distinfo | 47 +--
games/quakeforge/options.mk | 26 ++
games/quakeforge/patches/patch-aa | 13 -
games/quakeforge/patches/patch-ab | 13 -
games/quakeforge/patches/patch-ac | 22 -
games/quakeforge/patches/patch-ad | 22 -
games/quakeforge/patches/patch-ae | 22 -
games/quakeforge/patches/patch-af | 22 -
games/quakeforge/patches/patch-ag | 130 +---------
games/quakeforge/patches/patch-ah | 51 ----
games/quakeforge/patches/patch-ai | 19 -
games/quakeforge/patches/patch-aj | 13 -
games/quakeforge/patches/patch-ak | 13 -
games/quakeforge/patches/patch-al | 109 ---------
games/quakeforge/patches/patch-am | 164 --------------
games/quakeforge/patches/patch-an | 35 --
games/quakeforge/patches/patch-ao | 13 -
games/quakeforge/patches/patch-ap | 15 -
games/quakeforge/patches/patch-aq | 22 -
games/quakeforge/patches/patch-ar | 14 -
games/quakeforge/patches/patch-as | 187 ----------------
games/quakeforge/patches/patch-at | 22 -
games/quakeforge/patches/patch-au | 14 -
games/quakeforge/patches/patch-av | 12 -
games/quakeforge/patches/patch-aw | 12 -
games/quakeforge/patches/patch-include_QF_llist.h | 22 -
games/quakeforge/patches/patch-include_QF_math_vector.h | 18 +
games/quakeforge/patches/patch-include_QF_mathlib.h | 47 +--
games/quakeforge/patches/patch-include_r__dynamic.h | 13 -
games/quakeforge/patches/patch-include_r__local.h | 13 -
games/quakeforge/patches/patch-libs_models_gl__skin.c | 36 +++
games/quakeforge/patches/patch-libs_net_nm_net__udp.c | 34 ++
games/quakeforge/patches/patch-libs_util_llist.c | 22 -
games/quakeforge/patches/patch-libs_util_plugin.c | 15 +
games/quakeforge/patches/patch-libs_util_quakeio.c | 13 -
games/quakeforge/patches/patch-qw_source_master.c | 8 +-
39 files changed, 303 insertions(+), 1186 deletions(-)
diffs (truncated from 1804 to 300 lines):
diff -r 3d9ebacda2cb -r a4ad0ac4ea4e games/quakeforge/MESSAGE
--- a/games/quakeforge/MESSAGE Sat Jul 06 22:49:00 2019 +0000
+++ b/games/quakeforge/MESSAGE Sat Jul 06 22:53:24 2019 +0000
@@ -1,8 +1,8 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2004/04/17 03:04:03 snj Exp $
+$NetBSD: MESSAGE,v 1.2 2019/07/06 22:53:24 nia Exp $
To use QuakeForge, you must have a set of data files. One possible source
is pkgsrc/games/quakedata/. Once you have obtained a set of data files,
-place the id1 directory in ~/.quakeforge/.
+place the id1 directory in ~/.local/share/quakeforge.
===========================================================================
diff -r 3d9ebacda2cb -r a4ad0ac4ea4e games/quakeforge/Makefile
--- a/games/quakeforge/Makefile Sat Jul 06 22:49:00 2019 +0000
+++ b/games/quakeforge/Makefile Sat Jul 06 22:53:24 2019 +0000
@@ -1,20 +1,19 @@
-# $NetBSD: Makefile,v 1.37 2019/07/02 13:37:34 nia Exp $
+# $NetBSD: Makefile,v 1.38 2019/07/06 22:53:24 nia Exp $
-DISTNAME= quakeforge-0.5.5
-PKGREVISION= 18
+DISTNAME= quakeforge-0.7.2
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=quake/}
MAINTAINER= snj%NetBSD.org@localhost
HOMEPAGE= http://www.quakeforge.net/
COMMENT= Improved Quake engine
+LICENSE= gnu-gpl-v2
+CONFIGURE_ARGS+= --enable-xdg
CONFIGURE_ARGS+= --with-cpp=${CPP:Q}" %d %i %o"
-CONFIGURE_ARGS+= --disable-ogg
-CONFIGURE_ARGS+= --disable-xmms
GNU_CONFIGURE= YES
USE_LANGUAGES= c c++
-USE_TOOLS+= bison gmake
+USE_TOOLS+= bison gmake pkg-config
USE_LIBTOOL= YES
SUBST_CLASSES+= dsp
@@ -23,19 +22,11 @@
SUBST_FILES.dsp= libs/audio/targets/snd_oss.c
SUBST_SED.dsp= -e "s|/dev/dsp|${DEVOSSAUDIO}|"
+LIBS+= ${BUILDLINK_LDADD.oss}
+
REPLACE_PYTHON+= tools/qfcc/source/qfpreqcc
-PKG_OPTIONS_VAR= PKG_OPTIONS.quakeforge
-PKG_SUPPORTED_OPTIONS= inet6
-PKG_SUGGESTED_OPTIONS= inet6
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+= --with-ipv6
-.else
-CONFIGURE_ARGS+= --without-ipv6
-.endif
+.include "../../mk/bsd.prefs.mk"
PLIST_VARS+= sunaudio linux
.if ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS"
@@ -48,10 +39,16 @@
INSTALLATION_DIRS= include/QF/GL include/QF/plugin include/QF/ruamoko/gui
+.include "options.mk"
.include "../../lang/python/application.mk"
+.include "../../audio/flac/buildlink3.mk"
+.include "../../audio/libsamplerate/buildlink3.mk"
+.include "../../audio/libvorbis/buildlink3.mk"
+.include "../../audio/libwildmidi/buildlink3.mk"
.include "../../devel/SDL/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXxf86dga/buildlink3.mk"
.include "../../x11/libXxf86vm/buildlink3.mk"
diff -r 3d9ebacda2cb -r a4ad0ac4ea4e games/quakeforge/PLIST
--- a/games/quakeforge/PLIST Sat Jul 06 22:49:00 2019 +0000
+++ b/games/quakeforge/PLIST Sat Jul 06 22:53:24 2019 +0000
@@ -1,28 +1,24 @@
-@comment $NetBSD: PLIST,v 1.11 2018/01/01 23:47:44 rillig Exp $
+@comment $NetBSD: PLIST,v 1.12 2019/07/06 22:53:24 nia Exp $
bin/bsp2img
bin/hw-master
${PLIST.linux}bin/nq-fbdev
-bin/nq-glx
bin/nq-sdl
-bin/nq-sdl32
bin/nq-server
-bin/nq-sgl
bin/nq-x11
bin/pak
bin/qfbsp
bin/qfcc
bin/qflight
+bin/qflmp
bin/qfmodelgen
bin/qfpreqcc
bin/qfprogs
+bin/qfspritegen
bin/qfvis
bin/qfwavinfo
bin/qtv
${PLIST.linux}bin/qw-client-fbdev
-bin/qw-client-glx
bin/qw-client-sdl
-bin/qw-client-sdl32
-bin/qw-client-sgl
bin/qw-client-x11
bin/qw-master
bin/qw-server
@@ -32,18 +28,31 @@
include/QF/GL/defines.h
include/QF/GL/extensions.h
include/QF/GL/funcs.h
+include/QF/GL/qf_draw.h
include/QF/GL/qf_explosions.h
include/QF/GL/qf_funcs_list.h
+include/QF/GL/qf_iqm.h
include/QF/GL/qf_lightmap.h
-include/QF/GL/qf_noisetextures.h
include/QF/GL/qf_rlight.h
include/QF/GL/qf_rmain.h
include/QF/GL/qf_rsurf.h
-include/QF/GL/qf_screen.h
include/QF/GL/qf_sky.h
include/QF/GL/qf_textures.h
include/QF/GL/qf_vid.h
include/QF/GL/types.h
+include/QF/GLSL/defines.h
+include/QF/GLSL/funcs.h
+include/QF/GLSL/qf_alias.h
+include/QF/GLSL/qf_bsp.h
+include/QF/GLSL/qf_draw.h
+include/QF/GLSL/qf_funcs_list.h
+include/QF/GLSL/qf_iqm.h
+include/QF/GLSL/qf_lightmap.h
+include/QF/GLSL/qf_particles.h
+include/QF/GLSL/qf_textures.h
+include/QF/GLSL/qf_vid.h
+include/QF/GLSL/types.h
+include/QF/alloc.h
include/QF/bspfile.h
include/QF/cbuf.h
include/QF/cdaudio.h
@@ -64,13 +73,21 @@
include/QF/in_event.h
include/QF/info.h
include/QF/input.h
+include/QF/iqm.h
include/QF/joystick.h
include/QF/keys.h
include/QF/link.h
include/QF/llist.h
include/QF/locs.h
+include/QF/math/dual.h
+include/QF/math/half.h
+include/QF/math/matrix3.h
+include/QF/math/matrix4.h
+include/QF/math/quaternion.h
+include/QF/math/vector.h
include/QF/mathlib.h
include/QF/mdfour.h
+include/QF/mersenne.h
include/QF/model.h
include/QF/modelgen.h
include/QF/msg.h
@@ -85,6 +102,7 @@
include/QF/plugin/input.h
include/QF/plugin/snd_output.h
include/QF/plugin/snd_render.h
+include/QF/plugin/vid_render.h
include/QF/png.h
include/QF/pr_comp.h
include/QF/pr_debug.h
@@ -100,49 +118,9 @@
include/QF/render.h
include/QF/riff.h
include/QF/ruamoko.h
-include/QF/ruamoko/Array.h
-include/QF/ruamoko/AutoreleasePool.h
-include/QF/ruamoko/Entity.h
-include/QF/ruamoko/List.h
-include/QF/ruamoko/ListNode.h
-include/QF/ruamoko/Object.h
-include/QF/ruamoko/Stack.h
-include/QF/ruamoko/cbuf.h
-include/QF/ruamoko/cmd.h
-include/QF/ruamoko/crudefile.h
-include/QF/ruamoko/cvar.h
-include/QF/ruamoko/debug.h
-include/QF/ruamoko/draw.h
-include/QF/ruamoko/entities.h
-include/QF/ruamoko/file.h
-include/QF/ruamoko/gib.h
-include/QF/ruamoko/gui/Group.h
-include/QF/ruamoko/gui/InputLine.h
-include/QF/ruamoko/gui/Pic.h
-include/QF/ruamoko/gui/Point.h
-include/QF/ruamoko/gui/Rect.h
-include/QF/ruamoko/gui/Size.h
-include/QF/ruamoko/gui/Slider.h
-include/QF/ruamoko/gui/Text.h
-include/QF/ruamoko/gui/View.h
-include/QF/ruamoko/hash.h
-include/QF/ruamoko/infokey.h
-include/QF/ruamoko/key.h
-include/QF/ruamoko/math.h
-include/QF/ruamoko/message.h
-include/QF/ruamoko/nq_message.h
-include/QF/ruamoko/physics.h
-include/QF/ruamoko/plist.h
-include/QF/ruamoko/qfile.h
-include/QF/ruamoko/qfs.h
-include/QF/ruamoko/qw_message.h
-include/QF/ruamoko/qw_physics.h
-include/QF/ruamoko/qw_sys.h
-include/QF/ruamoko/server.h
-include/QF/ruamoko/sound.h
-include/QF/ruamoko/string.h
-include/QF/ruamoko/system.h
include/QF/screen.h
+include/QF/script.h
+include/QF/set.h
include/QF/sizebuf.h
include/QF/skin.h
include/QF/sound.h
@@ -155,43 +133,100 @@
include/QF/ver_check.h
include/QF/vid.h
include/QF/view.h
+include/QF/vrect.h
include/QF/wad.h
include/QF/wadfile.h
+include/QF/winding.h
include/QF/zone.h
lib/libQFcd.la
lib/libQFconsole.la
-lib/libQFgamecode.la
-lib/libQFgamecode_builtins.la
lib/libQFgib.la
lib/libQFimage.la
lib/libQFjs.la
lib/libQFmodels.la
-lib/libQFmodels_gl.la
-lib/libQFmodels_sw.la
-lib/libQFrenderer_gl.la
-lib/libQFrenderer_sw.la
-lib/libQFrenderer_sw32.la
lib/libQFruamoko.la
lib/libQFsound.la
lib/libQFutil.la
-lib/quakeforge/cd_file.la
-${PLIST.linux}lib/quakeforge/cd_linux.la
-lib/quakeforge/cd_sdl.la
-lib/quakeforge/console_client.la
-lib/quakeforge/console_server.la
-lib/quakeforge/snd_output_disk.la
-lib/quakeforge/snd_output_oss.la
-lib/quakeforge/snd_output_sdl.la
-${PLIST.sunaudio}lib/quakeforge/snd_output_sun.la
-lib/quakeforge/snd_render_default.la
-lib/ruamoko/libcsqc.a
-lib/ruamoko/libgui.a
-lib/ruamoko/libnq.a
-lib/ruamoko/libqw.a
-lib/ruamoko/libr.a
+lib/pkgconfig/qfcc.pc
+lib/pkgconfig/quakeforge.pc
+lib/quakeforge/plugins/cd_file.la
+${PLIST.linux}lib/quakeforge/plugins/cd_linux.la
+lib/quakeforge/plugins/cd_sdl.la
+lib/quakeforge/plugins/console_client.la
+lib/quakeforge/plugins/console_server.la
+${PLIST.alsa}lib/quakeforge/plugins/snd_output_alsa.la
+lib/quakeforge/plugins/snd_output_oss.la
+lib/quakeforge/plugins/snd_output_sdl.la
+${PLIST.sunaudio}lib/quakeforge/plugins/snd_output_sun.la
+lib/quakeforge/plugins/snd_render_default.la
+${PLIST.jack}lib/quakeforge/plugins/snd_render_jack.la
+lib/quakeforge/plugins/vid_render_gl.la
+lib/quakeforge/plugins/vid_render_glsl.la
+lib/quakeforge/plugins/vid_render_sw.la
+lib/quakeforge/plugins/vid_render_sw32.la
man/man1/pak.1
man/man1/qfcc.1
man/man1/qflight.1
man/man1/qfvis.1
man/man1/wad.1
+man/man1/zpak.1
+share/applications/quakeforge-nq-sdl.desktop
+share/applications/quakeforge-nq-x11.desktop
+share/applications/quakeforge-qw-sdl.desktop
Home |
Main Index |
Thread Index |
Old Index