Wed Nov 25 20:59:37 2020 UTC ()
cantata: update to 2.4.2.

2.4.2
-----
1. Correctly handle changing 'Basic' mode music folder.
2. When stopping 'Basic' mode MPD instance, send SIGKILL.
3. Correctly set 'storeLyricsInMpdDir' config item, UI was setting wrong config
   item.
4. Set minimum Qt5 version to 5.11
5. Fix destructor of DeviceManagerPrivate to prevent Cantata from potentially
   crashing when closing.
6. Correctly set song details 'time', 'year', 'track' and 'disc' for streams
   from online services.
7. Don't use last.fm for artist image searches, its broken.
8. Hide BB10 styles (look bad), and gtk2 style (doesn't start) from list of
   styles in interface settings.
9. When checking if song exists, check disc number.
10. Fix getting song details from Cantata stream URLs.
11. Amend MPRIS interface: fix CanPlay/CanPause/CanSeek status update as well
    as LoopStatus getter and setter.
12. When checking if songs are different, compare track and disc numbers too.
13. Avoid unknown song durations and duplicate updates of MPRIS' song details.
14. Synchronize update of current song details and status of MPRIS interface,
    trigger MPRIS status update when connection to MPD has been lost.
15. Add chartlyrics.com to list of lyrics providers.
16. Set default lyrics providers to azlyrics.com, chartlyrics.com, and
    lyrics.wikia.com
17. Fix enabling of play queue navigation actions 'next' and 'previous'.
18. Fix bus name of freedesktop.org's power management.
19. Additionally call Inhibit() from org.freedesktop.login1.Manager.
20. Query Qt whether system tray is available if current desktop environment is
    not some kind of GNOME (incl. Unity flavored GNOME).
21. Fix writing 'descr' attribute when saving podcast information to cache dir.
22. Fix loading cover images with wrong file extension in context view.
23. Avoid prepending song's file path with MPD's music directory if it is empty,
    a stream URL or an absolute path.
24. Ignore current song in selection when moving selected songs within the play
    queue to play them next.
25. Also show metadata of the current track in the context view if 'title' or
    'artist' are missing, but do not try to fetch information nor lyrics.
26. Switch from freedb.org to gnudb.org
27. Update bitrate settings for encoders used with transcoding jobs.


(wiz)
diff -r1.16 -r1.17 pkgsrc/audio/cantata/Makefile
diff -r1.4 -r1.5 pkgsrc/audio/cantata/distinfo
diff -r1.1 -r1.2 pkgsrc/audio/cantata/patches/patch-CMakeLists.txt
diff -r0 -r1.1 pkgsrc/audio/cantata/patches/patch-playlists_dynamicplaylists.cpp
cvs diff -r1.16 -r1.17 pkgsrc/audio/cantata/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/cantata/Makefile 2020/11/05 09:07:23 1.16
+++ pkgsrc/audio/cantata/Makefile 2020/11/25 20:59:37 1.17
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.16 2020/11/05 09:07:23 ryoon Exp $ 1# $NetBSD: Makefile,v 1.17 2020/11/25 20:59:37 wiz Exp $
2 2
3DISTNAME= cantata-2.4.1 3DISTNAME= cantata-2.4.2
4PKGREVISION= 1 
5CATEGORIES= audio 4CATEGORIES= audio
6MASTER_SITES= ${MASTER_SITE_GITHUB:=CDrummond/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=CDrummond/}
7GITHUB_RELEASE= v${PKGVERSION_NOREV} 6GITHUB_RELEASE= v${PKGVERSION_NOREV}
8EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
9 8
10MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://github.com/CDrummond/cantata/ 10HOMEPAGE= https://github.com/CDrummond/cantata/
12COMMENT= Qt5 Graphical MPD Client 11COMMENT= Qt5 Graphical MPD Client
13LICENSE= gnu-gpl-v3 12LICENSE= gnu-gpl-v3
14 13
15USE_CMAKE= yes 14USE_CMAKE= yes
16USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
17USE_TOOLS+= bash:run perl:run 16USE_TOOLS+= bash:run perl:run
@@ -26,17 +25,18 @@ PLIST_VARS+= notdarwin @@ -26,17 +25,18 @@ PLIST_VARS+= notdarwin
26.include "../../x11/qt5-qtmacextras/buildlink3.mk" 25.include "../../x11/qt5-qtmacextras/buildlink3.mk"
27.else 26.else
28PLIST.notdarwin= yes 27PLIST.notdarwin= yes
29.endif 28.endif
30 29
31.include "../../audio/libebur128/buildlink3.mk" 30.include "../../audio/libebur128/buildlink3.mk"
32.include "../../audio/mpg123/buildlink3.mk" 31.include "../../audio/mpg123/buildlink3.mk"
33.include "../../audio/taglib/buildlink3.mk" 32.include "../../audio/taglib/buildlink3.mk"
34.include "../../devel/libmtp/buildlink3.mk" 33.include "../../devel/libmtp/buildlink3.mk"
35.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 34.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
36.include "../../multimedia/ffmpeg4/buildlink3.mk" 35.include "../../multimedia/ffmpeg4/buildlink3.mk"
37.include "../../net/avahi/buildlink3.mk" 36.include "../../net/avahi/buildlink3.mk"
38.include "../../security/openssl/buildlink3.mk" 37.include "../../security/openssl/buildlink3.mk"
 38BUILDLINK_API_DEPENDS.qt5-qtbase+= qt5-qtbase>=5.11
39.include "../../x11/qt5-qtbase/buildlink3.mk" 39.include "../../x11/qt5-qtbase/buildlink3.mk"
40.include "../../x11/qt5-qtmultimedia/buildlink3.mk" 40.include "../../x11/qt5-qtmultimedia/buildlink3.mk"
41.include "../../x11/qt5-qtsvg/buildlink3.mk" 41.include "../../x11/qt5-qtsvg/buildlink3.mk"
42.include "../../mk/bsd.pkg.mk" 42.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/audio/cantata/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/cantata/distinfo 2020/09/08 21:30:03 1.4
+++ pkgsrc/audio/cantata/distinfo 2020/11/25 20:59:37 1.5
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.4 2020/09/08 21:30:03 wiz Exp $ 1$NetBSD: distinfo,v 1.5 2020/11/25 20:59:37 wiz Exp $
2 2
3SHA1 (cantata-2.4.1.tar.bz2) = be0d7e7d8b0042d5f895c71a17459e859e81ccc9 3SHA1 (cantata-2.4.2.tar.bz2) = 98e1fc8b5ac20ed9e2a243ec120dec151aff45a3
4RMD160 (cantata-2.4.1.tar.bz2) = 46a3e5660063a66e2ac78c2e110b91683835bd19 4RMD160 (cantata-2.4.2.tar.bz2) = 323a2ebe0e332ecd752eda2afbf064d8abcdc157
5SHA512 (cantata-2.4.1.tar.bz2) = 9bb9953f41ad562e186c201505db6ea42dccdcb0b60e0c6eda0c5521428ecafdba95b51e8827de3498b2b25284d36f800bfa96a49839d2a69e0f92705f44a439 5SHA512 (cantata-2.4.2.tar.bz2) = e0164082e2effe85807e8779a0d44d1634de12e5f9b9d907ccb225184177a1fadeacda66ebeeeffcf16f795cd975cbd5b0f1620677470b4262d1e03e6db0b176
6Size (cantata-2.4.1.tar.bz2) = 2550982 bytes 6Size (cantata-2.4.2.tar.bz2) = 2498195 bytes
7SHA1 (patch-CMakeLists.txt) = 90915916c7a640ab4da757d8f38eb7847a1519af 7SHA1 (patch-CMakeLists.txt) = 44a81fa0361ea4d1cb52b1701e296a8eb3aaec61
 8SHA1 (patch-playlists_dynamicplaylists.cpp) = 4b2767658696d7d9d3f1a838310ca36fd3b554b9
cvs diff -r1.1 -r1.2 pkgsrc/audio/cantata/patches/patch-CMakeLists.txt (expand / switch to unified diff)

--- pkgsrc/audio/cantata/patches/patch-CMakeLists.txt 2019/07/05 18:20:19 1.1
+++ pkgsrc/audio/cantata/patches/patch-CMakeLists.txt 2020/11/25 20:59:37 1.2
@@ -1,51 +1,51 @@ @@ -1,51 +1,51 @@
1$NetBSD: patch-CMakeLists.txt,v 1.1 2019/07/05 18:20:19 adam Exp $ 1$NetBSD: patch-CMakeLists.txt,v 1.2 2020/11/25 20:59:37 wiz Exp $
2 2
3Don't make application bundle on Darwin. 3Don't make application bundle on Darwin.
4 4
5--- CMakeLists.txt.orig 2018-10-20 22:39:39.000000000 +0000 5--- CMakeLists.txt.orig 2020-03-14 09:27:06.000000000 +0000
6+++ CMakeLists.txt 6+++ CMakeLists.txt
7@@ -81,7 +81,7 @@ if (AVAHI_FOUND) 7@@ -87,7 +87,7 @@ if (AVAHI_FOUND)
8 set(CANTATA_LIBS ${CANTATA_LIBS} ${AVAHI_LIBRARIES}) 8 set(CANTATA_LIBS ${CANTATA_LIBS} ${AVAHI_LIBRARIES})
9 endif() 9 endif()
10  10
11-if (NOT APPLE AND NOT WIN32 AND NOT HAIKU) 11-if (NOT APPLE AND NOT WIN32 AND NOT HAIKU)
12+if (NOT WIN32 AND NOT HAIKU) 12+if (NOT WIN32 AND NOT HAIKU)
13 set(SHARE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/share" 13 set(SHARE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/share"
14 CACHE PATH "Define install directory for read-only architecture-independent data") 14 CACHE PATH "Define install directory for read-only architecture-independent data")
15 else () 15 else ()
16@@ -91,7 +91,7 @@ endif () 16@@ -97,7 +97,7 @@ endif ()
17  17
18 if (WIN32) 18 if (WIN32)
19 set(CANTATA_ICON_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}/icons/cantata) 19 set(CANTATA_ICON_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}/icons/cantata)
20-elseif (APPLE) 20-elseif (APPLE)
21+elseif (FALSE) 21+elseif (FALSE)
22 set(MACOSX_BUNDLE_BUNDLE_NAME Cantata) 22 set(MACOSX_BUNDLE_BUNDLE_NAME Cantata)
23 set(MACOSX_BUNDLE_EXECUTABLE cantata) 23 set(MACOSX_BUNDLE_EXECUTABLE cantata)
24 set(MACOSX_BUNDLE_SHORT_VERSION_STRING ${CANTATA_VERSION}) 24 set(MACOSX_BUNDLE_SHORT_VERSION_STRING ${CANTATA_VERSION})
25@@ -124,7 +124,7 @@ if (NOT APPLE AND NOT WIN32) 25@@ -130,7 +130,7 @@ if (NOT APPLE AND NOT WIN32)
26 endif () 26 endif ()
27  27
28  28
29-if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT AND NOT APPLE AND NOT WIN32 AND NOT HAIKU) 29-if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT AND NOT APPLE AND NOT WIN32 AND NOT HAIKU)
30+if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT AND NOT WIN32 AND NOT HAIKU) 30+if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT AND NOT WIN32 AND NOT HAIKU)
31 set(CMAKE_INSTALL_PREFIX "/usr") 31 set(CMAKE_INSTALL_PREFIX "/usr")
32 message("-- Set install prefix to ${CMAKE_INSTALL_PREFIX}") 32 message("-- Set install prefix to ${CMAKE_INSTALL_PREFIX}")
33 endif () 33 endif ()
34@@ -361,8 +361,6 @@ set(CANTATA_LIBS ${CANTATA_LIBS} support 34@@ -370,8 +370,6 @@ set(CANTATA_LIBS ${CANTATA_LIBS} support
35  35
36 if (WIN32) 36 if (WIN32)
37 # Not installed for windows - script uses sym-links... 37 # Not installed for windows - script uses sym-links...
38-elseif (APPLE) 38-elseif (APPLE)
39- install(PROGRAMS playlists/cantata-dynamic DESTINATION ${MACOSX_BUNDLE_RESOURCES}/scripts/) 39- install(PROGRAMS playlists/cantata-dynamic DESTINATION ${MACOSX_BUNDLE_RESOURCES}/scripts/)
40 else () 40 else ()
41 install(PROGRAMS playlists/cantata-dynamic DESTINATION ${SHARE_INSTALL_PREFIX}/${CMAKE_PROJECT_NAME}/scripts) 41 install(PROGRAMS playlists/cantata-dynamic DESTINATION ${SHARE_INSTALL_PREFIX}/${CMAKE_PROJECT_NAME}/scripts)
42 endif () 42 endif ()
43@@ -526,7 +524,7 @@ if (WIN32) 43@@ -535,7 +533,7 @@ if (WIN32)
44 set(CMAKE_BUILD_TYPE "Release") 44 set(CMAKE_BUILD_TYPE "Release")
45 ADD_EXECUTABLE(cantata WIN32 ${CANTATA_SRCS} ${CANTATA_RC_SRCS} ${CANTATA_UI_HDRS} ${CANTATA_PO}) 45 ADD_EXECUTABLE(cantata WIN32 ${CANTATA_SRCS} ${CANTATA_RC_SRCS} ${CANTATA_UI_HDRS} ${CANTATA_PO})
46 install(TARGETS cantata DESTINATION ${CMAKE_INSTALL_PREFIX}) 46 install(TARGETS cantata DESTINATION ${CMAKE_INSTALL_PREFIX})
47-elseif (APPLE) 47-elseif (APPLE)
48+elseif (FALSE) 48+elseif (FALSE)
49 ADD_EXECUTABLE(cantata MACOSX_BUNDLE ${CANTATA_SRCS} ${CANTATA_RC_SRCS} ${CANTATA_UI_HDRS} ${CANTATA_PO}) 49 ADD_EXECUTABLE(cantata MACOSX_BUNDLE ${CANTATA_SRCS} ${CANTATA_RC_SRCS} ${CANTATA_UI_HDRS} ${CANTATA_PO})
50  50
51 set(BREW_OPENSSL_PATH /usr/local/opt/openssl/lib) 51 set(BREW_OPENSSL_PATH /usr/local/opt/openssl/lib)
File Added: pkgsrc/audio/cantata/patches/Attic/patch-playlists_dynamicplaylists.cpp
$NetBSD: patch-playlists_dynamicplaylists.cpp,v 1.1 2020/11/25 20:59:37 wiz Exp $

Add missing semicolon.

--- playlists/dynamicplaylists.cpp.orig	2020-08-23 10:14:57.000000000 +0000
+++ playlists/dynamicplaylists.cpp
@@ -361,8 +361,8 @@ int DynamicPlaylists::getPid() const
 }
 
 static QString helperScript() {
-    QString script = QLatin1String("cantata-dynamic")
-    QString local = fixPath(QCoreApplication::applicationDirPath())+script;
+    QString script = QLatin1String("cantata-dynamic");
+    QString local = Utils::fixPath(QCoreApplication::applicationDirPath())+script;
     if (QFile::exists(local)) {
         return local;
     }