[pulseaudio-commits] 4 commits - src/Makefile.am src/utils
Arun Raghavan
arun at kemper.freedesktop.org
Mon Feb 20 01:15:36 PST 2012
src/Makefile.am | 37 +++++++++++++++++++--
src/utils/.gitignore | 1
src/utils/padsp | 86 ---------------------------------------------------
src/utils/padsp.in | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 120 insertions(+), 90 deletions(-)
New commits:
commit 5710d6deeb12f3210a0e85e94bf5ab663912cf31
Author: Sjoerd Simons <sjoerd at luon.net>
Date: Sun Feb 19 12:47:41 2012 +0100
.gitignore: Add padsp to gitignore
diff --git a/src/utils/.gitignore b/src/utils/.gitignore
new file mode 100644
index 0000000..1bf1c53
--- /dev/null
+++ b/src/utils/.gitignore
@@ -0,0 +1 @@
+padsp
commit 9087f1f6ac8578384fa9c14d884daac8c2532153
Author: Sjoerd Simons <sjoerd at luon.net>
Date: Fri Feb 17 22:11:59 2012 +0100
build: Force order of library installation
libtools causing relinking on installation, to make this succeed
libpulsecommon needs to be installed before the other libraries and the
padsp libraries needs to be installed afterwards.
Unfortunately autotools doesn't consider dependencies when running the
install target, thus we have to enforce the ordering ourselves
diff --git a/src/Makefile.am b/src/Makefile.am
index fe7794b..39e9522 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -762,7 +762,8 @@ libpulse_mainloop_glib_la_LDFLAGS = $(AM_LDFLAGS) $(VERSIONING_LDFLAGS) -version
###################################
if HAVE_OSS_WRAPPER
-pkglib_LTLIBRARIES += libpulsedsp.la
+padsplibdir = $(pkglibdir)
+padsplib_LTLIBRARIES = libpulsedsp.la
bin_SCRIPTS += utils/padsp
edit = @sed \
@@ -1991,4 +1992,23 @@ update-map-file:
update-all: update-ffmpeg update-sbc update-map-file
+# Force installation order of libraries. libtool relinks on install time, in
+# which case libpulsecommon has to be install before others, but the padsp
+# preload library has to be done after the normal libraries (e.g. libpulse)
+# ...
+# Unfortunately automake behaviour means that rules without commands also
+# override build-in rules, so it's not trivial to add dependencies.
+# See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328 for the workaround
+# ...
+# Isn't libtool/autotools fun!
+
+installlibLTLIBRARIES = install-libLTLIBRARIES
+$(installlibLTLIBRARIES): install-pkglibLTLIBRARIES
+
+installmodlibexecLTLIBRARIES = install-modlibexecLTLIBRARIES
+$(installmodlibexecLTLIBRARIES): install-pkglibLTLIBRARIES
+
+installpadsplibLTLIBRARIES = install-padsplibLTLIBRARIES
+$(installpadsplibLTLIBRARIES): install-libLTLIBRARIES
+
.PHONY: utils/padsp massif update-all update-ffmpeg update-sbc update-map-file
commit a96390d86519cf38a23296d912a0271263774ec9
Author: Michael Biebl <biebl at debian.org>
Date: Wed Feb 15 21:59:17 2012 +0100
padsp: Move the padsp helper lib into a private library
libpulsedsp is only used as a LD_PRELOAD library
for the padsp wrapper. So no need to have it in
a public library
diff --git a/src/Makefile.am b/src/Makefile.am
index 229c792..fe7794b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -87,7 +87,7 @@ EXTRA_DIST = \
daemon/esdcompat.in \
daemon/start-pulseaudio-x11.in \
daemon/start-pulseaudio-kde.in \
- utils/padsp \
+ utils/padsp.in \
utils/qpaeq \
modules/module-defs.h.m4 \
daemon/pulseaudio.desktop.in \
@@ -762,8 +762,17 @@ libpulse_mainloop_glib_la_LDFLAGS = $(AM_LDFLAGS) $(VERSIONING_LDFLAGS) -version
###################################
if HAVE_OSS_WRAPPER
-lib_LTLIBRARIES += libpulsedsp.la
+pkglib_LTLIBRARIES += libpulsedsp.la
bin_SCRIPTS += utils/padsp
+
+edit = @sed \
+ -e "s|@pkglibdir[@]|$(pkglibdir)|g"
+
+utils/padsp: utils/padsp.in
+ $(edit) $< >$@
+
+CLEANFILES += utils/padsp
+
endif
libpulsedsp_la_SOURCES = utils/padsp.c
diff --git a/src/utils/padsp b/src/utils/padsp
deleted file mode 100755
index 4fe175c..0000000
--- a/src/utils/padsp
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/sh
-
-# This file is part of PulseAudio.
-#
-# Copyright 2006 Lennart Poettering
-# Copyright 2006 Pierre Ossman <ossman at cendio.se> for Cendio AB
-#
-# PulseAudio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# PulseAudio is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA.
-
-while getopts 'hs:n:m:MSDd' param ; do
- case $param in
- s)
- PULSE_SERVER="$OPTARG"
- export PULSE_SERVER
- ;;
- n)
- PADSP_CLIENT_NAME="$OPTARG"
- export PADSP_CLIENT_NAME
- ;;
- m)
- PADSP_STREAM_NAME="$OPTARG"
- export PADSP_STREAM_NAME
- ;;
- M)
- PADSP_NO_MIXER=1
- export PADSP_NO_MIXER
- ;;
- S)
- PADSP_NO_SNDSTAT=1
- export PADSP_NO_SNDSTAT
- ;;
- D)
- PADSP_NO_DSP=1
- export PADSP_NO_DSP
- ;;
- d)
- if [ x"$PADSP_DEBUG" = x ]; then
- PADSP_DEBUG=1
- else
- PADSP_DEBUG=$(( $PADSP_DEBUG + 1 ))
- fi
- export PADSP_DEBUG
- ;;
- *)
- echo "$0 - redirect OSS audio devices to PulseAudio"
- echo " "
- echo "$0 [options] application [arguments]"
- echo " "
- echo "options:"
- echo " -h show brief help"
- echo " -s <host>[:<port>] contact a specific PulseAudio server"
- echo " -n <name> client name to report to the server"
- echo " -m <name> stream name to report to the server"
- echo " -M disable /dev/mixer emulation"
- echo " -S disable /dev/sndstat emulation"
- echo " -D disable /dev/dsp emulation"
- echo " -d enable debug output"
- exit 0
- ;;
- esac
-done
-
-shift $(( $OPTIND - 1 ))
-
-if [ x"$LD_PRELOAD" = x ] ; then
- LD_PRELOAD="libpulsedsp.so"
-else
- LD_PRELOAD="$LD_PRELOAD libpulsedsp.so"
-fi
-
-export LD_PRELOAD
-
-exec "$@"
diff --git a/src/utils/padsp.in b/src/utils/padsp.in
new file mode 100644
index 0000000..4ecce8c
--- /dev/null
+++ b/src/utils/padsp.in
@@ -0,0 +1,86 @@
+#!/bin/sh
+
+# This file is part of PulseAudio.
+#
+# Copyright 2006 Lennart Poettering
+# Copyright 2006 Pierre Ossman <ossman at cendio.se> for Cendio AB
+#
+# PulseAudio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# PulseAudio is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with PulseAudio; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA.
+
+while getopts 'hs:n:m:MSDd' param ; do
+ case $param in
+ s)
+ PULSE_SERVER="$OPTARG"
+ export PULSE_SERVER
+ ;;
+ n)
+ PADSP_CLIENT_NAME="$OPTARG"
+ export PADSP_CLIENT_NAME
+ ;;
+ m)
+ PADSP_STREAM_NAME="$OPTARG"
+ export PADSP_STREAM_NAME
+ ;;
+ M)
+ PADSP_NO_MIXER=1
+ export PADSP_NO_MIXER
+ ;;
+ S)
+ PADSP_NO_SNDSTAT=1
+ export PADSP_NO_SNDSTAT
+ ;;
+ D)
+ PADSP_NO_DSP=1
+ export PADSP_NO_DSP
+ ;;
+ d)
+ if [ x"$PADSP_DEBUG" = x ]; then
+ PADSP_DEBUG=1
+ else
+ PADSP_DEBUG=$(( $PADSP_DEBUG + 1 ))
+ fi
+ export PADSP_DEBUG
+ ;;
+ *)
+ echo "$0 - redirect OSS audio devices to PulseAudio"
+ echo " "
+ echo "$0 [options] application [arguments]"
+ echo " "
+ echo "options:"
+ echo " -h show brief help"
+ echo " -s <host>[:<port>] contact a specific PulseAudio server"
+ echo " -n <name> client name to report to the server"
+ echo " -m <name> stream name to report to the server"
+ echo " -M disable /dev/mixer emulation"
+ echo " -S disable /dev/sndstat emulation"
+ echo " -D disable /dev/dsp emulation"
+ echo " -d enable debug output"
+ exit 0
+ ;;
+ esac
+done
+
+shift $(( $OPTIND - 1 ))
+
+if [ x"$LD_PRELOAD" = x ] ; then
+ LD_PRELOAD="@pkglibdir@/libpulsedsp.so"
+else
+ LD_PRELOAD="$LD_PRELOAD @pkglibdir@/libpulsedsp.so"
+fi
+
+export LD_PRELOAD
+
+exec "$@"
commit cea6e165164283f718a2896600c81810a7a87ddd
Author: Michael Biebl <biebl at debian.org>
Date: Wed Feb 15 21:54:28 2012 +0100
build: Move libpulsecommon into $pkglib
libpulsecommon is a private library only for use within pulseaudio, so
lets move it into a private directory
[ed: from discussion on IRC, while it looks redundant to have modules in
lib/pulse-$VER and private libraries in $pkglibdir, this is actually
desirable. For example, a multi-architecture libpulse would have a
$pkgdir per architecture (/usr/lib/<arch>/pulseaudio) whereas you'd
still want the server-specific modules in /usr/lib/pulse...) -- Arun]
diff --git a/src/Makefile.am b/src/Makefile.am
index 521bf50..229c792 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -530,7 +530,7 @@ echo_cancel_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
# Common library #
###################################
-lib_LTLIBRARIES = \
+pkglib_LTLIBRARIES = \
libpulsecommon- at PA_MAJORMINOR@.la
libpulsecommon_ at PA_MAJORMINOR@_la_SOURCES = \
@@ -694,7 +694,7 @@ pulseinclude_HEADERS = \
pulse/volume.h \
pulse/xmalloc.h
-lib_LTLIBRARIES += \
+lib_LTLIBRARIES = \
libpulse.la \
libpulse-simple.la
More information about the pulseaudio-commits
mailing list