CVS commit: pkgsrc/audio/lmms

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/audio/lmms
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Tue, 19 Aug 2025 07:20:26 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Aug 19 07:20:26 UTC 2025

Modified Files:
        pkgsrc/audio/lmms: Makefile distinfo
        pkgsrc/audio/lmms/patches: patch-CMakeLists.txt
            patch-src_CMakeLists.txt
Added Files:
        pkgsrc/audio/lmms/patches: patch-cmake_modules_BuildPlugin.cmake
            patch-plugins_vst__base_CMakeLists.txt
            patch-src_3rdparty_qt5-x11embed_CMakeLists.txt

Log Message:
lmms: fix build with cmake 4


To generate a diff of this commit:
cvs rdiff -u -r1.103 -r1.104 pkgsrc/audio/lmms/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/audio/lmms/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/audio/lmms/patches/patch-CMakeLists.txt
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/audio/lmms/patches/patch-cmake_modules_BuildPlugin.cmake \
    pkgsrc/audio/lmms/patches/patch-plugins_vst__base_CMakeLists.txt \
    pkgsrc/audio/lmms/patches/patch-src_3rdparty_qt5-x11embed_CMakeLists.txt
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/lmms/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/audio/lmms/Makefile
diff -u pkgsrc/audio/lmms/Makefile:1.103 pkgsrc/audio/lmms/Makefile:1.104
--- pkgsrc/audio/lmms/Makefile:1.103    Thu Apr 24 14:13:14 2025
+++ pkgsrc/audio/lmms/Makefile  Tue Aug 19 07:20:26 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.103 2025/04/24 14:13:14 wiz Exp $
+# $NetBSD: Makefile,v 1.104 2025/08/19 07:20:26 wiz Exp $
 
 DISTNAME=      lmms_1.2.2
 PKGNAME=       ${DISTNAME:S/_/-/1}
@@ -17,7 +17,6 @@ LICENSE=      gnu-gpl-v2
 TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools
 
 WRKSRC=                ${WRKDIR}/lmms
-USE_CMAKE=     yes
 USE_TOOLS+=    pkg-config
 USE_LANGUAGES= c c++
 
@@ -35,6 +34,7 @@ CMAKE_CONFIGURE_ARGS+=        -DWANT_CARLA=OFF 
 CMAKE_CONFIGURE_ARGS+= -DWANT_SOUNDIO=OFF # requires libsoundio
 CMAKE_CONFIGURE_ARGS+= -DWANT_SNDIO=OFF # requires sndio
 CMAKE_CONFIGURE_ARGS+= -DWANT_VST_NOWINE=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_POLICY_VERSION_MINIMUM=3.5
 
 # for libzynaddsubfx.so in plugins/zynaddsubfx/.
 LDFLAGS+=      ${COMPILER_RPATH_FLAG}${PREFIX}/lib/lmms
@@ -45,6 +45,7 @@ BUILDLINK_TRANSFORM+= rm:-floop-optimize
 
 CHECK_PORTABILITY_SKIP+=       cmake/linux/package_linux.sh.in
 
+.include "../../devel/cmake/build.mk"
 .include "options.mk"
 .include "../../audio/fluidsynth/buildlink3.mk"
 .include "../../audio/lame/buildlink3.mk"

Index: pkgsrc/audio/lmms/distinfo
diff -u pkgsrc/audio/lmms/distinfo:1.16 pkgsrc/audio/lmms/distinfo:1.17
--- pkgsrc/audio/lmms/distinfo:1.16     Fri Jan 14 10:59:32 2022
+++ pkgsrc/audio/lmms/distinfo  Tue Aug 19 07:20:26 2025
@@ -1,9 +1,12 @@
-$NetBSD: distinfo,v 1.16 2022/01/14 10:59:32 nia Exp $
+$NetBSD: distinfo,v 1.17 2025/08/19 07:20:26 wiz Exp $
 
 BLAKE2s (lmms_1.2.2.tar.xz) = 332b1a6f78341a5766ccb4cddc9968ab97ba04150741421c89169a367f190acb
 SHA512 (lmms_1.2.2.tar.xz) = df74d9e938f1c3807e9941b11db4ccfe9450e23b723c82774de15b7666ac39f1bfdd8519231e28849f994628190ecc92fa05d55bbc0b50a4421f2d183e729028
 Size (lmms_1.2.2.tar.xz) = 22733960 bytes
-SHA1 (patch-CMakeLists.txt) = e30599b486c83b734fd8f9afa4cf2bd488eab338
-SHA1 (patch-src_CMakeLists.txt) = 92acfc9bc236c1b211bbe9686de818641c01b257
+SHA1 (patch-CMakeLists.txt) = dee00450d0ca7089ca66b5b1a49df1f7f51a4533
+SHA1 (patch-cmake_modules_BuildPlugin.cmake) = cbf13f5eab53cd1dbab6778777d17d1e0ac7cdf4
+SHA1 (patch-plugins_vst__base_CMakeLists.txt) = 7d6a97bb9bdd00a48261407306663ee568e3b10b
+SHA1 (patch-src_3rdparty_qt5-x11embed_CMakeLists.txt) = 6721d6f7780b6fcee9f5853cee33a3d44fd69758
+SHA1 (patch-src_CMakeLists.txt) = 1c60d02e69426490c3b118d54626e21d603bd766
 SHA1 (patch-src_core_audio_AudioOss.cpp) = 6bc591b929f26cbfb5f160c3d9b49316bf165e58
 SHA1 (patch-src_core_midi_MidiOss.cpp) = 5baf2619765f8a7372cd47ac0f3fb6a2fb3af618

Index: pkgsrc/audio/lmms/patches/patch-CMakeLists.txt
diff -u pkgsrc/audio/lmms/patches/patch-CMakeLists.txt:1.2 pkgsrc/audio/lmms/patches/patch-CMakeLists.txt:1.3
--- pkgsrc/audio/lmms/patches/patch-CMakeLists.txt:1.2  Mon Jun 10 19:08:42 2019
+++ pkgsrc/audio/lmms/patches/patch-CMakeLists.txt      Tue Aug 19 07:20:26 2025
@@ -1,10 +1,41 @@
-$NetBSD: patch-CMakeLists.txt,v 1.2 2019/06/10 19:08:42 nia Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.3 2025/08/19 07:20:26 wiz Exp $
 
+cmake 4 compatibility using arch patch.
+https://gitlab.archlinux.org/archlinux/packaging/packages/lmms/-/blob/main/cmake-4.patch?ref_type=heads
 Install plain (un-gzipped) man page.
 
 --- CMakeLists.txt.orig        2018-11-03 01:43:42.000000000 +0000
 +++ CMakeLists.txt
-@@ -563,16 +563,6 @@ ADD_SUBDIRECTORY(doc)
+@@ -1,19 +1,9 @@
+-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.7)
++CMAKE_MINIMUM_REQUIRED(VERSION 3.5)
+ 
+ PROJECT(lmms)
+ 
+ SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" ${CMAKE_MODULE_PATH})
+ 
+-IF(COMMAND CMAKE_POLICY)
+-      CMAKE_POLICY(SET CMP0005 NEW)
+-      CMAKE_POLICY(SET CMP0003 NEW)
+-      IF (CMAKE_MAJOR_VERSION GREATER 2)
+-              CMAKE_POLICY(SET CMP0026 OLD)
+-              CMAKE_POLICY(SET CMP0045 NEW)
+-              CMAKE_POLICY(SET CMP0050 OLD)
+-      ENDIF()
+-ENDIF(COMMAND CMAKE_POLICY)
+-
+ INCLUDE(AddFileDependencies)
+ INCLUDE(CheckIncludeFiles)
+ INCLUDE(FindPkgConfig)
+@@ -539,7 +529,6 @@ IF(WIN32 OR WIN64)
+       ADD_CUSTOM_TARGET(bin2res COMMAND g++ "\"${BIN2RES_CPP}\"" -o "\"${BIN2RES}\"" DEPENDS "${BIN2RES_CPP}")
+ ELSE(WIN32 OR WIN64)
+       ADD_EXECUTABLE(bin2res buildtools/bin2res.cpp)
+-      GET_TARGET_PROPERTY(BIN2RES bin2res LOCATION)
+ ENDIF(WIN32 OR WIN64)
+ 
+ # we somehow have to make LMMS-binary depend on MOC-files
+@@ -575,16 +564,6 @@ ADD_SUBDIRECTORY(doc)
  # post-install tasks
  ADD_SUBDIRECTORY(cmake/postinstall)
  

Index: pkgsrc/audio/lmms/patches/patch-src_CMakeLists.txt
diff -u pkgsrc/audio/lmms/patches/patch-src_CMakeLists.txt:1.1 pkgsrc/audio/lmms/patches/patch-src_CMakeLists.txt:1.2
--- pkgsrc/audio/lmms/patches/patch-src_CMakeLists.txt:1.1      Mon Jun 10 19:08:42 2019
+++ pkgsrc/audio/lmms/patches/patch-src_CMakeLists.txt  Tue Aug 19 07:20:26 2025
@@ -1,9 +1,21 @@
-$NetBSD: patch-src_CMakeLists.txt,v 1.1 2019/06/10 19:08:42 nia Exp $
+$NetBSD: patch-src_CMakeLists.txt,v 1.2 2025/08/19 07:20:26 wiz Exp $
+
+cmake 4 compatibility using arch patch.
+https://gitlab.archlinux.org/archlinux/packaging/packages/lmms/-/blob/main/cmake-4.patch?ref_type=heads
 
 Install uncompressed man pages to the correct location.
 
 --- src/CMakeLists.txt.orig    2018-11-03 01:43:42.000000000 +0000
 +++ src/CMakeLists.txt
+@@ -45,7 +45,7 @@ ENDIF()
+ 
+ SET(lmms_EMBEDDED_RESOURCES "${CMAKE_SOURCE_DIR}/doc/AUTHORS" "${CMAKE_SOURCE_DIR}/LICENSE.txt" "${CONTRIBUTORS}")
+ SET(LMMS_ER_H "${CMAKE_CURRENT_BINARY_DIR}/embedded_resources.h")
+-ADD_CUSTOM_COMMAND(OUTPUT "${LMMS_ER_H}" COMMAND "${BIN2RES}" ARGS ${lmms_EMBEDDED_RESOURCES} > "${LMMS_ER_H}" DEPENDS bin2res)
++ADD_CUSTOM_COMMAND(OUTPUT "${LMMS_ER_H}" COMMAND bin2res ARGS ${lmms_EMBEDDED_RESOURCES} > "${LMMS_ER_H}" DEPENDS bin2res)
+ 
+ # Paths relative to lmms executable
+ FILE(RELATIVE_PATH LIB_DIR_RELATIVE "/${BIN_DIR}" "/${LIB_DIR}")
 @@ -113,7 +113,7 @@ ELSE()
        )
  ENDIF()
@@ -18,6 +30,6 @@ Install uncompressed man pages to the co
  
        INSTALL(TARGETS lmms RUNTIME DESTINATION "${BIN_DIR}")
 -      INSTALL(FILES "${CMAKE_BINARY_DIR}/lmms.1.gz" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man1/" PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
-+      INSTALL(FILES "${CMAKE_BINARY_DIR}/doc/lmms.1" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_MANDIR}/man1/" PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
++      INSTALL(FILES "${CMAKE_SOURCE_DIR}/doc/lmms.1" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_MANDIR}/man1/" PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
  
  ENDIF(LMMS_BUILD_WIN32)

Added files:

Index: pkgsrc/audio/lmms/patches/patch-cmake_modules_BuildPlugin.cmake
diff -u /dev/null pkgsrc/audio/lmms/patches/patch-cmake_modules_BuildPlugin.cmake:1.1
--- /dev/null   Tue Aug 19 07:20:26 2025
+++ pkgsrc/audio/lmms/patches/patch-cmake_modules_BuildPlugin.cmake     Tue Aug 19 07:20:26 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-cmake_modules_BuildPlugin.cmake,v 1.1 2025/08/19 07:20:26 wiz Exp $
+
+cmake 4 compatibility using arch patch.
+https://gitlab.archlinux.org/archlinux/packaging/packages/lmms/-/blob/main/cmake-4.patch?ref_type=heads
+
+--- cmake/modules/BuildPlugin.cmake.orig       2018-11-03 01:43:42.000000000 +0000
++++ cmake/modules/BuildPlugin.cmake
+@@ -27,7 +27,7 @@ MACRO(BUILD_PLUGIN PLUGIN_NAME)
+ 
+               SET(ER_H "${CMAKE_CURRENT_BINARY_DIR}/embedded_resources.h")
+               ADD_CUSTOM_COMMAND(OUTPUT ${ER_H}
+-                      COMMAND ${BIN2RES}
++                      COMMAND bin2res
+                       ARGS ${PLUGIN_EMBEDDED_RESOURCES} > "${ER_H}"
+                       DEPENDS bin2res)
+       ENDIF(ER_LEN)
Index: pkgsrc/audio/lmms/patches/patch-plugins_vst__base_CMakeLists.txt
diff -u /dev/null pkgsrc/audio/lmms/patches/patch-plugins_vst__base_CMakeLists.txt:1.1
--- /dev/null   Tue Aug 19 07:20:26 2025
+++ pkgsrc/audio/lmms/patches/patch-plugins_vst__base_CMakeLists.txt    Tue Aug 19 07:20:26 2025
@@ -0,0 +1,20 @@
+$NetBSD: patch-plugins_vst__base_CMakeLists.txt,v 1.1 2025/08/19 07:20:26 wiz Exp $
+
+cmake 4 compatibility using arch patch.
+https://gitlab.archlinux.org/archlinux/packaging/packages/lmms/-/blob/main/cmake-4.patch?ref_type=heads
+
+--- plugins/vst_base/CMakeLists.txt.orig       2018-11-03 01:43:42.000000000 +0000
++++ plugins/vst_base/CMakeLists.txt
+@@ -78,11 +78,10 @@ ENDIF()
+ set(ENV{PATH} "$ENV{PATH}:${WINE_BINDIR}")
+ 
+ ADD_CUSTOM_COMMAND(
+-      SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/RemoteVstPlugin.cpp"
+       COMMAND export
+               ARGS "PATH=$PATH:${WINE_BINDIR}"
+       COMMAND ${WINE_CXX}
+-      ARGS ${WINE_CXX_ARGS}
++      ARGS ${WINE_CXX_ARGS} "${CMAKE_CURRENT_SOURCE_DIR}/RemoteVstPlugin.cpp"
+       # Ensure correct file extension
+       COMMAND sh -c "mv ../RemoteVstPlugin.exe ../RemoteVstPlugin || true"
+       TARGET vstbase
Index: pkgsrc/audio/lmms/patches/patch-src_3rdparty_qt5-x11embed_CMakeLists.txt
diff -u /dev/null pkgsrc/audio/lmms/patches/patch-src_3rdparty_qt5-x11embed_CMakeLists.txt:1.1
--- /dev/null   Tue Aug 19 07:20:26 2025
+++ pkgsrc/audio/lmms/patches/patch-src_3rdparty_qt5-x11embed_CMakeLists.txt    Tue Aug 19 07:20:26 2025
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_3rdparty_qt5-x11embed_CMakeLists.txt,v 1.1 2025/08/19 07:20:26 wiz Exp $
+
+cmake 4 compatibility using arch patch.
+https://gitlab.archlinux.org/archlinux/packaging/packages/lmms/-/blob/main/cmake-4.patch?ref_type=heads
+
+--- src/3rdparty/qt5-x11embed/CMakeLists.txt.orig      2018-11-03 01:43:42.000000000 +0000
++++ src/3rdparty/qt5-x11embed/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
++cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
+ project(qt5-x11embed)
+ 
+ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/ECM/find-modules")

Prev by Date: CVS commit: pkgsrc/audio/lmms
Next by Date: CVS commit: pkgsrc/audio/milkytracker
Previous by Thread: CVS commit: pkgsrc/audio/lmms
Next by Thread: CVS commit: pkgsrc/audio/milkytracker
Indexes:

Home | Main Index | Thread Index | Old Index