<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/957699013bd4590165c9dd098402ac0b9e6f8636">https://github.com/macports/macports-ports/commit/957699013bd4590165c9dd098402ac0b9e6f8636</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 957699013bd herrie: Fix build with libxspf
</span>957699013bd is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 957699013bd4590165c9dd098402ac0b9e6f8636
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Tue Jan 23 08:16:02 2024 -0600
<span style='display:block; white-space:pre;color:#404040;'> herrie: Fix build with libxspf
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/41744
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also include upstream patch for better libsndfile detection.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Switch to GitHub hosting and remove references to the old domain name
</span><span style='display:block; white-space:pre;color:#404040;'> that is no longer owned by the project.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add gettext-runtime dependency because it does link with libintl.dylib.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Modernize checksums.
</span>---
audio/herrie/Portfile | 32 +++++----
audio/herrie/files/libsndfile.patch | 17 +++++
audio/herrie/files/libxspf.patch | 127 ++++++++++++++++++++++++++++++++++++
3 files changed, 164 insertions(+), 12 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/herrie/Portfile b/audio/herrie/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 88b06c4a6fc..31ed794ec76 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/herrie/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/herrie/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,16 @@
</span> PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup EdSchouten herrie 2.2 herrie-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 e0f70ca4d867cf6cdbb452bd0f0860ef1f5a9f39 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 142341072920f86b6eb570b8f13bf5fd87c06cf801543dc7d1a819e39eb9fb2b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 71596
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name herrie
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span> categories audio
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0ffe0;'>+license BSD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> description Small command line interface music player
long_description \
Herrie is a minimalistic music player that uses the command \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,17 +26,19 @@ long_description \
</span> Herrie also has some more exotic features, including support \
for AudioScrobbler and the ability to chroot() itself into a \
directory.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://herrie.info/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://herrie.info/distfiles/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- http://www.stack.nl/~ed/projects/${name}/distfiles/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 88832b10298ab89473730eb0c93b6ddf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 e0f70ca4d867cf6cdbb452bd0f0860ef1f5a9f39 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 ae5c39be11aeb19898cd3f968580eafc623830b7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from releases
</span> use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:gettext port:pkgconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 port:ncurses
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:gettext \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/pkg-config:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gettext-runtime \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ncurses
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles libsndfile.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libxspf.patch
</span>
configure.pre_args
configure.env-append PREFIX=${prefix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/herrie/files/libsndfile.patch b/audio/herrie/files/libsndfile.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..0227ab44f8d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/herrie/files/libsndfile.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Check for latest libsndfile.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/EdSchouten/herrie/commit/4e80990dc29266e8238f79539f8a751556d53892
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix libsndfile 1.0.18 detection.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/EdSchouten/herrie/commit/dbff9fee97b28db470c044485d37dba594d52b9b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/conftest.c.orig 2008-10-14 11:20:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/conftest.c 2024-01-23 08:11:44.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -63,6 +63,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ main(int argc, char *argv[])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef BUILD_SNDFILE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sf_get_string(NULL, SF_STR_ALBUM);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif /* BUILD_SNDFILE */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef BUILD_XSPF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ spiff_write(NULL, NULL, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* BUILD_XSPF */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/herrie/files/libxspf.patch b/audio/herrie/files/libxspf.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4ffa94a7e01
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/herrie/files/libxspf.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,127 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Migrate to libxspf.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/EdSchouten/herrie/commit/fab586018f80d3d6a386256dead60cc0cebbede8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2008-10-14 11:20:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2024-01-23 08:05:44.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -288,7 +288,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [ "$CFG_XSPF" != "" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS="$CFLAGS -DBUILD_XSPF"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LDFLAGS="$LDFLAGS -lspiff"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ test_pkgconfig "libxspf" "xspf" "_vfs_xspf"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SRCS="$SRCS util vfs_xspf"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PLAYQ_DUMPFILE="autosave.xspf"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/conftest.c.orig 2008-10-14 11:20:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/conftest.c 2024-01-23 08:10:51.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -56,9 +56,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <vorbis/codec.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <vorbis/vorbisfile.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* BUILD_VORBIS */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef BUILD_XSPF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <spiff/spiff_c.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif /* BUILD_XSPF */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ main(int argc, char *argv[])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -67,9 +64,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef BUILD_SNDFILE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sf_get_string(NULL, SF_STR_ALBUM);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* BUILD_SNDFILE */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef BUILD_XSPF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- spiff_write(NULL, NULL, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif /* BUILD_XSPF */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return (0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/vfs_xspf.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/vfs_xspf.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -30,7 +30,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "stdinc.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <spiff/spiff_c.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <xspf_c.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "util.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "vfs.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -50,22 +50,22 @@ vfs_xspf_match(struct vfsent *ve, int isdir)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vfs_xspf_populate(struct vfsent *ve)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- struct spiff_list *slist;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- struct spiff_track *strack;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- struct spiff_mvalue *sloc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ struct xspf_list *slist;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ struct xspf_track *strack;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ struct xspf_mvalue *sloc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *dirname, *baseuri, *filename;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct vfsref *vr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ baseuri = url_escape(ve->filename);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- slist = spiff_parse(ve->filename, baseuri);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ slist = xspf_parse(ve->filename, baseuri);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_free(baseuri);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (slist == NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return (-1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dirname = g_path_get_dirname(ve->filename);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SPIFF_LIST_FOREACH_TRACK(slist, strack) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SPIFF_TRACK_FOREACH_LOCATION(strack, sloc) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ XSPF_LIST_FOREACH_TRACK(slist, strack) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ XSPF_TRACK_FOREACH_LOCATION(strack, sloc) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Skip file:// part */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ filename = url_unescape(sloc->value);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -77,40 +77,40 @@ vfs_xspf_populate(struct vfsent *ve)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_free(dirname);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- spiff_free(slist);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ xspf_free(slist);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return (0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vfs_xspf_write(const struct vfslist *vl, const char *filename)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- struct spiff_list *list;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- struct spiff_track *track;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- struct spiff_mvalue *location;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ struct xspf_list *list;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ struct xspf_track *track;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ struct xspf_mvalue *location;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *fn, *baseuri;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct vfsref *vr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int ret;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- list = spiff_new();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ list = xspf_new();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VFS_LIST_FOREACH_REVERSE(vl, vr) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Add a new track to the beginning of the list */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- track = spiff_new_track_before(&list->tracks);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ track = xspf_new_track_before(&list->tracks);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Make sure we don't write non-UTF-8 titles to disk */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (g_utf8_validate(vfs_name(vr), -1, NULL))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- spiff_setvalue(&track->title, vfs_name(vr));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ xspf_setvalue(&track->title, vfs_name(vr));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- location = spiff_new_mvalue_before(&track->locations);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ location = xspf_new_mvalue_before(&track->locations);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fn = url_escape(vfs_filename(vr));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- spiff_setvalue(&location->value, fn);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ xspf_setvalue(&location->value, fn);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_free(fn);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ baseuri = url_escape(filename);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ret = spiff_write(list, filename, baseuri);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ret = xspf_write(list, filename, baseuri);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_free(baseuri);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- spiff_free(list);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ xspf_free(list);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return (ret);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span></pre><pre style='margin:0'>
</pre>