CVS commit: pkgsrc/audio/milkytracker

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Aug 19 07:28:18 UTC 2025

Modified Files:
        pkgsrc/audio/milkytracker: Makefile distinfo
        pkgsrc/audio/milkytracker/patches: patch-CMakeLists.txt

Log Message:
milkytracker: fix build with cmake 4

Convert to cmake/build.mk


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 pkgsrc/audio/milkytracker/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/audio/milkytracker/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/audio/milkytracker/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/audio/milkytracker/Makefile
diff -u pkgsrc/audio/milkytracker/Makefile:1.29 pkgsrc/audio/milkytracker/Makefile:1.30
--- pkgsrc/audio/milkytracker/Makefile:1.29     Wed Feb 12 06:44:25 2025
+++ pkgsrc/audio/milkytracker/Makefile  Tue Aug 19 07:28:18 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2025/02/12 06:44:25 ryoon Exp $
+# $NetBSD: Makefile,v 1.30 2025/08/19 07:28:18 wiz Exp $
 
 DISTNAME=      milkytracker-1.04.00
 PKGREVISION=   3
@@ -12,7 +12,6 @@ HOMEPAGE=     https://milkytracker.org/
 COMMENT=       Music tracker inspired by Fast Tracker 2
 LICENSE=       gnu-gpl-v3
 
-USE_CMAKE=     yes
 USE_TOOLS+=    pkg-config
 USE_LANGUAGES= c c++11
 
@@ -34,6 +33,7 @@ post-install:
        ${INSTALL_DATA} ${WRKSRC}/resources/milkytracker.desktop \
                ${DESTDIR}${PREFIX}/share/applications
 
+.include "../../devel/cmake/build.mk"
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} != "Darwin"
 .include "../../archivers/lhasa/buildlink3.mk"

Index: pkgsrc/audio/milkytracker/distinfo
diff -u pkgsrc/audio/milkytracker/distinfo:1.15 pkgsrc/audio/milkytracker/distinfo:1.16
--- pkgsrc/audio/milkytracker/distinfo:1.15     Sat Jul 29 23:49:38 2023
+++ pkgsrc/audio/milkytracker/distinfo  Tue Aug 19 07:28:18 2025
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.15 2023/07/29 23:49:38 charlotte Exp $
+$NetBSD: distinfo,v 1.16 2025/08/19 07:28:18 wiz Exp $
 
 BLAKE2s (milkytracker-1.04.00.tar.gz) = eed572213484e863645a8714aacb58cd75d90b3e1cbb4db329f1edb496c81cd8
 SHA512 (milkytracker-1.04.00.tar.gz) = 5a41fa07d51880e220f15ff3f50e73b999931c875d31e627233669f5a07dfd38621478b8ec27b2242aa4ae6143a0d2ad51627a366fd366256331b71c47ad25da
 Size (milkytracker-1.04.00.tar.gz) = 3756275 bytes
-SHA1 (patch-CMakeLists.txt) = b4c6c17d5fac239213807a24f722b535209602ab
+SHA1 (patch-CMakeLists.txt) = 1acd34919e4be76dfade12f47493dee5dd60c031
 SHA1 (patch-docs_CMakeLists.txt) = 096dc06a4f898665a00d409cfb124925df9f93f6

Index: pkgsrc/audio/milkytracker/patches/patch-CMakeLists.txt
diff -u pkgsrc/audio/milkytracker/patches/patch-CMakeLists.txt:1.1 pkgsrc/audio/milkytracker/patches/patch-CMakeLists.txt:1.2
--- pkgsrc/audio/milkytracker/patches/patch-CMakeLists.txt:1.1  Sat Jul 29 23:49:38 2023
+++ pkgsrc/audio/milkytracker/patches/patch-CMakeLists.txt      Tue Aug 19 07:28:18 2025
@@ -1,9 +1,12 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2023/07/29 23:49:38 charlotte Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2025/08/19 07:28:18 wiz Exp $
 
 This code actually uses C++11 features.
 
---- CMakeLists.txt.orig        2023-07-29 16:39:59.293802020 -0700
-+++ CMakeLists.txt     2023-07-29 16:40:56.764591389 -0700
+Fix build with cmake 4.
+https://github.com/milkytracker/MilkyTracker/issues/393
+
+--- CMakeLists.txt.orig        2023-07-05 08:03:59.000000000 +0000
++++ CMakeLists.txt
 @@ -22,8 +22,8 @@
  cmake_minimum_required(VERSION 3.10)
  project(MilkyTracker)
@@ -15,3 +18,11 @@ This code actually uses C++11 features.
  set(CMAKE_CXX_EXTENSIONS OFF)
  
  # Enable IDE solution folders
+@@ -169,7 +169,6 @@ elseif(WIN32)
+ else()
+     # Workaround for SDL bug #3295, which occurs in SDL2 <2.0.5
+     # https://bugzilla.libsdl.org/show_bug.cgi?id=3295
+-    cmake_policy(SET CMP0004 OLD)
+ 
+     find_package(SDL2 REQUIRED)
+ endif()