On Thu, Nov 02, 2023 at 09:27:21AM +0000, Tom Murphy wrote:
> On Thu, Nov 02, 2023 at 01:59:53AM -0700, Nam Nguyen wrote:
> > Tom Murphy writes:
> >
> > > Hi again,
> > >
> > > Apologies, in the Makefile shuffle I took out PKGNAME by mistake.
> > > Updated diff below. Thanks!
> > >
> > > -Tom
> > >
> >
> > Please find two diffs: an attached diff for -stable and an inline diff
> > for -current with some additional tweaks on top of tom's diff:
> >
> > - stable diff backports the security fix preventing download of .so
> > files and bumps REVISION
> > see:
> > https://github.com/QW-Group/ezquake-source/commit/df38450a75ef7492c51c6e9f3012235521a01b98
> > https://github.com/QW-Group/ezquake-source/issues/857
> >
> > - Break up DIST_TUPLE to 80 char long lines and add license markers.
> > - Add a second ${GAMEDIR} substition in EX_browser_sources.c patch. With
> > this, server browser now successfully reads from
> > /usr/local/share/ezquake/na-sv.txt. The lists are outdated by 12 years
> > so I will try to add some servers upstream.
> > - when resizing in cwm or xmonad, I get a black window. This is caused
> > by vid_software_palette changing from 0 to 1 default. I have a patch
> > to revert this to 0, which should be a good default for
> > users. Alternatively, you can specify "vid_software_palette 0" in your
> > config and we can not use this patch.
> >
> > see:
> > https://github.com/QW-Group/ezquake-source/issues/858
> >
> > Tom asked me to test runtime. I tested -stable and -current and gameplay
> > was good other than the black window upon resizing in cwm or xmonad,
> > which is addressed by the patch.
> >
> > OK?
Tested the 3.6.4 update and everything works as expected. ok thfr@
>
>
> >
> > Index: Makefile
> > ===================================================================
> > RCS file: /cvs/ports/games/ezquake/Makefile,v
> > retrieving revision 1.15
> > diff -u -p -u -p -r1.15 Makefile
> > --- Makefile 6 Mar 2023 13:37:15 -0000 1.15
> > +++ Makefile 2 Nov 2023 08:27:35 -0000
> > @@ -1,30 +1,32 @@
> > -N = ezquake
> > -V = 3.6.1
> > COMMENT = modern QuakeWorld client
> >
> > -PKGNAME = ${N}-${V}
> > -GH_ACCOUNT = QW-Group
> > -GH_PROJECT = ${N}-source
> > -GH_TAGNAME = ${V}
> > -
> > CATEGORIES = games
> >
> > -HOMEPAGE = https://ezquake.github.io/
> > -MAINTAINER = Tom Murphy <open...@pertho.net>
> > +N = ezquake
> > +V = 3.6.4
> > +PKGNAME = ${N}-${V}
> > +DIST_TUPLE += github QW-Group ${N}-source ${V} . # GPLv2+
> > +DIST_TUPLE += github QW-Group qwprot \
> > + 53af547d0608a1507895fc1629cdc3f4820fc0af src/qwprot # GPLv2+
> >
> > # GPLv2+
> > PERMIT_PACKAGE = Yes
> >
> > -WANTLIB += GL SDL2 c curl expat freetype jansson jpeg m pcre png pthread
> > -WANTLIB += sndfile speex speexdsp z
> > +MAINTAINER = Tom Murphy <open...@pertho.net>
> > +
> > +HOMEPAGE = https://ezquake.github.io/
> > +
> > +WANTLIB += GL SDL2 c curl expat freetype jansson jpeg m minizip pcre2-8 png
> > +WANTLIB += pthread sndfile speex speexdsp z
> >
> > -LIB_DEPENDS = audio/libsndfile \
> > +LIB_DEPENDS = archivers/minizip \
> > + audio/libsndfile \
> > audio/speex \
> > graphics/jpeg \
> > graphics/png \
> > + devel/pcre2 \
> > devel/sdl2 \
> > devel/jansson \
> > - devel/pcre \
> > net/curl
> >
> > USE_GMAKE = Yes
> > @@ -36,7 +38,7 @@ GAMEDIR = ${PREFIX}/share/ezquake
> > SUBST_VARS += GAMEDIR
> >
> > do-configure:
> > - ${SUBST_CMD} ${WRKSRC}/EX_browser_sources.c
> > + ${SUBST_CMD} ${WRKSRC}/src/EX_browser_sources.c
> >
> > do-install:
> > ${INSTALL_PROGRAM} ${WRKSRC}/ezquake ${PREFIX}/bin
> > Index: distinfo
> > ===================================================================
> > RCS file: /cvs/ports/games/ezquake/distinfo,v
> > retrieving revision 1.9
> > diff -u -p -u -p -r1.9 distinfo
> > --- distinfo 29 Nov 2022 15:03:53 -0000 1.9
> > +++ distinfo 2 Nov 2023 08:27:35 -0000
> > @@ -1,2 +1,4 @@
> > -SHA256 (ezquake-source-3.6.1.tar.gz) =
> > u2+D8QD+6h4ld2gE5J/79UjXh3wPR9XiuZ8+ShdnX/4=
> > -SIZE (ezquake-source-3.6.1.tar.gz) = 23503412
> > +SHA256 (QW-Group-ezquake-source-3.6.4.tar.gz) =
> > BvKf049WKRxMr/GTyLJUF6DBjlj6JrwOWOBjl//tmTM=
> > +SHA256 (QW-Group-qwprot-53af547d0608a1507895fc1629cdc3f4820fc0af.tar.gz) =
> > +nkEALY4D495qX9h2LdciMAwR3CWcT6ewRLjBUsuxFA=
> > +SIZE (QW-Group-ezquake-source-3.6.4.tar.gz) = 1920426
> > +SIZE (QW-Group-qwprot-53af547d0608a1507895fc1629cdc3f4820fc0af.tar.gz) =
> > 8815
> > Index: patches/patch-EX_browser_sources_c
> > ===================================================================
> > RCS file: patches/patch-EX_browser_sources_c
> > diff -N patches/patch-EX_browser_sources_c
> > --- patches/patch-EX_browser_sources_c 11 Mar 2022 19:04:20 -0000
> > 1.2
> > +++ /dev/null 1 Jan 1970 00:00:00 -0000
> > @@ -1,12 +0,0 @@
> > -Index: EX_browser_sources.c
> > ---- EX_browser_sources.c.orig
> > -+++ EX_browser_sources.c
> > -@@ -36,7 +36,7 @@ along with this program. If not, see <http://www.gnu.
> > -
> > - #include "EX_browser.h"
> > -
> > --#define SOURCES_LIST_FILENAME "sb/sources.txt"
> > -+#define SOURCES_LIST_FILENAME "${GAMEDIR}/sources.txt"
> > -
> > - // Used by curl to read server lists from the web
> > - struct curl_buf
> > Index: patches/patch-Makefile
> > ===================================================================
> > RCS file: /cvs/ports/games/ezquake/patches/patch-Makefile,v
> > retrieving revision 1.6
> > diff -u -p -u -p -r1.6 patch-Makefile
> > --- patches/patch-Makefile 29 Nov 2022 15:03:53 -0000 1.6
> > +++ patches/patch-Makefile 2 Nov 2023 08:27:35 -0000
> > @@ -12,8 +12,8 @@ Index: Makefile
> > +LDFLAGS ?= -L${X11BASE}/lib
> > LIBS ?=
> >
> > - #Temporarily disable tree vectorization optimization enabled at O3 due to
> > gcc bug
> > -@@ -575,7 +575,7 @@ endif
> > + CFLAGS_c :=
> > +@@ -571,7 +571,7 @@ endif
> > ifdef CONFIG_WINDOWS
> > TARG_c := ezquake$(EZ_POSTFIX).exe
> > else
> > Index: patches/patch-src_EX_browser_sources_c
> > ===================================================================
> > RCS file: patches/patch-src_EX_browser_sources_c
> > diff -N patches/patch-src_EX_browser_sources_c
> > --- /dev/null 1 Jan 1970 00:00:00 -0000
> > +++ patches/patch-src_EX_browser_sources_c 2 Nov 2023 08:27:35 -0000
> > @@ -0,0 +1,21 @@
> > +Index: src/EX_browser_sources.c
> > +--- src/EX_browser_sources.c.orig
> > ++++ src/EX_browser_sources.c
> > +@@ -36,7 +36,7 @@ along with this program. If not, see <http://www.gnu.
> > +
> > + #include "EX_browser.h"
> > +
> > +-#define SOURCES_LIST_FILENAME "sb/sources.txt"
> > ++#define SOURCES_LIST_FILENAME "${GAMEDIR}/sources.txt"
> > +
> > + // Used by curl to read server lists from the web
> > + struct curl_buf
> > +@@ -351,7 +351,7 @@ void Update_Source(source_data *s)
> > + {
> > + // read servers from file
> > + char name[1024];
> > +- snprintf(name, sizeof (name), "sb/%s", s->address.filename);
> > ++ snprintf(name, sizeof (name), "${GAMEDIR}/%s",
> > s->address.filename);
> > + should_dump = Update_Source_From_File(s, name, servers,
> > &serversn);
> > + GetLocalTime(&(s->last_update));
> > + }
> > Index: patches/patch-src_vid_sdl2_c
> > ===================================================================
> > RCS file: patches/patch-src_vid_sdl2_c
> > diff -N patches/patch-src_vid_sdl2_c
> > --- /dev/null 1 Jan 1970 00:00:00 -0000
> > +++ patches/patch-src_vid_sdl2_c 2 Nov 2023 08:27:35 -0000
> > @@ -0,0 +1,17 @@
> > +vid_software_palette 1 causes black screen when resizing game window
> > +
> > +see:
> > +https://github.com/QW-Group/ezquake-source/issues/858
> > +
> > +Index: src/vid_sdl2.c
> > +--- src/vid_sdl2.c.orig
> > ++++ src/vid_sdl2.c
> > +@@ -222,7 +222,7 @@ cvar_t r_verbose = {"vid_verbose",
> > + cvar_t r_showextensions = {"vid_showextensions", "0",
> > CVAR_SILENT };
> > + cvar_t gl_multisamples = {"gl_multisamples", "0",
> > CVAR_LATCH_GFX | CVAR_AUTO }; // It's here because it needs to be
> > registered before window creation
> > + cvar_t vid_gammacorrection = {"vid_gammacorrection", "0",
> > CVAR_LATCH_GFX };
> > +-cvar_t vid_software_palette = {"vid_software_palette", "1",
> > CVAR_NO_RESET | CVAR_LATCH_GFX };
> > ++cvar_t vid_software_palette = {"vid_software_palette", "0",
> > CVAR_NO_RESET | CVAR_LATCH_GFX };
> > +
> > + cvar_t vid_framebuffer = {"vid_framebuffer",
> > "0", CVAR_NO_RESET | CVAR_LATCH_GFX, conres_changed_callback };
> > + cvar_t vid_framebuffer_blit = {"vid_framebuffer_blit",
> > "0", CVAR_NO_RESET };
>
>
> This works great for me. I didn't catch that the patch for
> EX_browser_sources had gone, I thought I had added it.
>
> Compiles fine and makes a package. Thanks, Nam!
>
> -Tom
>
