pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/games/quakeforge
Module Name: pkgsrc
Committed By: nia
Date: Sat Jul 6 22:53:25 UTC 2019
Modified Files:
pkgsrc/games/quakeforge: MESSAGE Makefile PLIST distinfo
pkgsrc/games/quakeforge/patches: patch-ag patch-include_QF_mathlib.h
patch-qw_source_master.c
Added Files:
pkgsrc/games/quakeforge: options.mk
pkgsrc/games/quakeforge/patches: patch-include_QF_math_vector.h
patch-libs_models_gl__skin.c patch-libs_net_nm_net__udp.c
patch-libs_util_plugin.c
Removed Files:
pkgsrc/games/quakeforge/patches: patch-aa patch-ab patch-ac patch-ad
patch-ae patch-af patch-ah patch-ai patch-aj patch-ak patch-al
patch-am patch-an patch-ao patch-ap patch-aq patch-ar patch-as
patch-at patch-au patch-av patch-aw patch-include_QF_llist.h
patch-include_r__dynamic.h patch-include_r__local.h
patch-libs_util_llist.c patch-libs_util_quakeio.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/games/quakeforge/MESSAGE
cvs rdiff -u -r1.37 -r1.38 pkgsrc/games/quakeforge/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/games/quakeforge/PLIST
cvs rdiff -u -r1.14 -r1.15 pkgsrc/games/quakeforge/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/games/quakeforge/options.mk
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/games/quakeforge/patches/patch-aa
cvs rdiff -u -r1.2 -r0 pkgsrc/games/quakeforge/patches/patch-ab \
pkgsrc/games/quakeforge/patches/patch-ac \
pkgsrc/games/quakeforge/patches/patch-ad \
pkgsrc/games/quakeforge/patches/patch-ae \
pkgsrc/games/quakeforge/patches/patch-af \
pkgsrc/games/quakeforge/patches/patch-al \
pkgsrc/games/quakeforge/patches/patch-am \
pkgsrc/games/quakeforge/patches/patch-an \
pkgsrc/games/quakeforge/patches/patch-as
cvs rdiff -u -r1.3 -r1.4 pkgsrc/games/quakeforge/patches/patch-ag
cvs rdiff -u -r1.1 -r0 pkgsrc/games/quakeforge/patches/patch-ah \
pkgsrc/games/quakeforge/patches/patch-ai \
pkgsrc/games/quakeforge/patches/patch-aj \
pkgsrc/games/quakeforge/patches/patch-ak \
pkgsrc/games/quakeforge/patches/patch-ao \
pkgsrc/games/quakeforge/patches/patch-ap \
pkgsrc/games/quakeforge/patches/patch-aq \
pkgsrc/games/quakeforge/patches/patch-ar \
pkgsrc/games/quakeforge/patches/patch-at \
pkgsrc/games/quakeforge/patches/patch-au \
pkgsrc/games/quakeforge/patches/patch-av \
pkgsrc/games/quakeforge/patches/patch-aw \
pkgsrc/games/quakeforge/patches/patch-include_QF_llist.h \
pkgsrc/games/quakeforge/patches/patch-include_r__dynamic.h \
pkgsrc/games/quakeforge/patches/patch-include_r__local.h \
pkgsrc/games/quakeforge/patches/patch-libs_util_llist.c \
pkgsrc/games/quakeforge/patches/patch-libs_util_quakeio.c
cvs rdiff -u -r0 -r1.1 \
pkgsrc/games/quakeforge/patches/patch-include_QF_math_vector.h \
pkgsrc/games/quakeforge/patches/patch-libs_models_gl__skin.c \
pkgsrc/games/quakeforge/patches/patch-libs_net_nm_net__udp.c \
pkgsrc/games/quakeforge/patches/patch-libs_util_plugin.c
cvs rdiff -u -r1.4 -r1.5 \
pkgsrc/games/quakeforge/patches/patch-include_QF_mathlib.h
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/games/quakeforge/patches/patch-qw_source_master.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/games/quakeforge/MESSAGE
diff -u pkgsrc/games/quakeforge/MESSAGE:1.1.1.1 pkgsrc/games/quakeforge/MESSAGE:1.2
--- pkgsrc/games/quakeforge/MESSAGE:1.1.1.1 Sat Apr 17 03:04:03 2004
+++ pkgsrc/games/quakeforge/MESSAGE Sat Jul 6 22:53:24 2019
@@ -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.
===========================================================================
Index: pkgsrc/games/quakeforge/Makefile
diff -u pkgsrc/games/quakeforge/Makefile:1.37 pkgsrc/games/quakeforge/Makefile:1.38
--- pkgsrc/games/quakeforge/Makefile:1.37 Tue Jul 2 13:37:34 2019
+++ pkgsrc/games/quakeforge/Makefile Sat Jul 6 22:53:24 2019
@@ -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_MESSAGE.dsp= Adjusting sound devic
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 @@ PLIST.linux= yes
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"
Index: pkgsrc/games/quakeforge/PLIST
diff -u pkgsrc/games/quakeforge/PLIST:1.11 pkgsrc/games/quakeforge/PLIST:1.12
--- pkgsrc/games/quakeforge/PLIST:1.11 Mon Jan 1 23:47:44 2018
+++ pkgsrc/games/quakeforge/PLIST Sat Jul 6 22:53:24 2019
@@ -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/ati.h
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/image.h
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/general.h
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/quakeio.h
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/va.h
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
+share/applications/quakeforge-qw-x11.desktop
share/games/quakeforge/QF/menu.dat.gz
+share/games/quakeforge/QF/menu.plist
+share/games/quakeforge/QF/menu.sym.gz
+share/qfcc/include/Array.h
+share/qfcc/include/AutoreleasePool.h
+share/qfcc/include/Entity.h
+share/qfcc/include/Object.h
+share/qfcc/include/PropertyList.h
+share/qfcc/include/Protocol.h
+share/qfcc/include/Set.h
+share/qfcc/include/cbuf.h
+share/qfcc/include/cmd.h
+share/qfcc/include/crudefile.h
+share/qfcc/include/cvar.h
+share/qfcc/include/debug.h
+share/qfcc/include/draw.h
+share/qfcc/include/entities.h
+share/qfcc/include/file.h
+share/qfcc/include/gib.h
+share/qfcc/include/gui/Group.h
+share/qfcc/include/gui/InputLine.h
+share/qfcc/include/gui/Pic.h
+share/qfcc/include/gui/Point.h
+share/qfcc/include/gui/Rect.h
+share/qfcc/include/gui/Size.h
+share/qfcc/include/gui/Slider.h
+share/qfcc/include/gui/Text.h
+share/qfcc/include/gui/View.h
+share/qfcc/include/hash.h
+share/qfcc/include/infokey.h
+share/qfcc/include/key.h
+share/qfcc/include/math.h
+share/qfcc/include/message.h
+share/qfcc/include/msgbuf.h
+share/qfcc/include/nq_message.h
+share/qfcc/include/physics.h
+share/qfcc/include/plist.h
+share/qfcc/include/qfile.h
+share/qfcc/include/qfs.h
+share/qfcc/include/qw_message.h
+share/qfcc/include/qw_physics.h
+share/qfcc/include/qw_sys.h
+share/qfcc/include/runtime.h
+share/qfcc/include/script.h
+share/qfcc/include/server.h
+share/qfcc/include/sound.h
+share/qfcc/include/string.h
+share/qfcc/include/sv_sound.h
+share/qfcc/include/system.h
+share/qfcc/lib/libcsqc.a
+share/qfcc/lib/libgui.a
+share/qfcc/lib/libnq.a
+share/qfcc/lib/libqw.a
+share/qfcc/lib/libr.a
+share/qfcc/lib/libscheme.a
+@pkgdir include/QF/ruamoko/gui
Index: pkgsrc/games/quakeforge/distinfo
diff -u pkgsrc/games/quakeforge/distinfo:1.14 pkgsrc/games/quakeforge/distinfo:1.15
--- pkgsrc/games/quakeforge/distinfo:1.14 Tue Jul 2 13:37:34 2019
+++ pkgsrc/games/quakeforge/distinfo Sat Jul 6 22:53:24 2019
@@ -1,36 +1,13 @@
-$NetBSD: distinfo,v 1.14 2019/07/02 13:37:34 nia Exp $
+$NetBSD: distinfo,v 1.15 2019/07/06 22:53:24 nia Exp $
-SHA1 (quakeforge-0.5.5.tar.gz) = 3ceb229b3d777b6c5e0cb1530b4547b20737f402
-RMD160 (quakeforge-0.5.5.tar.gz) = d22b29498e950bfdf96169bafee6409fca1a8e11
-SHA512 (quakeforge-0.5.5.tar.gz) = 533089502d42d4496267cebee9256c76a85e9b31247ee418df514ce3aa02afca42d41d781deefc538fc06929a70e41e8e763abb7ea58604e560ea912d585a8e7
-Size (quakeforge-0.5.5.tar.gz) = 2659432 bytes
-SHA1 (patch-aa) = d54d4784c5832a00382946d78929cf618696b898
-SHA1 (patch-ab) = f1abe7e12fd956acb18ed4c95db97e5d86eed8b5
-SHA1 (patch-ac) = fd8daa6dc4a32418c1c31790f9b969db43746e8f
-SHA1 (patch-ad) = a6d824831a5444f92c7b3ab396ea31ef52503dea
-SHA1 (patch-ae) = aa0431df430f4fc08da32550f7fc5a156096bb43
-SHA1 (patch-af) = 15c725bc5c99f558518a1b7ebb219b8b20b19926
-SHA1 (patch-ag) = 41b8acf4e012646d5a15e35540275b5584b2603d
-SHA1 (patch-ah) = b8da2ec1d52c89535d949445871e85872d9a135f
-SHA1 (patch-ai) = 67ef987cfa9dc50485a5a44341a7576e0e99d5c0
-SHA1 (patch-aj) = 5b28f79846fd2dff62004ff52bfc0dad33a91a67
-SHA1 (patch-ak) = e6983bd274f6945510f2624352bf3ec22610f6cc
-SHA1 (patch-al) = 7efe85d428efa0dfd0ccf3bf9255deb7970dc5ee
-SHA1 (patch-am) = 3c68f6bac84a0f25a50d5f9062795b75649cbe8a
-SHA1 (patch-an) = 07a0e85e59d44a7f2421b225822e97068ad80062
-SHA1 (patch-ao) = ee771a71c83b0b11298baca223af4c5e998da4d2
-SHA1 (patch-ap) = 96a767e320124567f53e60b2c39de17d24427085
-SHA1 (patch-aq) = 7b9a23a532b84c902a54799aed336247248276f7
-SHA1 (patch-ar) = bb4fdab9879930fb73572a831718c75109e10ea4
-SHA1 (patch-as) = 4e82270282d1d5a3fb7b0b95768bf53754f569e8
-SHA1 (patch-at) = 3e8bb9d7882c5428cec94d78295668e7930624e6
-SHA1 (patch-au) = 5fbe311a03bc65e39e501b38f50a9c42b298a03a
-SHA1 (patch-av) = 8ba99fa13916ab9efd881a89760307fc5863e9d5
-SHA1 (patch-aw) = d02d3a0cfbb47ad2f73e3ee523aed2964a8fcbae
-SHA1 (patch-include_QF_llist.h) = 34b69e99ca69d4564d7100b0e3bcd8d8a024ec94
-SHA1 (patch-include_QF_mathlib.h) = 9f8ff732bbabdc64bba7354c581dc42b4f242330
-SHA1 (patch-include_r__dynamic.h) = e37cd1d4e242db48793c29c2b78aa78eb14d138d
-SHA1 (patch-include_r__local.h) = 7bb3b46ea3835489a20609739bd7a8dc79b36c96
-SHA1 (patch-libs_util_llist.c) = d41fdac88ac1c9dbccd1bffd512f7e34ae381860
-SHA1 (patch-libs_util_quakeio.c) = fd2810a21507d1a2faae313edb260efdfde9a9a8
-SHA1 (patch-qw_source_master.c) = 8f42fec4b36c24daa8205f342318e91611b8b5df
+SHA1 (quakeforge-0.7.2.tar.gz) = 6c10b095b2c6e860e3b20fca970429d8eda72e36
+RMD160 (quakeforge-0.7.2.tar.gz) = 4cb283f8aa14268ec23145d55830d0044820f75a
+SHA512 (quakeforge-0.7.2.tar.gz) = ec68f298e10db926e7e9d569d375204eed10e80f03cdc79598beea468df6de53a12afa71a832e60705a50475c87f6f617df53bccdf6dfae3482acc34d9b39ce6
+Size (quakeforge-0.7.2.tar.gz) = 3890305 bytes
+SHA1 (patch-ag) = aa5055bab261255d3b4791ad120bbd3a2529bdbb
+SHA1 (patch-include_QF_math_vector.h) = f9bf8f9cb061655e86b4a43e032ce0f67b293f5a
+SHA1 (patch-include_QF_mathlib.h) = 66656322e240432fd38867affe0aed48dd30ce99
+SHA1 (patch-libs_models_gl__skin.c) = bbf69bf452716412e8d014adadf2be23b1076195
+SHA1 (patch-libs_net_nm_net__udp.c) = 6a13a4567ef7c6a963de8c1880a8ac7cc8542ce0
+SHA1 (patch-libs_util_plugin.c) = ba0eeb6ab9a2716d471c031b50e2eccb83826c03
+SHA1 (patch-qw_source_master.c) = aa2757ce195f5f85fd550d7d5a016ca8765f7a8f
Index: pkgsrc/games/quakeforge/patches/patch-ag
diff -u pkgsrc/games/quakeforge/patches/patch-ag:1.3 pkgsrc/games/quakeforge/patches/patch-ag:1.4
--- pkgsrc/games/quakeforge/patches/patch-ag:1.3 Tue Jul 2 13:37:34 2019
+++ pkgsrc/games/quakeforge/patches/patch-ag Sat Jul 6 22:53:24 2019
@@ -1,127 +1,29 @@
-$NetBSD: patch-ag,v 1.3 2019/07/02 13:37:34 nia Exp $
+$NetBSD: patch-ag,v 1.4 2019/07/06 22:53:24 nia Exp $
---- configure.orig 2004-05-02 20:53:17.000000000 +0000
+Fix test operator portability.
+
+Use a symlink for libGL.
+
+--- configure.orig 2013-01-23 03:11:09.000000000 +0000
+++ configure
-@@ -4034,13 +4034,13 @@ darwin* | rhapsody*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
--freebsd* | kfreebsd*-gnu)
-+freebsd* | kfreebsd*-gnu | dragonfly*)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- case $host_cpu in
- i*86 )
- # Not sure whether the presence of OpenBSD here was a mistake.
- # Let's accept both of them until this is cleared up.
-- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
-+ lt_cv_deplibs_check_method='file_magic (DragonFly|FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
- lt_cv_file_magic_cmd=/usr/bin/file
- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
- ;;
-@@ -7704,7 +7704,7 @@ if test -z "$aix_libpath"; then aix_libp
- ;;
-
- # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-- freebsd* | kfreebsd*-gnu)
-+ freebsd* | kfreebsd*-gnu | dragonfly*)
- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
- hardcode_libdir_flag_spec='-R$libdir'
- hardcode_direct=yes
-@@ -8282,7 +8282,7 @@ kfreebsd*-gnu)
- dynamic_linker='GNU ld.so'
- ;;
-
--freebsd*)
-+freebsd* | dragonfly*)
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
- version_type=freebsd-$objformat
- case $version_type in
-@@ -10653,7 +10653,7 @@ if test -z "$aix_libpath"; then aix_libp
- freebsd-elf*)
- archive_cmds_need_lc_CXX=no
- ;;
-- freebsd* | kfreebsd*-gnu)
-+ freebsd* | kfreebsd*-gnu| dragonfly*)
- # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
- # conventions
- ld_shlibs_CXX=yes
-@@ -11360,7 +11360,7 @@ echo $ECHO_N "checking for $compiler opt
- ;;
- esac
- ;;
-- freebsd* | kfreebsd*-gnu)
-+ freebsd* | kfreebsd*-gnu | dragonfly*)
- # FreeBSD uses GNU C++
- ;;
- hpux9* | hpux10* | hpux11*)
-@@ -11974,7 +11974,7 @@ kfreebsd*-gnu)
- dynamic_linker='GNU ld.so'
- ;;
-
--freebsd*)
-+freebsd* | dragonfly*)
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
- version_type=freebsd-$objformat
- case $version_type in
-@@ -14537,7 +14537,7 @@ if test -z "$aix_libpath"; then aix_libp
- ;;
-
- # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-- freebsd* | kfreebsd*-gnu)
-+ freebsd* | kfreebsd*-gnu | dragonfly*)
- archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
- hardcode_libdir_flag_spec_F77='-R$libdir'
- hardcode_direct_F77=yes
-@@ -15115,7 +15115,7 @@ kfreebsd*-gnu)
- dynamic_linker='GNU ld.so'
- ;;
+@@ -19708,7 +19708,7 @@ if test "${enable_xmms+set}" = set; then
+ enableval=$enable_xmms;
+ fi
--freebsd*)
-+freebsd* | dragonfly*)
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
- version_type=freebsd-$objformat
- case $version_type in
-@@ -16883,7 +16883,7 @@ if test -z "$aix_libpath"; then aix_libp
- ;;
+-if test "x$mingw" != xyes -a "x$enable_xmms" == xyes; then
++if test "x$mingw" != xyes -a "x$enable_xmms" = xyes; then
- # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-- freebsd* | kfreebsd*-gnu)
-+ freebsd* | kfreebsd*-gnu | dragonfly*)
- archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
- hardcode_libdir_flag_spec_GCJ='-R$libdir'
- hardcode_direct_GCJ=yes
-@@ -17461,7 +17461,7 @@ kfreebsd*-gnu)
- dynamic_linker='GNU ld.so'
- ;;
--freebsd*)
-+freebsd* | dragonfly*)
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
- version_type=freebsd-$objformat
- case $version_type in
-@@ -22733,7 +22733,7 @@ cat >>conftest.$ac_ext <<_ACEOF
- int
- main ()
- {
--void *(*foo)(size_t) = alloca;
-+void *foo = alloca(sizeof(void));
- ;
- return 0;
- }
-@@ -31107,7 +31107,7 @@ if test "x$gl_driver" = xauto -o "x$gl_d
+ # Check whether --with-xmms-prefix was given.
+@@ -20937,10 +20937,8 @@ fi
+ if test "x$gl_driver" = xauto -o "x$gl_driver" = xyes; then
if test "$SYSTYPE" = WIN32; then
gl_driver="OPENGL32.DLL"
+- elif test "$SYSTYPE" = OPENBSD; then
+- gl_driver="libGL.so"
else
- gl_driver="libGL.so.1"
+ gl_driver="libGL.so"
fi
fi
-@@ -32305,6 +32305,7 @@ fi
-
- 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
Index: pkgsrc/games/quakeforge/patches/patch-include_QF_mathlib.h
diff -u pkgsrc/games/quakeforge/patches/patch-include_QF_mathlib.h:1.4 pkgsrc/games/quakeforge/patches/patch-include_QF_mathlib.h:1.5
--- pkgsrc/games/quakeforge/patches/patch-include_QF_mathlib.h:1.4 Tue Jul 2 13:37:34 2019
+++ pkgsrc/games/quakeforge/patches/patch-include_QF_mathlib.h Sat Jul 6 22:53:24 2019
@@ -1,41 +1,28 @@
-$NetBSD: patch-include_QF_mathlib.h,v 1.4 2019/07/02 13:37:34 nia Exp $
+$NetBSD: patch-include_QF_mathlib.h,v 1.5 2019/07/06 22:53:24 nia Exp $
---- include/QF/mathlib.h.orig 2004-04-07 18:01:45.000000000 +0000
+Fix inline usage for C99.
+
+--- include/QF/mathlib.h.orig 2013-01-23 03:10:55.000000000 +0000
+++ include/QF/mathlib.h
-@@ -255,12 +255,8 @@ void QuatMult (const quat_t v1, const qu
- (PlaneDist (point, plane) - (plane)->dist)
+@@ -174,11 +174,9 @@ void RotatePointAroundVector (vec3_t dst
+ } while (0)
- extern mplane_t * const frustum;
+ extern plane_t * const frustum;
-extern inline qboolean R_CullBox (const vec3_t mins, const vec3_t maxs);
-extern inline qboolean R_CullSphere (const vec3_t origin, const float radius);
--extern inline float VectorNormalize (vec3_t v); // returns vector length
--#ifndef IMPLEMENT_R_Cull
--extern inline
--#endif
-+
-+static inline
- qboolean
- R_CullBox (const vec3_t mins, const vec3_t maxs)
- {
-@@ -272,9 +268,7 @@ R_CullBox (const vec3_t mins, const vec3
- return false;
- }
--#ifndef IMPLEMENT_R_Cull
+ #ifndef IMPLEMENT_R_Cull
-extern inline
--#endif
+static inline
- qboolean
- R_CullSphere (const vec3_t origin, const float radius)
- {
-@@ -290,9 +284,7 @@ R_CullSphere (const vec3_t origin, const
- return false;
+ #else
+ VISIBLE
+ #endif
+@@ -194,7 +192,7 @@ R_CullBox (const vec3_t mins, const vec3
}
--#ifndef IMPLEMENT_VectorNormalize
+ #ifndef IMPLEMENT_R_Cull
-extern inline
--#endif
+static inline
- float
- VectorNormalize (vec3_t v)
- {
+ #else
+ VISIBLE
+ #endif
Index: pkgsrc/games/quakeforge/patches/patch-qw_source_master.c
diff -u pkgsrc/games/quakeforge/patches/patch-qw_source_master.c:1.1 pkgsrc/games/quakeforge/patches/patch-qw_source_master.c:1.2
--- pkgsrc/games/quakeforge/patches/patch-qw_source_master.c:1.1 Sat Aug 31 14:49:08 2013
+++ pkgsrc/games/quakeforge/patches/patch-qw_source_master.c Sat Jul 6 22:53:25 2019
@@ -1,8 +1,10 @@
-$NetBSD: patch-qw_source_master.c,v 1.1 2013/08/31 14:49:08 joerg Exp $
+$NetBSD: patch-qw_source_master.c,v 1.2 2019/07/06 22:53:25 nia Exp $
---- qw/source/master.c.orig 2013-08-31 13:54:32.000000000 +0000
+Don't use IN_PKTINFO on NetBSD.
+
+--- qw/source/master.c.orig 2013-01-23 03:10:55.000000000 +0000
+++ qw/source/master.c
-@@ -76,7 +76,7 @@ static __attribute__ ((unused)) const ch
+@@ -73,7 +73,7 @@
static void __attribute__ ((format (printf, 1, 2)))
ma_log (const char *fmt, ...);
Added files:
Index: pkgsrc/games/quakeforge/options.mk
diff -u /dev/null pkgsrc/games/quakeforge/options.mk:1.1
--- /dev/null Sat Jul 6 22:53:25 2019
+++ pkgsrc/games/quakeforge/options.mk Sat Jul 6 22:53:24 2019
@@ -0,0 +1,26 @@
+# $NetBSD: options.mk,v 1.1 2019/07/06 22:53:24 nia Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.quakeforge
+PKG_SUPPORTED_OPTIONS= alsa jack
+PKG_SUGGESTED_OPTIONS=
+PKG_SUGGESTED_OPTIONS.Linux= alsa
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+= alsa
+.if !empty(PKG_OPTIONS:Malsa)
+PLIST.alsa= yes
+CONFIGURE_ARGS+= --enable-alsa
+.include "../../audio/alsa-lib/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --disable-alsa
+.endif
+
+PLIST_VARS+= jack
+.if !empty(PKG_OPTIONS:Mjack)
+PLIST.jack= yes
+CONFIGURE_ARGS+= --enable-jack
+.include "../../audio/jack/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --disable-jack
+.endif
Index: pkgsrc/games/quakeforge/patches/patch-include_QF_math_vector.h
diff -u /dev/null pkgsrc/games/quakeforge/patches/patch-include_QF_math_vector.h:1.1
--- /dev/null Sat Jul 6 22:53:25 2019
+++ pkgsrc/games/quakeforge/patches/patch-include_QF_math_vector.h Sat Jul 6 22:53:24 2019
@@ -0,0 +1,18 @@
+$NetBSD: patch-include_QF_math_vector.h,v 1.1 2019/07/06 22:53:24 nia Exp $
+
+Fix inline usage for C99.
+
+--- include/QF/math/vector.h.orig 2013-01-23 03:10:55.000000000 +0000
++++ include/QF/math/vector.h
+@@ -183,10 +183,8 @@ void _VectorSubtract (const vec3_t veca,
+ void CrossProduct (const vec3_t v1, const vec3_t v2, vec3_t cross);
+ vec_t _VectorNormalize (vec3_t v); // returns vector length
+
+-extern inline float VectorNormalize (vec3_t v); // returns vector length
+-
+ #ifndef IMPLEMENT_VectorNormalize
+-extern inline
++static inline
+ #else
+ VISIBLE
+ #endif
Index: pkgsrc/games/quakeforge/patches/patch-libs_models_gl__skin.c
diff -u /dev/null pkgsrc/games/quakeforge/patches/patch-libs_models_gl__skin.c:1.1
--- /dev/null Sat Jul 6 22:53:25 2019
+++ pkgsrc/games/quakeforge/patches/patch-libs_models_gl__skin.c Sat Jul 6 22:53:24 2019
@@ -0,0 +1,36 @@
+$NetBSD: patch-libs_models_gl__skin.c,v 1.1 2019/07/06 22:53:24 nia Exp $
+
+Seems to segfault without this.
+
+From FreeBSD Ports.
+
+--- libs/models/gl_skin.c.orig 2013-01-23 03:10:55.000000000 +0000
++++ libs/models/gl_skin.c
+@@ -230,19 +230,20 @@ gl_Skin_SetupSkin (skin_t *skin, int cma
+ int changed;
+ glskin_t *s;
+
++ skin->texnum = 0;
++ skin->auxtex = 0;
++ if (!cmap) {
++ return;
++ }
+ // simplify cmap usage (texture offset/array index)
+ cmap--;
+ s = skins + cmap;
+ changed = (s->tex != skin->texels);
+ s->tex = skin->texels;
+ if (!changed) {
+- skin->texnum = 0;
+- skin->auxtex = 0;
+- if (cmap >= 0) {
+- skin->texnum = skin_textures + cmap;
+- if (s->fb)
+- skin->auxtex = skin_fb_textures + cmap;
+- }
++ skin->texnum = skin_textures + cmap;
++ if (s->fb)
++ skin->auxtex = skin_fb_textures + cmap;
+ return;
+ }
+ if (s->tex)
Index: pkgsrc/games/quakeforge/patches/patch-libs_net_nm_net__udp.c
diff -u /dev/null pkgsrc/games/quakeforge/patches/patch-libs_net_nm_net__udp.c:1.1
--- /dev/null Sat Jul 6 22:53:25 2019
+++ pkgsrc/games/quakeforge/patches/patch-libs_net_nm_net__udp.c Sat Jul 6 22:53:24 2019
@@ -0,0 +1,34 @@
+$NetBSD: patch-libs_net_nm_net__udp.c,v 1.1 2019/07/06 22:53:24 nia Exp $
+
+Initialize struct sockaddr_in.
+
+Don't use IN_PKTINFO on NetBSD.
+
+--- libs/net/nm/net_udp.c.orig 2013-01-23 03:10:55.000000000 +0000
++++ libs/net/nm/net_udp.c
+@@ -335,7 +335,7 @@ UDP_OpenSocket (int port)
+ if (fcntl (newsocket, F_SETFL, flags | O_NONBLOCK) == -1)
+ goto ErrorReturn;
+ #endif
+-#ifdef HAVE_IN_PKTINFO
++#if defined(HAVE_IN_PKTINFO) && !defined(__NetBSD__)
+ if (setsockopt (newsocket, SOL_IP, IP_PKTINFO, &ip_pktinfo,
+ sizeof (ip_pktinfo)) == -1) {
+ close (newsocket);
+@@ -343,6 +343,7 @@ UDP_OpenSocket (int port)
+ }
+ #endif
+
++ memset(&address, 0, sizeof(address));
+ address.sin_family = AF_INET;
+ address.sin_addr.s_addr = INADDR_ANY;
+ address.sin_port = htons (port);
+@@ -470,7 +471,7 @@ UDP_Read (int socket, byte *buf, int len
+ {
+ int ret;
+ AF_address_t addr;
+-#ifdef HAVE_IN_PKTINFO
++#if defined(HAVE_IN_PKTINFO) && !defined(__NetBSD__)
+ char ancillary[CMSG_SPACE (sizeof (struct in_pktinfo))];
+ struct msghdr msghdr = {
+ &addr,
Index: pkgsrc/games/quakeforge/patches/patch-libs_util_plugin.c
diff -u /dev/null pkgsrc/games/quakeforge/patches/patch-libs_util_plugin.c:1.1
--- /dev/null Sat Jul 6 22:53:25 2019
+++ pkgsrc/games/quakeforge/patches/patch-libs_util_plugin.c Sat Jul 6 22:53:24 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-libs_util_plugin.c,v 1.1 2019/07/06 22:53:24 nia Exp $
+
+Use RTLD_LAZY on NetBSD as well as OpenBSD.
+
+--- libs/util/plugin.c.orig 2013-01-23 03:10:55.000000000 +0000
++++ libs/util/plugin.c
+@@ -122,7 +122,7 @@ pi_open_lib (const char *name, int globa
+ {
+ void *dlhand = 0;
+ #ifdef HAVE_DLOPEN
+-# ifdef __OpenBSD__
++# if defined(__OpenBSD__) || defined(__NetBSD__)
+ int flags = RTLD_LAZY;
+ # else
+ int flags = RTLD_NOW;
Home |
Main Index |
Thread Index |
Old Index