CVS commit: pkgsrc/games/openclonk

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Oct 27 20:18:32 UTC 2026

Modified Files:
        pkgsrc/games/openclonk: Makefile distinfo
        pkgsrc/games/openclonk/patches: patch-CMakeLists.txt

Log Message:
openclonk: serialize building of the packs

c4groups is re-using the same file names, so races will lead to
broken or missing packs.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/games/openclonk/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/games/openclonk/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/games/openclonk/patches/patch-CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/games/openclonk/Makefile
diff -u pkgsrc/games/openclonk/Makefile:1.24 pkgsrc/games/openclonk/Makefile:1.25
--- pkgsrc/games/openclonk/Makefile:1.24        Tue Sep 29 06:05:19 2026
+++ pkgsrc/games/openclonk/Makefile     Tue Oct 27 20:18:31 2026
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2026/09/29 06:05:19 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2026/10/27 20:18:31 wiz Exp $
 
 DISTNAME=      openclonk-8.1-src
 PKGNAME=       ${DISTNAME:S/-src//}
-PKGREVISION=   19
+PKGREVISION=   20
 CATEGORIES=    games
 MASTER_SITES=  https://www.openclonk.org/builds/release/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=  .tar.bz2
@@ -19,7 +19,7 @@ USE_TOOLS+=   gmake pkg-config
 
 USE_CXX_FEATURES+=     c++14
 
-CMAKE_CONFIGURE_ARGS+=  -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_POLICY_VERSION_MINIMUM=3.5
 
 .include "../../devel/cmake/build.mk"
 .include "../../audio/SDL2_mixer/buildlink3.mk"

Index: pkgsrc/games/openclonk/distinfo
diff -u pkgsrc/games/openclonk/distinfo:1.2 pkgsrc/games/openclonk/distinfo:1.3
--- pkgsrc/games/openclonk/distinfo:1.2 Wed Dec 18 10:41:25 2024
+++ pkgsrc/games/openclonk/distinfo     Tue Oct 27 20:18:31 2026
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2024/12/18 10:41:25 wiz Exp $
+$NetBSD: distinfo,v 1.3 2026/10/27 20:18:31 wiz Exp $
 
 BLAKE2s (openclonk-8.1-src.tar.bz2) = 3c71fb0de076096b4860cbbbb21d2e45421bbf9f54e88396450633b9e696cbd0
 SHA512 (openclonk-8.1-src.tar.bz2) = b52a2fba0906cc80fffe2ce308bb4631d4e2d4ada6b8442856deb5e729d37d5c473c3c1a50765eb0bd978d9e3c874d83e0d60f67f44d9535a3ac432029849f6c
 Size (openclonk-8.1-src.tar.bz2) = 120149164 bytes
-SHA1 (patch-CMakeLists.txt) = f0d0eac3227c0bf3ff11cb85203ba471de8d9344
+SHA1 (patch-CMakeLists.txt) = 1b7e1ef5582c098c552106ad53b1d3cec7fa078d
 SHA1 (patch-src_editor_C4EditCursor.cpp) = f9a011bacf85b49f5874be4a95774760ae28d88d
 SHA1 (patch-src_gui_C4ScriptGuiWindow.cpp) = d665c09dee1c8ef788bb0f0936be88f7eb5897a6
 SHA1 (patch-src_script_C4AulParse.cpp) = ae6125dc48256632bb1c5924fa4bdc843d9ce900

Index: pkgsrc/games/openclonk/patches/patch-CMakeLists.txt
diff -u pkgsrc/games/openclonk/patches/patch-CMakeLists.txt:1.1 pkgsrc/games/openclonk/patches/patch-CMakeLists.txt:1.2
--- pkgsrc/games/openclonk/patches/patch-CMakeLists.txt:1.1     Thu Jun 20 17:02:50 2024
+++ pkgsrc/games/openclonk/patches/patch-CMakeLists.txt Tue Oct 27 20:18:32 2026
@@ -1,11 +1,13 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2024/06/20 17:02:50 charlotte Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2026/10/27 20:18:32 wiz Exp $
 
 Don't attempt to deal with link-time optimization manually; CMake is smart
 enough to figure it out on its own.
 
---- CMakeLists.txt.orig        2020-02-12 22:30:26.516115047 -0800
-+++ CMakeLists.txt     2020-02-12 22:30:36.341115137 -0800
-@@ -91,38 +91,6 @@
+Serialize building of the packs, c4groups re-uses the same names.
+
+--- CMakeLists.txt.orig        2018-03-16 17:25:33.000000000 +0000
++++ CMakeLists.txt
+@@ -91,38 +91,6 @@ endfunction()
        endforeach()
  endfunction()
  
@@ -44,3 +46,43 @@ enough to figure it out on its own.
  if(MSVC)
        if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
                # Set up some additional flags only if we're using the MS compiler,
+@@ -1510,6 +1478,7 @@ endif()
+       list(APPEND OC_C4GROUPS Music.ocg)
+ endif()
+ 
++set(OC_C4GROUPS_PREV "")
+ foreach(group ${OC_C4GROUPS})
+       if (APPLE)
+               if (CMAKE_GENERATOR STREQUAL Xcode)
+@@ -1518,7 +1487,7 @@ foreach(group ${OC_C4GROUPS})
+                               "$<TARGET_FILE:${native_c4group}>"
+                               "${CMAKE_CURRENT_SOURCE_DIR}/planet/${group}"
+                               # leave out third parameter here so the script can figure out Xcode-ish paths as usual
+-                              DEPENDS "${native_c4group}"
++                              DEPENDS "${native_c4group}" ${OC_C4GROUPS_PREV}
+                       )
+               else()
+                       add_custom_command(TARGET openclonk
+@@ -1526,7 +1495,7 @@ foreach(group ${OC_C4GROUPS})
+                               "$<TARGET_FILE:${native_c4group}>"
+                               "${CMAKE_CURRENT_SOURCE_DIR}/planet/${group}"
+                               "${CMAKE_CURRENT_BINARY_DIR}/openclonk.app/Contents/Resources"
+-                              DEPENDS "${native_c4group}"
++                              DEPENDS "${native_c4group}" ${OC_C4GROUPS_PREV}
+                       )
+               endif()
+       else()
+@@ -1534,11 +1503,12 @@ foreach(group ${OC_C4GROUPS})
+                       OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${group}
+                       COMMAND "${native_c4group}" ARGS "${CMAKE_CURRENT_SOURCE_DIR}/planet/${group}" -t "${CMAKE_CURRENT_BINARY_DIR}/${group}"
+                       MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/planet/${group}
+-                      DEPENDS "${native_c4group}"
++                      DEPENDS "${native_c4group}" ${OC_C4GROUPS_PREV}
+                       VERBATIM
+               )
+               install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${group} DESTINATION share/games/openclonk)
+       endif()
++      set(OC_C4GROUPS_PREV "${CMAKE_CURRENT_BINARY_DIR}/${group}")
+ endforeach()
+ 
+ if(NOT APPLE)