From nobody Wed Feb 21 13:57:04 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TfyWN6GMbz5CF2H; Wed, 21 Feb 2024 13:57:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TfyWN453Pz4g64; Wed, 21 Feb 2024 13:57:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708523824; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sg1N4ncXNX2qPhnGyg3HRbleodc1e0qXbFzH7/gYf3c=; b=pjyXDEBEk4K9qQnjWmHPtczIws9iwHLXThz4GRxdmVG5TTAnUCndhBp0vKToOkNd8LX73C w7qQYwsqc6eMFv8fJi1rqGV3XT+u4GVuj3G0tBJOQgE5I65z3CwUrOLS+PNLDrNSCyzqdh uF73BjZpLKRoF5kHVGLz6+GxpGyg/3B/qMicuR59sK5PVZOcy2IkiGIFxgbDR9+nLXBqVF bujykSwvphG0yD5eyimktmFGj9/A7H441KZnkJC66JdoSVAMaWsPqkpS7PDKVKLVIQ5cbF 3LUDPE4DKY6e+CbdfcMDHDGDRVHgoX/zzFX2rSeQDGY2K8jJqiEwGbh+yBrM2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708523824; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sg1N4ncXNX2qPhnGyg3HRbleodc1e0qXbFzH7/gYf3c=; b=URZ5VhovKC5ATfvO1woeTfVSywx7LWk4kNqC96DSC5w2HArL1pYy1RS5y5Bu8o+emSNB/s 0hk/SAJB9Z68GUq1S0p/cMcEFDNXuIo+/snWRlG4E7nrs2IIZrlyXt6JN/kfInl6EfWgFj wM8XUgCtchPxqePoRMqKRNrou574m0lBeTsMiDc1EJsyVJwd+3SKs4A22rTtelXCiv+QGe P2nCcwMst8fzro71zucC0inby3RaCHbgAQ0v3GddJ4PSUcRspOq5f6TINgf227SitYM7SQ m5G0e28rw4JozhEYZi1d3MMRHdt2itmtxomVz8tlLhUGR9Jka7MnjwmfospRHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708523824; a=rsa-sha256; cv=none; b=T/h0qhCMB9R482g5VMB85g+PG+NNu7rp1PZ23PxsofMip1tf376rtc9kEzwK8xdUH5X/Ir iWIKf/wDF7PzKMLa/f1h0Ryvtn/mp/y/YCisbVX3GDuvCnqud6trupJEjZiTi/kDUqPjFZ nUv34UtbmIv6ciw7a+no6x2UcUGEd7WjaSOW/903+fiytj07owGeDI1v4REyB3smjT6adK w+SXqqvvLlwSRKCDPe/6mNgTQUK8FsPZ7hwJrCFJIpocbuCDLEdV3MYsaYqU3U7nZX9jXh VQvpuKGikp/vgkb2CZODJqTKueF6Iu6EHmJ8o6K+VWq0yqwt7xUPEI7trYW3Jw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TfyWN39kyz14Wr; Wed, 21 Feb 2024 13:57:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41LDv4US066340; Wed, 21 Feb 2024 13:57:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41LDv4SM066337; Wed, 21 Feb 2024 13:57:04 GMT (envelope-from git) Date: Wed, 21 Feb 2024 13:57:04 GMT Message-Id: <202402211357.41LDv4SM066337@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: b9da7fa0441f - main - games/ezquake: support for textures built into bsp maps up to 8192x8192 in size List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b9da7fa0441f97e509ef289bf5770cad5568a351 Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=b9da7fa0441f97e509ef289bf5770cad5568a351 commit b9da7fa0441f97e509ef289bf5770cad5568a351 Author: Vladimir Druzenko AuthorDate: 2024-02-21 13:50:23 +0000 Commit: Vladimir Druzenko CommitDate: 2024-02-21 13:50:23 +0000 games/ezquake: support for textures built into bsp maps up to 8192x8192 in size 1. Add support for textures built into bsp maps up to 8192x8192 in size. 2. Add LICENSE. 3. Recreate all patches with make makepatch. Approved by: arrowd (mentor, implicit) --- games/ezquake/Makefile | 5 ++++- games/ezquake/files/patch-Makefile | 6 +++--- games/ezquake/files/patch-config_manager.c | 4 ++-- games/ezquake/files/patch-fs.c | 12 ++++++------ games/ezquake/files/patch-gl__texture.c | 11 +++++++++++ games/ezquake/files/patch-host.c | 6 +++--- 6 files changed, 29 insertions(+), 15 deletions(-) diff --git a/games/ezquake/Makefile b/games/ezquake/Makefile index 94ab54e06e9e..6052010e5a9f 100644 --- a/games/ezquake/Makefile +++ b/games/ezquake/Makefile @@ -1,6 +1,6 @@ PORTNAME= ezquake DISTVERSION= 3.2.3 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 2 CATEGORIES= games MASTER_SITES= https://github.com/ezQuake/ezquake-source/archive/ \ @@ -13,6 +13,9 @@ MAINTAINER= vvd@FreeBSD.org COMMENT= Modern QuakeWorld client WWW= https://www.ezquake.com/ +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/LICENSE + LIB_DEPENDS= libcurl.so:ftp/curl \ libexpat.so:textproc/expat2 \ libjansson.so:devel/jansson \ diff --git a/games/ezquake/files/patch-Makefile b/games/ezquake/files/patch-Makefile index a2bf147c34bb..36c05c1dc79f 100644 --- a/games/ezquake/files/patch-Makefile +++ b/games/ezquake/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig +--- Makefile.orig 2021-02-09 17:35:52 UTC +++ Makefile -@@ -89,6 +89,7 @@ +@@ -89,6 +89,7 @@ SDL2_CFLAGS ?= $(shell sdl2-config --cflags) SDL2_LIBS ?= $(shell sdl2-config --libs) CFLAGS_c += $(BUILD_DEFS) $(VER_DEFS) $(PATH_DEFS) $(SDL2_CFLAGS) -DNDEBUG -DJSS_CAM -DUSE_PR2 -DWITH_NQPROGS -DUSE_SDL2 -DWITH_ZIP @@ -8,7 +8,7 @@ LIBS_c += $(SDL2_LIBS) # built-in requirements -@@ -379,7 +380,7 @@ +@@ -379,7 +380,7 @@ endif ifdef CONFIG_WINDOWS TARG_c := ezquake.exe else diff --git a/games/ezquake/files/patch-config_manager.c b/games/ezquake/files/patch-config_manager.c index a8101f526004..f4b99ada77e8 100644 --- a/games/ezquake/files/patch-config_manager.c +++ b/games/ezquake/files/patch-config_manager.c @@ -1,6 +1,6 @@ ---- config_manager.c.orig +--- config_manager.c.orig 2021-02-09 17:35:52 UTC +++ config_manager.c -@@ -68,7 +68,7 @@ +@@ -68,7 +68,7 @@ cvar_t cfg_save_sysinfo = {"cfg_save_sysinfo", "0"}; cvar_t cfg_save_cmdline = {"cfg_save_cmdline", "1"}; cvar_t cfg_backup = {"cfg_backup", "0"}; cvar_t cfg_legacy_exec = {"cfg_legacy_exec", "1"}; diff --git a/games/ezquake/files/patch-fs.c b/games/ezquake/files/patch-fs.c index d8996840c962..a36395ef144f 100644 --- a/games/ezquake/files/patch-fs.c +++ b/games/ezquake/files/patch-fs.c @@ -1,6 +1,6 @@ ---- fs.c.orig +--- fs.c.orig 2021-02-09 17:35:52 UTC +++ fs.c -@@ -63,6 +63,8 @@ +@@ -63,6 +63,8 @@ char com_basedir[MAX_OSPATH]; // c:/quake char com_homedir[MAX_PATH]; // something really long C:/Documents and Settings/qqshka char userdirfile[MAX_OSPATH] = {0}; char com_userdir[MAX_OSPATH] = {0}; @@ -9,7 +9,7 @@ int userdir_type = -1; searchpath_t *fs_searchpaths = NULL; -@@ -616,6 +618,12 @@ +@@ -616,6 +618,12 @@ void FS_SetGamedir (char *dir, qbool force) // Flush all data, so it will be forced to reload. Cache_Flush (); @@ -22,7 +22,7 @@ snprintf(com_gamedir, sizeof(com_gamedir), "%s/%s", com_basedir, dir); FS_AddGameDirectory(com_gamedir, FS_LOAD_FILE_ALL); -@@ -699,6 +707,8 @@ +@@ -699,6 +707,8 @@ void FS_InitFilesystemEx( qbool guess_cwd ) { #elif defined(__linux__) if (!Sys_fullpath(com_basedir, "/proc/self/exe", sizeof(com_basedir))) Sys_Error("FS_InitFilesystemEx: Sys_fullpath failed"); @@ -31,7 +31,7 @@ #else com_basedir[0] = 0; // FIXME: MAC / FreeBSD #endif -@@ -717,12 +727,11 @@ +@@ -717,12 +727,11 @@ void FS_InitFilesystemEx( qbool guess_cwd ) { strlcpy (com_basedir, COM_Argv(i + 1), sizeof(com_basedir)); } else { // made com_basedir equa to cwd @@ -48,7 +48,7 @@ } for (i = 0; i < (int) strlen(com_basedir); i++) -@@ -767,6 +776,14 @@ +@@ -767,6 +776,14 @@ void FS_InitFilesystemEx( qbool guess_cwd ) { } // start up with id1 by default diff --git a/games/ezquake/files/patch-gl__texture.c b/games/ezquake/files/patch-gl__texture.c new file mode 100644 index 000000000000..c5250684aefd --- /dev/null +++ b/games/ezquake/files/patch-gl__texture.c @@ -0,0 +1,11 @@ +--- gl_texture.c.orig 2021-02-09 17:35:52 UTC ++++ gl_texture.c +@@ -417,7 +417,7 @@ static void GL_Upload32 (unsigned *data, int width, in + + static void GL_Upload8 (byte *data, int width, int height, int mode) + { +- static unsigned trans[640 * 480]; ++ static unsigned trans[8192 * 8192]; + int i, image_size, p; + unsigned *table; + diff --git a/games/ezquake/files/patch-host.c b/games/ezquake/files/patch-host.c index cba197302ad7..ff4f65a13da5 100644 --- a/games/ezquake/files/patch-host.c +++ b/games/ezquake/files/patch-host.c @@ -1,6 +1,6 @@ ---- host.c.orig +--- host.c.orig 2021-02-09 17:35:52 UTC +++ host.c -@@ -333,16 +333,30 @@ +@@ -333,16 +333,30 @@ void SYSINFO_Init(void) SYSINFO_processor_description = cpu_model; gettimeofday(&old_tp, NULL); @@ -31,7 +31,7 @@ if (gl_renderer && gl_renderer[0]) { if (SYSINFO_3D_description != NULL) { -@@ -351,7 +365,7 @@ +@@ -351,7 +365,7 @@ void SYSINFO_Init(void) SYSINFO_3D_description = Q_strdup(gl_renderer); }