diff options
Diffstat (limited to 'audio')
21 files changed, 141 insertions, 124 deletions
diff --git a/audio/jack/Makefile b/audio/jack/Makefile index a9d8864a28ea..4eeb835bb582 100644 --- a/audio/jack/Makefile +++ b/audio/jack/Makefile @@ -4,6 +4,9 @@ DISTVERSION= 1.9.22 PORTREVISION= 3 CATEGORIES= audio +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES= 250420381b1a6974798939ad7104ab1a4b9a9994.patch:-p1 + MAINTAINER= dev@submerge.ch COMMENT= Low latency audio server WWW= https://jackaudio.org/ diff --git a/audio/jack/distinfo b/audio/jack/distinfo index 3b177ebf1c1e..82331fc743b2 100644 --- a/audio/jack/distinfo +++ b/audio/jack/distinfo @@ -1,5 +1,7 @@ -TIMESTAMP = 1722598892 +TIMESTAMP = 1744074843 SHA256 (jackaudio-jack2-v1.9.22_GH0.tar.gz) = 1e42b9fc4ad7db7befd414d45ab2f8a159c0b30fcd6eee452be662298766a849 SIZE (jackaudio-jack2-v1.9.22_GH0.tar.gz) = 933448 SHA256 (jackaudio-jack2-v1.9.22-0762eac06a8c327757acfa7c770e16d827610873_GH0.tar.gz) = d6207cfb28f5d8e3531d5a283a80631b94b3e633b9f51edecdf5d112e979a3e3 SIZE (jackaudio-jack2-v1.9.22-0762eac06a8c327757acfa7c770e16d827610873_GH0.tar.gz) = 967723 +SHA256 (250420381b1a6974798939ad7104ab1a4b9a9994.patch) = cfdf5776d57b07a19a1e0dcbe2d8baf4c08b651406091ec57a1be357b6c6c1fe +SIZE (250420381b1a6974798939ad7104ab1a4b9a9994.patch) = 117136 diff --git a/audio/linux-rl9-alsa-plugins-oss/Makefile b/audio/linux-rl9-alsa-plugins-oss/Makefile index b7d343e357f1..3cb5e020b2b6 100644 --- a/audio/linux-rl9-alsa-plugins-oss/Makefile +++ b/audio/linux-rl9-alsa-plugins-oss/Makefile @@ -1,7 +1,7 @@ PORTNAME= alsa-plugins PORTVERSION= 1.2.7.1 DISTVERSIONSUFFIX= -1.el9 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= audio linux MASTER_SITES= ROCKY_LINUX MASTER_SITE_SUBDIR= ${LINUX_DIST_VER}/BaseOS/source/tree/Packages/a/ \ @@ -19,7 +19,7 @@ LICENSE= LGPL21+ USES= autoreconf:build gmake libtool:build linux:rl9 pkgconfig USE_LDCONFIG= yes -USE_LINUX= alsalib:build,run alsa-lib-devel:build base:build devtools:build libsigsegv:build,run +USE_LINUX= alsalib:build,run alsa-lib-devel:build base:build devtools:build USE_LINUX_PREFIX=yes CONFIG_ARGS= --disable-static --disable-mix --disable-usbstream \ diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile index 9cdfdcd3d580..9d8fc52b190a 100644 --- a/audio/musicpd/Makefile +++ b/audio/musicpd/Makefile @@ -1,6 +1,5 @@ PORTNAME= musicpd -PORTVERSION= 0.23.17 -PORTREVISION= 3 +PORTVERSION= 0.24.3 CATEGORIES= audio MASTER_SITES= https://www.musicpd.org/download/mpd/${PORTVERSION:R}/ DISTNAME= mpd-${PORTVERSION} @@ -12,21 +11,22 @@ WWW= https://www.musicpd.org/ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libboost_iostreams.so:devel/boost-libs \ - libfmt.so:devel/libfmt \ +LIB_DEPENDS= libfmt.so:devel/libfmt \ libicudata.so:devel/icu -USES= compiler:c++17-lang localbase:ldflags meson pkgconfig \ +USES= compiler:c++20-lang localbase:ldflags meson pkgconfig \ python:build tar:xz USE_RC_SUBR= ${PORTNAME} MESON_ARGS= --auto-features=disabled \ -Dbzip2=enabled \ + -Dchromaprint=disabled \ -Dhttpd=true \ -Dicu=enabled \ -Dmpcdec=disabled \ -Doss=enabled \ -Dpipe=true \ + -Dshine=disabled \ -Dsyslog=enabled \ -Dzlib=enabled @@ -55,7 +55,7 @@ OPTIONS_MULTI_FILE_FORMAT= \ OPTIONS_GROUP= ACCESS PLAYBACK OPTIONS_GROUP_ACCESS= CDPARANOIA CURL LAME NFS PLAYLISTS QOBUZ \ - SMB SOUNDCLOUD UPNP YAJL + SMB UPNP OPTIONS_GROUP_PLAYBACK= AO JACK OPENAL OPENMPT PIPEWIRE PULSEAUDIO \ SHOUTCAST SNDIO @@ -71,11 +71,9 @@ PLAYLISTS_DESC= Enable extra playlist support (wma, RSS) QOBUZ_DESC= Streaming service support: Qobuz SIDPLAY_DESC= Sidplay support (C64 mono and stereo files) SMB_DESC= SMB network support (currently strongly discouraged) -SOUNDCLOUD_DESC=Streaming service support: SoundCloud TWOLAME_DESC= TwoLAME support (mp2) VORBISENC_DESC= Ogg Vorbis encoder WILDMIDI_DESC= WildMIDI support (MIDI files) -YAJL_DESC= JSON support via libyajl ZZIP_DESC= Support for zzip archives OPTIONS_DEFAULT=CURL FFMPEG FLAC ID3TAG LAME MANPAGES OPUS \ @@ -83,7 +81,8 @@ OPTIONS_DEFAULT=CURL FFMPEG FLAC ID3TAG LAME MANPAGES OPUS \ WAVPACK MANPAGES_MESON_ENABLED= documentation -MANPAGES_BUILD_DEPENDS= ${LOCALBASE}/bin/sphinx-build:textproc/py-sphinx@${PY_FLAVOR} +MANPAGES_BUILD_DEPENDS= ${LOCALBASE}/bin/sphinx-build:textproc/py-sphinx@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>=0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} # Decoder plugins ADPLUG_MESON_ENABLED= adplug @@ -193,11 +192,10 @@ ID3TAG_LIB_DEPENDS= libid3tag.so:audio/libid3tag IPV6_MESON_ENABLED= ipv6 # Commercial service support -QOBUZ_MESON_ENABLED= qobuz +QOBUZ_MESON_ON= -Dqobuz=enabled -Dnlohmann_json=enabled QOBUZ_LIB_DEPENDS= libgcrypt.so:security/libgcrypt -QOBUZ_IMPLIES= CURL YAJL -SOUNDCLOUD_MESON_ENABLED= soundcloud -SOUNDCLOUD_IMPLIES= CURL YAJL +QOBUZ_BUILD_DEPENDS= ${LOCALBASE}/include/nlohmann/json.hpp:devel/nlohmann-json +QOBUZ_IMPLIES= CURL # Misc library support AVAHI_MESON_ON= -Dzeroconf=avahi @@ -206,8 +204,6 @@ MDNSRESPONDER_MESON_ON= -Dzeroconf=bonjour MDNSRESPONDER_LIB_DEPENDS= libdns_sd.so:net/mDNSResponder UPNP_MESON_ON= -Dupnp=npupnp UPNP_LIB_DEPENDS= libnpupnp.so:net/libnpupnp -YAJL_MESON_ENABLED= yajl -YAJL_LIB_DEPENDS= libyajl.so:devel/yajl MPDUSER?= mpd MPDGROUP?= mpd diff --git a/audio/musicpd/distinfo b/audio/musicpd/distinfo index 92b91de6afd7..60939364c663 100644 --- a/audio/musicpd/distinfo +++ b/audio/musicpd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1738356364 -SHA256 (mpd-0.23.17.tar.xz) = a86f4fe811695743b08db82a9f1a840b8918bb4f46b06f48aa1d8d1b5386dff2 -SIZE (mpd-0.23.17.tar.xz) = 779344 +TIMESTAMP = 1744525479 +SHA256 (mpd-0.24.3.tar.xz) = 4225680e068b2ad87e3c2de414ec3209758de93d671f89fa3bae90b70af478a2 +SIZE (mpd-0.24.3.tar.xz) = 1014788 diff --git a/audio/musicpd/files/patch-doc_mpdconf.example b/audio/musicpd/files/patch-doc_mpdconf.example index 48eb896465cd..b1a8089a580d 100644 --- a/audio/musicpd/files/patch-doc_mpdconf.example +++ b/audio/musicpd/files/patch-doc_mpdconf.example @@ -1,64 +1,67 @@ ---- doc/mpdconf.example.orig 2023-05-22 17:46:38 UTC +--- doc/mpdconf.example.orig 2025-03-11 10:05:29 UTC +++ doc/mpdconf.example -@@ -10,14 +10,14 @@ - # be disabled and audio files will only be accepted over ipc socket (using +@@ -11,7 +11,7 @@ # file:// protocol) or streaming files over an accepted protocol. # + #music_directory "$XDG_MUSIC_DIR" -#music_directory "~/music" +music_directory "/var/mpd/music" # # This setting sets the MPD internal playlist directory. The purpose of this # directory is storage for playlists created by MPD. The server will use - # playlist files not created by the server but only if they are in the MPD +@@ -19,7 +19,7 @@ # format. This setting defaults to playlist saving being disabled. # + #playlist_directory "$XDG_CONFIG_HOME/mpd/playlists" -#playlist_directory "~/.mpd/playlists" +playlist_directory "/var/mpd/.mpd/playlists" # # This setting sets the location of the MPD database. This file is used to # load the database at server start up and store the database while the -@@ -25,7 +25,7 @@ - # MPD to accept files over ipc socket (using file:// protocol) or streaming +@@ -28,7 +28,7 @@ # files over an accepted protocol. # + #db_file "$XDG_CACHE_HOME/mpd/database" -#db_file "~/.mpd/database" +db_file "/var/mpd/.mpd/database" # These settings are the locations for the daemon log files for the daemon. # -@@ -35,7 +35,7 @@ - # If you use systemd, do not configure a log_file. With systemd, MPD +@@ -39,7 +39,7 @@ # defaults to the systemd journal, which is fine. # + #log_file "$XDG_CACHE_HOME/mpd/log" -#log_file "~/.mpd/log" +log_file "/var/mpd/.mpd/log" # This setting sets the location of the file which stores the process ID # for use of mpd --kill and some init scripts. This setting is disabled by -@@ -43,19 +43,19 @@ - # +@@ -48,7 +48,7 @@ # If you use systemd, do not configure a pid_file. # + #pid_file "$XDG_RUNTIME_DIR/mpd/mpd.pid" -#pid_file "~/.mpd/pid" +pid_file "/var/mpd/.mpd/pid" # This setting sets the location of the file which contains information about # most variables to get MPD back into the same general shape it was in before - # it was brought down. This setting is disabled by default and the server +@@ -56,13 +56,13 @@ # state will be reset on server start up. # + #state_file "$XDG_RUNTIME_DIR/mpd/state" -#state_file "~/.mpd/state" +state_file "/var/mpd/.mpd/state" # # The location of the sticker database. This is a database which # manages dynamic information attached to songs. # + #sticker_file "$XDG_CACHE_HOME/sticker.sql" -#sticker_file "~/.mpd/sticker.sql" +sticker_file "/var/mpd/.mpd/sticker.sql" # ############################################################################### -@@ -67,7 +67,7 @@ +@@ -74,7 +74,7 @@ # initialization. This setting is disabled by default and MPD is run as the # current user. # @@ -67,16 +70,16 @@ # # This setting specifies the group that MPD will run as. If not specified # primary group of user specified with "user" setting will be used (if set). -@@ -85,7 +85,7 @@ - #bind_to_address "any" +@@ -93,7 +93,7 @@ # # And for Unix Socket + #bind_to_address "$XDG_RUNTIME_DIR/mpd/socket" -#bind_to_address "~/.mpd/socket" -+#bind_to_address "/var/mpd/.mpd/socket" ++bind_to_address "/var/mpd/.mpd/socket" # # This setting is the TCP port that is desired for the daemon to get assigned # to. -@@ -181,8 +181,8 @@ +@@ -189,8 +189,8 @@ # #database { # plugin "simple" @@ -87,7 +90,7 @@ #} # # An example of database config for a satellite setup -@@ -227,14 +227,14 @@ input { +@@ -235,14 +235,14 @@ input { # # An example of an OSS output: # diff --git a/audio/musicpd/files/patch-src_decoder_plugins_FfmpegIo.cxx b/audio/musicpd/files/patch-src_decoder_plugins_FfmpegIo.cxx deleted file mode 100644 index a4217e44ce77..000000000000 --- a/audio/musicpd/files/patch-src_decoder_plugins_FfmpegIo.cxx +++ /dev/null @@ -1,12 +0,0 @@ -https://github.com/MusicPlayerDaemon/MPD/issues/1898 - ---- src/decoder/plugins/FfmpegIo.cxx.orig 2023-10-08 08:11:05 UTC -+++ src/decoder/plugins/FfmpegIo.cxx -@@ -25,6 +25,7 @@ extern "C" { - #include "input/InputStream.hxx" - - extern "C" { -+#include <libavutil/error.h> - #include <libavutil/mem.h> - } - diff --git a/audio/musicpd/files/patch-src_input_plugins_CdioParanoiaInputPlugin.cxx b/audio/musicpd/files/patch-src_input_plugins_CdioParanoiaInputPlugin.cxx new file mode 100644 index 000000000000..3c33c16f1ffc --- /dev/null +++ b/audio/musicpd/files/patch-src_input_plugins_CdioParanoiaInputPlugin.cxx @@ -0,0 +1,11 @@ +--- src/input/plugins/CdioParanoiaInputPlugin.cxx.orig 2025-03-16 11:40:07 UTC ++++ src/input/plugins/CdioParanoiaInputPlugin.cxx +@@ -5,6 +5,8 @@ + * CD-Audio handling (requires libcdio_paranoia) + */ + ++#include <cstddef> ++ + #include "CdioParanoiaInputPlugin.hxx" + #include "lib/cdio/Paranoia.hxx" + #include "lib/fmt/RuntimeError.hxx" diff --git a/audio/musicpd/files/patch-src_lib_nfs_Error.cxx b/audio/musicpd/files/patch-src_lib_nfs_Error.cxx deleted file mode 100644 index e93ed7f839c1..000000000000 --- a/audio/musicpd/files/patch-src_lib_nfs_Error.cxx +++ /dev/null @@ -1,20 +0,0 @@ ---- src/lib/nfs/Error.cxx.orig 2020-09-23 13:26:51 UTC -+++ src/lib/nfs/Error.cxx -@@ -33,13 +33,13 @@ - #include "Error.hxx" - #include "util/StringFormat.hxx" - -+#include <cassert> -+#include <string.h> -+#include <sys/time.h> -+ - extern "C" { - #include <nfsc/libnfs.h> - } -- --#include <cassert> -- --#include <string.h> - - static StringBuffer<256> - FormatNfsClientError(struct nfs_context *nfs, const char *msg) noexcept diff --git a/audio/musicpd/files/patch-src_lib_yajl_Callbacks.hxx b/audio/musicpd/files/patch-src_lib_yajl_Callbacks.hxx deleted file mode 100644 index a6b6fa9381ba..000000000000 --- a/audio/musicpd/files/patch-src_lib_yajl_Callbacks.hxx +++ /dev/null @@ -1,11 +0,0 @@ ---- src/lib/yajl/Callbacks.hxx.orig 2025-01-29 16:11:53 UTC -+++ src/lib/yajl/Callbacks.hxx -@@ -32,7 +32,7 @@ - #include "util/Cast.hxx" - #include "util/StringView.hxx" - --#include <yajl_parse.h> -+#include <yajl/yajl_parse.h> - - namespace Yajl { - diff --git a/audio/musicpd/files/patch-src_lib_yajl_Gen.hxx b/audio/musicpd/files/patch-src_lib_yajl_Gen.hxx deleted file mode 100644 index 05e45ddfec43..000000000000 --- a/audio/musicpd/files/patch-src_lib_yajl_Gen.hxx +++ /dev/null @@ -1,11 +0,0 @@ ---- src/lib/yajl/Gen.hxx.orig 2025-01-29 16:11:53 UTC -+++ src/lib/yajl/Gen.hxx -@@ -31,7 +31,7 @@ - - #include "util/ConstBuffer.hxx" - --#include <yajl_gen.h> -+#include <yajl/yajl_gen.h> - - #include <algorithm> - #include <string_view> diff --git a/audio/musicpd/files/patch-src_lib_yajl_Handle.hxx b/audio/musicpd/files/patch-src_lib_yajl_Handle.hxx deleted file mode 100644 index cc90959b4b9f..000000000000 --- a/audio/musicpd/files/patch-src_lib_yajl_Handle.hxx +++ /dev/null @@ -1,11 +0,0 @@ ---- src/lib/yajl/Handle.hxx.orig 2025-01-29 16:11:53 UTC -+++ src/lib/yajl/Handle.hxx -@@ -29,7 +29,7 @@ - - #pragma once - --#include <yajl_parse.h> -+#include <yajl/yajl_parse.h> - - #include <utility> - diff --git a/audio/musicpd/files/patch-src_net_DscpParser.cxx b/audio/musicpd/files/patch-src_net_DscpParser.cxx new file mode 100644 index 000000000000..eb8d51688676 --- /dev/null +++ b/audio/musicpd/files/patch-src_net_DscpParser.cxx @@ -0,0 +1,14 @@ +--- src/net/DscpParser.cxx.orig 2025-03-11 10:05:29 UTC ++++ src/net/DscpParser.cxx +@@ -9,7 +9,10 @@ + #ifdef _WIN32 + #include <ws2tcpip.h> + #else +-#include <netinet/ip.h> ++#include <sys/types.h> ++#include <sys/socket.h> ++#include <netinet/in.h> ++#include <arpa/inet.h> + #endif + + #ifndef IPTOS_DSCP_AF11 diff --git a/audio/musicpd/files/patch-src_protocol_ArgParser.cxx b/audio/musicpd/files/patch-src_protocol_ArgParser.cxx deleted file mode 100644 index 6944c08007ac..000000000000 --- a/audio/musicpd/files/patch-src_protocol_ArgParser.cxx +++ /dev/null @@ -1,10 +0,0 @@ ---- src/protocol/ArgParser.cxx.orig 2021-10-14 13:25:21 UTC -+++ src/protocol/ArgParser.cxx -@@ -24,6 +24,7 @@ - #include "util/NumberParser.hxx" - - #include <stdlib.h> -+#include <stdio.h> - - static inline ProtocolError - MakeArgError(const char *msg, const char *value) noexcept diff --git a/audio/pipewire-spa-oss/Makefile b/audio/pipewire-spa-oss/Makefile index 9b3f02335f05..f149d25a3f79 100644 --- a/audio/pipewire-spa-oss/Makefile +++ b/audio/pipewire-spa-oss/Makefile @@ -1,6 +1,5 @@ PORTNAME= pipewire-spa-oss -DISTVERSION= g20241030 -PORTREVISION= 5 +DISTVERSION= g20250416 CATEGORIES= audio MAINTAINER= arrowd@FreeBSD.org @@ -19,7 +18,7 @@ USES= cargo llvm:lib,noexport USE_GITHUB= yes GH_ACCOUNT= shkhln GH_PROJECT= pw-oss -GH_TAGNAME= f174398a4b5f16f1bc5752666d90bf101f86c7c8 +GH_TAGNAME= 2fd15da459d6ed099a276ec6428301e8ac43bfb4 CARGO_CRATES= aho-corasick-1.1.3 \ annotate-snippets-0.9.2 \ diff --git a/audio/pipewire-spa-oss/distinfo b/audio/pipewire-spa-oss/distinfo index 717dc1bffb49..86db2cd4b96a 100644 --- a/audio/pipewire-spa-oss/distinfo +++ b/audio/pipewire-spa-oss/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1730474257 +TIMESTAMP = 1744783357 SHA256 (rust/crates/aho-corasick-1.1.3.crate) = 8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916 SIZE (rust/crates/aho-corasick-1.1.3.crate) = 183311 SHA256 (rust/crates/annotate-snippets-0.9.2.crate) = ccaf7e9dfbb6ab22c82e473cd1a8a7bd313c19a5b7e40970f3d89ef5a5c9e81e @@ -153,5 +153,5 @@ SHA256 (rust/crates/yansi-term-0.1.2.crate) = fe5c30ade05e61656247b2e334a031dfd0 SIZE (rust/crates/yansi-term-0.1.2.crate) = 14342 SHA256 (pipewire-pipewire-rs-016e554768ae251c8de3724ea4b06f4749a8dd00_GL0.tar.gz) = 64cc560c9127b1adf5e42f64b901336b3d190ea2c96fd0a128ae9dd4f2514549 SIZE (pipewire-pipewire-rs-016e554768ae251c8de3724ea4b06f4749a8dd00_GL0.tar.gz) = 114265 -SHA256 (shkhln-pw-oss-g20241030-f174398a4b5f16f1bc5752666d90bf101f86c7c8_GH0.tar.gz) = 197fd0aca13b2e4ef3169f82daae0c7011b08b4c9f6bf565097b310237eddd6e -SIZE (shkhln-pw-oss-g20241030-f174398a4b5f16f1bc5752666d90bf101f86c7c8_GH0.tar.gz) = 28209 +SHA256 (shkhln-pw-oss-g20250416-2fd15da459d6ed099a276ec6428301e8ac43bfb4_GH0.tar.gz) = 68dc7aa6641cd8c0dd883df391f71229222902e05e5da8ffc5c17d24007ed47b +SIZE (shkhln-pw-oss-g20250416-2fd15da459d6ed099a276ec6428301e8ac43bfb4_GH0.tar.gz) = 32288 diff --git a/audio/pulseaudio-module-xrdp/Makefile b/audio/pulseaudio-module-xrdp/Makefile index 3a732dd438f5..cbd83b08b502 100644 --- a/audio/pulseaudio-module-xrdp/Makefile +++ b/audio/pulseaudio-module-xrdp/Makefile @@ -1,7 +1,6 @@ PORTNAME= pulseaudio-module-xrdp DISTVERSIONPREFIX= v -DISTVERSION= 0.7 -PORTREVISION= 3 +DISTVERSION= 0.8 CATEGORIES= audio DIST_SUBDIR= xrdp diff --git a/audio/pulseaudio-module-xrdp/distinfo b/audio/pulseaudio-module-xrdp/distinfo index e1f41fb705c8..4a098106667d 100644 --- a/audio/pulseaudio-module-xrdp/distinfo +++ b/audio/pulseaudio-module-xrdp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1678170017 -SHA256 (xrdp/neutrinolabs-pulseaudio-module-xrdp-v0.7_GH0.tar.gz) = be101538ebe891bd4ae9d533559b99cf07abf0bbce399f50f2d248f35c160a9d -SIZE (xrdp/neutrinolabs-pulseaudio-module-xrdp-v0.7_GH0.tar.gz) = 26205 +TIMESTAMP = 1744708194 +SHA256 (xrdp/neutrinolabs-pulseaudio-module-xrdp-v0.8_GH0.tar.gz) = f0cc39b67421511c28395329a4091f8c5be79d861414b7d67313aa760e3b9db4 +SIZE (xrdp/neutrinolabs-pulseaudio-module-xrdp-v0.8_GH0.tar.gz) = 27409 diff --git a/audio/shortwave/files/patch-Cargo.toml b/audio/shortwave/files/patch-Cargo.toml new file mode 100644 index 000000000000..48ac761b7f66 --- /dev/null +++ b/audio/shortwave/files/patch-Cargo.toml @@ -0,0 +1,10 @@ +--- Cargo.toml.orig 2025-02-05 10:44:30 UTC ++++ Cargo.toml +@@ -17,7 +17,6 @@ futures-util = "0.3" + diesel = { version = "2.2", features = ["sqlite", "r2d2"] } + diesel_migrations = "2.2" + futures-util = "0.3" +-glycin = { version = "2.0", features = ["gdk4"] } + indexmap = "2.7" + Inflector = "0.11" + language-tags = "0.3" diff --git a/audio/shortwave/files/patch-meson.build b/audio/shortwave/files/patch-meson.build new file mode 100644 index 000000000000..f8c9ae7d237a --- /dev/null +++ b/audio/shortwave/files/patch-meson.build @@ -0,0 +1,15 @@ +--- meson.build.orig 2025-02-05 10:44:30 UTC ++++ meson.build +@@ -19,8 +19,10 @@ dependency('shumate-1.0', version: '>= 1.3') + dependency('shumate-1.0', version: '>= 1.3') + + # Required by glycin crate +-dependency('lcms2', version: '>= 2.12.0') +-dependency('libseccomp', version: '>= 2.5.0') ++if host_machine.system() == 'linux' ++ dependency('lcms2', version: '>= 2.12.0') ++ dependency('libseccomp', version: '>= 2.5.0') ++endif + + dependency('gstreamer-1.0', version: '>= 1.16') + dependency('gstreamer-base-1.0', version: '>= 1.16') diff --git a/audio/shortwave/files/patch-src_api_cover__loader.rs b/audio/shortwave/files/patch-src_api_cover__loader.rs new file mode 100644 index 000000000000..cb4f3baf003e --- /dev/null +++ b/audio/shortwave/files/patch-src_api_cover__loader.rs @@ -0,0 +1,40 @@ +--- src/api/cover_loader.rs.orig 2025-02-05 10:44:30 UTC ++++ src/api/cover_loader.rs +@@ -22,7 +22,6 @@ use gdk::RGBA; + use async_compat::CompatExt; + use futures_util::StreamExt; + use gdk::RGBA; +-use glycin::Loader; + use gtk::gio::{Cancelled, File}; + use gtk::graphene::Rect; + use gtk::prelude::TextureExt; +@@ -88,9 +87,7 @@ impl CoverRequest { + async fn cover_bytes(&self) -> Result<(gdk::Texture, Vec<u8>)> { + self.download_tmp_file().compat().await?; + +- let loader = Loader::new(self.tmp_file.clone()); +- let image = loader.load().await?; +- let texture = image.next_frame().await?.texture(); ++ let texture = Self::load_texture(&self.tmp_file).await?; + + let snapshot = gtk::Snapshot::new(); + snapshot_thumbnail(&snapshot, texture, self.size as f32); +@@ -106,6 +103,18 @@ impl CoverRequest { + + let png_bytes = texture.save_to_png_bytes().to_vec(); + Ok((texture, png_bytes)) ++ } ++ ++ #[cfg(target_os = "linux")] ++ async fn load_texture(file: &gio::File) -> Result<gdk::Texture> { ++ let loader = glycin::Loader::new(file.clone()); ++ let image = loader.load().await?; ++ Ok(image.next_frame().await?.texture()) ++ } ++ ++ #[cfg(target_os = "freebsd")] ++ async fn load_texture(file: &gio::File) -> Result<gdk::Texture> { ++ Ok(gdk::Texture::from_file(file)?) + } + + async fn download_tmp_file(&self) -> Result<()> { |