cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix -rpath so that the sndio() module loads correctly.

Browse Source 
Add comment to pc file patches.
Remove -rpath patches from Makefile.am.
Fix a bogus blindly copied over define from FreeBSD.

Note that pulseaudio is still broken, sndio(7) errors out...
This commit is contained in:
ajacoutot 2012-11-10 14:52:54 +00:00
parent cecc2a325b
commit 46b430f2cb
6 changed files with 23 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
audio/pulseaudio/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.30 2012/10/17 11:49:08 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.31 2012/11/10 14:52:54 ajacoutot Exp $
# XXX
# fix autospawn lock (patch-src_daemon_main_c)
@ -18,6 +18,7 @@ COMMENT= cross-platform networked sound server
VERSION= 2.1
DISTNAME= pulseaudio-${VERSION}
REVISION= 0
SHARED_LIBS += pulse 1.1 # .14.2
SHARED_LIBS += pulse-simple 0.0 # .0.3
@ -100,9 +101,10 @@ CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--disable-gconf \
--disable-avahi \
--disable-orc
# linked "privately" to lib/pulseaudio/libpulsecommon-X.Y.so
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib \
-Wl,-rpath,${TRUEPREFIX}/lib/pulse-${VERSION}/modules"
-Wl,-rpath,${TRUEPREFIX}/lib/pulseaudio:${TRUEPREFIX}/lib/pulse-${VERSION}/modules"
FAKE_FLAGS= pulseconfdir="${PREFIX}/share/examples/pulseaudio/pulse"

5
audio/pulseaudio/patches/patch-libpulse-mainloop-glib_pc_in
View File

@ -1,4 +1,7 @@
$OpenBSD: patch-libpulse-mainloop-glib_pc_in,v 1.1 2012/10/15 12:15:39 ajacoutot Exp $
$OpenBSD: patch-libpulse-mainloop-glib_pc_in,v 1.2 2012/11/10 14:52:54 ajacoutot Exp $
linked "privately" to lib/pulseaudio/libpulsecommon-X.Y.so
--- libpulse-mainloop-glib.pc.in.orig Mon Oct 15 12:27:21 2012
+++ libpulse-mainloop-glib.pc.in Mon Oct 15 12:28:53 2012
@@ -6,7 +6,7 @@ includedir=@includedir@

5
audio/pulseaudio/patches/patch-libpulse-simple_pc_in
View File

@ -1,4 +1,7 @@
$OpenBSD: patch-libpulse-simple_pc_in,v 1.1 2012/10/15 12:15:39 ajacoutot Exp $
$OpenBSD: patch-libpulse-simple_pc_in,v 1.2 2012/11/10 14:52:54 ajacoutot Exp $
linked "privately" to lib/pulseaudio/libpulsecommon-X.Y.so
--- libpulse-simple.pc.in.orig Mon Oct 15 12:27:26 2012
+++ libpulse-simple.pc.in Mon Oct 15 12:29:00 2012
@@ -6,7 +6,7 @@ includedir=@includedir@

5
audio/pulseaudio/patches/patch-libpulse_pc_in
View File

@ -1,4 +1,7 @@
$OpenBSD: patch-libpulse_pc_in,v 1.1 2012/10/15 12:15:39 ajacoutot Exp $
$OpenBSD: patch-libpulse_pc_in,v 1.2 2012/11/10 14:52:54 ajacoutot Exp $
linked "privately" to lib/pulseaudio/libpulsecommon-X.Y.so
--- libpulse.pc.in.orig Mon Oct 15 12:29:53 2012
+++ libpulse.pc.in Mon Oct 15 12:29:59 2012
@@ -7,6 +7,6 @@ modlibexecdir=@modlibexecdir@

30
audio/pulseaudio/patches/patch-src_Makefile_am
View File

@ -1,8 +1,4 @@
$OpenBSD: patch-src_Makefile_am,v 1.4 2012/10/17 11:49:09 ajacoutot Exp $
libpulse.so and libpulse-mainloop-glib.so are linked "privately" to
lib/pulseaudio/libpulsecommon.so so add it to the link path.
$OpenBSD: patch-src_Makefile_am,v 1.5 2012/11/10 14:52:54 ajacoutot Exp $
--- src/Makefile.am.orig Thu Jul 19 13:29:43 2012
+++ src/Makefile.am Wed Oct 17 11:26:22 2012
@@ -602,7 +602,7 @@ libpulsecommon_@PA_MAJORMINOR@_la_SOURCES = \
@ -14,30 +10,6 @@ lib/pulseaudio/libpulsecommon.so so add it to the link path.
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)
@@ -750,12 +750,12 @@ endif
libpulse_simple_la_SOURCES = pulse/simple.c pulse/simple.h
libpulse_simple_la_CFLAGS = $(AM_CFLAGS)
libpulse_simple_la_LIBADD = $(AM_LIBADD) libpulse.la libpulsecommon-@PA_MAJORMINOR@.la
-libpulse_simple_la_LDFLAGS = $(AM_LDFLAGS) $(VERSIONING_LDFLAGS) -version-info $(LIBPULSE_SIMPLE_VERSION_INFO)
+libpulse_simple_la_LDFLAGS = $(AM_LDFLAGS) $(VERSIONING_LDFLAGS) -version-info $(LIBPULSE_SIMPLE_VERSION_INFO) -Wl,-rpath,$(pkglibdir)
libpulse_mainloop_glib_la_SOURCES = pulse/glib-mainloop.h pulse/glib-mainloop.c
libpulse_mainloop_glib_la_CFLAGS = $(AM_CFLAGS) $(GLIB20_CFLAGS)
libpulse_mainloop_glib_la_LIBADD = $(AM_LIBADD) libpulse.la libpulsecommon-@PA_MAJORMINOR@.la $(GLIB20_LIBS)
-libpulse_mainloop_glib_la_LDFLAGS = $(AM_LDFLAGS) $(VERSIONING_LDFLAGS) -version-info $(LIBPULSE_MAINLOOP_GLIB_VERSION_INFO)
+libpulse_mainloop_glib_la_LDFLAGS = $(AM_LDFLAGS) $(VERSIONING_LDFLAGS) -version-info $(LIBPULSE_MAINLOOP_GLIB_VERSION_INFO) -Wl,-rpath,$(pkglibdir)
###################################
# OSS emulation #
@@ -1083,6 +1083,9 @@ modlibexec_LTLIBRARIES += \
module-oss.la
endif

14
audio/pulseaudio/patches/patch-src_daemon_main_c
View File

@ -1,19 +1,17 @@
$OpenBSD: patch-src_daemon_main_c,v 1.2 2011/10/01 08:37:30 ajacoutot Exp $
--- src/daemon/main.c.orig Tue Sep 13 21:54:48 2011
+++ src/daemon/main.c Fri Sep 30 14:50:32 2011
$OpenBSD: patch-src_daemon_main_c,v 1.3 2012/11/10 14:52:54 ajacoutot Exp $
--- src/daemon/main.c.orig Thu Jul 19 13:29:38 2012
+++ src/daemon/main.c Sat Nov 10 15:20:40 2012
@@ -735,6 +735,7 @@ int main(int argc, char *argv[]) {
* first take the autospawn lock to make things
* synchronous. */
+#if notyet /* XXX broken on *BSD */
+#if 0 /* XXX broken on *BSD */
if ((autospawn_fd = pa_autospawn_lock_init()) < 0) {
pa_log("Failed to initialize autospawn lock");
goto finish;
@@ -744,8 +745,8 @@ int main(int argc, char *argv[]) {
pa_log("Failed to acquire autospawn lock");
goto finish;
@@ -746,6 +747,7 @@ int main(int argc, char *argv[]) {
}
-
autospawn_locked = TRUE;
+#endif
}