From nobody Thu Jun 11 12:54:03 2026 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 4gbjJW61N1z6hR2Y for ; Thu, 11 Jun 2026 12:54:03 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gbjJW3PlQz3R9C for ; Thu, 11 Jun 2026 12:54:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781182443; 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=ZO3im99QIKJgelOK4WX8lr9C2ztWTVhgvxveAZzxvVw=; b=pEtIHqQJ7Qq8K5lm3+xycEWj1deK8qXVO2O9zlVrT7Op4AfsmWTGzEGJJ8752m121rufnr H/kO6tPrwZlua94vd922fHG5BZdmlbFlEiCl0bRJqrxYtvpNxBown+1temcKhdwHC6C8oP DRy0cQpBJDnFFV5UooUsF8XBIaJR1hTNPTdtxa3P8sueRbVXsRSl9IEnKirEiG5M1yMp5o UXmWZ8bFnatDdUKUt1tQjCrcVUUaCRhNEJztlopHsJDY+iDglvIfeKvmH0i0AYlRy9J8CY 7XIpN/p4dcKWJyZt8wXH6nU2ckRjar3ZvJgID6uJw69/sLVODIC76yAncnII/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781182443; a=rsa-sha256; cv=none; b=l7LK36ONTc6d9aiq83ttoKYm7DlRS8hX5KjmL0wxzzokg1igUxMJtICheCWCYgSG4aCcsQ sfniKtT5Osexd4iynyMchLiJbpc7CWR9bEmJCzg8wxLEJ+x0K60fYMkUcNt1NclnTmZpKO Z0y5cZEegXrEuxdG9OjmXLUqRAzLD+TwArxj81tQE7UjWIvur5UlfwN8VWr0UOtkFFeTwo qVEf8YI2YbTXjLT3gsBKEPy5qTIpGtkDjJ27lcxh1sTST/BoKkjRNIQBDUnDlkLeAYJgAG xtFh4PpKYv0dm3dSnv0jAMfDLdWxLV+FGZHq6UqaYi/sl/C56/z/LTupLXfORw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781182443; 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=ZO3im99QIKJgelOK4WX8lr9C2ztWTVhgvxveAZzxvVw=; b=NB3Va/5mxev/dIHPHWzCh4ny3kv0UlSmO0UopPY2cYu0UI4EdJTbp14kM5Pb0HlHjOf7Oq bmishDlfca8aPvb5DkHRqrcsmU1e3V6JvcPlz05PNwdSURSiSaDY0BYL/DUqBfZ62g1D+K soglFH7oQcddPIruk3zD6hczb5WnvOK4akaYDG4Q6ScqJFBT0X07/3TtEQ2AJzM8lSMxQ1 3tt/YzUoJzR4xdXNU0eNTOAhOIOd4YYUlfdLcLcTfxYVf6h9REjxVkC2zjq4UyLz42+GLJ lcAlcj77pjcRLgf9MfWTaYs7I1OLGDyuQbJABhG79tddjLTSaUeNQqoFsfn3VA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gbjJW31PSzrv1 for ; Thu, 11 Jun 2026 12:54:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 47249 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 11 Jun 2026 12:54:03 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: e2ed67523617 - main - games/warzone2100: update 4.6.=?utf-8?Q?3 =E2=86=92 4.?=7.0 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e2ed675236174f38e911dbf77cb7d08082fcfbe2 Auto-Submitted: auto-generated Date: Thu, 11 Jun 2026 12:54:03 +0000 Message-Id: <6a2aafeb.47249.64ef2e02@gitrepo.freebsd.org> The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=e2ed675236174f38e911dbf77cb7d08082fcfbe2 commit e2ed675236174f38e911dbf77cb7d08082fcfbe2 Author: Dmitry Marakasov AuthorDate: 2026-06-04 12:38:23 +0000 Commit: Dmitry Marakasov CommitDate: 2026-06-11 12:53:56 +0000 games/warzone2100: update 4.6.3 → 4.7.0 PR: 295923 Submitted by: eric@camachat.org (partial) Tested by: eric@camachat.org --- games/warzone2100/Makefile | 11 +++++---- games/warzone2100/distinfo | 6 ++--- .../files/patch-lib_ivis__opengl_CMakeLists.txt | 15 +++++++++++++ .../files/patch-lib_ivis__opengl_gfx_api_vk.cpp | 26 ++++++++++++++++++++++ 4 files changed, 49 insertions(+), 9 deletions(-) diff --git a/games/warzone2100/Makefile b/games/warzone2100/Makefile index 39fb8651f567..49f4f3913d88 100644 --- a/games/warzone2100/Makefile +++ b/games/warzone2100/Makefile @@ -1,6 +1,5 @@ PORTNAME= warzone2100 -DISTVERSION= 4.6.3 -PORTREVISION= 2 +DISTVERSION= 4.7.0 CATEGORIES= games MASTER_SITES= https://github.com/Warzone2100/warzone2100/releases/download/${DISTVERSION}/ DISTNAME= ${PORTNAME}_src @@ -10,8 +9,6 @@ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Innovative 3D real-time strategy game WWW= https://wz2100.net/ -BROKEN= Fails to build, error: no member named 'eVkColorspaceSrgbNonlinear' in 'vk::ColorSpaceKHR' - LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING @@ -30,7 +27,8 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ libsodium.so:security/libsodium \ libtheoradec.so:multimedia/libtheora \ libvorbis.so:audio/libvorbis \ - libzip.so:archivers/libzip + libzip.so:archivers/libzip \ + libturbojpeg.so:graphics/libjpeg-turbo RUN_DEPENDS= ${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu USES= cmake bison compiler:c++11-lib gl openal:al pkgconfig \ @@ -40,7 +38,8 @@ USE_SDL= sdl3 CMAKE_ON= WZ_DISABLE_FETCHCONTENT_GIT_CLONE \ CMAKE_DISABLE_FIND_PACKAGE_Asciidoctor \ CMAKE_DISABLE_FIND_PACKAGE_Git \ - FETCHCONTENT_FULLY_DISCONNECTED + WZ_USE_SYSTEM_LIBJPEG_TURBO \ + WZ_SKIP_ELF_SEPARATE_DEBUG CMAKE_OFF= FMT_INSTALL \ WZ_DOWNLOAD_PREBUILT_PACKAGES \ WZ_ENABLE_WARNINGS_AS_ERRORS \ diff --git a/games/warzone2100/distinfo b/games/warzone2100/distinfo index 2e27f41c31f0..6175d2060b1b 100644 --- a/games/warzone2100/distinfo +++ b/games/warzone2100/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1770289432 -SHA256 (warzone2100-4.6.3/warzone2100_src.tar.xz) = 431fe2436cff96878e2ed4edc6d0739453ad6293d6430b5832de9b522ff0b13a -SIZE (warzone2100-4.6.3/warzone2100_src.tar.xz) = 491362256 +TIMESTAMP = 1778612735 +SHA256 (warzone2100-4.7.0/warzone2100_src.tar.xz) = 95ee4d5b88680ea1b1cf230b67ea84028e08a2458b84605ac9f7fb9eb97c4e37 +SIZE (warzone2100-4.7.0/warzone2100_src.tar.xz) = 521127404 diff --git a/games/warzone2100/files/patch-lib_ivis__opengl_CMakeLists.txt b/games/warzone2100/files/patch-lib_ivis__opengl_CMakeLists.txt new file mode 100644 index 000000000000..8a0ac7baea28 --- /dev/null +++ b/games/warzone2100/files/patch-lib_ivis__opengl_CMakeLists.txt @@ -0,0 +1,15 @@ +--- lib/ivis_opengl/CMakeLists.txt.orig 2026-06-08 11:42:23 UTC ++++ lib/ivis_opengl/CMakeLists.txt +@@ -178,9 +178,9 @@ if (WZ_USE_SYSTEM_LIBJPEG_TURBO) + option(WZ_USE_SYSTEM_LIBJPEG_TURBO "Build with the system libjpeg-turbo library" ${_DEFAULT_WZ_USE_SYSTEM_LIBJPEG_TURBO_VALUE}) + + if (WZ_USE_SYSTEM_LIBJPEG_TURBO) +- find_package(libjpeg-turbo CONFIG REQUIRED) +- target_link_libraries(ivis-opengl PRIVATE $,libjpeg-turbo::turbojpeg,libjpeg-turbo::turbojpeg-static>) +- ++ find_package(PkgConfig REQUIRED) ++ pkg_check_modules(libturbojpeg REQUIRED IMPORTED_TARGET libturbojpeg) ++ target_link_libraries(ivis-opengl PRIVATE PkgConfig::libturbojpeg) + else() + include(ExternalProject) + diff --git a/games/warzone2100/files/patch-lib_ivis__opengl_gfx_api_vk.cpp b/games/warzone2100/files/patch-lib_ivis__opengl_gfx_api_vk.cpp new file mode 100644 index 000000000000..3b7d8527ee09 --- /dev/null +++ b/games/warzone2100/files/patch-lib_ivis__opengl_gfx_api_vk.cpp @@ -0,0 +1,26 @@ +--- lib/ivis_opengl/gfx_api_vk.cpp.orig 2026-04-07 13:57:52 UTC ++++ lib/ivis_opengl/gfx_api_vk.cpp +@@ -4255,10 +4255,10 @@ vk::SurfaceFormatKHR chooseSwapSurfaceFormat(const std + vk::SurfaceFormatKHR chooseSwapSurfaceFormat(const std::vector& availableFormats) + { + const auto desiredFormats = std::array { +- vk::SurfaceFormatKHR{ vk::Format::eA2B10G10R10UnormPack32, vk::ColorSpaceKHR::eVkColorspaceSrgbNonlinear }, +- vk::SurfaceFormatKHR{ vk::Format::eA2R10G10B10UnormPack32, vk::ColorSpaceKHR::eVkColorspaceSrgbNonlinear }, +- vk::SurfaceFormatKHR{ vk::Format::eB8G8R8A8Unorm, vk::ColorSpaceKHR::eVkColorspaceSrgbNonlinear }, +- vk::SurfaceFormatKHR{ vk::Format::eR8G8B8A8Unorm, vk::ColorSpaceKHR::eVkColorspaceSrgbNonlinear } ++ vk::SurfaceFormatKHR{ vk::Format::eA2B10G10R10UnormPack32, vk::ColorSpaceKHR::eSrgbNonlinear }, ++ vk::SurfaceFormatKHR{ vk::Format::eA2R10G10B10UnormPack32, vk::ColorSpaceKHR::eSrgbNonlinear }, ++ vk::SurfaceFormatKHR{ vk::Format::eB8G8R8A8Unorm, vk::ColorSpaceKHR::eSrgbNonlinear }, ++ vk::SurfaceFormatKHR{ vk::Format::eR8G8B8A8Unorm, vk::ColorSpaceKHR::eSrgbNonlinear } + }; + + if(availableFormats.size() == 1 +@@ -4266,7 +4266,7 @@ vk::SurfaceFormatKHR chooseSwapSurfaceFormat(const std + { + // don't appear to be any preferred formats, so create one + vk::SurfaceFormatKHR format; +- format.colorSpace = vk::ColorSpaceKHR::eVkColorspaceSrgbNonlinear; ++ format.colorSpace = vk::ColorSpaceKHR::eSrgbNonlinear; + format.format = vk::Format::eB8G8R8A8Unorm; + return format; + }