Date: Tue, 26 Nov 2024 16:45:55 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: c286664d47d9 - main - audio/strawberry: Update to 1.2.2 Message-ID: <202411261645.4AQGjtow005856@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=c286664d47d924e1117068c96cca16c71307ce69 commit c286664d47d924e1117068c96cca16c71307ce69 Author: Jason E. Hale <jhale@FreeBSD.org> AuthorDate: 2024-11-26 09:43:59 +0000 Commit: Jason E. Hale <jhale@FreeBSD.org> CommitDate: 2024-11-26 16:45:47 +0000 audio/strawberry: Update to 1.2.2 Remove the GSTREAMER and VLC options. GStreamer is now the only supported backend. Convert the TEST option to the CMake testing framework. https://github.com/strawberrymusicplayer/strawberry/releases/tag/1.2.1 https://github.com/strawberrymusicplayer/strawberry/releases/tag/1.2.2 --- audio/strawberry/Makefile | 57 ++++++++-------------- audio/strawberry/distinfo | 6 +-- audio/strawberry/files/patch-CMakeLists.txt | 16 ------ .../strawberry/files/patch-src_device_cddadevice.h | 25 ++++++++++ audio/strawberry/pkg-plist | 2 - 5 files changed, 48 insertions(+), 58 deletions(-) diff --git a/audio/strawberry/Makefile b/audio/strawberry/Makefile index bf4d44c28f68..4e3cefc16b2a 100644 --- a/audio/strawberry/Makefile +++ b/audio/strawberry/Makefile @@ -1,6 +1,5 @@ PORTNAME= strawberry -DISTVERSION= 1.1.3 -PORTREVISION= 2 +DISTVERSION= 1.2.2 CATEGORIES= audio MASTER_SITES= https://github.com/strawberrymusicplayer/${PORTNAME}/releases/download/${DISTVERSION}/ @@ -12,34 +11,32 @@ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= boost-libs>0:devel/boost-libs -LIB_DEPENDS= libabsl_base.so:devel/abseil \ - libicui18n.so:devel/icu \ - libprotobuf.so:devel/protobuf \ +LIB_DEPENDS= libicui18n.so:devel/icu \ libtag.so:audio/taglib +TEST_DEPENDS= googletest>=0:devel/googletest -USES= cmake compiler:c++17-lang desktop-file-utils gettext-runtime \ - gl gnome pkgconfig qt:6 sqlite tar:xz xorg - -USE_GNOME= glib20 +USES= cmake:testing compiler:c++17-lang desktop-file-utils \ + gl gnome gstreamer pkgconfig qt:6 sqlite tar:xz xorg USE_GL= opengl -USE_QT= base sqldriver-sqlite:run tools:build +USE_GNOME= glib20 +USE_GSTREAMER= faac faad flac lame libav mpg123 opus taglib vorbis +USE_QT= base sqldriver-sqlite:run USE_XORG= ice sm x11 xcb xext -CMAKE_ON= BUILD_WITH_QT6 -CMAKE_OFF= ENABLE_UDISKS2 +CMAKE_OFF= ENABLE_UDISKS2 +CMAKE_TESTING_SETENV= yes +CMAKE_TESTING_TARGET= strawberry_tests -OPTIONS_MULTI= BACKEND SOUND -OPTIONS_MULTI_BACKEND= GSTREAMER VLC +OPTIONS_DEFINE= CDIO EBUR128 IPOD MOODBAR MTP MUSICBRAINZ NLS +OPTIONS_DEFAULT= ALSA EBUR128 MOODBAR MUSICBRAINZ +OPTIONS_MULTI= SOUND OPTIONS_MULTI_SOUND= ALSA PULSEAUDIO -OPTIONS_DEFINE= CDIO EBUR128 IPOD MOODBAR MTP MUSICBRAINZ NLS TEST -OPTIONS_DEFAULT= ALSA EBUR128 GSTREAMER MOODBAR MUSICBRAINZ OPTIONS_SUB= yes -BACKEND_DESC= Playback engine +EBUR128_DESC= EBU R 128 loudness normalization IPOD_DESC= iPod Classic support MOODBAR_DESC= Moodbar support MUSICBRAINZ_DESC= Tagging/fingerprinting from MusicBrainz -VLC_DESC= Multimedia support via (lib)vlc ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_CMAKE_BOOL= ENABLE_ALSA @@ -47,44 +44,30 @@ ALSA_CMAKE_BOOL= ENABLE_ALSA CDIO_LIB_DEPENDS= libcdio.so:sysutils/libcdio CDIO_USE= GSTREAMER=cdparanoia 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_USE= GSTREAMER=faac,faad,flac,lame,libav,mpg123,opus,taglib,vorbis -GSTREAMER_CMAKE_BOOL= ENABLE_GSTREAMER IPOD_LIB_DEPENDS= libgpod.so:audio/libgpod \ libimobiledevice-1.0.so:comms/libimobiledevice \ libplist-2.0.so:devel/libplist -IPOD_CMAKE_BOOL= ENABLE_LIBGPOD +IPOD_USE= GNOME=gdkpixbuf2 +IPOD_CMAKE_BOOL= ENABLE_GPOD MOODBAR_LIB_DEPENDS= libfftw3.so:math/fftw3 MOODBAR_CMAKE_BOOL= ENABLE_MOODBAR -MOODBAR_IMPLIES= GSTREAMER MTP_LIB_DEPENDS= libmtp.so:multimedia/libmtp -MTP_CMAKE_BOOL= ENABLE_LIBMTP +MTP_CMAKE_BOOL= ENABLE_MTP MUSICBRAINZ_LIB_DEPENDS= libchromaprint.so:audio/chromaprint MUSICBRAINZ_CMAKE_BOOL= ENABLE_MUSICBRAINZ \ ENABLE_SONGFINGERPRINTING -MUSICBRAINZ_IMPLIES= GSTREAMER -NLS_USES= gettext-tools +NLS_USE= QT=tools:build NLS_CMAKE_BOOL= ENABLE_TRANSLATIONS PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio -PULSEAUDIO_CMAKE_BOOL= ENABLE_LIBPULSE - -VLC_LIB_DEPENDS= libvlc.so:multimedia/vlc -VLC_CMAKE_BOOL= ENABLE_VLC - -TEST_BUILD_DEPENDS= googletest>=0:devel/googletest -TEST_TEST_TARGET= strawberry_tests +PULSEAUDIO_CMAKE_BOOL= ENABLE_PULSE .include <bsd.port.mk> diff --git a/audio/strawberry/distinfo b/audio/strawberry/distinfo index da08adecbe5d..49367cb568d0 100644 --- a/audio/strawberry/distinfo +++ b/audio/strawberry/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1728892573 -SHA256 (strawberry-1.1.3.tar.xz) = cc133169f03f7b966074023eef105028e334d3dad8a066adbe8e6bdc7c1ab8dd -SIZE (strawberry-1.1.3.tar.xz) = 11347368 +TIMESTAMP = 1732431674 +SHA256 (strawberry-1.2.2.tar.xz) = 3543ca25f3b7fc913f3986a8cb5f5f6f323549a71c21cc0c1a3491fe4d135177 +SIZE (strawberry-1.2.2.tar.xz) = 11460012 diff --git a/audio/strawberry/files/patch-CMakeLists.txt b/audio/strawberry/files/patch-CMakeLists.txt deleted file mode 100644 index 5f7eb9f4cee6..000000000000 --- a/audio/strawberry/files/patch-CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -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 2023-09-19 20:48:15 UTC -+++ CMakeLists.txt -@@ -195,7 +195,8 @@ endif() - list(APPEND QT_COMPONENTS X11Extras) - endif() - --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}) - - if(Qt${QT_VERSION_MAJOR}DBus_FOUND) - get_target_property(QT_DBUSXML2CPP_EXECUTABLE Qt${QT_VERSION_MAJOR}::qdbusxml2cpp LOCATION) diff --git a/audio/strawberry/files/patch-src_device_cddadevice.h b/audio/strawberry/files/patch-src_device_cddadevice.h new file mode 100644 index 000000000000..658e5191492f --- /dev/null +++ b/audio/strawberry/files/patch-src_device_cddadevice.h @@ -0,0 +1,25 @@ +Fix conflicting definitions of NULL beween glib and cdio when CDIO option +is enabled. + +https://github.com/strawberrymusicplayer/strawberry/issues/1610 + +--- src/device/cddadevice.h.orig 2024-11-23 16:55:49 UTC ++++ src/device/cddadevice.h +@@ -24,13 +24,14 @@ + + #include "config.h" + +-#include <cdio/cdio.h> +-#include <gst/audio/gstaudiocdsrc.h> +- + #include <QObject> + #include <QString> + #include <QStringList> + #include <QUrl> ++ ++// These must come after Qt includes ++#include <cdio/cdio.h> ++#include <gst/audio/gstaudiocdsrc.h> + + #include "includes/shared_ptr.h" + #include "core/song.h" diff --git a/audio/strawberry/pkg-plist b/audio/strawberry/pkg-plist index da1eaa8a2086..f21ac39b7b41 100644 --- a/audio/strawberry/pkg-plist +++ b/audio/strawberry/pkg-plist @@ -1,9 +1,7 @@ bin/strawberry -bin/strawberry-tagreader share/applications/org.strawberrymusicplayer.strawberry.desktop share/icons/hicolor/128x128/apps/strawberry.png share/icons/hicolor/48x48/apps/strawberry.png share/icons/hicolor/64x64/apps/strawberry.png -share/man/man1/strawberry-tagreader.1.gz share/man/man1/strawberry.1.gz share/metainfo/org.strawberrymusicplayer.strawberry.appdata.xml
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202411261645.4AQGjtow005856>