pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

owntone: update to 28.12



Module Name:	pkgsrc-wip
Committed By:	Andrew Cagney <andrew.cagney%gmail.com@localhost>
Pushed By:	cagney
Date:		Wed Jul 9 12:31:19 2025 +0000
Changeset:	d1acfdbd4c484a2bf991abe355331c4749514bcc

Modified Files:
	owntone/Makefile
	owntone/PLIST
	owntone/TODO
	owntone/distinfo
Added Files:
	owntone/patches/patch-src_library_filescanner__ffmpeg.c

Log Message:
owntone: update to 28.12

Added patch to fix build of `filescanner_ffmpeg.c`.
Opened https://github.com/owntone/owntone-server/issues/1901
to start conversation about correct fix (likely involving, sigh,
autoconf).

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d1acfdbd4c484a2bf991abe355331c4749514bcc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 owntone/Makefile                                   |  2 +-
 owntone/PLIST                                      | 26 ++++++++++++-------
 owntone/TODO                                       | 29 ++++++++++++++++++---
 owntone/distinfo                                   |  7 ++---
 .../patch-src_library_filescanner__ffmpeg.c        | 30 ++++++++++++++++++++++
 5 files changed, 78 insertions(+), 16 deletions(-)

diffs:
diff --git a/owntone/Makefile b/owntone/Makefile
index 1477cf0e9a..096f491e6b 100644
--- a/owntone/Makefile
+++ b/owntone/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-VERSION=	28.9
+VERSION=	28.12
 DISTNAME=	owntone-${VERSION}
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_GITHUB:=owntone/owntone-server/releases/download/${VERSION}/}
diff --git a/owntone/PLIST b/owntone/PLIST
index 004985443d..a0bc6ea794 100644
--- a/owntone/PLIST
+++ b/owntone/PLIST
@@ -11,11 +11,19 @@ share/doc/owntone/docs/advanced/outputs-pulse.md
 share/doc/owntone/docs/advanced/radio-streams.md
 share/doc/owntone/docs/advanced/remote-access.md
 share/doc/owntone/docs/artwork.md
-share/doc/owntone/docs/clients/cli.md
-share/doc/owntone/docs/clients/mpd.md
-share/doc/owntone/docs/clients/remote.md
-share/doc/owntone/docs/clients/supported-clients.md
-share/doc/owntone/docs/clients/web-interface.md
+share/doc/owntone/docs/audio-outputs/airplay.md
+share/doc/owntone/docs/audio-outputs/chromecast.md
+share/doc/owntone/docs/audio-outputs/local-audio.md
+share/doc/owntone/docs/audio-outputs/mobile.md
+share/doc/owntone/docs/audio-outputs/roku.md
+share/doc/owntone/docs/audio-outputs/streaming.md
+share/doc/owntone/docs/audio-outputs/web.md
+share/doc/owntone/docs/building.md
+share/doc/owntone/docs/configuration.md
+share/doc/owntone/docs/control-clients/cli-api.md
+share/doc/owntone/docs/control-clients/desktop.md
+share/doc/owntone/docs/control-clients/mobile.md
+share/doc/owntone/docs/control-clients/web.md
 share/doc/owntone/docs/getting-started.md
 share/doc/owntone/docs/index.md
 share/doc/owntone/docs/installation.md
@@ -23,10 +31,7 @@ share/doc/owntone/docs/integrations/lastfm.md
 share/doc/owntone/docs/integrations/spotify.md
 share/doc/owntone/docs/json-api.md
 share/doc/owntone/docs/library.md
-share/doc/owntone/docs/outputs/airplay.md
-share/doc/owntone/docs/outputs/chromecast.md
-share/doc/owntone/docs/outputs/local-audio.md
-share/doc/owntone/docs/outputs/streaming.md
+share/doc/owntone/docs/media-clients.md
 share/doc/owntone/docs/playlists.md
 share/doc/owntone/docs/smart-playlists.md
 share/doc/owntone/scripts/pairinghelper.sh
@@ -43,3 +48,6 @@ share/owntone/htdocs/index.html
 share/owntone/htdocs/mstile-150x150.png
 share/owntone/htdocs/safari-pinned-tab.svg
 share/owntone/htdocs/site.webmanifest
+@pkgdir var/run
+@pkgdir var/log
+@pkgdir var/cache/owntone
diff --git a/owntone/TODO b/owntone/TODO
index aadb7c4a4a..b40f25b84d 100644
--- a/owntone/TODO
+++ b/owntone/TODO
@@ -8,9 +8,32 @@ Not sure that ffmpeg5 is correct
 Need to figure out ALSA so mpd mode can be tested.
 
 Config file should be installed into share/examples/owntone and
-installed using CONF_FILES
+installed using CONF_FILES.
 
 Build and install web interface (separate package?).
 
-Bug https://github.com/owntone/owntone-server/issues/1568 but might
-work for someone else.
+Starts then stops?
+
+[2025-07-09 12:34:27] [  LOG] [            (-1)]     main: OwnTone version 28.12 taking off
+[2025-07-09 12:34:27] [  LOG] [            (-1)]     main: Built with:
+[2025-07-09 12:34:27] [  LOG] [            (-1)]     main: - ffmpeg
+[2025-07-09 12:34:27] [  LOG] [            (-1)]     main: - Spotify
+[2025-07-09 12:34:27] [  LOG] [            (-1)]     main: - librespot-c
+[2025-07-09 12:34:27] [  LOG] [            (-1)]     main: - LastFM
+[2025-07-09 12:34:27] [  LOG] [            (-1)]     main: - Without Chromecast
+[2025-07-09 12:34:27] [  LOG] [            (-1)]     main: - MPD
+[2025-07-09 12:34:27] [  LOG] [            (-1)]     main: - Websockets
+[2025-07-09 12:34:27] [  LOG] [            (-1)]     main: - ALSA
+[2025-07-09 12:34:27] [  LOG] [            (-1)]     main: - Webinterface
+[2025-07-09 12:34:27] [  LOG] [            (-1)]     main: - Regex
+[2025-07-09 12:34:27] [  LOG] [            (-1)]     main: mDNS init
+[2025-07-09 12:34:27] [FATAL] [            (-1)]     main: mDNS init failed
+[2025-07-09 12:34:27] [  LOG] [            (-1)]     main: Exiting.
+
+Upstream bugs:
+
+- can't talk to amp
+  https://github.com/owntone/owntone-server/issues/1568
+
+- filescanner_ffmpeg.c needs patching
+  https://github.com/owntone/owntone-server/issues/1901
diff --git a/owntone/distinfo b/owntone/distinfo
index d46547d136..7da1434fae 100644
--- a/owntone/distinfo
+++ b/owntone/distinfo
@@ -1,5 +1,6 @@
 $NetBSD$
 
-BLAKE2s (owntone-28.9.tar.xz) = c02391da9ca26d72e786f8aea54aec2f8a383c78654c70c50e9c45fff0de4e1d
-SHA512 (owntone-28.9.tar.xz) = 29f42a4a8c9501a038ecc5026fc4bce9d777dee722937b89a55523cd68f001c821017d09f32b704a0c331879f7049d7d087d8e6899c82924f45401b012c65e95
-Size (owntone-28.9.tar.xz) = 1066248 bytes
+BLAKE2s (owntone-28.12.tar.xz) = 45f41289dd0d1542ca9a4275778488e6c33f802aa8899e1fe0e8fb1324f94005
+SHA512 (owntone-28.12.tar.xz) = 87801bb843dab3215158c63f3aeed67ec725a678628cbf2bce417a60b2b7466a413c3d776e306ff3973240aa9e96fb744df801efa2dd3287530ffb3508e606f4
+Size (owntone-28.12.tar.xz) = 1123924 bytes
+SHA1 (patch-src_library_filescanner__ffmpeg.c) = f5645de396580a4621f7305b41923df9ed134b98
diff --git a/owntone/patches/patch-src_library_filescanner__ffmpeg.c b/owntone/patches/patch-src_library_filescanner__ffmpeg.c
new file mode 100644
index 0000000000..4323256a75
--- /dev/null
+++ b/owntone/patches/patch-src_library_filescanner__ffmpeg.c
@@ -0,0 +1,30 @@
+$NetBSD$
+
+--- src/library/filescanner_ffmpeg.c.orig	2025-07-08 21:13:46.878613539 +0000
++++ src/library/filescanner_ffmpeg.c
+@@ -812,6 +812,25 @@ fast_copy(int fd_dst, int fd_src)
+   // Here we use kernel-space copying for performance reasons
+ #if defined(__APPLE__)
+   return fcopyfile(fd_src, fd_dst, 0, COPYFILE_ALL);
++#elif defined(__NetBSD__)
++  while (true) {
++    unsigned char buf[1024/*?!?*/];
++    ssize_t nr;
++
++    nr = read(fd_src, buf, sizeof(buf));
++    if (nr == -1) {
++      return -1;
++    }
++
++    if (nr == 0) {
++      return 0;
++    }
++
++    if (write(fd_dst, buf, nr) != nr) {
++      return -1;
++    }
++
++  }
+ #else
+   struct stat fileinfo = { 0 };
+   ssize_t bytes_copied;


Home | Main Index | Thread Index | Old Index