Date: Mon, 25 Sep 2023 03:48:38 GMT From: "Jason E. Hale" <jhale@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 384aeb3131a4 - main - audio/strawberry: Update to 1.0.20 Message-ID: <202309250348.38P3mcZT028809@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=384aeb3131a4c2ff05380120a916399f1aa68e57 commit 384aeb3131a4c2ff05380120a916399f1aa68e57 Author: Jason E. Hale <jhale@FreeBSD.org> AuthorDate: 2023-09-25 02:04:10 +0000 Commit: Jason E. Hale <jhale@FreeBSD.org> CommitDate: 2023-09-25 03:48:34 +0000 audio/strawberry: Update to 1.0.20 Version 1.0.20 is a hotfix release on top of 1.0.19. Add EBUR128 option for loudness normalization analysis. Switch default flavor to qt6. Upstream has recommended building against Qt6 whenever possible for 18 months. https://github.com/strawberrymusicplayer/strawberry/releases/tag/1.0.20 https://github.com/strawberrymusicplayer/strawberry/releases/tag/1.0.19 --- audio/strawberry/Makefile | 28 +++++++++++++++++----------- audio/strawberry/distinfo | 6 +++--- audio/strawberry/files/patch-CMakeLists.txt | 12 ++++++------ 3 files changed, 26 insertions(+), 20 deletions(-) diff --git a/audio/strawberry/Makefile b/audio/strawberry/Makefile index c76dcebc567f..90dc202932c6 100644 --- a/audio/strawberry/Makefile +++ b/audio/strawberry/Makefile @@ -1,6 +1,5 @@ PORTNAME= strawberry -DISTVERSION= 1.0.18 -PORTREVISION= 1 +DISTVERSION= 1.0.20 CATEGORIES= audio MASTER_SITES= https://github.com/strawberrymusicplayer/${PORTNAME}/releases/download/${DISTVERSION}/ \ https://files.jkvinge.net/packages/strawberry/ @@ -14,23 +13,25 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= boost-libs>0:devel/boost-libs -LIB_DEPENDS= libgnutls.so:security/gnutls \ - libprotobuf.so:devel/protobuf \ +LIB_DEPENDS= libprotobuf.so:devel/protobuf \ libtag.so:audio/taglib -FLAVORS= qt5 qt6 +FLAVORS= qt6 qt5 FLAVOR?= ${FLAVORS:[1]} qt5_CONFLICTS_INSTALL= strawberry strawberry-qt6 qt6_CONFLICTS_INSTALL= strawberry strawberry-qt5 USES= cmake compiler:c++17-lang desktop-file-utils gettext-runtime \ - gnome pkgconfig qt:${FLAVOR:S/qt//} sqlite tar:xz xorg + gl gnome pkgconfig qt:${FLAVOR:S/qt//} sqlite tar:xz xorg USE_GNOME= glib20 -_USE_QT5= concurrent core dbus gui network sql sql-sqlite3:run widgets \ +_USE_GL_qt5= # +_USE_GL_qt6= opengl +USE_GL= ${_USE_GL_${FLAVOR}} +_USE_QT_qt5= concurrent core dbus gui network sql sql-sqlite3:run widgets \ x11extras buildtools:build linguisttools:build qmake:build -_USE_QT6= base sqldriver-sqlite:run tools:build -USE_QT= ${_USE_QT${FLAVOR:S/qt//}} +_USE_QT_qt6= base sqldriver-sqlite:run tools:build +USE_QT= ${_USE_QT_${FLAVOR}} USE_XORG= ice sm x11 xcb xext CMAKE_ON= BUILD_WITH_${FLAVOR:tu} @@ -43,8 +44,8 @@ OPTIONS_MULTI_BACKEND= GSTREAMER VLC OPTIONS_MULTI_SOUND= ALSA PULSEAUDIO OPTIONS_SINGLE= UNICODE OPTIONS_SINGLE_UNICODE= ICONV ICU -OPTIONS_DEFINE= CDIO IPOD MOODBAR MTP MUSICBRAINZ NLS TEST -OPTIONS_DEFAULT= ALSA GSTREAMER ICU MOODBAR MUSICBRAINZ +OPTIONS_DEFINE= CDIO EBUR128 IPOD MOODBAR MTP MUSICBRAINZ NLS TEST +OPTIONS_DEFAULT= ALSA EBUR128 GSTREAMER ICU MOODBAR MUSICBRAINZ OPTIONS_SUB= yes BACKEND_DESC= Playback engine @@ -60,6 +61,11 @@ CDIO_LIB_DEPENDS= libcdio.so:sysutils/libcdio CDIO_CMAKE_BOOL= ENABLE_AUDIOCD CDIO_IMPLIES= GSTREAMER +EBUR128_DESC= EBU R 128 loudness normalization +EBUR128_USES= ebur128 +EBUR128_CMAKE_BOOL= ENABLE_EBUR128 +EBUR128_IMPLIES= GSTREAMER + GSTREAMER_USES= gstreamer GSTREAMER_CMAKE_BOOL= ENABLE_GSTREAMER diff --git a/audio/strawberry/distinfo b/audio/strawberry/distinfo index cac0b25f1033..160396029633 100644 --- a/audio/strawberry/distinfo +++ b/audio/strawberry/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688332466 -SHA256 (strawberry-1.0.18.tar.xz) = 8687463b3c5c6d4344ab295ed0946b56d279b7e45875eb4fcca521ca1218c860 -SIZE (strawberry-1.0.18.tar.xz) = 11241608 +TIMESTAMP = 1695601826 +SHA256 (strawberry-1.0.20.tar.xz) = e27afd4b70cdbb1c88af868cafc3abcb526c825c53e413df326f008322413194 +SIZE (strawberry-1.0.20.tar.xz) = 11234412 diff --git a/audio/strawberry/files/patch-CMakeLists.txt b/audio/strawberry/files/patch-CMakeLists.txt index 80e0cb6b7adf..5f7eb9f4cee6 100644 --- a/audio/strawberry/files/patch-CMakeLists.txt +++ b/audio/strawberry/files/patch-CMakeLists.txt @@ -2,15 +2,15 @@ Find OPTIONAL_COMPONENTS seperately. When the REQUIRED keyword is used, Qt5Config.cmake handles all components as required causing failure if optional components are missing. ---- CMakeLists.txt.orig 2022-09-18 23:50:52 UTC +--- CMakeLists.txt.orig 2023-09-19 20:48:15 UTC +++ CMakeLists.txt -@@ -207,7 +207,8 @@ endif() - list(APPEND QT_OPTIONAL_COMPONENTS X11Extras) +@@ -195,7 +195,8 @@ endif() + list(APPEND QT_COMPONENTS X11Extras) endif() --find_package(Qt${QT_VERSION_MAJOR} ${QT_MIN_VERSION} REQUIRED COMPONENTS ${QT_COMPONENTS} OPTIONAL_COMPONENTS ${QT_OPTIONAL_COMPONENTS}) +-find_package(Qt${QT_VERSION_MAJOR} ${QT_MIN_VERSION} COMPONENTS ${QT_COMPONENTS} REQUIRED OPTIONAL_COMPONENTS ${QT_OPTIONAL_COMPONENTS}) +find_package(Qt${QT_VERSION_MAJOR} ${QT_MIN_VERSION} REQUIRED COMPONENTS ${QT_COMPONENTS}) +find_package(Qt${QT_VERSION_MAJOR} ${QT_MIN_VERSION} OPTIONAL_COMPONENTS ${QT_OPTIONAL_COMPONENTS}) - set(QtCore_LIBRARIES Qt${QT_VERSION_MAJOR}::Core) - set(QtConcurrent_LIBRARIES Qt${QT_VERSION_MAJOR}::Concurrent) + if(Qt${QT_VERSION_MAJOR}DBus_FOUND) + get_target_property(QT_DBUSXML2CPP_EXECUTABLE Qt${QT_VERSION_MAJOR}::qdbusxml2cpp LOCATION)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202309250348.38P3mcZT028809>