Hello all.
This patch fixes problems with PulseAudio dependees. I'm not sure if
this is the right way to fix it but at least the most compact one from
those I tried already. :) So I'm sending it to public instead of
maintainer (robert@) for gathering more opinions. Thanks in advance
for review.
More details: ${PREFIX}/lib/libpulse.so is linked "privately" to
${PREFIX}/lib/pulseaudio/libpulsecommon.so, so every PulseAudio
user have to add ${PREFIX}/lib/pulseaudio to link path. Sometimes it's
not that obvious; in my case it was the following path:
audio/pulseaudio -> multimedia/phonon (in WIP) -> x11/kde4/libs
(libkdecore.so -> testkhtml binary). IMHO, fixing every other port is
stupid and ugly, thus I preferred to fix the problem at it's root.
At least kdelibs builds now fine without horrible CONFIGURE_ARGS hack
for each KDE apps port:
CONFIGURE_ARGS += -DCMAKE_EXE_LINKER_FLAGS="-L${LOCALBASE}/lib \
-Wl,-rpath,${LOCALBASE}/lib/pulseaudio"
Hope I'm not wrong...
--
WBR,
Vadim Zhukov
Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/pulseaudio/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- Makefile 8 Oct 2012 17:19:56 -0000 1.27
+++ Makefile 14 Oct 2012 13:43:29 -0000
@@ -19,7 +19,7 @@ COMMENT= cross-platform networked sound
VERSION= 2.0
DISTNAME= pulseaudio-${VERSION}
-REVISION= 4
+REVISION= 5
SHARED_LIBS += pulse 1.1 # .14.2
SHARED_LIBS += pulse-simple 0.0 # .0.3
Index: patches/patch-src_Makefile_am
===================================================================
RCS file: /cvs/ports/audio/pulseaudio/patches/patch-src_Makefile_am,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_Makefile_am
--- patches/patch-src_Makefile_am 29 Sep 2012 09:32:05 -0000 1.2
+++ patches/patch-src_Makefile_am 14 Oct 2012 13:43:29 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-src_Makefile_am,v 1.2 2012/09/29 09:32:05 ajacoutot Exp $
---- src/Makefile.am.orig Fri Apr 27 09:37:37 2012
-+++ src/Makefile.am Fri Sep 28 19:19:30 2012
+--- src/Makefile.am.orig Fri Apr 27 11:37:37 2012
++++ src/Makefile.am Sun Oct 14 17:22:26 2012
@@ -602,7 +602,7 @@ libpulsecommon_@PA_MAJORMINOR@_la_SOURCES = \
libpulsecommon_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) $(LIBSNDFILE_CFLAGS)
@@ -10,6 +10,15 @@ $OpenBSD: patch-src_Makefile_am,v 1.2 20
if HAVE_X11
libpulsecommon_@PA_MAJORMINOR@_la_SOURCES += \
+@@ -740,7 +740,7 @@ libpulse_la_SOURCES = \
+
+ libpulse_la_CFLAGS = $(AM_CFLAGS) $(LIBJSON_CFLAGS)
+ libpulse_la_LIBADD = $(AM_LIBADD) $(WINSOCK_LIBS) $(LTLIBICONV)
$(LIBJSON_LIBS) libpulsecommon-@PA_MAJORMINOR@.la
+-libpulse_la_LDFLAGS = $(AM_LDFLAGS) $(VERSIONING_LDFLAGS) -version-info
$(LIBPULSE_VERSION_INFO)
++libpulse_la_LDFLAGS = $(AM_LDFLAGS) $(VERSIONING_LDFLAGS) -version-info
$(LIBPULSE_VERSION_INFO) -Wl,-rpath,$(pkglibdir)
+
+ if HAVE_DBUS
+ libpulse_la_CFLAGS += $(DBUS_CFLAGS)
@@ -1083,6 +1083,9 @@ modlibexec_LTLIBRARIES += \
module-oss.la
endif
