blob: 03a2c7397da84172f407547cb6788cea2da51998 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
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);
}
|
GitWeb
