This diff is from my series to update taglib to version 2.
Simple update cantata-3.3.0 which also switch to Qt6. Tested on amd64.
OK?
Cheers Rafael
diff --git a/audio/cantata/Makefile b/audio/cantata/Makefile
index 822689d6f8b..f41b98b5453 100644
--- a/audio/cantata/Makefile
+++ b/audio/cantata/Makefile
@@ -1,44 +1,39 @@
COMMENT = Qt-based MPD client
-V = 2.5.0
-DISTNAME = cantata-${V}
-HOMEPAGE = https://github.com/CDrummond/cantata
-REVISION = 0
-
-SITES =
https://github.com/CDrummond/cantata/releases/download/v${V}/
-EXTRACT_SUFX = .tar.bz2
+GH_ACCOUNT= nullobsi
+GH_PROJECT= cantata
+GH_TAGNAME= v3.3.0
CATEGORIES = audio
# GPLv2 only
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} Qt5Concurrent Qt5Core Qt5DBus Qt5Gui
-WANTLIB += Qt5Multimedia Qt5Network Qt5Sql Qt5Svg Qt5Widgets Qt5Xml
-WANTLIB += avahi-client avahi-common avcodec avformat avutil c
-WANTLIB += cddb cdio cdio_cdda cdio_paranoia ebur128 iconv m mpg123
-WANTLIB += mtp musicbrainz5 tag z
+WANTLIB += ${COMPILER_LIBCXX} GL Qt6Concurrent Qt6Core Qt6DBus
+WANTLIB += Qt6Gui Qt6Multimedia Qt6Network Qt6Sql Qt6Svg Qt6Widgets
+WANTLIB += Qt6Xml avahi-client avahi-common avcodec avformat avutil
+WANTLIB += c cddb cdio_cdda cdio_paranoia ebur128 m mpg123 mtp
+WANTLIB += musicbrainz5 tag z
MODULES = devel/cmake \
- x11/qt5
+ x11/qt6
+
+RUN_DEPENDS = devel/desktop-file-utils \
+ x11/gtk+4,-guic
-RUN_DEPENDS += devel/desktop-file-utils
-RUN_DEPENDS += x11/gtk+4,-guic
-LIB_DEPENDS += audio/mpg123 \
- audio/libcdio \
+LIB_DEPENDS = audio/libcddb \
audio/libcdio-paranoia \
- audio/libcddb \
audio/libebur128 \
audio/libmusicbrainz5 \
- audio/taglib \
- x11/qt5/qtmultimedia \
- x11/qt5/qtsvg \
+ audio/mpg123 \
+ audio/taglib>=2.0 \
devel/libmtp \
- graphics/ffmpeg
+ graphics/ffmpeg \
+ net/avahi,-libs \
+ x11/qt6/qtmultimedia \
+ x11/qt6/qtsvg
CONFIGURE_ARGS += -DCMAKE_INSTALL_PREFIX:Path=${PREFIX} \
- -DENABLE_LIBVLC=OFF \
- -DLRELEASE_EXECUTABLE:String=${MODQT_LRELEASE} \
-
-DLCONVERT_EXECUTABLE:String=${LOCALBASE}/lib/qt5/bin/lconvert
+ -DENABLE_LIBVLC=OFF
.include <bsd.port.mk>
diff --git a/audio/cantata/distinfo b/audio/cantata/distinfo
index e5674df2fa7..c654bbf8cec 100644
--- a/audio/cantata/distinfo
+++ b/audio/cantata/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cantata-2.5.0.tar.bz2) = 634Aqz9WevqgLqLIbi/oEaR1r6uTGCuVkixusSaCFyQ=
-SIZE (cantata-2.5.0.tar.bz2) = 2487031
+SHA256 (cantata-3.3.0.tar.gz) = KOoVENg2CEsVLmMdICRi5DAJHSXnv6r2aLE1TiAPciU=
+SIZE (cantata-3.3.0.tar.gz) = 4783803
diff --git a/audio/cantata/patches/patch-3rdparty_solid-lite_CMakeLists_txt
b/audio/cantata/patches/patch-3rdparty_solid-lite_CMakeLists_txt
index 5b4585cff39..8ca1e24b3b3 100644
--- a/audio/cantata/patches/patch-3rdparty_solid-lite_CMakeLists_txt
+++ b/audio/cantata/patches/patch-3rdparty_solid-lite_CMakeLists_txt
@@ -1,14 +1,11 @@
-fallout from https://github.com/CDrummond/cantata/issues/1175
-
Index: 3rdparty/solid-lite/CMakeLists.txt
--- 3rdparty/solid-lite/CMakeLists.txt.orig
+++ 3rdparty/solid-lite/CMakeLists.txt
-@@ -45,7 +45,7 @@ set(solidlite_LIB_SRCS
- backends/shared/rootdevice.cpp
+@@ -245,6 +245,7 @@ target_link_libraries(
+ solidlite
+ PRIVATE
+ Qt${QT_VERSION_MAJOR}::Core
++ Qt${QT_VERSION_MAJOR}::DBus
+ Qt${QT_VERSION_MAJOR}::Widgets
+ ${solidlite_OPTIONAL_LIBS}
)
-
-- if (NOT WIN32 AND NOT APPLE AND WITH_SOLID_UDISKS2)
-+ if (NOT WIN32 AND NOT APPLE AND NOT OPENBSD AND WITH_SOLID_UDISKS2)
- find_package( UDev REQUIRED)
- macro_log_feature( UDEV_FOUND "UDev" "UDev support for Solid"
"http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"; FALSE ""
"Allows Solid to use UDev to provide information about devices on Linux" )
- endif()
diff --git a/audio/cantata/patches/patch-cmake_FindCdioparanoia_cmake
b/audio/cantata/patches/patch-cmake_FindCdioparanoia_cmake
deleted file mode 100644
index ce8363baa86..00000000000
--- a/audio/cantata/patches/patch-cmake_FindCdioparanoia_cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-make sure cmake looks in the right directory
-
-Index: cmake/FindCdioparanoia.cmake
---- cmake/FindCdioparanoia.cmake.orig
-+++ cmake/FindCdioparanoia.cmake
-@@ -21,6 +21,7 @@ if (CDIOPARANOIA_FOUND)
- check_include_files(cdio/cdda.h HAVE_CDIO_CDDA_H)
- # Issue 1022 - sometimes its cdio/paranoia/paranoia.h
- if (NOT HAVE_CDIO_PARANOIA_H)
-+ set(CMAKE_REQUIRED_INCLUDES /usr/local/include)
- check_include_files(cdio/paranoia/paranoia.h
HAVE_CDIO_PARANOIA_PARANOIA_H)
- endif()
- if (NOT HAVE_CDIO_CDDA_H)
diff --git a/audio/cantata/patches/patch-cmake_FindMusicBrainz5_cmake
b/audio/cantata/patches/patch-cmake_FindMusicBrainz5_cmake
new file mode 100644
index 00000000000..0bb07bdd8c8
--- /dev/null
+++ b/audio/cantata/patches/patch-cmake_FindMusicBrainz5_cmake
@@ -0,0 +1,28 @@
+Index: cmake/FindMusicBrainz5.cmake
+--- cmake/FindMusicBrainz5.cmake.orig
++++ cmake/FindMusicBrainz5.cmake
+@@ -40,7 +40,7 @@ The following cache variables may also be set:
+ # First use PKG-Config as a starting point.
+ find_package(PkgConfig)
+ if(PKG_CONFIG_FOUND)
+- pkg_check_modules(PC_MusicBrainz5 QUIET libmusicbrainz5)
++ pkg_check_modules(PC_MusicBrainz5 QUIET libmusicbrainz5cc)
+ endif(PKG_CONFIG_FOUND)
+
+ find_path(MusicBrainz5_INCLUDE_DIR
+@@ -50,7 +50,7 @@ find_path(MusicBrainz5_INCLUDE_DIR
+ )
+
+ find_library(MusicBrainz5_LIBRARY
+- NAMES musicbrainz5
++ NAMES musicbrainz5cc
+ PATHS ${PC_MusicBrainz5_LIBRARY_DIRS}
+ )
+
+@@ -83,4 +83,4 @@ endif()
+ mark_as_advanced(
+ MusicBrainz5_INCLUDE_DIR
+ MusicBrainz5_LIBRARY
+-)
+\ No newline at end of file
++)
diff --git a/audio/cantata/patches/patch-devices_extractjob_h
b/audio/cantata/patches/patch-devices_extractjob_h
deleted file mode 100644
index f95fa6cbd7b..00000000000
--- a/audio/cantata/patches/patch-devices_extractjob_h
+++ /dev/null
@@ -1,18 +0,0 @@
-If libcdios header is found before cdparanioas, CD_FRAMESIZE_RAW is not defined
-because our libcdio is too old (this define got added in 0.82):
-
-http://git.savannah.gnu.org/cgit/libcdio.git/tree/include/cdio/sector.h?h=release-0.82#n274
-
-Index: devices/extractjob.h
---- devices/extractjob.h.orig
-+++ devices/extractjob.h
-@@ -27,6 +27,9 @@
-
- #include "filejob.h"
- #include "encoders.h"
-+#ifndef CD_FRAMESIZE_RAW
-+#define CD_FRAMESIZE_RAW CDIO_CD_FRAMESIZE_RAW
-+#endif
-
- class ExtractJob : public FileJob
- {
diff --git a/audio/cantata/pkg/PLIST b/audio/cantata/pkg/PLIST
index 0e34afa6788..5dd9479480b 100644
--- a/audio/cantata/pkg/PLIST
+++ b/audio/cantata/pkg/PLIST
@@ -1,43 +1,45 @@
@bin bin/cantata
-lib/cantata/
-@bin lib/cantata/cantata-replaygain
-@bin lib/cantata/cantata-tags
-share/applications/cantata.desktop
-share/cantata/
-share/cantata/icons/
-share/cantata/icons/podcasts.png
-share/cantata/icons/soundcloud.png
-share/cantata/icons/stream.png
-share/cantata/scripts/
-share/cantata/scripts/cantata-dynamic
-share/cantata/scripts/cantata-remote
-share/cantata/translations/
-share/cantata/translations/cantata_cs.qm
-share/cantata/translations/cantata_da.qm
-share/cantata/translations/cantata_de.qm
-share/cantata/translations/cantata_en_GB.qm
-share/cantata/translations/cantata_es.qm
-share/cantata/translations/cantata_fi.qm
-share/cantata/translations/cantata_fr.qm
-share/cantata/translations/cantata_hu.qm
-share/cantata/translations/cantata_it.qm
-share/cantata/translations/cantata_ja.qm
-share/cantata/translations/cantata_ko.qm
-share/cantata/translations/cantata_nl.qm
-share/cantata/translations/cantata_pl.qm
-share/cantata/translations/cantata_pt_BR.qm
-share/cantata/translations/cantata_ru.qm
-share/cantata/translations/cantata_zh_CN.qm
-share/icons/hicolor/128x128/apps/cantata.png
-share/icons/hicolor/16x16/apps/cantata.png
-share/icons/hicolor/22x22/apps/cantata.png
-share/icons/hicolor/24x24/apps/cantata.png
-share/icons/hicolor/256x256/apps/cantata.png
-share/icons/hicolor/32x32/apps/cantata.png
-share/icons/hicolor/48x48/apps/cantata.png
-share/icons/hicolor/512x512/apps/cantata.png
-share/icons/hicolor/64x64/apps/cantata.png
-share/icons/hicolor/scalable/apps/cantata.svg
-share/icons/hicolor/symbolic/apps/cantata-symbolic.svg
@tag gtk-update-icon-cache %D/share/icons/hicolor
@tag update-desktop-database
+libexec/Cantata/
+@bin libexec/Cantata/cantata-replaygain
+@bin libexec/Cantata/cantata-tags
+share/Cantata/
+share/Cantata/icons/
+share/Cantata/icons/podcasts.png
+share/Cantata/icons/soundcloud.png
+share/Cantata/icons/stream.png
+share/Cantata/scripts/
+share/Cantata/scripts/cantata-dynamic
+share/Cantata/scripts/cantata-remote
+share/Cantata/translations/
+share/Cantata/translations/cantata_cs.qm
+share/Cantata/translations/cantata_da.qm
+share/Cantata/translations/cantata_de.qm
+share/Cantata/translations/cantata_en_GB.qm
+share/Cantata/translations/cantata_es.qm
+share/Cantata/translations/cantata_fi.qm
+share/Cantata/translations/cantata_fr.qm
+share/Cantata/translations/cantata_hu.qm
+share/Cantata/translations/cantata_it.qm
+share/Cantata/translations/cantata_ja.qm
+share/Cantata/translations/cantata_ko.qm
+share/Cantata/translations/cantata_nl.qm
+share/Cantata/translations/cantata_pl.qm
+share/Cantata/translations/cantata_pt_BR.qm
+share/Cantata/translations/cantata_ru.qm
+share/Cantata/translations/cantata_zh_CN.qm
+share/applications/dog.unix.cantata.Cantata.desktop
+share/icons/hicolor/128x128/apps/dog.unix.cantata.Cantata.png
+share/icons/hicolor/16x16/apps/dog.unix.cantata.Cantata.png
+share/icons/hicolor/22x22/apps/dog.unix.cantata.Cantata.png
+share/icons/hicolor/24x24/apps/dog.unix.cantata.Cantata.png
+share/icons/hicolor/256x256/apps/dog.unix.cantata.Cantata.png
+share/icons/hicolor/32x32/apps/dog.unix.cantata.Cantata.png
+share/icons/hicolor/48x48/apps/dog.unix.cantata.Cantata.png
+share/icons/hicolor/512x512/apps/dog.unix.cantata.Cantata.png
+share/icons/hicolor/64x64/apps/dog.unix.cantata.Cantata.png
+share/icons/hicolor/scalable/apps/dog.unix.cantata.Cantata.svg
+share/icons/hicolor/symbolic/apps/dog.unix.cantata.Cantata-symbolic.svg
+share/metainfo/
+share/metainfo/dog.unix.cantata.Cantata.metainfo.xml
