46b430f2cb
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...
44 lines
1.5 KiB
Plaintext
44 lines
1.5 KiB
Plaintext
$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 = \
|
|
|
|
libpulsecommon_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) $(LIBSNDFILE_CFLAGS)
|
|
libpulsecommon_@PA_MAJORMINOR@_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version
|
|
-libpulsecommon_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) $(LIBWRAP_LIBS) $(WINSOCK_LIBS) $(LTLIBICONV) $(LIBSNDFILE_LIBS)
|
|
+libpulsecommon_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) $(LIBWRAP_LIBS) $(WINSOCK_LIBS) $(LTLIBICONV) $(LIBSNDFILE_LIBS) -lexecinfo
|
|
|
|
if HAVE_X11
|
|
libpulsecommon_@PA_MAJORMINOR@_la_SOURCES += \
|
|
@@ -1083,6 +1083,9 @@ modlibexec_LTLIBRARIES += \
|
|
module-oss.la
|
|
endif
|
|
|
|
+modlibexec_LTLIBRARIES += \
|
|
+ module-sndio.la
|
|
+
|
|
if HAVE_COREAUDIO
|
|
modlibexec_LTLIBRARIES += \
|
|
module-coreaudio-detect.la \
|
|
@@ -1302,6 +1305,7 @@ SYMDEF_FILES = \
|
|
module-x11-xsmp-symdef.h \
|
|
module-x11-cork-request-symdef.h \
|
|
module-oss-symdef.h \
|
|
+ module-sndio-symdef.h \
|
|
module-alsa-sink-symdef.h \
|
|
module-alsa-source-symdef.h \
|
|
module-alsa-card-symdef.h \
|
|
@@ -1601,6 +1605,12 @@ liboss_util_la_LIBADD = $(MODULE_LIBADD)
|
|
module_oss_la_SOURCES = modules/oss/module-oss.c
|
|
module_oss_la_LDFLAGS = $(MODULE_LDFLAGS)
|
|
module_oss_la_LIBADD = $(MODULE_LIBADD) liboss-util.la
|
|
+
|
|
+# SNDIO
|
|
+
|
|
+module_sndio_la_SOURCES = modules/module-sndio.c
|
|
+module_sndio_la_LDFLAGS = $(MODULE_LDFLAGS)
|
|
+module_sndio_la_LIBADD = $(MODULE_LIBADD) -lsndio
|
|
|
|
# COREAUDIO
|
|
|