diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /media-sound/herrie/files/herrie-2.2-fix-buildsystem.patch |
reinit the tree, so we can have metadata
Diffstat (limited to 'media-sound/herrie/files/herrie-2.2-fix-buildsystem.patch')
-rw-r--r-- | media-sound/herrie/files/herrie-2.2-fix-buildsystem.patch | 38 |
1 files changed, 38 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); + } + |