[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.19-176-g8ec304d
Lennart Poettering
gitmailer-noreply at 0pointer.de
Wed Oct 7 11:00:34 PDT 2009
This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.
The master branch has been updated
from d0b478e9a6ecb5c6b74180b1845069946d8f6f10 (commit)
- Log -----------------------------------------------------------------
8ec304d Fix build when using -fweb, accept both register and memory constraints.
f55357c Add check for FFTW, and add option to disable it at build-time.
b64b6bb Fix out-of-tree builds when dbus module is enabled.
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 10 ++++++++++
src/Makefile.am | 12 +++++++++---
src/pulsecore/svolume_mmx.c | 4 ++--
src/pulsecore/svolume_sse.c | 4 ++--
4 files changed, 23 insertions(+), 7 deletions(-)
-----------------------------------------------------------------------
commit b64b6bbf4c5eda8d4c80dd956987234d1378d055
Author: Diego Elio 'Flameeyes' Pettenò <flameeyes at gmail.com>
Date: Wed Oct 7 19:29:33 2009 +0200
Fix out-of-tree builds when dbus module is enabled.
diff --git a/src/Makefile.am b/src/Makefile.am
index 35941a6..b277a9a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -70,6 +70,8 @@ AM_CFLAGS = \
-I$(top_builddir)/src/modules/x11 \
-I$(top_srcdir)/src/modules/jack \
-I$(top_builddir)/src/modules/jack \
+ -I$(top_srcdir)/src/modules/dbus \
+ -I$(top_builddir)/src/modules/dbus \
$(PTHREAD_CFLAGS) -D_POSIX_PTHREAD_SEMANTICS \
$(LIBSAMPLERATE_CFLAGS) \
$(LIBSNDFILE_CFLAGS) \
commit f55357cd0bcbc0a86f4ea9056584885897a8ec6c
Author: Diego Elio 'Flameeyes' Pettenò <flameeyes at gmail.com>
Date: Wed Oct 7 19:30:11 2009 +0200
Add check for FFTW, and add option to disable it at build-time.
This way there will be a message at configure if FFTW is not found, and
this gets in-line with the rest of the modules' dependencies.
diff --git a/configure.ac b/configure.ac
index fd10c83..77ec884 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1273,6 +1273,16 @@ AC_SUBST(OPENSSL_LIBS)
AC_SUBST(HAVE_OPENSSL)
AM_CONDITIONAL([HAVE_OPENSSL], [test "x$HAVE_OPENSSL" = x1])
+#### FFTW (optional) ####
+AC_ARG_WITH(
+ [fftw],
+ AS_HELP_STRING([--without-fftw], [Omit FFTW-using modules (equalizer)]))
+
+if test "x${with_fftw}" != "xno"; then
+ PKG_CHECK_MODULES([FFTW], [fftw3f], [HAVE_FFTW=1], [HAVE_FFTW=0])
+fi
+AM_CONDITIONAL([HAVE_FFTW], [test "x$HAVE_FFTW" = "x1"])
+
### Build and Install man pages ###
AC_ARG_ENABLE(manpages,
AS_HELP_STRING([--disable-manpages],[Disable building and installation of man pages]),
diff --git a/src/Makefile.am b/src/Makefile.am
index b277a9a..c5d3ab7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1017,7 +1017,6 @@ modlibexec_LTLIBRARIES += \
module-combine.la \
module-remap-sink.la \
module-ladspa-sink.la \
- module-equalizer-sink.la \
module-esound-sink.la \
module-tunnel-sink.la \
module-tunnel-source.la \
@@ -1195,6 +1194,11 @@ modlibexec_LTLIBRARIES += \
endif
endif
+if HAVE_FFTW
+modlibexec_LTLIBRARIES += \
+ module-equalizer-sink.la
+endif
+
# These are generated by an M4 script
SYMDEF_FILES = \
modules/module-cli-symdef.h \
@@ -1415,9 +1419,9 @@ module_ladspa_sink_la_LDFLAGS = $(MODULE_LDFLAGS)
module_ladspa_sink_la_LIBADD = $(AM_LIBADD) $(LIBLTDL) libpulsecore- at PA_MAJORMINORMICRO@.la libpulsecommon- at PA_MAJORMINORMICRO@.la libpulse.la
module_equalizer_sink_la_SOURCES = modules/module-equalizer-sink.c
-module_equalizer_sink_la_CFLAGS = $(AM_CFLAGS)
+module_equalizer_sink_la_CFLAGS = $(AM_CFLAGS) $(FFTW_CFLAGS)
module_equalizer_sink_la_LDFLAGS = $(MODULE_LDFLAGS)
-module_equalizer_sink_la_LIBADD = $(AM_LIBADD) $(DBUS_LIBS) -lfftw3f libpulsecore- at PA_MAJORMINORMICRO@.la libpulsecommon- at PA_MAJORMINORMICRO@.la libpulse.la
+module_equalizer_sink_la_LIBADD = $(AM_LIBADD) $(DBUS_LIBS) $(FFTW_LIBS) libpulsecore- at PA_MAJORMINORMICRO@.la libpulsecommon- at PA_MAJORMINORMICRO@.la libpulse.la
module_match_la_SOURCES = modules/module-match.c
module_match_la_LDFLAGS = $(MODULE_LDFLAGS)
commit 8ec304d2d1e956cc3f5f35437ac4fe580b36f004
Author: Diego Elio 'Flameeyes' Pettenò <flameeyes at gmail.com>
Date: Wed Oct 7 19:31:11 2009 +0200
Fix build when using -fweb, accept both register and memory constraints.
This was reported as Gentoo bug #287391 by Torsten Kaiser, and the fix was
suggested by Mike Frysinger.
diff --git a/src/pulsecore/svolume_mmx.c b/src/pulsecore/svolume_mmx.c
index 1768eb5..745c7de 100644
--- a/src/pulsecore/svolume_mmx.c
+++ b/src/pulsecore/svolume_mmx.c
@@ -152,7 +152,7 @@ pa_volume_s16ne_mmx (int16_t *samples, int32_t *volumes, unsigned channels, unsi
" emms \n\t"
: "+r" (samples), "+r" (volumes), "+r" (length), "=D" ((pa_reg_x86)channel), "=&r" (temp)
- : "X" ((pa_reg_x86)channels)
+ : "rm" ((pa_reg_x86)channels)
: "cc"
);
}
@@ -228,7 +228,7 @@ pa_volume_s16re_mmx (int16_t *samples, int32_t *volumes, unsigned channels, unsi
" emms \n\t"
: "+r" (samples), "+r" (volumes), "+r" (length), "=D" ((pa_reg_x86)channel), "=&r" (temp)
- : "X" ((pa_reg_x86)channels)
+ : "rm" ((pa_reg_x86)channels)
: "cc"
);
}
diff --git a/src/pulsecore/svolume_sse.c b/src/pulsecore/svolume_sse.c
index ab9394f..1cc4e0a 100644
--- a/src/pulsecore/svolume_sse.c
+++ b/src/pulsecore/svolume_sse.c
@@ -149,7 +149,7 @@ pa_volume_s16ne_sse2 (int16_t *samples, int32_t *volumes, unsigned channels, uns
"8: \n\t"
: "+r" (samples), "+r" (volumes), "+r" (length), "=D" (channel), "=&r" (temp)
- : "X" ((pa_reg_x86)channels)
+ : "rm" ((pa_reg_x86)channels)
: "cc"
);
}
@@ -237,7 +237,7 @@ pa_volume_s16re_sse2 (int16_t *samples, int32_t *volumes, unsigned channels, uns
"8: \n\t"
: "+r" (samples), "+r" (volumes), "+r" (length), "=D" (channel), "=&r" (temp)
- : "X" ((pa_reg_x86)channels)
+ : "rm" ((pa_reg_x86)channels)
: "cc"
);
}
--
hooks/post-receive
PulseAudio Sound Server
More information about the pulseaudio-commits
mailing list