diff options
Diffstat (limited to 'media-sound/herrie/files')
-rw-r--r-- | media-sound/herrie/files/herrie-2.2-fix-buildsystem.patch | 38 | ||||
-rw-r--r-- | media-sound/herrie/files/herrie-2.2-libxspf.patch | 122 | ||||
-rw-r--r-- | media-sound/herrie/files/herrie-chost_issue.patch | 29 |
3 files changed, 189 insertions, 0 deletions
diff --git a/media-sound/herrie/files/herrie-2.2-fix-buildsystem.patch b/media-sound/herrie/files/herrie-2.2-fix-buildsystem.patch new file mode 100644 index 000000000000..03a2c7397da8 --- /dev/null +++ b/media-sound/herrie/files/herrie-2.2-fix-buildsystem.patch @@ -0,0 +1,38 @@ +Fix ncurses underlinking by using the pkg-config output instead of assuming +-lncurses/-lncursesw to be enough. In addition, fix wrong modplug include +directive. See also: +https://bugs.gentoo.org/show_bug.cgi?id=573522 + +--- herrie-2.2/configure ++++ herrie-2.2/configure +@@ -215,7 +215,7 @@ + exit 1 + fi + CFLAGS_main="-DAUDIO_OUTPUT=\\\"$CFG_AO\\\" -DCONFFILE=\\\"$CONFFILE\\\"" +-LDFLAGS="$LDFLAGS -L$PREFIX/lib -l$CFG_CURSES_LIB" ++LDFLAGS="$LDFLAGS -L$PREFIX/lib `pkg-config --libs $CFG_CURSES_LIB`" + SRCS="audio_file audio_output_$CFG_AO config gui_browser gui_draw \ + gui_input gui_msgbar gui_playq gui_vfslist main playq playq_party \ + playq_xmms vfs vfs_playlist vfs_regular" +--- herrie-2.2/src/audio_format_modplug.c ++++ herrie-2.2/src/audio_format_modplug.c +@@ -31,7 +31,7 @@ + #include "stdinc.h" + + #include <sys/mman.h> +-#include <modplug.h> ++#include <libmodplug/modplug.h> + + #include "audio_file.h" + #include "audio_format.h" +--- herrie-2.2/src/main.c ++++ herrie-2.2/src/main.c +@@ -165,7 +165,7 @@ + #endif /* CLOSE_STDERR */ + if ((errmsg = vfs_lockup()) != NULL) { + gui_draw_init_abort(); +- g_printerr(errmsg); ++ g_printerr("%s", errmsg); + return (1); + } + diff --git a/media-sound/herrie/files/herrie-2.2-libxspf.patch b/media-sound/herrie/files/herrie-2.2-libxspf.patch new file mode 100644 index 000000000000..fa7cb7a4fcbb --- /dev/null +++ b/media-sound/herrie/files/herrie-2.2-libxspf.patch @@ -0,0 +1,122 @@ +--- herrie-2.2/configure ++++ herrie-2.2/configure +@@ -301,7 +301,7 @@ fi + if [ "$CFG_XSPF" != "" ] + then + CFLAGS="$CFLAGS -DBUILD_XSPF" +- LDFLAGS="$LDFLAGS -lspiff" ++ test_pkgconfig "libxspf" "xspf" "_vfs_xspf" + SRCS="$SRCS util vfs_xspf" + PLAYQ_DUMPFILE="autosave.xspf" + else +--- herrie-2.2/src/conftest.c ++++ herrie-2.2/src/conftest.c +@@ -56,16 +56,10 @@ + #include <vorbis/codec.h> + #include <vorbis/vorbisfile.h> + #endif /* BUILD_VORBIS */ +-#ifdef BUILD_XSPF +-#include <spiff/spiff_c.h> +-#endif /* BUILD_XSPF */ + + int + main(int argc, char *argv[]) + { +-#ifdef BUILD_XSPF +- spiff_write(NULL, NULL, NULL); +-#endif /* BUILD_XSPF */ + + return (0); + } +--- herrie-2.2/src/vfs_xspf.c ++++ herrie-2.2/src/vfs_xspf.c +@@ -30,7 +30,7 @@ + + #include "stdinc.h" + +-#include <spiff/spiff_c.h> ++#include <xspf_c.h> + + #include "util.h" + #include "vfs.h" +@@ -50,22 +50,22 @@ vfs_xspf_match(struct vfsent *ve, int isdir) + int + vfs_xspf_populate(struct vfsent *ve) + { +- struct spiff_list *slist; +- struct spiff_track *strack; +- struct spiff_mvalue *sloc; ++ struct xspf_list *slist; ++ struct xspf_track *strack; ++ struct xspf_mvalue *sloc; + char *dirname, *baseuri, *filename; + struct vfsref *vr; + + baseuri = url_escape(ve->filename); +- slist = spiff_parse(ve->filename, baseuri); ++ slist = xspf_parse(ve->filename, baseuri); + g_free(baseuri); + if (slist == NULL) + return (-1); + + dirname = g_path_get_dirname(ve->filename); + +- SPIFF_LIST_FOREACH_TRACK(slist, strack) { +- SPIFF_TRACK_FOREACH_LOCATION(strack, sloc) { ++ XSPF_LIST_FOREACH_TRACK(slist, strack) { ++ XSPF_TRACK_FOREACH_LOCATION(strack, sloc) { + /* Skip file:// part */ + filename = url_unescape(sloc->value); + +@@ -77,40 +77,40 @@ vfs_xspf_populate(struct vfsent *ve) + } + + g_free(dirname); +- spiff_free(slist); ++ xspf_free(slist); + return (0); + } + + int + vfs_xspf_write(const struct vfslist *vl, const char *filename) + { +- struct spiff_list *list; +- struct spiff_track *track; +- struct spiff_mvalue *location; ++ struct xspf_list *list; ++ struct xspf_track *track; ++ struct xspf_mvalue *location; + char *fn, *baseuri; + struct vfsref *vr; + int ret; + +- list = spiff_new(); ++ list = xspf_new(); + + VFS_LIST_FOREACH_REVERSE(vl, vr) { + /* Add a new track to the beginning of the list */ +- track = spiff_new_track_before(&list->tracks); ++ track = xspf_new_track_before(&list->tracks); + + /* Make sure we don't write non-UTF-8 titles to disk */ + if (g_utf8_validate(vfs_name(vr), -1, NULL)) +- spiff_setvalue(&track->title, vfs_name(vr)); ++ xspf_setvalue(&track->title, vfs_name(vr)); + +- location = spiff_new_mvalue_before(&track->locations); ++ location = xspf_new_mvalue_before(&track->locations); + fn = url_escape(vfs_filename(vr)); +- spiff_setvalue(&location->value, fn); ++ xspf_setvalue(&location->value, fn); + g_free(fn); + } + + baseuri = url_escape(filename); +- ret = spiff_write(list, filename, baseuri); ++ ret = xspf_write(list, filename, baseuri); + g_free(baseuri); +- spiff_free(list); ++ xspf_free(list); + + return (ret); + } diff --git a/media-sound/herrie/files/herrie-chost_issue.patch b/media-sound/herrie/files/herrie-chost_issue.patch new file mode 100644 index 000000000000..1949972baa6a --- /dev/null +++ b/media-sound/herrie/files/herrie-chost_issue.patch @@ -0,0 +1,29 @@ +This patch sets the OS variable according to the CHOST given by the environment, +thus enabling cross-compilation. + +Index: herrie-1.8/configure +=================================================================== +--- herrie-1.8.orig/configure ++++ herrie-1.8/configure +@@ -50,6 +50,21 @@ CFG_VORBIS=yes + CFG_XSPF=yes + DOIT=@ + ++case "$CHOST" in ++ *-darwin*) ++ OS=Darwin ++ ;; ++ *-linux*) ++ OS=Linux ++ ;; ++ *-freebsd*) ++ OS=FreeBSD ++ ;; ++ *-solaris*) ++ OS=SunOS ++ ;; ++esac ++ + # Operating system defaults + [ "$OS" != "" ] || OS=`uname` + case $OS in |