mykola/freebsd-ports
1
0
Fork 0
forked from Lainports/freebsd-ports
Code Pull requests Activity

audio/strawberry: Update to 1.2.2

Browse source 
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
This commit is contained in:
Jason E. Hale 2024-11-26 04:43:59 -05:00
parent fc99957071
commit c286664d47
5 changed files with 48 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
audio/strawberry/Makefile
View file

@ -1,6 +1,5 @@
PORTNAME= strawberry PORTNAME= strawberry
DISTVERSION= 1.1.3 DISTVERSION= 1.2.2
PORTREVISION= 2
CATEGORIES= audio CATEGORIES= audio
MASTER_SITES= https://github.com/strawberrymusicplayer/${PORTNAME}/releases/download/${DISTVERSION}/ MASTER_SITES= https://github.com/strawberrymusicplayer/${PORTNAME}/releases/download/${DISTVERSION}/
@ -12,34 +11,32 @@ LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= boost-libs>0:devel/boost-libs BUILD_DEPENDS= boost-libs>0:devel/boost-libs
LIB_DEPENDS= libabsl_base.so:devel/abseil \ LIB_DEPENDS= libicui18n.so:devel/icu \
libicui18n.so:devel/icu \
libprotobuf.so:devel/protobuf \
libtag.so:audio/taglib libtag.so:audio/taglib
TEST_DEPENDS= googletest>=0:devel/googletest
USES= cmake compiler:c++17-lang desktop-file-utils gettext-runtime \ USES= cmake:testing compiler:c++17-lang desktop-file-utils \
gl gnome pkgconfig qt:6 sqlite tar:xz xorg gl gnome gstreamer pkgconfig qt:6 sqlite tar:xz xorg
USE_GNOME= glib20
USE_GL= opengl 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 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_DEFINE= CDIO EBUR128 IPOD MOODBAR MTP MUSICBRAINZ NLS
OPTIONS_MULTI_BACKEND= GSTREAMER VLC OPTIONS_DEFAULT= ALSA EBUR128 MOODBAR MUSICBRAINZ
OPTIONS_MULTI= SOUND
OPTIONS_MULTI_SOUND= ALSA PULSEAUDIO 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 OPTIONS_SUB= yes
BACKEND_DESC= Playback engine EBUR128_DESC= EBU R 128 loudness normalization
IPOD_DESC= iPod Classic support IPOD_DESC= iPod Classic support
MOODBAR_DESC= Moodbar support MOODBAR_DESC= Moodbar support
MUSICBRAINZ_DESC= Tagging/fingerprinting from MusicBrainz MUSICBRAINZ_DESC= Tagging/fingerprinting from MusicBrainz
VLC_DESC= Multimedia support via (lib)vlc
ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
ALSA_CMAKE_BOOL= ENABLE_ALSA ALSA_CMAKE_BOOL= ENABLE_ALSA
@ -47,44 +44,30 @@ ALSA_CMAKE_BOOL= ENABLE_ALSA
CDIO_LIB_DEPENDS= libcdio.so:sysutils/libcdio CDIO_LIB_DEPENDS= libcdio.so:sysutils/libcdio
CDIO_USE= GSTREAMER=cdparanoia CDIO_USE= GSTREAMER=cdparanoia
CDIO_CMAKE_BOOL= ENABLE_AUDIOCD CDIO_CMAKE_BOOL= ENABLE_AUDIOCD
CDIO_IMPLIES= GSTREAMER
EBUR128_DESC= EBU R 128 loudness normalization
EBUR128_USES= ebur128 EBUR128_USES= ebur128
EBUR128_CMAKE_BOOL= ENABLE_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 \ IPOD_LIB_DEPENDS= libgpod.so:audio/libgpod \
libimobiledevice-1.0.so:comms/libimobiledevice \ libimobiledevice-1.0.so:comms/libimobiledevice \
libplist-2.0.so:devel/libplist 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_LIB_DEPENDS= libfftw3.so:math/fftw3
MOODBAR_CMAKE_BOOL= ENABLE_MOODBAR MOODBAR_CMAKE_BOOL= ENABLE_MOODBAR
MOODBAR_IMPLIES= GSTREAMER
MTP_LIB_DEPENDS= libmtp.so:multimedia/libmtp 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_LIB_DEPENDS= libchromaprint.so:audio/chromaprint
MUSICBRAINZ_CMAKE_BOOL= ENABLE_MUSICBRAINZ \ MUSICBRAINZ_CMAKE_BOOL= ENABLE_MUSICBRAINZ \
ENABLE_SONGFINGERPRINTING ENABLE_SONGFINGERPRINTING
MUSICBRAINZ_IMPLIES= GSTREAMER
NLS_USES= gettext-tools NLS_USE= QT=tools:build
NLS_CMAKE_BOOL= ENABLE_TRANSLATIONS NLS_CMAKE_BOOL= ENABLE_TRANSLATIONS
PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
PULSEAUDIO_CMAKE_BOOL= ENABLE_LIBPULSE PULSEAUDIO_CMAKE_BOOL= ENABLE_PULSE
VLC_LIB_DEPENDS= libvlc.so:multimedia/vlc
VLC_CMAKE_BOOL= ENABLE_VLC
TEST_BUILD_DEPENDS= googletest>=0:devel/googletest
TEST_TEST_TARGET= strawberry_tests
.include <bsd.port.mk> .include <bsd.port.mk>

6
audio/strawberry/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1728892573 TIMESTAMP = 1732431674
SHA256 (strawberry-1.1.3.tar.xz) = cc133169f03f7b966074023eef105028e334d3dad8a066adbe8e6bdc7c1ab8dd SHA256 (strawberry-1.2.2.tar.xz) = 3543ca25f3b7fc913f3986a8cb5f5f6f323549a71c21cc0c1a3491fe4d135177
SIZE (strawberry-1.1.3.tar.xz) = 11347368 SIZE (strawberry-1.2.2.tar.xz) = 11460012

16
audio/strawberry/files/patch-CMakeLists.txt
View file

@ -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)

25
audio/strawberry/files/patch-src_device_cddadevice.h Normal file
View file

@ -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"

2
audio/strawberry/pkg-plist
View file

@ -1,9 +1,7 @@
bin/strawberry bin/strawberry
bin/strawberry-tagreader
share/applications/org.strawberrymusicplayer.strawberry.desktop share/applications/org.strawberrymusicplayer.strawberry.desktop
share/icons/hicolor/128x128/apps/strawberry.png share/icons/hicolor/128x128/apps/strawberry.png
share/icons/hicolor/48x48/apps/strawberry.png share/icons/hicolor/48x48/apps/strawberry.png
share/icons/hicolor/64x64/apps/strawberry.png share/icons/hicolor/64x64/apps/strawberry.png
share/man/man1/strawberry-tagreader.1.gz
share/man/man1/strawberry.1.gz share/man/man1/strawberry.1.gz
share/metainfo/org.strawberrymusicplayer.strawberry.appdata.xml share/metainfo/org.strawberrymusicplayer.strawberry.appdata.xml