Attachment 67482 Details for Bug 55180 – pulse-split.patch

[patch] pulse-split.patch

pulse-split.patch (text/plain), 9.64 KB, created by Pierre Ossman on 2012-09-21 08:32:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pierre Ossman

Created: 2012-09-21 08:32:13 UTC

Size: 9.64 KB

patch

obsolete

>Index: src/Makefile.am
>===================================================================
>--- src/Makefile.am	(revision 25849)
>+++ src/Makefile.am	(working copy)
>@@ -71,7 +71,7 @@
> FOREIGN_CFLAGS = -w
> 
> MODULE_LDFLAGS = $(AM_LDFLAGS) -module -disable-static -avoid-version $(NOUNDEFINED_LDFLAGS)
>-MODULE_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la libpulse.la
>+MODULE_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la
> 
> ###################################
> #          Extra files            #
>@@ -141,9 +141,9 @@
> 		daemon/main.c
> 
> pulseaudio_CFLAGS = $(AM_CFLAGS) $(CAP_CFLAGS)
>-pulseaudio_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la libpulse.la $(LIBLTDL) $(CAP_LIBS)
>+pulseaudio_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la $(LIBLTDL) $(CAP_LIBS)
> # This is needed because automake doesn't properly expand the foreach below
>-pulseaudio_DEPENDENCIES = libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la libpulse.la $(PREOPEN_LIBS)
>+pulseaudio_DEPENDENCIES = libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la $(PREOPEN_LIBS)
> 
> if HAVE_DBUS
> pulseaudio_CFLAGS += $(DBUS_CFLAGS)
>@@ -535,8 +535,13 @@
> 
> libpulsecommon_@PA_MAJORMINOR@_la_SOURCES = \
> 		pulse/client-conf.c pulse/client-conf.h \
>+		pulse/error.c pulse/error.h \
> 		pulse/fork-detect.c pulse/fork-detect.h \
>+		pulse/format.c pulse/format.h \
> 		pulse/xmalloc.c pulse/xmalloc.h \
>+		pulse/mainloop-api.c pulse/mainloop-api.h \
>+		pulse/mainloop-signal.c pulse/mainloop-signal.h \
>+		pulse/mainloop.c pulse/mainloop.h \
> 		pulse/proplist.c pulse/proplist.h \
> 		pulse/utf8.c pulse/utf8.h \
> 		pulse/channelmap.c pulse/channelmap.h \
>@@ -544,6 +549,7 @@
> 		pulse/util.c pulse/util.h \
> 		pulse/timeval.c pulse/timeval.h \
> 		pulse/rtclock.c pulse/rtclock.h \
>+		pulse/volume.c pulse/volume.h \
> 		pulsecore/atomic.h \
> 		pulsecore/authkey.c pulsecore/authkey.h \
> 		pulsecore/conf-parser.c pulsecore/conf-parser.h \
>@@ -600,9 +606,9 @@
> 		pulsecore/sndfile-util.c pulsecore/sndfile-util.h \
> 		pulsecore/socket.h
> 
>-libpulsecommon_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) $(LIBSNDFILE_CFLAGS)
>+libpulsecommon_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) $(LIBSNDFILE_CFLAGS) $(LIBJSON_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) $(LIBJSON_LIBS)
> 
> if HAVE_X11
> libpulsecommon_@PA_MAJORMINOR@_la_SOURCES += \
>@@ -712,17 +718,12 @@
> 		pulse/channelmap.c pulse/channelmap.h \
> 		pulse/context.c pulse/context.h \
> 		pulse/def.h \
>-		pulse/error.c pulse/error.h \
> 		pulse/ext-device-manager.c pulse/ext-device-manager.h \
> 		pulse/ext-device-restore.c pulse/ext-device-restore.h \
> 		pulse/ext-stream-restore.c pulse/ext-stream-restore.h \
>-		pulse/format.c pulse/format.h \
> 		pulse/gccmacro.h \
> 		pulse/internal.h \
> 		pulse/introspect.c pulse/introspect.h \
>-		pulse/mainloop-api.c pulse/mainloop-api.h \
>-		pulse/mainloop-signal.c pulse/mainloop-signal.h \
>-		pulse/mainloop.c pulse/mainloop.h \
> 		pulse/operation.c pulse/operation.h \
> 		pulse/proplist.c pulse/proplist.h \
> 		pulse/pulseaudio.h \
>@@ -735,11 +736,10 @@
> 		pulse/timeval.c pulse/timeval.h \
> 		pulse/utf8.c pulse/utf8.h \
> 		pulse/util.c pulse/util.h \
>-		pulse/volume.c pulse/volume.h \
> 		pulse/xmalloc.c pulse/xmalloc.h
> 
>-libpulse_la_CFLAGS = $(AM_CFLAGS) $(LIBJSON_CFLAGS)
>-libpulse_la_LIBADD = $(AM_LIBADD) $(WINSOCK_LIBS) $(LTLIBICONV) $(LIBJSON_LIBS) libpulsecommon-@PA_MAJORMINOR@.la
>+libpulse_la_CFLAGS = $(AM_CFLAGS)
>+libpulse_la_LIBADD = $(AM_LIBADD) $(WINSOCK_LIBS) $(LTLIBICONV) libpulsecommon-@PA_MAJORMINOR@.la
> libpulse_la_LDFLAGS = $(AM_LDFLAGS) $(VERSIONING_LDFLAGS) -version-info $(LIBPULSE_VERSION_INFO)
> 
> if HAVE_DBUS
>@@ -841,7 +841,7 @@
> 
> libpulsecore_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) $(SERVER_CFLAGS) $(LIBSAMPLERATE_CFLAGS) $(LIBSPEEX_CFLAGS) $(LIBSNDFILE_CFLAGS) $(WINSOCK_CFLAGS)
> libpulsecore_@PA_MAJORMINOR@_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version
>-libpulsecore_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSPEEX_LIBS) $(LIBSNDFILE_LIBS) $(WINSOCK_LIBS) $(LTLIBICONV) libpulsecommon-@PA_MAJORMINOR@.la libpulse.la libpulsecore-foreign.la
>+libpulsecore_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSPEEX_LIBS) $(LIBSNDFILE_LIBS) $(WINSOCK_LIBS) $(LTLIBICONV) libpulsecommon-@PA_MAJORMINOR@.la libpulsecore-foreign.la
> 
> if HAVE_ORC
> ORC_SOURCE += pulsecore/svolume
>@@ -923,24 +923,24 @@
> 
> libprotocol_simple_la_SOURCES = pulsecore/protocol-simple.c pulsecore/protocol-simple.h
> libprotocol_simple_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version
>-libprotocol_simple_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la libpulse.la
>+libprotocol_simple_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la
> 
> libcli_la_SOURCES = pulsecore/cli.c pulsecore/cli.h
> libcli_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version
>-libcli_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la libpulse.la
>+libcli_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la
> 
> libprotocol_cli_la_SOURCES = pulsecore/protocol-cli.c pulsecore/protocol-cli.h
> libprotocol_cli_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version
>-libprotocol_cli_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la libpulse.la libcli.la
>+libprotocol_cli_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la libcli.la
> 
> libprotocol_http_la_SOURCES = pulsecore/protocol-http.c pulsecore/protocol-http.h pulsecore/mime-type.c pulsecore/mime-type.h
> libprotocol_http_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version
>-libprotocol_http_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la libpulse.la
>+libprotocol_http_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la
> 
> libprotocol_native_la_SOURCES = pulsecore/protocol-native.c pulsecore/protocol-native.h pulsecore/native-common.h
> libprotocol_native_la_CFLAGS = $(AM_CFLAGS) $(SERVER_CFLAGS)
> libprotocol_native_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version
>-libprotocol_native_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la libpulse.la
>+libprotocol_native_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la
> if HAVE_DBUS
> libprotocol_native_la_CFLAGS += $(DBUS_CFLAGS)
> libprotocol_native_la_LIBADD += $(DBUS_LIBS)
>@@ -949,7 +949,7 @@
> if HAVE_ESOUND
> libprotocol_esound_la_SOURCES = pulsecore/protocol-esound.c pulsecore/protocol-esound.h pulsecore/esound.h
> libprotocol_esound_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version
>-libprotocol_esound_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la libpulse.la
>+libprotocol_esound_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la
> endif
> 
> librtp_la_SOURCES = \
>@@ -959,20 +959,20 @@
> 		modules/rtp/rtsp_client.c modules/rtp/rtsp_client.h \
> 		modules/rtp/headerlist.c modules/rtp/headerlist.h
> librtp_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version
>-librtp_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la libpulse.la
>+librtp_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la
> 
> libraop_la_SOURCES = \
>         modules/raop/raop_client.c modules/raop/raop_client.h \
>         modules/raop/base64.c modules/raop/base64.h
> libraop_la_CFLAGS = $(AM_CFLAGS) $(OPENSSL_CFLAGS) -I$(top_srcdir)/src/modules/rtp
> libraop_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version
>-libraop_la_LIBADD = $(AM_LIBADD) $(OPENSSL_LIBS) libpulsecore-@PA_MAJORMINOR@.la librtp.la libpulsecommon-@PA_MAJORMINOR@.la libpulse.la
>+libraop_la_LIBADD = $(AM_LIBADD) $(OPENSSL_LIBS) libpulsecore-@PA_MAJORMINOR@.la librtp.la libpulsecommon-@PA_MAJORMINOR@.la
> 
> # Avahi
> libavahi_wrap_la_SOURCES = pulsecore/avahi-wrap.c pulsecore/avahi-wrap.h
> libavahi_wrap_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version
> libavahi_wrap_la_CFLAGS = $(AM_CFLAGS) $(AVAHI_CFLAGS)
>-libavahi_wrap_la_LIBADD = $(AM_LIBADD) $(AVAHI_CFLAGS) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la libpulse.la
>+libavahi_wrap_la_LIBADD = $(AM_LIBADD) $(AVAHI_CFLAGS) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la
> 
> ###################################
> #        Plug-in libraries        #
>@@ -1909,7 +1909,7 @@
> module_gconf_la_CFLAGS = $(AM_CFLAGS) -DPA_GCONF_HELPER=\"$(pulselibexecdir)/gconf-helper\"
> 
> gconf_helper_SOURCES = modules/gconf/gconf-helper.c
>-gconf_helper_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la libpulse.la $(GCONF_LIBS)
>+gconf_helper_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la $(GCONF_LIBS)
> gconf_helper_CFLAGS = $(AM_CFLAGS) $(GCONF_CFLAGS)
> gconf_helper_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
> 
>@@ -1948,7 +1948,7 @@
> 		modules/bluetooth/a2dp-codecs.h \
> 		modules/bluetooth/ipc.c modules/bluetooth/ipc.h
> libbluetooth_ipc_la_LDFLAGS = -avoid-version
>-libbluetooth_ipc_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la libpulse.la
>+libbluetooth_ipc_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la
> libbluetooth_ipc_la_CFLAGS = $(AM_CFLAGS)
> BLUETOOTH_IPC_FILES = $(subst modules/bluetooth/,,$(libbluetooth_ipc_la_SOURCES)) rtp.h
>

Actions: View | Splinter Review

Attachments on bug 55180: 67482

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.