diff options
| author | Alexey Dokuchaev <danfe@FreeBSD.org> | 2012-06-21 16:59:38 +0000 |
|---|---|---|
| committer | Alexey Dokuchaev <danfe@FreeBSD.org> | 2012-06-21 16:59:38 +0000 |
| commit | 5969e71de707361cbfcdd39bf1f94e0498762ba5 (patch) | |
| tree | 00bae54d3568f38510fc4ad2dc08bda3027e6bc4 /audio/osd-lyrics | |
| parent | Update to 0.7.1. (diff) | |
Unbreak on FreeBSD 9.X and -CURRENT after r215840: #include <stdlib.h> inside
`#pragma GCC visibility push(hidden)' results in free() symbol being .hidden,
and linker woes. As a remedy, temporarily revert visibility to default when
including this header (probably not the best way to solve the problem though).
While here, pacify portlint(1) by removing hard-coded shlib ABI versions in
LIB_DEPENDS.
Reported by: pointyhat (via pav, erwin)
Notes
Notes:
svn path=/head/; revision=299741
Diffstat (limited to 'audio/osd-lyrics')
| -rw-r--r-- | audio/osd-lyrics/Makefile | 12 | ||||
| -rw-r--r-- | audio/osd-lyrics/files/patch-free-visibility | 24 |
2 files changed, 29 insertions, 7 deletions
diff --git a/audio/osd-lyrics/Makefile b/audio/osd-lyrics/Makefile index 707fcc644644..763d983bc012 100644 --- a/audio/osd-lyrics/Makefile +++ b/audio/osd-lyrics/Makefile @@ -17,11 +17,9 @@ COMMENT= On-screen lyrics display program for various media players LICENSE= GPLv3 -LIB_DEPENDS= notify.4:${PORTSDIR}/devel/libnotify \ - dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ - curl.6:${PORTSDIR}/ftp/curl - -BROKEN= does not compile +LIB_DEPENDS= notify:${PORTSDIR}/devel/libnotify \ + dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ + curl:${PORTSDIR}/ftp/curl GNU_CONFIGURE= yes CONFIGURE_ENV= DATADIRNAME=share @@ -42,13 +40,13 @@ OPTIONS= MPD "Enable MPD support" off \ .include <bsd.port.options.mk> .if defined(WITH_MPD) -LIB_DEPENDS+= mpd.4:${PORTSDIR}/audio/libmpd +LIB_DEPENDS+= mpd:${PORTSDIR}/audio/libmpd .else CONFIGURE_ARGS+= --disable-mpd .endif .if defined(WITH_XMMS2) -LIB_DEPENDS+= xmmsclient.6:${PORTSDIR}/audio/xmms2 +LIB_DEPENDS+= xmmsclient:${PORTSDIR}/audio/xmms2 .else CONFIGURE_ARGS+= --disable-xmms2 .endif diff --git a/audio/osd-lyrics/files/patch-free-visibility b/audio/osd-lyrics/files/patch-free-visibility new file mode 100644 index 000000000000..032d195fef72 --- /dev/null +++ b/audio/osd-lyrics/files/patch-free-visibility @@ -0,0 +1,24 @@ +--- lib/chardetect/src/entry/impl.cpp.orig ++++ lib/chardetect/src/entry/impl.cpp +@@ -42,7 +42,9 @@ + #include "nscore.h" + #include "nsUniversalDetector.h" + #include <string.h> ++#pragma GCC visibility push(default) + #include <stdlib.h> ++#pragma GCC visibility pop + + #ifdef _WIN32 + # include <windows.h> +--- lib/chardetect/src/prmem.h.orig ++++ lib/chardetect/src/prmem.h +@@ -37,7 +37,9 @@ + #ifndef nsDummyPrmem_h__ + #define nsDummyPrmem_h__ + ++#pragma GCC visibility push(default) + #include <stdlib.h> ++#pragma GCC visibility pop + + inline void* PR_Malloc(size_t len) + { |