From nobody Fri Dec 05 20:49:18 2025 X-Original-To: dev-commits-ports-all@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 4dNNlf72ZSz6Jh0f for ; Fri, 05 Dec 2025 20:49:18 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dNNlf3pQkz3r2X for ; Fri, 05 Dec 2025 20:49:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764967758; 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=YahMW0hyPCP4row+hReCqhpVLK0ZtFom5zLvEONcKss=; b=wePMGm5LG2+ULZ50syNyeXkRSHEJM2xIiPM3I5s72gqSLZzvaLBHY/hzNMnL4bE2C7ozH4 wmP2hqV0Gx6N6cPcaHS0lNJMcCF2tAIF2Lz+xuVmXrZXU/LZGDRDYVqsnMxKQQb4/5nSQy bfUh0KjT+yTS1l9yXrBPNI5UWe7EpVkBNrjKJiivQRcjs1fAV0etFHMudvnYnM6S0pvt46 1cUDfDohBxmXkfj8QIzcDbVWnb6kcRbbfPsomMn+nclwGHP5/gSlDWtCs3ftqYwj0TS37k hevAH+gZ7Am6tL1EtlZTUBPoeCJyRMpiFSp4g5Ol/MUBG1+iVjTbAD0ffieuAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764967758; 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=YahMW0hyPCP4row+hReCqhpVLK0ZtFom5zLvEONcKss=; b=WDBc0Ea8R/k6ffxJG7yVQ1ZpmbKhrwXPsGYOjNI7Qugf49K1AuKAgILDF1YjHJgFACo2Eu Ws/HYYq16o5io84uTT+5RIqWo+OJKGW/ZASSOYIYo4s9quNy0BRK9C5qgnnJqPlQ7Kjdfu 3qnhWIglQD38kYI9ZupqDORl0Gycqixnon3NIwLRT4Qev/SU8JBUsTqG/usUDuXR6iaQOv JsvWQYxQTUn5H7vMeQq3PxiQVtpGE+D/MdVaWM5ulPWOXPCIQyUpR4AiAARY6lNHBO9X+b xwpSHzO8a+2ZWmVDOH2vTFIOhEu4DsRonuUC9A960Tvwm2yYYtET+gdd/YCGAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764967758; a=rsa-sha256; cv=none; b=e0WfDQb9XUktllz3xN2Xl7hK81KewsxQ6rrbEugUQapLHXQlMKv5FDoYQCmI9frwwKFeT9 bGLA+PbWxAM7MHK/HIngff8GbtEwvyU6xdorLuaAVdbrojEyqhnzD5QZkhH3WA47KT2Qqi KmMH2BIQ7GQ6Zt9qLsy+RMEyfw2XE8S6Sr1WEIqqpjUWIeuMYt4dB0BiiFR2JEO5K6Wwl9 FRiNhqeVugvD849KKrWwQXvFPW15Gfub0nW03nfreHOcYeFQApo+WfjpXKQ3711yuSV+ZL 9YQgmr7q/H0nxw/yF6kKpUhtbTZCpuR8jn1UOYA5kYS5nL1A/5R0eDb6JBYI7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dNNlf2F3Fz9w3 for ; Fri, 05 Dec 2025 20:49:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2dab7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 05 Dec 2025 20:49:18 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: c8200812c000 - main - games/emptyepsilon: Fix build List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c8200812c000e298a635a0b9bc7bc2c419e80559 Auto-Submitted: auto-generated Date: Fri, 05 Dec 2025 20:49:18 +0000 Message-Id: <6933454e.2dab7.62eff923@gitrepo.freebsd.org> The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=c8200812c000e298a635a0b9bc7bc2c419e80559 commit c8200812c000e298a635a0b9bc7bc2c419e80559 Author: Yuri Victorovich AuthorDate: 2025-12-05 20:46:33 +0000 Commit: Yuri Victorovich CommitDate: 2025-12-05 20:49:12 +0000 games/emptyepsilon: Fix build ... by using glm submodule. Reported by: fallout --- games/emptyepsilon/Makefile | 12 ++++++-- games/emptyepsilon/distinfo | 4 ++- .../files/patch-sproton_CMakeLists.txt | 18 +++++++++++ ...ch-sproton_libs_basis__universal_CMakeLists.txt | 36 +++++++++++++++++++--- 4 files changed, 61 insertions(+), 9 deletions(-) diff --git a/games/emptyepsilon/Makefile b/games/emptyepsilon/Makefile index ea34d034715a..2a6462418750 100644 --- a/games/emptyepsilon/Makefile +++ b/games/emptyepsilon/Makefile @@ -16,7 +16,11 @@ LICENSE_FILE_GPLv2= ${WRKSRC}/LICENSE LICENSE_FILE_AngryFly-Royalty-Free-License= ${WRKSRC}/packs/License.txt LICENSE_PERMS_AngryFly-Royalty-Free-License= auto-accept dist-mirror pkg-mirror -BUILD_DEPENDS= glm>0:math/glm +# BUILD_DEPENDS for glm is commented out because the system glm (1.0.x) is +# incompatible with EmptyEpsilon's code. The bundled glm 0.9.9.8 is used instead +# via git submodule to avoid API incompatibilities (missing radians, degrees, +# u8vec4, vec3 functions/types in newer glm versions). +#BUILD_DEPENDS= glm>0:math/glm LIB_DEPENDS= libfreetype.so:print/freetype2 \ libsfml-system.so:devel/sfml \ libmeshoptimizer.so:misc/meshoptimizer \ @@ -30,10 +34,12 @@ USE_GITHUB= yes GH_ACCOUNT= daid GH_PROJECT= EmptyEpsilon GH_TUPLE= daid:SeriousProton:${DISTVERSIONFULL}:sproton/sproton \ - BinomialLLC:basis_universal:v1_15_update2:basis/SeriousProton/externals/basis + BinomialLLC:basis_universal:v1_15_update2:basis/SeriousProton/externals/basis \ + g-truc:glm:0.9.9.8:glm/sproton/libs/glm CMAKE_ARGS= -DSERIOUS_PROTON_DIR="${WRKSRC}/sproton" \ - -DWITH_OPUS=system + -DWITH_OPUS=system \ + -DWITH_GLM=bundled CXXFLAGS+= -DGLM_ENABLE_EXPERIMENTAL post-patch: diff --git a/games/emptyepsilon/distinfo b/games/emptyepsilon/distinfo index 706e55a5134b..d6c7e2a4f166 100644 --- a/games/emptyepsilon/distinfo +++ b/games/emptyepsilon/distinfo @@ -1,7 +1,9 @@ -TIMESTAMP = 1733775767 +TIMESTAMP = 1764964262 SHA256 (daid-EmptyEpsilon-EE-2024.12.08_GH0.tar.gz) = 8be5360270b9a616a5d749aec9653b3e36beba96b2d6b1651e18594a3314f010 SIZE (daid-EmptyEpsilon-EE-2024.12.08_GH0.tar.gz) = 261708187 SHA256 (daid-SeriousProton-EE-2024.12.08_GH0.tar.gz) = fa4a9873c5f8872f9f2d75d03eec06c8a40ea2e0daeb977f0445f14c1e76a236 SIZE (daid-SeriousProton-EE-2024.12.08_GH0.tar.gz) = 2648907 SHA256 (BinomialLLC-basis_universal-v1_15_update2_GH0.tar.gz) = 3caff917d63ed0255fc56bcdf80d305bb47ac9315a4a45409a1264a0e5e0e572 SIZE (BinomialLLC-basis_universal-v1_15_update2_GH0.tar.gz) = 13283133 +SHA256 (g-truc-glm-0.9.9.8_GH0.tar.gz) = 7d508ab72cb5d43227a3711420f06ff99b0a0cb63ee2f93631b162bfe1fe9592 +SIZE (g-truc-glm-0.9.9.8_GH0.tar.gz) = 4368032 diff --git a/games/emptyepsilon/files/patch-sproton_CMakeLists.txt b/games/emptyepsilon/files/patch-sproton_CMakeLists.txt new file mode 100644 index 000000000000..75f204e5320f --- /dev/null +++ b/games/emptyepsilon/files/patch-sproton_CMakeLists.txt @@ -0,0 +1,18 @@ +- Use bundled glm from libs/glm when WITH_GLM=bundled +- Avoids FetchContent for glm since we provide it via GH_TUPLE for compatibility + +--- sproton/CMakeLists.txt.orig 2024-11-06 08:14:52 UTC ++++ sproton/CMakeLists.txt +@@ -48,6 +48,12 @@ if(NOT WITH_GLM STREQUAL "bundled") + find_package(glm ${glm_find_args}) + endif() + ++# Check if glm is already provided in libs/glm (via ports GH_TUPLE) ++if(NOT glm_FOUND AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/libs/glm/CMakeLists.txt") ++ add_subdirectory(libs/glm EXCLUDE_FROM_ALL) ++ set(glm_FOUND TRUE) ++endif() ++ + if(glm_FOUND) + message(STATUS "GLM version used: SYSTEM") + if(NOT TARGET glm::glm) diff --git a/games/emptyepsilon/files/patch-sproton_libs_basis__universal_CMakeLists.txt b/games/emptyepsilon/files/patch-sproton_libs_basis__universal_CMakeLists.txt index 29b62170dd16..ff81bf53a1ff 100644 --- a/games/emptyepsilon/files/patch-sproton_libs_basis__universal_CMakeLists.txt +++ b/games/emptyepsilon/files/patch-sproton_libs_basis__universal_CMakeLists.txt @@ -1,8 +1,6 @@ -- avoid fetch, use pre-installed meshoptimizer package, see https://github.com/daid/SeriousProton/issues/253 - ---- sproton/libs/basis_universal/CMakeLists.txt.orig 2024-12-09 20:23:38 UTC -+++ sproton/libs/basis_universal/CMakeLists.txt -@@ -5,7 +5,7 @@ set(BASIS_URL "https://github.com/BinomialLLC/basis_un +--- sproton/libs/basis_universal/CMakeLists.txt.orig 2025-12-05 12:11:01.680012000 -0800 ++++ sproton/libs/basis_universal/CMakeLists.txt 2025-12-05 12:11:01.722728000 -0800 +@@ -5,7 +5,7 @@ set(BASIS_VERSION "v1_15_update2") set(BASIS_URL "https://github.com/BinomialLLC/basis_universal") @@ -11,3 +9,31 @@ include(FetchContent) FetchContent_Declare( basis +@@ -14,18 +14,21 @@ + ) + FetchContent_GetProperties(basis) + else() +- set(BASIS_BASE_PATH "${EXTERNALS_DIR}") +- set(basis_POPULATED FALSE) +- if(NOT EXISTS "${BASIS_BASE_PATH}/basis/CMakeLists.txt") ++ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../../SeriousProton/externals/basis/CMakeLists.txt") ++ set(basis_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../SeriousProton/externals/basis") ++ set(basis_BINARY_DIR "${PROJECT_BINARY_DIR}/externals/basis") ++ set(basis_POPULATED TRUE) ++ else() ++ set(BASIS_BASE_PATH "${EXTERNALS_DIR}") ++ set(basis_POPULATED FALSE) + set(BASIS_ZIP "${DOWNLOADS_DIR}/basis.zip") + file(DOWNLOAD "${BASIS_URL}/archive/refs/tags/${BASIS_VERSION}.zip" "${BASIS_ZIP}" TIMEOUT 60 TLS_VERIFY ON) + + file(MAKE_DIRECTORY "${BASIS_BASE_PATH}/basis") + execute_process(COMMAND ${CMAKE_COMMAND} -E tar -xf "${BASIS_ZIP}" WORKING_DIRECTORY "${BASIS_BASE_PATH}") ++ set(basis_SOURCE_DIR "${BASIS_BASE_PATH}/basis") ++ set(basis_BINARY_DIR "${PROJECT_BINARY_DIR}/externals/basis") + endif() +- +- set(basis_SOURCE_DIR "${BASIS_BASE_PATH}/basis") +- set(basis_BINARY_DIR "${PROJECT_BINARY_DIR}/externals/basis") + endif() + + if(NOT basis_POPULATED)