Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id E61A584D21 for ; Tue, 22 Aug 2023 20:26:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id DilrrAhXNqjk for ; Tue, 22 Aug 2023 20:26:30 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 5990384CD7 for ; Tue, 22 Aug 2023 20:26:30 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 4B66EFBDB; Tue, 22 Aug 2023 20:26:30 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_16927359903660" MIME-Version: 1.0 Date: Tue, 22 Aug 2023 20:26:30 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/audio/strawberry To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20230822202630.4B66EFBDB@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_16927359903660 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Tue Aug 22 20:26:30 UTC 2023 Modified Files: pkgsrc/audio/strawberry: Makefile distinfo options.mk pkgsrc/audio/strawberry/patches: patch-src_analyzer_boomanalyzer.cpp Added Files: pkgsrc/audio/strawberry/patches: patch-3rdparty_macdeployqt_shared.cpp patch-CMakeLists.txt patch-dist_CMakeLists.txt patch-ext_strawberry-tagreader_CMakeLists.txt patch-src_CMakeLists.txt Log Message: strawberry: updated to 1.0.18 Pkgsrc: - Qt6 as an option - Builds on Darwin Strawberry 1.0.18 Bugfixes: Fixed reading disc from QObuz songs Fixed volume being reset on playback with PulseAudio Fixed
tags in SQL query error message. Fixed compile with Qt 6 without XCB (QX11Application). Fixed smart playlist editor not properly loading search terms Fixed use of fixed icon for playlist favorite star icon Possible fix for collection thumbnails using disk cache having identical covers for albums with hashtag Fixed listenbrainz scrobbling for songs with multiple artist mbids. Fixed listenbrainz scrobbling for songs without duration. Fixed gapless playback sometimes not working. Fixed writing PNG images as embedded covers Fixed greyscale album covers not working in OSD D-Bus Fixed collection thumbnail disk cache with Qt 6.5.1 and newer. Fixed moodbar disk cache with Qt 6.5.1 and newer. Fixed playlist edit tag F2 shortcut only working for title tag Append number to filename if the destination file already exist when transcoding audio Fixed abseil linking issues with protobuf 1.22.0 and newer. (macOS) Fixed "Show this message" checkbox having no affect on Rosetta warning dialog (macOS) Disable unused D-Bus. (Windows) Fixed command line options not working with diacritics (Windows) Fixed issue with saving album covers in album directory being saved in temp directory instead. (Windows) Fixed crash when trying a play a song which doesn't exist Enhancements: Reduce memory overhead with album cover handling Improved listenbrainz error handling. Show error dialog for listenbrainz errors similar to last.fm/libre.fm. Reduce NetworkAccessManager instances. Replace SingleApplication with KDSingleApplication. Require Qt 5.12 or higher. Add new database fields for art_embedded and art_unset. Rewrite album cover loader. Move cover filename settings from collection to covers settings. Add setting to set priorities for album cover types. Add rating filtering to playlist search (Windows|MSVC) Add WSAPI2 plugin. To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 pkgsrc/audio/strawberry/Makefile cvs rdiff -u -r1.24 -r1.25 pkgsrc/audio/strawberry/distinfo cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/strawberry/options.mk cvs rdiff -u -r0 -r1.1 \ pkgsrc/audio/strawberry/patches/patch-3rdparty_macdeployqt_shared.cpp \ pkgsrc/audio/strawberry/patches/patch-CMakeLists.txt \ pkgsrc/audio/strawberry/patches/patch-dist_CMakeLists.txt \ pkgsrc/audio/strawberry/patches/patch-ext_strawberry-tagreader_CMakeLists.txt \ pkgsrc/audio/strawberry/patches/patch-src_CMakeLists.txt cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/audio/strawberry/patches/patch-src_analyzer_boomanalyzer.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_16927359903660 Content-Disposition: inline Content-Length: 12536 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/audio/strawberry/Makefile diff -u pkgsrc/audio/strawberry/Makefile:1.52 pkgsrc/audio/strawberry/Makefile:1.53 --- pkgsrc/audio/strawberry/Makefile:1.52 Tue Jul 18 12:56:06 2023 +++ pkgsrc/audio/strawberry/Makefile Tue Aug 22 20:26:29 2023 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.52 2023/07/18 12:56:06 nia Exp $ +# $NetBSD: Makefile,v 1.53 2023/08/22 20:26:29 adam Exp $ -DISTNAME= strawberry-1.0.14 -PKGREVISION= 5 +DISTNAME= strawberry-1.0.18 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_GITHUB:=strawberrymusicplayer/} GITHUB_RELEASE= ${PKGVERSION_NOREV} @@ -12,14 +11,12 @@ HOMEPAGE= https://www.strawberrymusicpla COMMENT= Music player and music collection organizer (based on Clementine) LICENSE= gnu-gpl-v3 -TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools - -USE_CMAKE= yes USE_LANGUAGES= c c++ USE_TOOLS+= pkg-config CMAKE_ARGS+= -DBUILD_WITH_QT5=ON CMAKE_ARGS+= -DBUILD_WITH_QT6=OFF +CMAKE_ARGS+= -DUSE_BUNDLE=OFF DEPENDS+= gst-plugins1-flac-[0-9]*:../../audio/gst-plugins1-flac DEPENDS+= gst-plugins1-mpg123-[0-9]*:../../audio/gst-plugins1-mpg123 @@ -43,7 +40,7 @@ DEPENDS+= gst-plugins1-oss-[0-9]*:../../ .endif .if ${OPSYS} == "NetBSD" -PREFER.sqlite3= pkgsrc # fts5 +PREFER.sqlite3= pkgsrc # fts5 # This package will link against libstdc++.so from the pkgsrc GCC when the # base OS GCC doesn't meet the minimum requirement. Thus we do this so the # appropriate gcc-libs package will be captured as a dependency, otherwise @@ -60,13 +57,14 @@ CHECK_PORTABILITY_SKIP+= dist/macos/macv post-install: ${MV} ${DESTDIR}${PREFIX}/share/man/man1/* \ - ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 | ${TRUE} + ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 || ${TRUE} .include "options.mk" .include "../../audio/chromaprint/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/protobuf/buildlink3.mk" @@ -79,11 +77,7 @@ post-install: .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../sysutils/dbus/buildlink3.mk" .include "../../textproc/icu/buildlink3.mk" -.include "../../x11/qt5-qtbase/buildlink3.mk" .if ${OPSYS} != "Darwin" . include "../../x11/libxcb/buildlink3.mk" -. include "../../x11/qt5-qtx11extras/buildlink3.mk" -.else -. include "../../x11/qt5-qtmacextras/buildlink3.mk" .endif .include "../../mk/bsd.pkg.mk" Index: pkgsrc/audio/strawberry/distinfo diff -u pkgsrc/audio/strawberry/distinfo:1.24 pkgsrc/audio/strawberry/distinfo:1.25 --- pkgsrc/audio/strawberry/distinfo:1.24 Sat Feb 4 15:38:39 2023 +++ pkgsrc/audio/strawberry/distinfo Tue Aug 22 20:26:29 2023 @@ -1,8 +1,13 @@ -$NetBSD: distinfo,v 1.24 2023/02/04 15:38:39 nia Exp $ +$NetBSD: distinfo,v 1.25 2023/08/22 20:26:29 adam Exp $ -BLAKE2s (strawberry-1.0.14.tar.xz) = 8c540a4dfd6173a6309b14880086b234a35e5ec2c415390c56c160dcabae208b -SHA512 (strawberry-1.0.14.tar.xz) = bf667cb93b8f0ffdb8dc625df821bc4355e3845629ff25ed57d7999e19072edffab05f27dbea90adf0bb9a9cbe478856a292a1a6f7ed2c5f37442548699a4c02 -Size (strawberry-1.0.14.tar.xz) = 11234760 bytes +BLAKE2s (strawberry-1.0.18.tar.xz) = e6d0d263252485b94f0a5482be6943e1482c8ac7dc0d927584eab3b25eaf0a22 +SHA512 (strawberry-1.0.18.tar.xz) = 3a4c38198ac71384bfadb336b77fb316009836340fe763a7fc00c7d084ca219797512f30fe8487a086ca37860c707c661865eea00a89f6d8058c063380ed7a94 +Size (strawberry-1.0.18.tar.xz) = 11241608 bytes +SHA1 (patch-3rdparty_macdeployqt_shared.cpp) = 784f13967c3af11aa856d496545de00ff5f93091 +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 -SHA1 (patch-src_analyzer_boomanalyzer.cpp) = 833bab9d6b59644c9acae662bc389bf731e507ad +SHA1 (patch-src_analyzer_boomanalyzer.cpp) = ae0cc1b61ed4492a2562c3c954b6dd797ef63e5d SHA1 (patch-src_utilities_transliterate.cpp) = 560be2ee9f98afa8d971bf58d26249424eda3c39 Index: pkgsrc/audio/strawberry/options.mk diff -u pkgsrc/audio/strawberry/options.mk:1.1 pkgsrc/audio/strawberry/options.mk:1.2 --- pkgsrc/audio/strawberry/options.mk:1.1 Fri May 15 17:38:35 2020 +++ pkgsrc/audio/strawberry/options.mk Tue Aug 22 20:26:29 2023 @@ -1,7 +1,10 @@ -# $NetBSD: options.mk,v 1.1 2020/05/15 17:38:35 nia Exp $ +# $NetBSD: options.mk,v 1.2 2023/08/22 20:26:29 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" @@ -11,3 +14,22 @@ CMAKE_ARGS+= -DLIBPULSE=ON .else CMAKE_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_ARGS+= -DBUILD_WITH_QT5=ON +CMAKE_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_ARGS+= -DBUILD_WITH_QT5=OFF +CMAKE_ARGS+= -DBUILD_WITH_QT6=ON +. include "../../x11/qt6-qtbase/buildlink3.mk" +. endif +.endif Index: pkgsrc/audio/strawberry/patches/patch-src_analyzer_boomanalyzer.cpp diff -u pkgsrc/audio/strawberry/patches/patch-src_analyzer_boomanalyzer.cpp:1.1 pkgsrc/audio/strawberry/patches/patch-src_analyzer_boomanalyzer.cpp:1.2 --- pkgsrc/audio/strawberry/patches/patch-src_analyzer_boomanalyzer.cpp:1.1 Mon Apr 25 15:19:48 2022 +++ pkgsrc/audio/strawberry/patches/patch-src_analyzer_boomanalyzer.cpp Tue Aug 22 20:26:30 2023 @@ -1,14 +1,15 @@ -$NetBSD: patch-src_analyzer_boomanalyzer.cpp,v 1.1 2022/04/25 15:19:48 tnn Exp $ +$NetBSD: patch-src_analyzer_boomanalyzer.cpp,v 1.2 2023/08/22 20:26:30 adam Exp $ avoid ambiguous math functions ---- src/analyzer/boomanalyzer.cpp.orig 2022-03-22 20:09:13.757653684 +0000 +--- src/analyzer/boomanalyzer.cpp.orig 2023-08-21 18:29:36.000000000 +0000 +++ src/analyzer/boomanalyzer.cpp -@@ -38,6 +38,7 @@ +@@ -36,6 +36,8 @@ + #include "fht.h" #include "analyzerbase.h" - using Analyzer::Scope; +using std::log10; - ++ const int BoomAnalyzer::kColumnWidth = 4; const int BoomAnalyzer::kMaxBandCount = 256; + const int BoomAnalyzer::kMinBandCount = 32; Added files: Index: pkgsrc/audio/strawberry/patches/patch-3rdparty_macdeployqt_shared.cpp diff -u /dev/null pkgsrc/audio/strawberry/patches/patch-3rdparty_macdeployqt_shared.cpp:1.1 --- /dev/null Tue Aug 22 20:26:30 2023 +++ pkgsrc/audio/strawberry/patches/patch-3rdparty_macdeployqt_shared.cpp Tue Aug 22 20:26:30 2023 @@ -0,0 +1,15 @@ +$NetBSD: patch-3rdparty_macdeployqt_shared.cpp,v 1.1 2023/08/22 20:26:30 adam Exp $ + +Fix build with Qt5 on Darwin. + +--- 3rdparty/macdeployqt/shared.cpp.orig 2023-08-21 18:34:21.000000000 +0000 ++++ 3rdparty/macdeployqt/shared.cpp +@@ -1490,7 +1490,7 @@ bool deployQmlImports(const QString &app + #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + QString qmlImportsPath = QLibraryInfo::path(QLibraryInfo::QmlImportsPath); + #else +- QString qmlImportsPath = QLibraryInfo::location(QLibraryInfo::QmlImportsPath); ++ QString qmlImportsPath = QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath); + #endif + argumentList.append( "-importPath"); + argumentList.append(qmlImportsPath); Index: pkgsrc/audio/strawberry/patches/patch-CMakeLists.txt diff -u /dev/null pkgsrc/audio/strawberry/patches/patch-CMakeLists.txt:1.1 --- /dev/null Tue Aug 22 20:26:30 2023 +++ pkgsrc/audio/strawberry/patches/patch-CMakeLists.txt Tue Aug 22 20:26:30 2023 @@ -0,0 +1,20 @@ +$NetBSD: patch-CMakeLists.txt,v 1.1 2023/08/22 20:26:30 adam Exp $ + +We don't need another packaging system. + +--- CMakeLists.txt.orig 2023-06-29 17:49:42.000000000 +0000 ++++ CMakeLists.txt +@@ -28,13 +28,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD") + set(OPENBSD ON) + endif() + +-if(LINUX) +- include(cmake/Rpm.cmake) +- include(cmake/Deb.cmake) +-endif() +-if(APPLE) +- include(cmake/Dmg.cmake) +-endif() + + set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) + Index: pkgsrc/audio/strawberry/patches/patch-dist_CMakeLists.txt diff -u /dev/null pkgsrc/audio/strawberry/patches/patch-dist_CMakeLists.txt:1.1 --- /dev/null Tue Aug 22 20:26:30 2023 +++ pkgsrc/audio/strawberry/patches/patch-dist_CMakeLists.txt Tue Aug 22 20:26:30 2023 @@ -0,0 +1,36 @@ +$NetBSD: patch-dist_CMakeLists.txt,v 1.1 2023/08/22 20:26:30 adam Exp $ + +Don't install as bundle on Darwin. + +--- dist/CMakeLists.txt.orig 2023-08-21 18:56:57.000000000 +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) + +-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(UNIX AND NOT APPLE) ++if(UNIX) + install(FILES ../data/icons/48x48/strawberry.png DESTINATION share/icons/hicolor/48x48/apps/) + install(FILES ../data/icons/64x64/strawberry.png DESTINATION share/icons/hicolor/64x64/apps/) + 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) + +-if(APPLE) ++if(FALSE) + install(FILES "${CMAKE_CURRENT_SOURCE_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-ext_strawberry-tagreader_CMakeLists.txt diff -u /dev/null pkgsrc/audio/strawberry/patches/patch-ext_strawberry-tagreader_CMakeLists.txt:1.1 --- /dev/null Tue Aug 22 20:26:30 2023 +++ pkgsrc/audio/strawberry/patches/patch-ext_strawberry-tagreader_CMakeLists.txt Tue Aug 22 20:26:30 2023 @@ -0,0 +1,15 @@ +$NetBSD: patch-ext_strawberry-tagreader_CMakeLists.txt,v 1.1 2023/08/22 20:26:30 adam Exp $ + +Don't install as bundle on Darwin. + +--- ext/strawberry-tagreader/CMakeLists.txt.orig 2023-08-21 19:03:18.000000000 +0000 ++++ ext/strawberry-tagreader/CMakeLists.txt +@@ -57,7 +57,7 @@ if(APPLE) + target_link_libraries(strawberry-tagreader PRIVATE /System/Library/Frameworks/Foundation.framework) + endif() + +-if(APPLE) ++if(FALSE) + install(TARGETS strawberry-tagreader DESTINATION ${CMAKE_BINARY_DIR}/strawberry.app/Contents/PlugIns) + else() + install(TARGETS strawberry-tagreader RUNTIME DESTINATION bin) Index: pkgsrc/audio/strawberry/patches/patch-src_CMakeLists.txt diff -u /dev/null pkgsrc/audio/strawberry/patches/patch-src_CMakeLists.txt:1.1 --- /dev/null Tue Aug 22 20:26:30 2023 +++ pkgsrc/audio/strawberry/patches/patch-src_CMakeLists.txt Tue Aug 22 20:26:30 2023 @@ -0,0 +1,23 @@ +$NetBSD: patch-src_CMakeLists.txt,v 1.1 2023/08/22 20:26:30 adam Exp $ + +Don't install as bundle on Darwin. + +--- src/CMakeLists.txt.orig 2023-08-21 18:52:06.000000000 +0000 ++++ src/CMakeLists.txt +@@ -1231,7 +1231,6 @@ if(WIN32) + endif() + + add_executable(strawberry +- MACOSX_BUNDLE + ${STRAWBERRY-WIN32-FLAG} + ${STRAWBERRY-WIN32-RESOURCES} + main.cpp +@@ -1246,7 +1245,7 @@ target_link_libraries(strawberry PRIVATE + # macdeploy.py relies on the blob being built first. + add_dependencies(strawberry strawberry-tagreader) + +-if(NOT APPLE) ++if(TRUE) + install(TARGETS strawberry RUNTIME DESTINATION bin) + endif() + --_----------=_16927359903660--