CVS commit: pkgsrc/games/valyriatear

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/games/valyriatear
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Tue, 10 Mar 2026 09:09:54 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Mar 10 09:09:54 UTC 2026

Modified Files:
        pkgsrc/games/valyriatear: Makefile distinfo
        pkgsrc/games/valyriatear/patches: patch-src_CMakeLists.txt
Added Files:
        pkgsrc/games/valyriatear/patches:
            patch-CMake_Modules_FindSDL2__ttf.cmake
            patch-src_engine_video_text.h
            patch-src_utils_src_utils_gl__include.h

Log Message:
valyriatear: fix build with newer SDL2_ttf and on Darwin


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/games/valyriatear/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/games/valyriatear/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/games/valyriatear/patches/patch-CMake_Modules_FindSDL2__ttf.cmake \
    pkgsrc/games/valyriatear/patches/patch-src_engine_video_text.h \
    pkgsrc/games/valyriatear/patches/patch-src_utils_src_utils_gl__include.h
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/games/valyriatear/patches/patch-src_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/valyriatear/Makefile
diff -u pkgsrc/games/valyriatear/Makefile:1.18 pkgsrc/games/valyriatear/Makefile:1.19
--- pkgsrc/games/valyriatear/Makefile:1.18      Thu Oct 23 20:37:16 2025
+++ pkgsrc/games/valyriatear/Makefile   Tue Mar 10 09:09:53 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2025/10/23 20:37:16 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2026/03/10 09:09:53 adam Exp $
 
 DISTNAME=      ValyriaTear-src-with-deps-1.1.0
 PKGNAME=       ${DISTNAME:tl:S/-src-with-deps//1}
@@ -16,11 +16,10 @@ TOOL_DEPENDS+=      dos2unix-[0-9]*:../../con
 
 WRKSRC=                ${WRKDIR}/ValyriaTear
 
-USE_CMAKE=     yes
-USE_TOOLS+=    pkg-config msgfmt
 USE_LANGUAGES= c c++
+USE_TOOLS+=    pkg-config msgfmt
 
-CMAKE_CONFIGURE_ARGS+=  -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_POLICY_VERSION_MINIMUM=3.5
 
 LDFLAGS+=      ${BUILDLINK_LDADD.gettext}
 
@@ -31,12 +30,13 @@ post-extract:
 .include "../../audio/openal-soft/buildlink3.mk"
 .include "../../devel/SDL2/buildlink3.mk"
 .include "../../devel/boost-headers/buildlink3.mk"
+.include "../../devel/cmake/build.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/SDL2_ttf/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/SDL2_image/buildlink3.mk"
 .include "../../graphics/glew/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../lang/lua51/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"

Index: pkgsrc/games/valyriatear/distinfo
diff -u pkgsrc/games/valyriatear/distinfo:1.6 pkgsrc/games/valyriatear/distinfo:1.7
--- pkgsrc/games/valyriatear/distinfo:1.6       Sat Jul 22 09:12:58 2023
+++ pkgsrc/games/valyriatear/distinfo   Tue Mar 10 09:09:53 2026
@@ -1,10 +1,13 @@
-$NetBSD: distinfo,v 1.6 2023/07/22 09:12:58 nia Exp $
+$NetBSD: distinfo,v 1.7 2026/03/10 09:09:53 adam Exp $
 
 BLAKE2s (ValyriaTear-src-with-deps-1.1.0.tar.gz) = 495aab3e77a776eb97b7117978f70d22d80ba9deb3af9ad2cd1431411d20c140
 SHA512 (ValyriaTear-src-with-deps-1.1.0.tar.gz) = 29d4927f2dba691ff99568acdbaa70c9608ad9f5b56160982c0e10be78a3c401aab85b43c633e48bc36e00e7f6e2de6aea5577790cb65fedd72d4e6ad14baf8d
 Size (ValyriaTear-src-with-deps-1.1.0.tar.gz) = 117039173 bytes
-SHA1 (patch-src_CMakeLists.txt) = 6189c5313ef3f01b174032e249c1a94ceabfa96c
+SHA1 (patch-CMake_Modules_FindSDL2__ttf.cmake) = c24ab84a5088d834c37d59421e5ebbafc484ea69
+SHA1 (patch-src_CMakeLists.txt) = e28e7ee4cf8866ba6e650bd61ef21b7622ead784
 SHA1 (patch-src_common_app__settings.cpp) = 826d0eb42ad777b61296b5b4a21787ce0707930b
 SHA1 (patch-src_common_global_shop_shop__data.h) = baddc1a5b2b9756d1a11b82b7f3ee36fd60de1ef
+SHA1 (patch-src_engine_video_text.h) = 515fa3822611fcbc7028b81975f3220aeb295c8a
 SHA1 (patch-src_main.cpp) = 2c8f826e34341f2a7a47c67886d6a6a3ce0fa819
+SHA1 (patch-src_utils_src_utils_gl__include.h) = 9f46181ef726a3b34cffaa6559acfff556cb61a5
 SHA1 (patch-src_utils_src_utils_ustring.cpp) = 988486c6b3f88f06ea50efdf9f4183e8f659f434

Index: pkgsrc/games/valyriatear/patches/patch-src_CMakeLists.txt
diff -u pkgsrc/games/valyriatear/patches/patch-src_CMakeLists.txt:1.1 pkgsrc/games/valyriatear/patches/patch-src_CMakeLists.txt:1.2
--- pkgsrc/games/valyriatear/patches/patch-src_CMakeLists.txt:1.1       Sun Apr  4 11:10:37 2021
+++ pkgsrc/games/valyriatear/patches/patch-src_CMakeLists.txt   Tue Mar 10 09:09:53 2026
@@ -1,6 +1,7 @@
-$NetBSD: patch-src_CMakeLists.txt,v 1.1 2021/04/04 11:10:37 nia Exp $
+$NetBSD: patch-src_CMakeLists.txt,v 1.2 2026/03/10 09:09:53 adam Exp $
 
 Use exact-lua-version-finding cmake script.
+Fix build on Darwin.
 
 --- src/CMakeLists.txt.orig    2019-09-13 15:35:59.000000000 +0000
 +++ src/CMakeLists.txt
@@ -13,3 +14,46 @@ Use exact-lua-version-finding cmake scri
  FIND_PACKAGE(PNG REQUIRED)
  FIND_PACKAGE(Gettext REQUIRED)
  FIND_PACKAGE(Boost 1.46.1 REQUIRED)
+@@ -106,8 +106,10 @@ IF (NOT DISABLE_TRANSLATIONS)
+         FIND_PACKAGE(Iconv REQUIRED)
+     ELSEIF (CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR BEOS OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+         FIND_PACKAGE(LibIntl REQUIRED)
++        IF (NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+         FIND_PACKAGE(LibIconv REQUIRED)
+-    ELSEIF (CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
++        ENDIF()
++    ELSEIF (CMAKE_SYSTEM_NAME STREQUAL "OpenBSD" OR CMAKE_SYSTEM_NAME STREQUAL "NetBSD")
+         FIND_PACKAGE(LibIntl REQUIRED)
+     ELSEIF (CMAKE_SYSTEM_NAME STREQUAL SunOS)
+         # explicit linking to libintl is required on Solaris
+@@ -451,6 +453,21 @@ IF (CMAKE_SYSTEM_NAME STREQUAL "OpenBSD"
+         ${X11_LIBRARIES}
+         ${LIBINTL_LIBRARIES}
+         ${EXTRA_LIBRARIES})
++ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
++    TARGET_LINK_LIBRARIES(valyriatear
++        ${INTERNAL_LIBRARIES}
++        ${SDL2_LIBRARY}
++        ${SDL2_TTF_LIBRARY}
++        ${SDL2_IMAGE_LIBRARY}
++        ${OPENGL_LIBRARIES}
++        ${GLEW_LIBRARY}
++        ${OPENAL_LIBRARY}
++        ${VORBISFILE_LIBRARIES}
++        ${PNG_LIBRARIES}
++        ${LUA_LIBRARIES}
++        ${LIBINTL_LIBRARIES}
++        ${EXTRA_LIBRARIES}
++        ${Iconv_LIBRARIES})
+ ELSE()
+     TARGET_LINK_LIBRARIES(valyriatear
+         ${INTERNAL_LIBRARIES}
+@@ -482,7 +499,7 @@ IF (UNIX)
+ ENDIF()
+ 
+ # Copy frameworks, resources etc.
+-if (APPLE)
++if (FALSE)
+     file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/../dat DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/../Resources/ FILES_MATCHING PATTERN "*.lua" PATTERN "*.png")
+     file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/../img DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/../Resources/ FILES_MATCHING PATTERN "*.lua" PATTERN "*.png" PATTERN "*.ttf")
+     file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/../mus DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/../Resources/ FILES_MATCHING PATTERN "*.ogg")

Added files:

Index: pkgsrc/games/valyriatear/patches/patch-CMake_Modules_FindSDL2__ttf.cmake
diff -u /dev/null pkgsrc/games/valyriatear/patches/patch-CMake_Modules_FindSDL2__ttf.cmake:1.1
--- /dev/null   Tue Mar 10 09:09:54 2026
+++ pkgsrc/games/valyriatear/patches/patch-CMake_Modules_FindSDL2__ttf.cmake    Tue Mar 10 09:09:53 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-CMake_Modules_FindSDL2__ttf.cmake,v 1.1 2026/03/10 09:09:53 adam Exp $
+
+Fix for newer CMake.
+
+--- CMake/Modules/FindSDL2_ttf.cmake.orig      2026-03-10 08:35:02.820680595 +0000
++++ CMake/Modules/FindSDL2_ttf.cmake
+@@ -74,7 +74,7 @@ endif()
+ set(SDL2_TTF_LIBRARIES ${SDL2_TTF_LIBRARY})
+ set(SDL2_TTF_INCLUDE_DIRS ${SDL2_TTF_INCLUDE_DIR})
+ 
+-# include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
++include(FindPackageHandleStandardArgs)
+ 
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2_ttf
+                                   REQUIRED_VARS SDL2_TTF_LIBRARIES SDL2_TTF_INCLUDE_DIRS
Index: pkgsrc/games/valyriatear/patches/patch-src_engine_video_text.h
diff -u /dev/null pkgsrc/games/valyriatear/patches/patch-src_engine_video_text.h:1.1
--- /dev/null   Tue Mar 10 09:09:54 2026
+++ pkgsrc/games/valyriatear/patches/patch-src_engine_video_text.h      Tue Mar 10 09:09:53 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_engine_video_text.h,v 1.1 2026/03/10 09:09:53 adam Exp $
+
+Avoid conflicting typedefs with SDL2_ttf.
+
+--- src/engine/video/text.h.orig       2026-03-10 08:43:28.184974680 +0000
++++ src/engine/video/text.h
+@@ -28,7 +28,7 @@
+ 
+ #include <map>
+ 
+-typedef struct _TTF_Font TTF_Font;
++#include <SDL2/SDL_ttf.h>
+ 
+ namespace vt_video
+ {
Index: pkgsrc/games/valyriatear/patches/patch-src_utils_src_utils_gl__include.h
diff -u /dev/null pkgsrc/games/valyriatear/patches/patch-src_utils_src_utils_gl__include.h:1.1
--- /dev/null   Tue Mar 10 09:09:54 2026
+++ pkgsrc/games/valyriatear/patches/patch-src_utils_src_utils_gl__include.h    Tue Mar 10 09:09:54 2026
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_utils_src_utils_gl__include.h,v 1.1 2026/03/10 09:09:54 adam Exp $
+
+Fix build on Darwin.
+
+--- src/utils/src/utils/gl_include.h.orig      2026-03-10 08:40:27.314681845 +0000
++++ src/utils/src/utils/gl_include.h
+@@ -11,11 +11,10 @@
+ #ifndef __GL_INCLUDE_HEADER__
+ #define __GL_INCLUDE_HEADER__
+ 
++#include <GL/glew.h>
+ #ifdef __APPLE__
+-#include <OpenGL/glew.h>
+ #include <OpenGL/gl.h>
+ #else
+-#include <GL/glew.h>
+ #include <GL/gl.h>
+ #endif
+

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/math/py-kiwisolver
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/math/py-kiwisolver
Indexes:

Home | Main Index | Thread Index | Old Index