CVS commit: pkgsrc/audio/cantata

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/audio/cantata
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Wed, 25 Nov 2020 20:59:37 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Nov 25 20:59:37 UTC 2020

Modified Files:
        pkgsrc/audio/cantata: Makefile distinfo
        pkgsrc/audio/cantata/patches: patch-CMakeLists.txt
Added Files:
        pkgsrc/audio/cantata/patches: patch-playlists_dynamicplaylists.cpp

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/audio/cantata/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/audio/cantata/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/cantata/patches/patch-CMakeLists.txt
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/audio/cantata/patches/patch-playlists_dynamicplaylists.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/cantata/Makefile
diff -u pkgsrc/audio/cantata/Makefile:1.16 pkgsrc/audio/cantata/Makefile:1.17
--- pkgsrc/audio/cantata/Makefile:1.16  Thu Nov  5 09:07:23 2020
+++ pkgsrc/audio/cantata/Makefile       Wed Nov 25 20:59:37 2020
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2020/11/05 09:07:23 ryoon Exp $
+# $NetBSD: Makefile,v 1.17 2020/11/25 20:59:37 wiz Exp $
 
-DISTNAME=      cantata-2.4.1
-PKGREVISION=   1
+DISTNAME=      cantata-2.4.2
 CATEGORIES=    audio
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=CDrummond/}
 GITHUB_RELEASE=        v${PKGVERSION_NOREV}
@@ -36,6 +35,7 @@ PLIST.notdarwin=      yes
 .include "../../multimedia/ffmpeg4/buildlink3.mk"
 .include "../../net/avahi/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+BUILDLINK_API_DEPENDS.qt5-qtbase+=     qt5-qtbase>=5.11
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../x11/qt5-qtmultimedia/buildlink3.mk"
 .include "../../x11/qt5-qtsvg/buildlink3.mk"

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

Index: pkgsrc/audio/cantata/patches/patch-CMakeLists.txt
diff -u pkgsrc/audio/cantata/patches/patch-CMakeLists.txt:1.1 pkgsrc/audio/cantata/patches/patch-CMakeLists.txt:1.2
--- pkgsrc/audio/cantata/patches/patch-CMakeLists.txt:1.1       Fri Jul  5 18:20:19 2019
+++ pkgsrc/audio/cantata/patches/patch-CMakeLists.txt   Wed Nov 25 20:59:37 2020
@@ -1,10 +1,10 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2019/07/05 18:20:19 adam Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2020/11/25 20:59:37 wiz Exp $
 
 Don't make application bundle on Darwin.
 
---- CMakeLists.txt.orig        2018-10-20 22:39:39.000000000 +0000
+--- CMakeLists.txt.orig        2020-03-14 09:27:06.000000000 +0000
 +++ CMakeLists.txt
-@@ -81,7 +81,7 @@ if (AVAHI_FOUND)
+@@ -87,7 +87,7 @@ if (AVAHI_FOUND)
      set(CANTATA_LIBS ${CANTATA_LIBS} ${AVAHI_LIBRARIES})
  endif()
  
@@ -13,7 +13,7 @@ Don't make application bundle on Darwin.
      set(SHARE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/share"
          CACHE PATH "Define install directory for read-only architecture-independent data")
  else ()
-@@ -91,7 +91,7 @@ endif ()
+@@ -97,7 +97,7 @@ endif ()
  
  if (WIN32)
      set(CANTATA_ICON_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}/icons/cantata)
@@ -22,7 +22,7 @@ Don't make application bundle on Darwin.
      set(MACOSX_BUNDLE_BUNDLE_NAME Cantata)
      set(MACOSX_BUNDLE_EXECUTABLE cantata)
      set(MACOSX_BUNDLE_SHORT_VERSION_STRING ${CANTATA_VERSION})
-@@ -124,7 +124,7 @@ if (NOT APPLE AND NOT WIN32)
+@@ -130,7 +130,7 @@ if (NOT APPLE AND NOT WIN32)
  endif ()
  
  
@@ -31,7 +31,7 @@ Don't make application bundle on Darwin.
      set(CMAKE_INSTALL_PREFIX "/usr")
      message("-- Set install prefix to ${CMAKE_INSTALL_PREFIX}")
  endif ()
-@@ -361,8 +361,6 @@ set(CANTATA_LIBS ${CANTATA_LIBS} support
+@@ -370,8 +370,6 @@ set(CANTATA_LIBS ${CANTATA_LIBS} support
  
  if (WIN32)
      # Not installed for windows - script uses sym-links...
@@ -40,7 +40,7 @@ Don't make application bundle on Darwin.
  else ()
      install(PROGRAMS playlists/cantata-dynamic DESTINATION ${SHARE_INSTALL_PREFIX}/${CMAKE_PROJECT_NAME}/scripts)
  endif ()
-@@ -526,7 +524,7 @@ if (WIN32)
+@@ -535,7 +533,7 @@ if (WIN32)
      set(CMAKE_BUILD_TYPE "Release")
      ADD_EXECUTABLE(cantata WIN32 ${CANTATA_SRCS} ${CANTATA_RC_SRCS} ${CANTATA_UI_HDRS} ${CANTATA_PO})
      install(TARGETS cantata DESTINATION ${CMAKE_INSTALL_PREFIX})

Added files:

Index: pkgsrc/audio/cantata/patches/patch-playlists_dynamicplaylists.cpp
diff -u /dev/null pkgsrc/audio/cantata/patches/patch-playlists_dynamicplaylists.cpp:1.1
--- /dev/null   Wed Nov 25 20:59:37 2020
+++ pkgsrc/audio/cantata/patches/patch-playlists_dynamicplaylists.cpp   Wed Nov 25 20:59:37 2020
@@ -0,0 +1,17 @@
+$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;
+     }

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index