Re: [UPDATE] games/bzflag to 2.4.22
On Thu, Dec 23, 2021 at 11:51:20PM +0100, Stefan Hagen wrote: > Brad Smith wrote: > > On 12/23/2021 5:27 PM, Stefan Hagen wrote: > > > > > Tom Murphy wrote: > > > >Just pinging the list about an update to games/bzflag. > > > >I posted this on the 28th of November originally. > > > > > > > >* Updates to v2.4.22 > > > >* graphics/glew added as dependency > > > > > > > >OK? > > > Hi Tom, > > > > > > lib-depends-check reports: > > > Extra: Xdamage.4 > > > WANTLIB += ICE SM Xau Xcursor Xdmcp Xi Xinerama Xmu Xrandr Xrender > > > WANTLIB += Xss Xt xcb-shm xcb-xfixes > > > > > > I adjusted WANTLIB accordingly in the patch below: > > > > > > ok sdk@ > > > > If you're going to update WANTLIB can you please regen the whole block > > so they're sorted? > > I think it was sorted system libs first. But not 100% accurate. > WANTLIB block fully sorted below. > > Index: games/bzflag/Makefile > === > RCS file: /home/cvs/ports/games/bzflag/Makefile,v > retrieving revision 1.49 > diff -u -p -u -p -r1.49 Makefile > --- games/bzflag/Makefile 20 Mar 2020 16:44:23 - 1.49 > +++ games/bzflag/Makefile 23 Dec 2021 22:50:03 - > @@ -2,7 +2,7 @@ > > COMMENT= graphical multiplayer 3D tank war game > > -V= 2.4.14 > +V= 2.4.22 > DISTNAME=bzflag-${V} > CATEGORIES= games x11 > MASTER_SITES=https://download.bzflag.org/bzflag/source/${V}/ > @@ -13,16 +13,19 @@ HOMEPAGE= https://www.bzflag.org/ > # LGPLv2.1 only or MPL 2.0 > PERMIT_PACKAGE= Yes > > -WANTLIB += GL GLU SDL2 X11 X11-xcb Xdamage Xext Xfixes Xxf86vm > -WANTLIB += c cares crypto curl curses drm expat glapi m > -WANTLIB += nghttp2 pthread samplerate sndio ssl usbhid xcb > -WANTLIB += xcb-dri2 xcb-dri3 xcb-glx xcb-present xcb-sync > -WANTLIB += xshmfence z ${COMPILER_LIBCXX} > +WANTLIB += ${COMPILER_LIBCXX} GL GLEW GLU ICE SDL2 SM X11 > +WANTLIB += X11-xcb Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama > +WANTLIB += Xmu Xrandr Xrender Xss Xt Xxf86vm c cares crypto > +WANTLIB += curl curses drm expat glapi m nghttp2 pthread > +WANTLIB += samplerate sndio ssl usbhid xcb xcb-dri2 xcb-dri3 > +WANTLIB += xcb-glx xcb-present xcb-shm xcb-sync xcb-xfixes > +WANTLIB += xshmfence z > > # C++11 > COMPILER=base-clang ports-gcc > > LIB_DEPENDS= devel/sdl2 \ > + graphics/glew \ > net/curl \ > net/libcares > RUN_DEPENDS= devel/desktop-file-utils > Index: games/bzflag/distinfo > === > RCS file: /home/cvs/ports/games/bzflag/distinfo,v > retrieving revision 1.13 > diff -u -p -u -p -r1.13 distinfo > --- games/bzflag/distinfo 15 Sep 2018 19:26:50 - 1.13 > +++ games/bzflag/distinfo 23 Dec 2021 17:09:27 - > @@ -1,2 +1,2 @@ > -SHA256 (bzflag-2.4.14.tar.bz2) = tWx3fHHU0d9VRG+d5unpKAGynYHDlmkIe6aAzmZFz/U= > -SIZE (bzflag-2.4.14.tar.bz2) = 14065461 > +SHA256 (bzflag-2.4.22.tar.bz2) = nmRlMwK2V72LX5b+EVCp/4Ch1Tptfoo1E4xrGwIAak0= > +SIZE (bzflag-2.4.22.tar.bz2) = 14169079 > Index: games/bzflag/patches/patch-src_platform_SDLMedia_cxx > === > RCS file: > /home/cvs/ports/games/bzflag/patches/patch-src_platform_SDLMedia_cxx,v > retrieving revision 1.4 > diff -u -p -u -p -r1.4 patch-src_platform_SDLMedia_cxx > --- games/bzflag/patches/patch-src_platform_SDLMedia_cxx 3 Sep 2012 > 07:19:34 - 1.4 > +++ games/bzflag/patches/patch-src_platform_SDLMedia_cxx 23 Dec 2021 > 17:09:27 - > @@ -1,13 +1,13 @@ > $OpenBSD: patch-src_platform_SDLMedia_cxx,v 1.4 2012/09/03 07:19:34 > ajacoutot Exp $ > src/platform/SDLMedia.cxx.orig Sun Jul 15 19:32:02 2012 > -+++ src/platform/SDLMedia.cxxTue Aug 7 07:18:22 2012 > -@@ -109,8 +109,7 @@ bool SDLMedia::openAudio() > +Index: src/platform/SDLMedia.cxx > +--- src/platform/SDLMedia.cxx.orig > src/platform/SDLMedia.cxx > +@@ -130,7 +130,7 @@ boolSDLMedia::openAudio() > + // how big a fragment to use? we want to hold at around 1/10th of > + // a second. > + // probably SDL is using multiple buffering, make it a 3rd > +-int fragmentSize = (int)(0.03f * (float)audioOutputRate); > ++int fragmentSize = (int)(0.1f * (float)audioOutputRate); > + int n; > > - // how big a fragment to use? we want to hold at around 1/10th of > - // a second. > -- // probably SDL is using multiple buffering, make it a 3rd > -- int fragmentSize = (int)(0.03f * (float)audioOutputRate); > -+ int fragmentSize = (int)(0.1f * (float)audioOutputRate); > - int n; > - > - n = 0; > + n = 0; > Index: games/bzflag/pkg/PLIST > === > RCS file: /home/cvs/ports/games/bzflag/pkg/PLIST,v > retrieving revision 1.15 > diff -u -p -u -p -r1.15 PLIST > --- games/bzflag/pkg/PLIST4 Sep 2018
Re: [UPDATE] games/bzflag to 2.4.22
Brad Smith wrote: > On 12/23/2021 5:27 PM, Stefan Hagen wrote: > > > Tom Murphy wrote: > > >Just pinging the list about an update to games/bzflag. > > >I posted this on the 28th of November originally. > > > > > >* Updates to v2.4.22 > > >* graphics/glew added as dependency > > > > > >OK? > > Hi Tom, > > > > lib-depends-check reports: > > Extra: Xdamage.4 > > WANTLIB += ICE SM Xau Xcursor Xdmcp Xi Xinerama Xmu Xrandr Xrender > > WANTLIB += Xss Xt xcb-shm xcb-xfixes > > > > I adjusted WANTLIB accordingly in the patch below: > > > > ok sdk@ > > If you're going to update WANTLIB can you please regen the whole block > so they're sorted? I think it was sorted system libs first. But not 100% accurate. WANTLIB block fully sorted below. Index: games/bzflag/Makefile === RCS file: /home/cvs/ports/games/bzflag/Makefile,v retrieving revision 1.49 diff -u -p -u -p -r1.49 Makefile --- games/bzflag/Makefile 20 Mar 2020 16:44:23 - 1.49 +++ games/bzflag/Makefile 23 Dec 2021 22:50:03 - @@ -2,7 +2,7 @@ COMMENT= graphical multiplayer 3D tank war game -V= 2.4.14 +V= 2.4.22 DISTNAME= bzflag-${V} CATEGORIES=games x11 MASTER_SITES= https://download.bzflag.org/bzflag/source/${V}/ @@ -13,16 +13,19 @@ HOMEPAGE= https://www.bzflag.org/ # LGPLv2.1 only or MPL 2.0 PERMIT_PACKAGE=Yes -WANTLIB += GL GLU SDL2 X11 X11-xcb Xdamage Xext Xfixes Xxf86vm -WANTLIB += c cares crypto curl curses drm expat glapi m -WANTLIB += nghttp2 pthread samplerate sndio ssl usbhid xcb -WANTLIB += xcb-dri2 xcb-dri3 xcb-glx xcb-present xcb-sync -WANTLIB += xshmfence z ${COMPILER_LIBCXX} +WANTLIB += ${COMPILER_LIBCXX} GL GLEW GLU ICE SDL2 SM X11 +WANTLIB += X11-xcb Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama +WANTLIB += Xmu Xrandr Xrender Xss Xt Xxf86vm c cares crypto +WANTLIB += curl curses drm expat glapi m nghttp2 pthread +WANTLIB += samplerate sndio ssl usbhid xcb xcb-dri2 xcb-dri3 +WANTLIB += xcb-glx xcb-present xcb-shm xcb-sync xcb-xfixes +WANTLIB += xshmfence z # C++11 COMPILER= base-clang ports-gcc LIB_DEPENDS= devel/sdl2 \ + graphics/glew \ net/curl \ net/libcares RUN_DEPENDS= devel/desktop-file-utils Index: games/bzflag/distinfo === RCS file: /home/cvs/ports/games/bzflag/distinfo,v retrieving revision 1.13 diff -u -p -u -p -r1.13 distinfo --- games/bzflag/distinfo 15 Sep 2018 19:26:50 - 1.13 +++ games/bzflag/distinfo 23 Dec 2021 17:09:27 - @@ -1,2 +1,2 @@ -SHA256 (bzflag-2.4.14.tar.bz2) = tWx3fHHU0d9VRG+d5unpKAGynYHDlmkIe6aAzmZFz/U= -SIZE (bzflag-2.4.14.tar.bz2) = 14065461 +SHA256 (bzflag-2.4.22.tar.bz2) = nmRlMwK2V72LX5b+EVCp/4Ch1Tptfoo1E4xrGwIAak0= +SIZE (bzflag-2.4.22.tar.bz2) = 14169079 Index: games/bzflag/patches/patch-src_platform_SDLMedia_cxx === RCS file: /home/cvs/ports/games/bzflag/patches/patch-src_platform_SDLMedia_cxx,v retrieving revision 1.4 diff -u -p -u -p -r1.4 patch-src_platform_SDLMedia_cxx --- games/bzflag/patches/patch-src_platform_SDLMedia_cxx3 Sep 2012 07:19:34 - 1.4 +++ games/bzflag/patches/patch-src_platform_SDLMedia_cxx23 Dec 2021 17:09:27 - @@ -1,13 +1,13 @@ $OpenBSD: patch-src_platform_SDLMedia_cxx,v 1.4 2012/09/03 07:19:34 ajacoutot Exp $ src/platform/SDLMedia.cxx.orig Sun Jul 15 19:32:02 2012 -+++ src/platform/SDLMedia.cxx Tue Aug 7 07:18:22 2012 -@@ -109,8 +109,7 @@ bool SDLMedia::openAudio() +Index: src/platform/SDLMedia.cxx +--- src/platform/SDLMedia.cxx.orig src/platform/SDLMedia.cxx +@@ -130,7 +130,7 @@ boolSDLMedia::openAudio() + // how big a fragment to use? we want to hold at around 1/10th of + // a second. + // probably SDL is using multiple buffering, make it a 3rd +-int fragmentSize = (int)(0.03f * (float)audioOutputRate); ++int fragmentSize = (int)(0.1f * (float)audioOutputRate); + int n; - // how big a fragment to use? we want to hold at around 1/10th of - // a second. -- // probably SDL is using multiple buffering, make it a 3rd -- int fragmentSize = (int)(0.03f * (float)audioOutputRate); -+ int fragmentSize = (int)(0.1f * (float)audioOutputRate); - int n; - - n = 0; + n = 0; Index: games/bzflag/pkg/PLIST === RCS file: /home/cvs/ports/games/bzflag/pkg/PLIST,v retrieving revision 1.15 diff -u -p -u -p -r1.15 PLIST --- games/bzflag/pkg/PLIST 4 Sep 2018 12:46:12 - 1.15 +++ games/bzflag/pkg/PLIST 23 Dec 2021 17:09:27 - @@ -3,39 +3,39 @@ @bin bin/bzflag @bin bin/bzfs lib/bzflag/ -lib/bzflag/CustomZoneSample.so -lib/bzflag/HoldTheFlag.so -lib/bzflag/Phoenix.so -lib/bzflag/RogueGenocide.so
Re: [UPDATE] games/bzflag to 2.4.22
Tom Murphy wrote: > Just pinging the list about an update to games/bzflag. > I posted this on the 28th of November originally. > > * Updates to v2.4.22 > * graphics/glew added as dependency > > OK? Hi Tom, lib-depends-check reports: Extra: Xdamage.4 WANTLIB += ICE SM Xau Xcursor Xdmcp Xi Xinerama Xmu Xrandr Xrender WANTLIB += Xss Xt xcb-shm xcb-xfixes I adjusted WANTLIB accordingly in the patch below: ok sdk@ Index: games/bzflag/Makefile === RCS file: /home/cvs/ports/games/bzflag/Makefile,v retrieving revision 1.49 diff -u -p -u -p -r1.49 Makefile --- games/bzflag/Makefile 20 Mar 2020 16:44:23 - 1.49 +++ games/bzflag/Makefile 23 Dec 2021 21:57:56 - @@ -2,7 +2,7 @@ COMMENT= graphical multiplayer 3D tank war game -V= 2.4.14 +V= 2.4.22 DISTNAME= bzflag-${V} CATEGORIES=games x11 MASTER_SITES= https://download.bzflag.org/bzflag/source/${V}/ @@ -13,7 +13,9 @@ HOMEPAGE= https://www.bzflag.org/ # LGPLv2.1 only or MPL 2.0 PERMIT_PACKAGE=Yes -WANTLIB += GL GLU SDL2 X11 X11-xcb Xdamage Xext Xfixes Xxf86vm +WANTLIB += GL GLEW GLU ICE SDL2 SM X11 X11-xcb Xau Xcursor +WANTLIB += Xdmcp Xext Xfixes Xi Xinerama Xmu Xrandr Xrender +WANTLIB += Xss Xt Xxf86vm xcb-shm xcb-xfixes WANTLIB += c cares crypto curl curses drm expat glapi m WANTLIB += nghttp2 pthread samplerate sndio ssl usbhid xcb WANTLIB += xcb-dri2 xcb-dri3 xcb-glx xcb-present xcb-sync @@ -23,6 +25,7 @@ WANTLIB += xshmfence z ${COMPILER_LIBCXX COMPILER= base-clang ports-gcc LIB_DEPENDS= devel/sdl2 \ + graphics/glew \ net/curl \ net/libcares RUN_DEPENDS= devel/desktop-file-utils Index: games/bzflag/distinfo === RCS file: /home/cvs/ports/games/bzflag/distinfo,v retrieving revision 1.13 diff -u -p -u -p -r1.13 distinfo --- games/bzflag/distinfo 15 Sep 2018 19:26:50 - 1.13 +++ games/bzflag/distinfo 23 Dec 2021 17:09:27 - @@ -1,2 +1,2 @@ -SHA256 (bzflag-2.4.14.tar.bz2) = tWx3fHHU0d9VRG+d5unpKAGynYHDlmkIe6aAzmZFz/U= -SIZE (bzflag-2.4.14.tar.bz2) = 14065461 +SHA256 (bzflag-2.4.22.tar.bz2) = nmRlMwK2V72LX5b+EVCp/4Ch1Tptfoo1E4xrGwIAak0= +SIZE (bzflag-2.4.22.tar.bz2) = 14169079 Index: games/bzflag/patches/patch-src_platform_SDLMedia_cxx === RCS file: /home/cvs/ports/games/bzflag/patches/patch-src_platform_SDLMedia_cxx,v retrieving revision 1.4 diff -u -p -u -p -r1.4 patch-src_platform_SDLMedia_cxx --- games/bzflag/patches/patch-src_platform_SDLMedia_cxx3 Sep 2012 07:19:34 - 1.4 +++ games/bzflag/patches/patch-src_platform_SDLMedia_cxx23 Dec 2021 17:09:27 - @@ -1,13 +1,13 @@ $OpenBSD: patch-src_platform_SDLMedia_cxx,v 1.4 2012/09/03 07:19:34 ajacoutot Exp $ src/platform/SDLMedia.cxx.orig Sun Jul 15 19:32:02 2012 -+++ src/platform/SDLMedia.cxx Tue Aug 7 07:18:22 2012 -@@ -109,8 +109,7 @@ bool SDLMedia::openAudio() +Index: src/platform/SDLMedia.cxx +--- src/platform/SDLMedia.cxx.orig src/platform/SDLMedia.cxx +@@ -130,7 +130,7 @@ boolSDLMedia::openAudio() + // how big a fragment to use? we want to hold at around 1/10th of + // a second. + // probably SDL is using multiple buffering, make it a 3rd +-int fragmentSize = (int)(0.03f * (float)audioOutputRate); ++int fragmentSize = (int)(0.1f * (float)audioOutputRate); + int n; - // how big a fragment to use? we want to hold at around 1/10th of - // a second. -- // probably SDL is using multiple buffering, make it a 3rd -- int fragmentSize = (int)(0.03f * (float)audioOutputRate); -+ int fragmentSize = (int)(0.1f * (float)audioOutputRate); - int n; - - n = 0; + n = 0; Index: games/bzflag/pkg/PLIST === RCS file: /home/cvs/ports/games/bzflag/pkg/PLIST,v retrieving revision 1.15 diff -u -p -u -p -r1.15 PLIST --- games/bzflag/pkg/PLIST 4 Sep 2018 12:46:12 - 1.15 +++ games/bzflag/pkg/PLIST 23 Dec 2021 17:09:27 - @@ -3,39 +3,39 @@ @bin bin/bzflag @bin bin/bzfs lib/bzflag/ -lib/bzflag/CustomZoneSample.so -lib/bzflag/HoldTheFlag.so -lib/bzflag/Phoenix.so -lib/bzflag/RogueGenocide.so -lib/bzflag/SAMPLE_PLUGIN.so -lib/bzflag/TimeLimit.so -lib/bzflag/airspawn.so -lib/bzflag/autoFlagReset.so -lib/bzflag/bzfscron.so -lib/bzflag/chathistory.so -lib/bzflag/customPollTypeSample.so -lib/bzflag/customflagsample.so -lib/bzflag/fairCTF.so -lib/bzflag/fastmap.so -lib/bzflag/flagStay.so -lib/bzflag/keepaway.so -lib/bzflag/killall.so -lib/bzflag/koth.so -lib/bzflag/logDetail.so -lib/bzflag/nagware.so -lib/bzflag/playHistoryTracker.so -lib/bzflag/rabbitTimer.so -lib/bzflag/rabidRabbit.so -lib/bzflag/recordmatch.so -lib/bzflag/regFlag.so
Re: [UPDATE] games/bzflag to 2.4.22
Hi, Just pinging the list about an update to games/bzflag. I posted this on the 28th of November originally. * Updates to v2.4.22 * graphics/glew added as dependency OK? Thanks, Tom Index: Makefile === RCS file: /cvs/ports/games/bzflag/Makefile,v retrieving revision 1.49 diff -u -p -r1.49 Makefile --- Makefile20 Mar 2020 16:44:23 - 1.49 +++ Makefile28 Nov 2021 12:26:08 - @@ -2,7 +2,7 @@ COMMENT= graphical multiplayer 3D tank war game -V= 2.4.14 +V= 2.4.22 DISTNAME= bzflag-${V} CATEGORIES=games x11 MASTER_SITES= https://download.bzflag.org/bzflag/source/${V}/ @@ -13,7 +13,7 @@ HOMEPAGE= https://www.bzflag.org/ # LGPLv2.1 only or MPL 2.0 PERMIT_PACKAGE=Yes -WANTLIB += GL GLU SDL2 X11 X11-xcb Xdamage Xext Xfixes Xxf86vm +WANTLIB += GL GLEW GLU SDL2 X11 X11-xcb Xdamage Xext Xfixes Xxf86vm WANTLIB += c cares crypto curl curses drm expat glapi m WANTLIB += nghttp2 pthread samplerate sndio ssl usbhid xcb WANTLIB += xcb-dri2 xcb-dri3 xcb-glx xcb-present xcb-sync @@ -23,6 +23,7 @@ WANTLIB += xshmfence z ${COMPILER_LIBCXX COMPILER= base-clang ports-gcc LIB_DEPENDS= devel/sdl2 \ + graphics/glew \ net/curl \ net/libcares RUN_DEPENDS= devel/desktop-file-utils Index: distinfo === RCS file: /cvs/ports/games/bzflag/distinfo,v retrieving revision 1.13 diff -u -p -r1.13 distinfo --- distinfo15 Sep 2018 19:26:50 - 1.13 +++ distinfo28 Nov 2021 12:26:08 - @@ -1,2 +1,2 @@ -SHA256 (bzflag-2.4.14.tar.bz2) = tWx3fHHU0d9VRG+d5unpKAGynYHDlmkIe6aAzmZFz/U= -SIZE (bzflag-2.4.14.tar.bz2) = 14065461 +SHA256 (bzflag-2.4.22.tar.bz2) = nmRlMwK2V72LX5b+EVCp/4Ch1Tptfoo1E4xrGwIAak0= +SIZE (bzflag-2.4.22.tar.bz2) = 14169079 Index: patches/patch-src_platform_SDLMedia_cxx === RCS file: /cvs/ports/games/bzflag/patches/patch-src_platform_SDLMedia_cxx,v retrieving revision 1.4 diff -u -p -r1.4 patch-src_platform_SDLMedia_cxx --- patches/patch-src_platform_SDLMedia_cxx 3 Sep 2012 07:19:34 - 1.4 +++ patches/patch-src_platform_SDLMedia_cxx 28 Nov 2021 12:26:08 - @@ -1,13 +1,13 @@ $OpenBSD: patch-src_platform_SDLMedia_cxx,v 1.4 2012/09/03 07:19:34 ajacoutot Exp $ src/platform/SDLMedia.cxx.orig Sun Jul 15 19:32:02 2012 -+++ src/platform/SDLMedia.cxx Tue Aug 7 07:18:22 2012 -@@ -109,8 +109,7 @@ bool SDLMedia::openAudio() +Index: src/platform/SDLMedia.cxx +--- src/platform/SDLMedia.cxx.orig src/platform/SDLMedia.cxx +@@ -130,7 +130,7 @@ boolSDLMedia::openAudio() + // how big a fragment to use? we want to hold at around 1/10th of + // a second. + // probably SDL is using multiple buffering, make it a 3rd +-int fragmentSize = (int)(0.03f * (float)audioOutputRate); ++int fragmentSize = (int)(0.1f * (float)audioOutputRate); + int n; - // how big a fragment to use? we want to hold at around 1/10th of - // a second. -- // probably SDL is using multiple buffering, make it a 3rd -- int fragmentSize = (int)(0.03f * (float)audioOutputRate); -+ int fragmentSize = (int)(0.1f * (float)audioOutputRate); - int n; - - n = 0; + n = 0; Index: pkg/PLIST === RCS file: /cvs/ports/games/bzflag/pkg/PLIST,v retrieving revision 1.15 diff -u -p -r1.15 PLIST --- pkg/PLIST 4 Sep 2018 12:46:12 - 1.15 +++ pkg/PLIST 28 Nov 2021 12:26:08 - @@ -3,39 +3,39 @@ @bin bin/bzflag @bin bin/bzfs lib/bzflag/ -lib/bzflag/CustomZoneSample.so -lib/bzflag/HoldTheFlag.so -lib/bzflag/Phoenix.so -lib/bzflag/RogueGenocide.so -lib/bzflag/SAMPLE_PLUGIN.so -lib/bzflag/TimeLimit.so -lib/bzflag/airspawn.so -lib/bzflag/autoFlagReset.so -lib/bzflag/bzfscron.so -lib/bzflag/chathistory.so -lib/bzflag/customPollTypeSample.so -lib/bzflag/customflagsample.so -lib/bzflag/fairCTF.so -lib/bzflag/fastmap.so -lib/bzflag/flagStay.so -lib/bzflag/keepaway.so -lib/bzflag/killall.so -lib/bzflag/koth.so -lib/bzflag/logDetail.so -lib/bzflag/nagware.so -lib/bzflag/playHistoryTracker.so -lib/bzflag/rabbitTimer.so -lib/bzflag/rabidRabbit.so -lib/bzflag/recordmatch.so -lib/bzflag/regFlag.so -lib/bzflag/serverControl.so -lib/bzflag/serverSidePlayerSample.so -lib/bzflag/shockwaveDeath.so -lib/bzflag/superUser.so -lib/bzflag/teamflagreset.so -lib/bzflag/thiefControl.so -lib/bzflag/timedctf.so -lib/bzflag/wwzones.so +@so lib/bzflag/CustomZoneSample.so +@so lib/bzflag/HoldTheFlag.so +@so lib/bzflag/Phoenix.so +@so lib/bzflag/RogueGenocide.so +@so lib/bzflag/SAMPLE_PLUGIN.so +@so lib/bzflag/TimeLimit.so +@so lib/bzflag/airspawn.so +@so lib/bzflag/autoFlagReset.so +@so lib/bzflag/bzfscron.so +@so lib/bzflag/chathistory.so +@so lib/bzflag/customPollTypeSample.so
[UPDATE] games/bzflag to 2.4.22
Hi, Here is a diff to update games/bzflag to v2.4.22. The bzflag client now depends on graphics/glew, so it has been added as a dependency. OK? Thanks, Tom Index: Makefile === RCS file: /cvs/ports/games/bzflag/Makefile,v retrieving revision 1.49 diff -u -p -r1.49 Makefile --- Makefile20 Mar 2020 16:44:23 - 1.49 +++ Makefile28 Nov 2021 12:26:08 - @@ -2,7 +2,7 @@ COMMENT= graphical multiplayer 3D tank war game -V= 2.4.14 +V= 2.4.22 DISTNAME= bzflag-${V} CATEGORIES=games x11 MASTER_SITES= https://download.bzflag.org/bzflag/source/${V}/ @@ -13,7 +13,7 @@ HOMEPAGE= https://www.bzflag.org/ # LGPLv2.1 only or MPL 2.0 PERMIT_PACKAGE=Yes -WANTLIB += GL GLU SDL2 X11 X11-xcb Xdamage Xext Xfixes Xxf86vm +WANTLIB += GL GLEW GLU SDL2 X11 X11-xcb Xdamage Xext Xfixes Xxf86vm WANTLIB += c cares crypto curl curses drm expat glapi m WANTLIB += nghttp2 pthread samplerate sndio ssl usbhid xcb WANTLIB += xcb-dri2 xcb-dri3 xcb-glx xcb-present xcb-sync @@ -23,6 +23,7 @@ WANTLIB += xshmfence z ${COMPILER_LIBCXX COMPILER= base-clang ports-gcc LIB_DEPENDS= devel/sdl2 \ + graphics/glew \ net/curl \ net/libcares RUN_DEPENDS= devel/desktop-file-utils Index: distinfo === RCS file: /cvs/ports/games/bzflag/distinfo,v retrieving revision 1.13 diff -u -p -r1.13 distinfo --- distinfo15 Sep 2018 19:26:50 - 1.13 +++ distinfo28 Nov 2021 12:26:08 - @@ -1,2 +1,2 @@ -SHA256 (bzflag-2.4.14.tar.bz2) = tWx3fHHU0d9VRG+d5unpKAGynYHDlmkIe6aAzmZFz/U= -SIZE (bzflag-2.4.14.tar.bz2) = 14065461 +SHA256 (bzflag-2.4.22.tar.bz2) = nmRlMwK2V72LX5b+EVCp/4Ch1Tptfoo1E4xrGwIAak0= +SIZE (bzflag-2.4.22.tar.bz2) = 14169079 Index: patches/patch-src_platform_SDLMedia_cxx === RCS file: /cvs/ports/games/bzflag/patches/patch-src_platform_SDLMedia_cxx,v retrieving revision 1.4 diff -u -p -r1.4 patch-src_platform_SDLMedia_cxx --- patches/patch-src_platform_SDLMedia_cxx 3 Sep 2012 07:19:34 - 1.4 +++ patches/patch-src_platform_SDLMedia_cxx 28 Nov 2021 12:26:08 - @@ -1,13 +1,13 @@ $OpenBSD: patch-src_platform_SDLMedia_cxx,v 1.4 2012/09/03 07:19:34 ajacoutot Exp $ src/platform/SDLMedia.cxx.orig Sun Jul 15 19:32:02 2012 -+++ src/platform/SDLMedia.cxx Tue Aug 7 07:18:22 2012 -@@ -109,8 +109,7 @@ bool SDLMedia::openAudio() +Index: src/platform/SDLMedia.cxx +--- src/platform/SDLMedia.cxx.orig src/platform/SDLMedia.cxx +@@ -130,7 +130,7 @@ boolSDLMedia::openAudio() + // how big a fragment to use? we want to hold at around 1/10th of + // a second. + // probably SDL is using multiple buffering, make it a 3rd +-int fragmentSize = (int)(0.03f * (float)audioOutputRate); ++int fragmentSize = (int)(0.1f * (float)audioOutputRate); + int n; - // how big a fragment to use? we want to hold at around 1/10th of - // a second. -- // probably SDL is using multiple buffering, make it a 3rd -- int fragmentSize = (int)(0.03f * (float)audioOutputRate); -+ int fragmentSize = (int)(0.1f * (float)audioOutputRate); - int n; - - n = 0; + n = 0; Index: pkg/PLIST === RCS file: /cvs/ports/games/bzflag/pkg/PLIST,v retrieving revision 1.15 diff -u -p -r1.15 PLIST --- pkg/PLIST 4 Sep 2018 12:46:12 - 1.15 +++ pkg/PLIST 28 Nov 2021 12:26:08 - @@ -3,39 +3,39 @@ @bin bin/bzflag @bin bin/bzfs lib/bzflag/ -lib/bzflag/CustomZoneSample.so -lib/bzflag/HoldTheFlag.so -lib/bzflag/Phoenix.so -lib/bzflag/RogueGenocide.so -lib/bzflag/SAMPLE_PLUGIN.so -lib/bzflag/TimeLimit.so -lib/bzflag/airspawn.so -lib/bzflag/autoFlagReset.so -lib/bzflag/bzfscron.so -lib/bzflag/chathistory.so -lib/bzflag/customPollTypeSample.so -lib/bzflag/customflagsample.so -lib/bzflag/fairCTF.so -lib/bzflag/fastmap.so -lib/bzflag/flagStay.so -lib/bzflag/keepaway.so -lib/bzflag/killall.so -lib/bzflag/koth.so -lib/bzflag/logDetail.so -lib/bzflag/nagware.so -lib/bzflag/playHistoryTracker.so -lib/bzflag/rabbitTimer.so -lib/bzflag/rabidRabbit.so -lib/bzflag/recordmatch.so -lib/bzflag/regFlag.so -lib/bzflag/serverControl.so -lib/bzflag/serverSidePlayerSample.so -lib/bzflag/shockwaveDeath.so -lib/bzflag/superUser.so -lib/bzflag/teamflagreset.so -lib/bzflag/thiefControl.so -lib/bzflag/timedctf.so -lib/bzflag/wwzones.so +@so lib/bzflag/CustomZoneSample.so +@so lib/bzflag/HoldTheFlag.so +@so lib/bzflag/Phoenix.so +@so lib/bzflag/RogueGenocide.so +@so lib/bzflag/SAMPLE_PLUGIN.so +@so lib/bzflag/TimeLimit.so +@so lib/bzflag/airspawn.so +@so lib/bzflag/autoFlagReset.so +@so lib/bzflag/bzfscron.so +@so lib/bzflag/chathistory.so +@so lib/bzflag/customPollTypeSample.so +@so lib/bzflag
UPDATE: games/bzflag 2.4.14 => 2.4.18
Hi ports -- Attached is a straightforward update to games/bzflag. Works well on amd64; big endian testing appreciated. OK? ~Brian Index: Makefile === RCS file: /cvs/ports/games/bzflag/Makefile,v retrieving revision 1.48 diff -u -p -r1.48 Makefile --- Makefile 12 Jul 2019 21:02:20 - 1.48 +++ Makefile 7 Dec 2019 06:45:10 - @@ -2,7 +2,7 @@ COMMENT= graphical multiplayer 3D tank war game -V= 2.4.14 +V= 2.4.18 DISTNAME= bzflag-${V} CATEGORIES= games x11 MASTER_SITES= https://download.bzflag.org/bzflag/source/${V}/ @@ -13,16 +13,18 @@ HOMEPAGE= https://www.bzflag.org/ # LGPLv2.1 only or MPL 2.0 PERMIT_PACKAGE= Yes -WANTLIB += GL GLU SDL2 X11 X11-xcb Xdamage Xext Xfixes Xxf86vm -WANTLIB += c cares crypto curl curses drm expat glapi m -WANTLIB += nghttp2 pthread samplerate sndio ssl usbhid xcb -WANTLIB += xcb-dri2 xcb-dri3 xcb-glx xcb-present xcb-sync -WANTLIB += xshmfence z ${COMPILER_LIBCXX} +WANTLIB += ${COMPILER_LIBCXX} GL GLEW GLU ICE SDL2 SM X11 X11-xcb +WANTLIB += Xcursor Xdamage Xext Xfixes Xi Xinerama Xmu Xrandr +WANTLIB += Xrender Xss Xt Xxf86vm c cares crypto curl curses drm +WANTLIB += expat glapi m nghttp2 samplerate sndio ssl usbhid xcb +WANTLIB += xcb-dri2 xcb-dri3 xcb-glx xcb-present xcb-sync xcb-xfixes +WANTLIB += xshmfence z # C++11 COMPILER= base-clang ports-gcc LIB_DEPENDS= devel/sdl2 \ + graphics/glew \ net/curl \ net/libcares RUN_DEPENDS= devel/desktop-file-utils Index: distinfo === RCS file: /cvs/ports/games/bzflag/distinfo,v retrieving revision 1.13 diff -u -p -r1.13 distinfo --- distinfo 15 Sep 2018 19:26:50 - 1.13 +++ distinfo 7 Dec 2019 06:45:10 - @@ -1,2 +1,2 @@ -SHA256 (bzflag-2.4.14.tar.bz2) = tWx3fHHU0d9VRG+d5unpKAGynYHDlmkIe6aAzmZFz/U= -SIZE (bzflag-2.4.14.tar.bz2) = 14065461 +SHA256 (bzflag-2.4.18.tar.bz2) = nQ1RLzoJogerOZqNxIByJFZM3HqTRrcC/sgNW3kYv74= +SIZE (bzflag-2.4.18.tar.bz2) = 14011236 Index: patches/patch-src_platform_SDLMedia_cxx === RCS file: /cvs/ports/games/bzflag/patches/patch-src_platform_SDLMedia_cxx,v retrieving revision 1.4 diff -u -p -r1.4 patch-src_platform_SDLMedia_cxx --- patches/patch-src_platform_SDLMedia_cxx 3 Sep 2012 07:19:34 - 1.4 +++ patches/patch-src_platform_SDLMedia_cxx 7 Dec 2019 06:45:10 - @@ -1,13 +1,13 @@ $OpenBSD: patch-src_platform_SDLMedia_cxx,v 1.4 2012/09/03 07:19:34 ajacoutot Exp $ src/platform/SDLMedia.cxx.orig Sun Jul 15 19:32:02 2012 -+++ src/platform/SDLMedia.cxx Tue Aug 7 07:18:22 2012 -@@ -109,8 +109,7 @@ bool SDLMedia::openAudio() +Index: src/platform/SDLMedia.cxx +--- src/platform/SDLMedia.cxx.orig src/platform/SDLMedia.cxx +@@ -117,7 +117,7 @@ boolSDLMedia::openAudio() + // how big a fragment to use? we want to hold at around 1/10th of + // a second. + // probably SDL is using multiple buffering, make it a 3rd +-int fragmentSize = (int)(0.03f * (float)audioOutputRate); ++int fragmentSize = (int)(0.1f * (float)audioOutputRate); + int n; - // how big a fragment to use? we want to hold at around 1/10th of - // a second. -- // probably SDL is using multiple buffering, make it a 3rd -- int fragmentSize = (int)(0.03f * (float)audioOutputRate); -+ int fragmentSize = (int)(0.1f * (float)audioOutputRate); - int n; - - n = 0; + n = 0; Index: pkg/PLIST === RCS file: /cvs/ports/games/bzflag/pkg/PLIST,v retrieving revision 1.15 diff -u -p -r1.15 PLIST --- pkg/PLIST 4 Sep 2018 12:46:12 - 1.15 +++ pkg/PLIST 7 Dec 2019 06:45:10 - @@ -3,39 +3,39 @@ @bin bin/bzflag @bin bin/bzfs lib/bzflag/ -lib/bzflag/CustomZoneSample.so -lib/bzflag/HoldTheFlag.so -lib/bzflag/Phoenix.so -lib/bzflag/RogueGenocide.so -lib/bzflag/SAMPLE_PLUGIN.so -lib/bzflag/TimeLimit.so -lib/bzflag/airspawn.so -lib/bzflag/autoFlagReset.so -lib/bzflag/bzfscron.so -lib/bzflag/chathistory.so -lib/bzflag/customPollTypeSample.so -lib/bzflag/customflagsample.so -lib/bzflag/fairCTF.so -lib/bzflag/fastmap.so -lib/bzflag/flagStay.so -lib/bzflag/keepaway.so -lib/bzflag/killall.so -lib/bzflag/koth.so -lib/bzflag/logDetail.so -lib/bzflag/nagware.so -lib/bzflag/playHistoryTracker.so -lib/bzflag/rabbitTimer.so -lib/bzflag/rabidRabbit.so -lib/bzflag/recordmatch.so -lib/bzflag/regFlag.so -lib/bzflag/serverControl.so -lib/bzflag/serverSidePlayerSample.so -lib/bzflag/shockwaveDeath.so -lib/bzflag/superUser.so -lib/bzflag/teamflagreset.so -lib/bzflag/thiefControl.so -lib/bzflag/timedctf.so -lib/bzflag/wwzones.so +@so lib/bzflag/CustomZoneSample.so +@so lib/bzflag/HoldTheFlag.so +@so lib/bzflag/Phoenix.so +@so lib/bzflag/RogueGenocide.so +@so lib/bzflag/SAMPLE_PLUGIN.so +@so lib/bzflag/TimeLimit.so +@so lib/bzflag/airspawn.so +@so lib/bzflag/autoFlagReset.so +@so lib/bzflag/bzfscron.so +@so
Re: [UPDATE] games/bzflag 2.4.12 -> 2.4.14
On 09/15/18 01:22, Charlene Wendling wrote: Hi ports! Here is an update for BZFlag, a multiplayer tank game. The changelog is there [1], the most notable change being that antialiasing works when starting the client windowed. What's new in the port: - port-lib-depends-check wasn't happy with our WANTLIB, so it has been modified. Testing (amd64): I've played for about an hour without any issue*, including audio. Any comment/feedback is welcome! Committed, thanks. Since I was already there, I tweaked the license marker (LGPLv2.1 only or MPL 2.0) and updated the COMPILER comment (C++11). ~Brian Charlène. [1] https://github.com/BZFlag-Dev/bzflag/releases/tag/v2.4.14 * Other than motion sickness ;)
[UPDATE] games/bzflag 2.4.12 -> 2.4.14
Hi ports! Here is an update for BZFlag, a multiplayer tank game. The changelog is there [1], the most notable change being that antialiasing works when starting the client windowed. What's new in the port: - port-lib-depends-check wasn't happy with our WANTLIB, so it has been modified. Testing (amd64): I've played for about an hour without any issue*, including audio. Any comment/feedback is welcome! Charlène. [1] https://github.com/BZFlag-Dev/bzflag/releases/tag/v2.4.14 * Other than motion sickness ;) bzflag.diff Description: Binary data
Re: UPDATE games/bzflag
On Sat, December 2, 2017 15:57, Kirill Bychkov wrote: > Hi! > The diff below updates bzflag to 2.4.12. > OK to commit? Anyone? > > Index: Makefile > === > RCS file: /cvs/ports/games/bzflag/Makefile,v > retrieving revision 1.43 > diff -u -p -r1.43 Makefile > --- Makefile 21 Nov 2017 00:13:00 - 1.43 > +++ Makefile 2 Dec 2017 12:26:22 - > @@ -2,32 +2,34 @@ > > COMMENT= graphical multiplayer 3D tank war game > > -DISTNAME=bzflag-2.4.2 > +V= 2.4.12 > +DISTNAME=bzflag-${V} > CATEGORIES= games x11 > -MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=bzflag/} > +MASTER_SITES=https://download.bzflag.org/bzflag/source/${V}/ > EXTRACT_SUFX=.tar.bz2 > -REVISION=6 > > -HOMEPAGE=http://www.bzflag.org/ > +HOMEPAGE=https://www.bzflag.org/ > > # LGPLv2.1 > PERMIT_PACKAGE_CDROM= Yes > > -WANTLIB += GL GLEW GLU ICE SDL SM X11 X11-xcb Xdamage Xext Xfixes Xi Xmu > -WANTLIB += Xt Xxf86vm c cares crypto curl drm expat glapi iconv intl m > ncurses > -WANTLIB += nghttp2 pthread sndio ssl ${COMPILER_LIBCXX} usbhid xcb xcb-dri2 > xcb-glx > -WANTLIB += z > +WANTLIB += GL GLU SDL2 X11 X11-xcb Xdamage Xext Xfixes Xxf86vm > +WANTLIB += c cares crypto curl drm expat glapi m ncurses > +WANTLIB += nghttp2 pthread sndio ssl usbhid xcb xcb-dri2 > +WANTLIB += xcb-glx z ${COMPILER_LIBCXX} > > -LIB_DEPENDS= devel/sdl \ > - graphics/glew \ > +# c++0x > +COMPILER=base-clang ports-gcc > + > +LIB_DEPENDS= devel/sdl2 \ > net/curl \ > net/libcares > RUN_DEPENDS= devel/desktop-file-utils > > -USE_GMAKE= Yes > +SEPARATE_BUILD= Yes > LIBTOOL_FLAGS= --tag=disable-static > CONFIGURE_STYLE= autoconf > -AUTOCONF_VERSION= 2.68 > +AUTOCONF_VERSION= 2.69 > CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \ > LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \ > ac_cv_lib_bind_gethostent=no > Index: distinfo > === > RCS file: /cvs/ports/games/bzflag/distinfo,v > retrieving revision 1.11 > diff -u -p -r1.11 distinfo > --- distinfo 3 Sep 2012 07:19:34 - 1.11 > +++ distinfo 2 Dec 2017 12:26:22 - > @@ -1,2 +1,2 @@ > -SHA256 (bzflag-2.4.2.tar.bz2) = T3vFIoTMSzn8NShV5VWysGTB3moY90dOJJBzBwdiyBE= > -SIZE (bzflag-2.4.2.tar.bz2) = 15971448 > +SHA256 (bzflag-2.4.12.tar.bz2) = qKE6WGSHmKb2+WmikRzyE3f+RZZPLt9GoyfRNw/xAA0= > +SIZE (bzflag-2.4.12.tar.bz2) = 14042357 > Index: patches/patch-include_VotingArbiter_h > === > RCS file: patches/patch-include_VotingArbiter_h > diff -N patches/patch-include_VotingArbiter_h > --- patches/patch-include_VotingArbiter_h 4 May 2017 21:38:05 - > 1.1 > +++ /dev/null 1 Jan 1970 00:00:00 - > @@ -1,43 +0,0 @@ > -$OpenBSD: patch-include_VotingArbiter_h,v 1.1 2017/05/04 21:38:05 espie Exp $ > -C++ Defect Report Core Issue 1344. > -Deducing basic properties of class, such as the presence of a default > -constructor should not require full program knowledge. Thus, the default > -parameters should be in the class declaration. > - > -clang flags this as an error. > - > -Index: include/VotingArbiter.h > include/VotingArbiter.h.orig > -+++ include/VotingArbiter.h > -@@ -86,9 +86,11 @@ class VotingArbiter (protected) > - public: > - > - /* default constructor */ > -- VotingArbiter(unsigned short int voteTime, unsigned short int vetoTime, > --unsigned short int votesRequired, float votePercentage, > --unsigned short int voteRepeatTime); > -+ VotingArbiter(unsigned short int voteTime = 60, > -+unsigned short int vetoTime = 20, > -+unsigned short int votesRequired = 2, > -+float votePercentage = 50.1, > -+unsigned short int voteRepeatTime = 300); > - /* default copy constructor */ > - VotingArbiter(const VotingArbiter& arbiter); > - ~VotingArbiter(void); > -@@ -231,11 +233,11 @@ class VotingArbiter (protected) > - }; > - > - > --inline VotingArbiter::VotingArbiter(unsigned short int voteTime=60, > --unsigned short int vetoTime=20, > --unsigned short int votesRequired=2, > --float votePercentage=50.1, > --unsigned short int voteRepeatTime=300) > -+inline VotingArbiter::VotingArbiter(unsigned short int voteTime, > -+unsigned short int vetoTime, > -+unsigned short int votesRequired, > -+float votePercentage, > -+unsigned short int voteRepeatTime) > - : _votingBooth(NULL), > - _maxVotes(votesRequired+1), > - _voteTime(voteTime), > Index: patches/patch-src_bzfs_VotingArbiter_h >
UPDATE games/bzflag
Hi! The diff below updates bzflag to 2.4.12. OK to commit? Index: Makefile === RCS file: /cvs/ports/games/bzflag/Makefile,v retrieving revision 1.43 diff -u -p -r1.43 Makefile --- Makefile21 Nov 2017 00:13:00 - 1.43 +++ Makefile2 Dec 2017 12:26:22 - @@ -2,32 +2,34 @@ COMMENT= graphical multiplayer 3D tank war game -DISTNAME= bzflag-2.4.2 +V= 2.4.12 +DISTNAME= bzflag-${V} CATEGORIES=games x11 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bzflag/} +MASTER_SITES= https://download.bzflag.org/bzflag/source/${V}/ EXTRACT_SUFX= .tar.bz2 -REVISION= 6 -HOMEPAGE= http://www.bzflag.org/ +HOMEPAGE= https://www.bzflag.org/ # LGPLv2.1 PERMIT_PACKAGE_CDROM= Yes -WANTLIB += GL GLEW GLU ICE SDL SM X11 X11-xcb Xdamage Xext Xfixes Xi Xmu -WANTLIB += Xt Xxf86vm c cares crypto curl drm expat glapi iconv intl m ncurses -WANTLIB += nghttp2 pthread sndio ssl ${COMPILER_LIBCXX} usbhid xcb xcb-dri2 xcb-glx -WANTLIB += z +WANTLIB += GL GLU SDL2 X11 X11-xcb Xdamage Xext Xfixes Xxf86vm +WANTLIB += c cares crypto curl drm expat glapi m ncurses +WANTLIB += nghttp2 pthread sndio ssl usbhid xcb xcb-dri2 +WANTLIB += xcb-glx z ${COMPILER_LIBCXX} -LIB_DEPENDS= devel/sdl \ - graphics/glew \ +# c++0x +COMPILER= base-clang ports-gcc + +LIB_DEPENDS= devel/sdl2 \ net/curl \ net/libcares RUN_DEPENDS= devel/desktop-file-utils -USE_GMAKE= Yes +SEPARATE_BUILD=Yes LIBTOOL_FLAGS= --tag=disable-static CONFIGURE_STYLE= autoconf -AUTOCONF_VERSION= 2.68 +AUTOCONF_VERSION= 2.69 CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \ LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \ ac_cv_lib_bind_gethostent=no Index: distinfo === RCS file: /cvs/ports/games/bzflag/distinfo,v retrieving revision 1.11 diff -u -p -r1.11 distinfo --- distinfo3 Sep 2012 07:19:34 - 1.11 +++ distinfo2 Dec 2017 12:26:22 - @@ -1,2 +1,2 @@ -SHA256 (bzflag-2.4.2.tar.bz2) = T3vFIoTMSzn8NShV5VWysGTB3moY90dOJJBzBwdiyBE= -SIZE (bzflag-2.4.2.tar.bz2) = 15971448 +SHA256 (bzflag-2.4.12.tar.bz2) = qKE6WGSHmKb2+WmikRzyE3f+RZZPLt9GoyfRNw/xAA0= +SIZE (bzflag-2.4.12.tar.bz2) = 14042357 Index: patches/patch-include_VotingArbiter_h === RCS file: patches/patch-include_VotingArbiter_h diff -N patches/patch-include_VotingArbiter_h --- patches/patch-include_VotingArbiter_h 4 May 2017 21:38:05 - 1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,43 +0,0 @@ -$OpenBSD: patch-include_VotingArbiter_h,v 1.1 2017/05/04 21:38:05 espie Exp $ -C++ Defect Report Core Issue 1344. -Deducing basic properties of class, such as the presence of a default -constructor should not require full program knowledge. Thus, the default -parameters should be in the class declaration. - -clang flags this as an error. - -Index: include/VotingArbiter.h include/VotingArbiter.h.orig -+++ include/VotingArbiter.h -@@ -86,9 +86,11 @@ class VotingArbiter (protected) - public: - - /* default constructor */ -- VotingArbiter(unsigned short int voteTime, unsigned short int vetoTime, -- unsigned short int votesRequired, float votePercentage, -- unsigned short int voteRepeatTime); -+ VotingArbiter(unsigned short int voteTime = 60, -+ unsigned short int vetoTime = 20, -+ unsigned short int votesRequired = 2, -+ float votePercentage = 50.1, -+ unsigned short int voteRepeatTime = 300); - /* default copy constructor */ - VotingArbiter(const VotingArbiter& arbiter); - ~VotingArbiter(void); -@@ -231,11 +233,11 @@ class VotingArbiter (protected) - }; - - --inline VotingArbiter::VotingArbiter(unsigned short int voteTime=60, -- unsigned short int vetoTime=20, -- unsigned short int votesRequired=2, -- float votePercentage=50.1, -- unsigned short int voteRepeatTime=300) -+inline VotingArbiter::VotingArbiter(unsigned short int voteTime, -+ unsigned short int vetoTime, -+ unsigned short int votesRequired, -+ float votePercentage, -+ unsigned short int voteRepeatTime) - : _votingBooth(NULL), - _maxVotes(votesRequired+1), - _voteTime(voteTime), Index: patches/patch-src_bzfs_VotingArbiter_h === RCS file: patches/patch-src_bzfs_VotingArbiter_h diff -N patches/patch-src_bzfs_VotingArbiter_h --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-src_bzfs_VotingArbiter_h 2 Dec 2017 12:26:22 - @@ -0,0