git: de32579ec7ea - main - emulators/tic-80: fix build with cmake 4
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 13 Sep 2026 11:20:50 UTC
The branch main has been updated by fuz:
URL: https://cgit.FreeBSD.org/ports/commit/?id=de32579ec7ea6236cc69ca5cad805c80dfff75ee
commit de32579ec7ea6236cc69ca5cad805c80dfff75ee
Author: Robert Clausecker <fuz@FreeBSD.org>
AuthorDate: 2026-09-11 15:37:13 +0000
Commit: Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2026-09-13 11:18:33 +0000
emulators/tic-80: fix build with cmake 4
A new version of TIC-80 seems to be out, but there has not been an
official release yet. Fix the old one as a stop-gap measure.
Event: EuroBSDcon Devsummit 2026
---
emulators/tic-80/files/patch-CMakeLists.txt | 24 ++++++++++++++--------
.../tic-80/files/patch-vendor_zip_CMakeLists.txt | 8 ++++++++
2 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/emulators/tic-80/files/patch-CMakeLists.txt b/emulators/tic-80/files/patch-CMakeLists.txt
index fe114b21b662..a58cbf3997e8 100644
--- a/emulators/tic-80/files/patch-CMakeLists.txt
+++ b/emulators/tic-80/files/patch-CMakeLists.txt
@@ -1,6 +1,12 @@
--- CMakeLists.txt.orig 2023-10-22 11:51:43 UTC
+++ CMakeLists.txt
-@@ -14,7 +14,6 @@ if(CMAKE_BUILD_TYPE)
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.3)
++cmake_minimum_required(VERSION 3.5)
+
+ set(VERSION_MAJOR 1)
+ set(VERSION_MINOR 1)
+@@ -14,7 +14,6 @@ endif()
string(TOUPPER ${CMAKE_BUILD_TYPE} BUILD_TYPE_UC)
endif()
@@ -8,7 +14,7 @@
if(Git_FOUND)
execute_process(
COMMAND ${GIT_EXECUTABLE} status
-@@ -160,72 +159,18 @@ set(THIRDPARTY_DIR ${CMAKE_SOURCE_DIR}/vendor)
+@@ -160,72 +159,18 @@ include(ExternalProject)
include(ExternalProject)
@@ -146,7 +152,7 @@
# pocketpy (Python)
################################
-@@ -417,27 +306,8 @@ if(EMSCRIPTEN)
+@@ -417,27 +306,8 @@ endif()
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fexceptions")
endif()
@@ -175,7 +181,7 @@
################################
# Blipbuf
################################
-@@ -446,36 +316,6 @@ add_library(blipbuf STATIC ${THIRDPARTY_DIR}/blip-buf/
+@@ -446,36 +316,6 @@ target_include_directories(blipbuf INTERFACE ${THIRDPA
target_include_directories(blipbuf INTERFACE ${THIRDPARTY_DIR}/blip-buf)
################################
@@ -263,7 +269,7 @@
endif()
if(LINUX)
-@@ -641,6 +481,8 @@ endif()
+@@ -641,6 +481,8 @@ if(BUILD_SDL AND NOT EMSCRIPTEN AND NOT RPI)
################################
if(BUILD_SDL AND NOT EMSCRIPTEN AND NOT RPI)
@@ -328,7 +334,7 @@
################################
# ZIP
################################
-@@ -856,6 +668,12 @@ set(CMAKE_DISABLE_TESTING ON CACHE BOOL "" FORCE)
+@@ -856,6 +668,12 @@ add_subdirectory(${THIRDPARTY_DIR}/zip)
add_subdirectory(${THIRDPARTY_DIR}/zip)
################################
@@ -359,7 +365,7 @@
find_package(CURL REQUIRED)
target_include_directories(naett PRIVATE ${CURL_INCLUDE_DIRS})
target_link_libraries(naett ${CURL_LIBRARIES})
-@@ -990,40 +808,6 @@ if(USE_NAETT)
+@@ -990,40 +808,6 @@ endif()
endif()
################################
@@ -400,7 +406,7 @@
# TIC-80 studio
################################
-@@ -1067,9 +851,9 @@ if(WIN32)
+@@ -1067,9 +851,9 @@ endif()
target_include_directories(tic80studio PRIVATE ${THIRDPARTY_DIR}/dirent/include)
endif()
@@ -412,7 +418,7 @@
if(USE_NAETT)
target_compile_definitions(tic80studio PRIVATE USE_NAETT)
-@@ -1087,80 +871,6 @@ endif()
+@@ -1087,80 +871,6 @@ target_compile_definitions(tic80studio PUBLIC BUILD_ED
target_compile_definitions(tic80studio PUBLIC BUILD_EDITORS)
################################
diff --git a/emulators/tic-80/files/patch-vendor_zip_CMakeLists.txt b/emulators/tic-80/files/patch-vendor_zip_CMakeLists.txt
new file mode 100644
index 000000000000..687e04ce5b2a
--- /dev/null
+++ b/emulators/tic-80/files/patch-vendor_zip_CMakeLists.txt
@@ -0,0 +1,8 @@
+--- vendor/zip/CMakeLists.txt.orig 2026-09-12 08:05:45 UTC
++++ vendor/zip/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.4)
++cmake_minimum_required(VERSION 3.5)
+
+ project(zip
+ LANGUAGES C