CVS commit: pkgsrc/audio/strawberry

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/audio/strawberry
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Tue, 19 May 2026 14:36:35 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue May 19 14:36:35 UTC 2026

Modified Files:
        pkgsrc/audio/strawberry: Makefile PLIST distinfo options.mk
        pkgsrc/audio/strawberry/patches: patch-CMakeLists.txt
            patch-dist_CMakeLists.txt patch-src_analyzer_blockanalyzer.cpp

Log Message:
strawberry: updated to 1.2.19

1.2.19

Bugfixes:

Fixed MPRIS2 Play causing playback to restart if already playing
Fixed incorrect use beginInsertRows() / endInsertRows() of when adding / removing devices
Fixed album cover manager save cover to file not working
Fixed repeat and shuffle button sizes
Fixed MPRIS2 resetting previous played track history
Fixed Qobuz authentication

Enhancements:

Rewrote Discord RPC with Qt and removed RapidJSON dependency
New grouping shuffle mode
Use HTTP POST for AcoustID lookup
Write MusicBrainz Track Id when completing tags using MusicBrainz
Added rating filter to the collection


To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 pkgsrc/audio/strawberry/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/strawberry/PLIST
cvs rdiff -u -r1.27 -r1.28 pkgsrc/audio/strawberry/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/audio/strawberry/options.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/strawberry/patches/patch-CMakeLists.txt \
    pkgsrc/audio/strawberry/patches/patch-dist_CMakeLists.txt \
    pkgsrc/audio/strawberry/patches/patch-src_analyzer_blockanalyzer.cpp

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

Modified files:

Index: pkgsrc/audio/strawberry/Makefile
diff -u pkgsrc/audio/strawberry/Makefile:1.89 pkgsrc/audio/strawberry/Makefile:1.90
--- pkgsrc/audio/strawberry/Makefile:1.89       Fri May 15 09:58:40 2026
+++ pkgsrc/audio/strawberry/Makefile    Tue May 19 14:36:35 2026
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.89 2026/05/15 09:58:40 adam Exp $
+# $NetBSD: Makefile,v 1.90 2026/05/19 14:36:35 adam Exp $
 
-DISTNAME=      strawberry-1.0.23
-PKGREVISION=   22
+DISTNAME=      strawberry-1.2.19
 CATEGORIES=    audio
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=strawberrymusicplayer/}
 GITHUB_RELEASE=        ${PKGVERSION_NOREV}
@@ -12,11 +11,13 @@ HOMEPAGE=   https://www.strawberrymusicpla
 COMMENT=       Music player and music collection organizer (based on Clementine)
 LICENSE=       gnu-gpl-v3
 
-USE_LANGUAGES= c c++
-USE_TOOLS+=    pkg-config
+USE_CC_FEATURES=       c99
+USE_CXX_FEATURES=      c++11
+USE_LANGUAGES=         c c++
+USE_TOOLS+=            pkg-config
 
-CMAKE_CONFIGURE_ARGS+= -DBUILD_WITH_QT5=ON
-CMAKE_CONFIGURE_ARGS+= -DBUILD_WITH_QT6=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_QTSPARKLE=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_SPARKLE=OFF
 CMAKE_CONFIGURE_ARGS+= -DUSE_BUNDLE=OFF
 
 DEPENDS+=      gst-plugins1-flac-[0-9]*:../../audio/gst-plugins1-flac
@@ -29,11 +30,11 @@ USE_CXX_FEATURES+=  c++17
 
 .include "../../mk/oss.buildlink3.mk"
 
-.if ${OPSYS} == "Linux"
+.if ${OPSYS} != "Darwin"
 DEPENDS+=      gst-plugins1-alsa-[0-9]*:../../audio/gst-plugins1-alsa
 .  include "../../audio/alsa-lib/buildlink3.mk"
-.else
-CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_ALSA=TRUE
+#.else
+#CMAKE_CONFIGURE_ARGS+=        -DCMAKE_DISABLE_FIND_PACKAGE_ALSA=TRUE
 .endif
 
 .if ${OPSYS} != "Linux" && ${OSS_TYPE} != "none"
@@ -44,26 +45,25 @@ DEPENDS+=   gst-plugins1-oss-[0-9]*:../../
 PREFER.sqlite3=                pkgsrc # fts5
 .endif
 
-INSTALLATION_DIRS+=    ${PKGMANDIR}/man1
-
 CHECK_PORTABILITY_SKIP+=       dist/macos/macversion.sh
 
-post-install:
-       ${MV} ${DESTDIR}${PREFIX}/share/man/man1/* \
-           ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 || ${TRUE}
-
 .include "options.mk"
+
 .include "../../audio/chromaprint/buildlink3.mk"
 .include "../../audio/libebur128/buildlink3.mk"
+.include "../../audio/libgpod/buildlink3.mk"
 .include "../../audio/taglib/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../devel/cmake/build.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libmtp/buildlink3.mk"
+.include "../../devel/qt6-qttools/buildlink3.mk"
 .include "../../devel/protobuf/buildlink3.mk"
+.include "../../devel/sparsehash/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../math/fftw/buildlink3.mk"
+.include "../../misc/kdsingleapplication/buildlink3.mk"
 .include "../../misc/libcdio/buildlink3.mk"
 .include "../../multimedia/gst-plugins1-base/buildlink3.mk"
 .include "../../multimedia/gst-plugins1-good/buildlink3.mk"
@@ -73,4 +73,5 @@ post-install:
 .if ${OPSYS} != "Darwin"
 .  include "../../x11/libxcb/buildlink3.mk"
 .endif
+.include "../../x11/qt6-qtbase/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/audio/strawberry/PLIST
diff -u pkgsrc/audio/strawberry/PLIST:1.1 pkgsrc/audio/strawberry/PLIST:1.2
--- pkgsrc/audio/strawberry/PLIST:1.1   Fri May 15 17:38:35 2020
+++ pkgsrc/audio/strawberry/PLIST       Tue May 19 14:36:35 2026
@@ -1,7 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2020/05/15 17:38:35 nia Exp $
+@comment $NetBSD: PLIST,v 1.2 2026/05/19 14:36:35 adam Exp $
 bin/strawberry
-bin/strawberry-tagreader
-man/man1/strawberry-tagreader.1
 man/man1/strawberry.1
 share/applications/org.strawberrymusicplayer.strawberry.desktop
 share/icons/hicolor/128x128/apps/strawberry.png

Index: pkgsrc/audio/strawberry/distinfo
diff -u pkgsrc/audio/strawberry/distinfo:1.27 pkgsrc/audio/strawberry/distinfo:1.28
--- pkgsrc/audio/strawberry/distinfo:1.27       Tue Apr 30 19:09:51 2024
+++ pkgsrc/audio/strawberry/distinfo    Tue May 19 14:36:35 2026
@@ -1,12 +1,9 @@
-$NetBSD: distinfo,v 1.27 2024/04/30 19:09:51 wiz Exp $
+$NetBSD: distinfo,v 1.28 2026/05/19 14:36:35 adam Exp $
 
-BLAKE2s (strawberry-1.0.23.tar.xz) = cdcd61c52ea68ad6d0677e0e7a82b80095be28f5347f34981c7480c688ba620f
-SHA512 (strawberry-1.0.23.tar.xz) = f3249e97b2f0130dadf2a5fcfc128d7054accd6b86cf088a3a45549c584529aefbadaf09e9ed074af85c679495b03ad700e78f6952e913a40b38eaf7c77d5adb
-Size (strawberry-1.0.23.tar.xz) = 11297440 bytes
-SHA1 (patch-CMakeLists.txt) = f34ff2387d1246a63a1bc08978fef43bf8ae12d0
-SHA1 (patch-dist_CMakeLists.txt) = 9c2ffc79cb54224a3321a6655815b66531057e38
-SHA1 (patch-ext_strawberry-tagreader_CMakeLists.txt) = 77bdd8371151d3c870783d4668d99299719922a1
-SHA1 (patch-src_CMakeLists.txt) = de97b8c8225924dcb2a3523b24023b62b54184d8
-SHA1 (patch-src_analyzer_blockanalyzer.cpp) = e1e22a4ea278f03142f13fd8310730854a8ddc9a
+BLAKE2s (strawberry-1.2.19.tar.xz) = cec6cbcd8fb05ef5786e18ec29f605699b855821cb94069dcb7c3076a2eb3c8a
+SHA512 (strawberry-1.2.19.tar.xz) = e5da4868115c4021c624b66c946243564ebf0fedb321939097c7da7e69b3ff772bd2e7f05fbcc541773bf89d0ce70b7b4d0415565d353c1ed20a7c56a033cda2
+Size (strawberry-1.2.19.tar.xz) = 11542036 bytes
+SHA1 (patch-CMakeLists.txt) = 97e61ba9af9c09fe21ed452f4727131a06847941
+SHA1 (patch-dist_CMakeLists.txt) = 8abaef03d614bfb0607f4a99647557f352ea7e5a
+SHA1 (patch-src_analyzer_blockanalyzer.cpp) = b798929eb1dc57647014c24116f249601e973789
 SHA1 (patch-src_analyzer_boomanalyzer.cpp) = ae0cc1b61ed4492a2562c3c954b6dd797ef63e5d
-SHA1 (patch-src_utilities_transliterate.cpp) = da900803acd33d2f370fc7792c31c56cdda4f328

Index: pkgsrc/audio/strawberry/options.mk
diff -u pkgsrc/audio/strawberry/options.mk:1.3 pkgsrc/audio/strawberry/options.mk:1.4
--- pkgsrc/audio/strawberry/options.mk:1.3      Sun Aug 25 06:18:25 2024
+++ pkgsrc/audio/strawberry/options.mk  Tue May 19 14:36:35 2026
@@ -1,35 +1,13 @@
-# $NetBSD: options.mk,v 1.3 2024/08/25 06:18:25 wiz Exp $
+# $NetBSD: options.mk,v 1.4 2026/05/19 14:36:35 adam Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.strawberry
 PKG_SUPPORTED_OPTIONS=         pulseaudio
-PKG_OPTIONS_OPTIONAL_GROUPS=   gui
-PKG_OPTIONS_GROUP.gui=         qt5 qt6
-PKG_SUGGESTED_OPTIONS=         qt5
 
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mpulseaudio)
-CMAKE_CONFIGURE_ARGS+= -DLIBPULSE=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_PULSE=ON
 .  include "../../audio/pulseaudio/buildlink3.mk"
 .else
-CMAKE_CONFIGURE_ARGS+= -DLIBPULSE=OFF
-.endif
-
-.if !empty(PKG_OPTIONS:Mqt5) || !empty(PKG_OPTIONS:Mqt6)
-.  if !empty(PKG_OPTIONS:Mqt5)
-TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools
-CMAKE_CONFIGURE_ARGS+= -DBUILD_WITH_QT5=ON
-CMAKE_CONFIGURE_ARGS+= -DBUILD_WITH_QT6=OFF
-.    include "../../x11/qt5-qtbase/buildlink3.mk"
-.    if ${OPSYS} != "Darwin"
-.      include "../../x11/qt5-qtx11extras/buildlink3.mk"
-.    else
-.      include "../../x11/qt5-qtmacextras/buildlink3.mk"
-.    endif
-.  elif !empty(PKG_OPTIONS:Mqt6)
-TOOL_DEPENDS+= qt6-qttools-[0-9]*:../../devel/qt6-qttools
-CMAKE_CONFIGURE_ARGS+= -DBUILD_WITH_QT5=OFF
-CMAKE_CONFIGURE_ARGS+= -DBUILD_WITH_QT6=ON
-.    include "../../x11/qt6-qtbase/buildlink3.mk"
-.  endif
+CMAKE_CONFIGURE_ARGS+= -DENABLE_PULSE=OFF
 .endif

Index: pkgsrc/audio/strawberry/patches/patch-CMakeLists.txt
diff -u pkgsrc/audio/strawberry/patches/patch-CMakeLists.txt:1.1 pkgsrc/audio/strawberry/patches/patch-CMakeLists.txt:1.2
--- pkgsrc/audio/strawberry/patches/patch-CMakeLists.txt:1.1    Tue Aug 22 20:26:30 2023
+++ pkgsrc/audio/strawberry/patches/patch-CMakeLists.txt        Tue May 19 14:36:35 2026
@@ -1,20 +1,40 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2023/08/22 20:26:30 adam Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2026/05/19 14:36:35 adam Exp $
 
 We don't need another packaging system.
+Don't make app bundle on Darwin.
 
---- CMakeLists.txt.orig        2023-06-29 17:49:42.000000000 +0000
+--- CMakeLists.txt.orig        2026-04-17 18:27:01.841352595 +0000
 +++ CMakeLists.txt
-@@ -28,13 +28,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
-   set(OPENBSD ON)
+@@ -26,12 +26,12 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+   set(LINUX ON)
  endif()
  
 -if(LINUX)
--  include(cmake/Rpm.cmake)
--  include(cmake/Deb.cmake)
--endif()
++if(FALSE)
+   include(cmake/Rpm.cmake)
+   include(cmake/Deb.cmake)
+ endif()
+ 
+-if(APPLE)
++if(FALSE)
+   include(cmake/Dmg.cmake)
+ endif()
+ 
+@@ -406,7 +406,7 @@ endif()
+ 
+ add_executable(strawberry)
+ 
 -if(APPLE)
--  include(cmake/Dmg.cmake)
--endif()
++if(FALSE)
+   set_target_properties(strawberry PROPERTIES MACOSX_BUNDLE TRUE)
+   set_target_properties(strawberry PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_BINARY_DIR}/dist/macos/Info.plist")
+ endif()
+@@ -1588,7 +1588,7 @@ endif()
  
- set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
+ target_link_libraries(strawberry PUBLIC strawberry_lib)
+ 
+-if(NOT APPLE)
++if(TRUE)
+   install(TARGETS strawberry RUNTIME DESTINATION bin)
+ endif()
  
Index: pkgsrc/audio/strawberry/patches/patch-dist_CMakeLists.txt
diff -u pkgsrc/audio/strawberry/patches/patch-dist_CMakeLists.txt:1.1 pkgsrc/audio/strawberry/patches/patch-dist_CMakeLists.txt:1.2
--- pkgsrc/audio/strawberry/patches/patch-dist_CMakeLists.txt:1.1       Tue Aug 22 20:26:30 2023
+++ pkgsrc/audio/strawberry/patches/patch-dist_CMakeLists.txt   Tue May 19 14:36:35 2026
@@ -1,22 +1,22 @@
-$NetBSD: patch-dist_CMakeLists.txt,v 1.1 2023/08/22 20:26:30 adam Exp $
+$NetBSD: patch-dist_CMakeLists.txt,v 1.2 2026/05/19 14:36:35 adam Exp $
 
 Don't install as bundle on Darwin.
+Use correct mandir.
 
---- dist/CMakeLists.txt.orig   2023-08-21 18:56:57.000000000 +0000
+--- dist/CMakeLists.txt.orig   2026-04-17 18:27:01.898133637 +0000
 +++ dist/CMakeLists.txt
-@@ -3,24 +3,24 @@ if(RPM_DISTRO AND RPM_DATE)
-   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/unix/strawberry.spec.in ${CMAKE_CURRENT_SOURCE_DIR}/unix/strawberry.spec @ONLY)
- endif(RPM_DISTRO AND RPM_DATE)
+@@ -3,7 +3,7 @@ if(RPM_DISTRO AND RPM_DATE)
+   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/unix/strawberry.spec.in ${CMAKE_BINARY_DIR}/strawberry.spec @ONLY)
+ endif()
  
 -if(APPLE)
 +if(FALSE)
-   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/macos/Info.plist.in ${CMAKE_CURRENT_SOURCE_DIR}/macos/Info.plist)
--endif(APPLE)
-+endif(FALSE)
- 
- if(WIN32)
-   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/windows/strawberry.nsi.in ${CMAKE_CURRENT_SOURCE_DIR}/windows/strawberry.nsi @ONLY)
- endif(WIN32)
+   if(DEFINED ENV{MACOSX_DEPLOYMENT_TARGET})
+     set(LSMinimumSystemVersion $ENV{MACOSX_DEPLOYMENT_TARGET})
+   else()
+@@ -17,16 +17,16 @@ if(WIN32)
+   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/windows/strawberry.nsi.in ${CMAKE_BINARY_DIR}/strawberry.nsi @ONLY)
+ endif()
  
 -if(UNIX AND NOT APPLE)
 +if(UNIX)
@@ -25,12 +25,12 @@ Don't install as bundle on Darwin.
    install(FILES ../data/icons/128x128/strawberry.png DESTINATION share/icons/hicolor/128x128/apps/)
    install(FILES unix/org.strawberrymusicplayer.strawberry.desktop DESTINATION share/applications)
    install(FILES unix/org.strawberrymusicplayer.strawberry.appdata.xml DESTINATION share/metainfo)
-   install(FILES unix/strawberry.1 unix/strawberry-tagreader.1 DESTINATION share/man/man1)
--endif(UNIX AND NOT APPLE)
-+endif(UNIX)
+-  install(FILES unix/strawberry.1 DESTINATION share/man/man1)
++  install(FILES unix/strawberry.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
+ endif()
  
 -if(APPLE)
 +if(FALSE)
-   install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/macos/Info.plist" DESTINATION "${CMAKE_BINARY_DIR}/strawberry.app/Contents")
+   install(FILES "${CMAKE_CURRENT_BINARY_DIR}/macos/Info.plist" DESTINATION "${CMAKE_BINARY_DIR}/strawberry.app/Contents")
    install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/macos/strawberry.icns" DESTINATION "${CMAKE_BINARY_DIR}/strawberry.app/Contents/Resources")
  endif()
Index: pkgsrc/audio/strawberry/patches/patch-src_analyzer_blockanalyzer.cpp
diff -u pkgsrc/audio/strawberry/patches/patch-src_analyzer_blockanalyzer.cpp:1.1 pkgsrc/audio/strawberry/patches/patch-src_analyzer_blockanalyzer.cpp:1.2
--- pkgsrc/audio/strawberry/patches/patch-src_analyzer_blockanalyzer.cpp:1.1    Mon Apr 25 15:19:48 2022
+++ pkgsrc/audio/strawberry/patches/patch-src_analyzer_blockanalyzer.cpp        Tue May 19 14:36:35 2026
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_analyzer_blockanalyzer.cpp,v 1.1 2022/04/25 15:19:48 tnn Exp $
+$NetBSD: patch-src_analyzer_blockanalyzer.cpp,v 1.2 2026/05/19 14:36:35 adam Exp $
 
-avoid ambiguous math functions
+Avoid ambiguous math functions.
 
---- src/analyzer/blockanalyzer.cpp.orig        2022-03-26 20:21:03.329168404 +0000
+--- src/analyzer/blockanalyzer.cpp.orig        2026-04-17 18:27:01.902890881 +0000
 +++ src/analyzer/blockanalyzer.cpp
 @@ -36,6 +36,8 @@
  #include "analyzerbase.h"
@@ -10,6 +10,6 @@ avoid ambiguous math functions
  
 +using std::log10;
 +
- const int BlockAnalyzer::kHeight = 2;
- const int BlockAnalyzer::kWidth = 4;
- const int BlockAnalyzer::kMinRows = 3;       // arbitrary
+ namespace {
+ constexpr int kHeight = 2;
+ constexpr int kWidth = 4;

Prev by Date: CVS commit: pkgsrc/misc
Next by Date: CVS commit: pkgsrc/audio/strawberry/patches
Previous by Thread: CVS commit: pkgsrc/misc
Next by Thread: CVS commit: pkgsrc/audio/strawberry/patches
Indexes:

Home | Main Index | Thread Index | Old Index