subject:"\[pulseaudio\-commits\] Branch 'next' \- configure.ac"

[pulseaudio-commits] Branch 'next' - configure.ac src/Makefile.am src/utils

2016-12-02 Thread Tanu Kaskinen

 configure.ac   |8 
 src/Makefile.am|2 +-
 src/utils/padsp.in |4 ++--
 3 files changed, 11 insertions(+), 3 deletions(-)

New commits:
commit d91f74c2f3391ad3048b7552b1b0de5a2fbe5a14
Author: Felipe Sateler 
Date:   Mon Nov 28 14:49:06 2016 -0300

padsp: allow overriding library install location

The current build script hardcodes the $pkglibdir in the padsp command.
This works and is a reasonable default. However, distributions that
know where they install, can override this path and thus make padsp
work for any architecture that has the library installed by using the
following configure argument:

   --with-pulsedsp-location='/usr/\\$$LIB/pulseaudio'

This works because ld.so considers $LIB a variable that will expand to
several location paths, depending on the architecture of the binary
being executed.

In debian, for example, this would work for libpulsedsp.so installed in
/usr/lib/x86_64-linux-gnu/ for amd64 and /usr/lib/i386-linux-gnu/ for
i386, with a single padsp command.

diff --git a/configure.ac b/configure.ac
index 809e705..3e473fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -759,6 +759,9 @@ AC_ARG_ENABLE([oss-output],
 AC_ARG_ENABLE([oss-wrapper],
 AS_HELP_STRING([--disable-oss-wrapper],[Disable optional OSS wrapper 
support]))
 
+AC_ARG_WITH([pulsedsp-location],
+AS_HELP_STRING([--with-pulsedsp-location],[Specify location where OSS 
wrapper will be installed]))
+
 AS_IF([test "x$enable_oss_output" != "xno" -o "x$enable_oss_wrapper" != "xno"],
 [AC_CHECK_HEADERS([sys/soundcard.h], HAVE_OSS=1, HAVE_OSS=0)],
 HAVE_OSS=0)
@@ -774,7 +777,12 @@ AS_IF([test "x$enable_oss_wrapper" != "xno"],
 [AS_IF([test "x$HAVE_OSS" = "x1"], HAVE_OSS_WRAPPER=1, 
HAVE_OSS_WRAPPER=0)],
 HAVE_OSS_WRAPPER=0)
 
+AS_IF([test "x$with_pulsedsp_location" != "x"],
+[PULSEDSP_LOCATION="$with_pulsedsp_location"],
+[PULSEDSP_LOCATION="\$(pkglibdir)"])
+
 AC_SUBST(HAVE_OSS_OUTPUT)
+AC_SUBST(PULSEDSP_LOCATION)
 AM_CONDITIONAL([HAVE_OSS_OUTPUT], [test "x$HAVE_OSS_OUTPUT" = "x1"])
 AM_CONDITIONAL([HAVE_OSS_WRAPPER], [test "x$HAVE_OSS_WRAPPER" = "x1"])
 AS_IF([test "x$HAVE_OSS_OUTPUT" = "x1"], AC_DEFINE([HAVE_OSS_OUTPUT], 1, [Have 
OSS output?]))
diff --git a/src/Makefile.am b/src/Makefile.am
index 2d5bdd4..ca702c1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -922,7 +922,7 @@ padsplib_LTLIBRARIES = libpulsedsp.la
 bin_SCRIPTS += padsp
 
 edit = @SED@ \
-   -e "s|@pkglibdir[@]|$(pkglibdir)|g"
+   -e 's|@PULSEDSP_LOCATION[@]|$(PULSEDSP_LOCATION)|g'
 
 padsp: utils/padsp.in
$(edit) $< > $@
diff --git a/src/utils/padsp.in b/src/utils/padsp.in
index 3430a65..fea00d2 100644
--- a/src/utils/padsp.in
+++ b/src/utils/padsp.in
@@ -74,9 +74,9 @@ done
 shift $(( $OPTIND - 1 ))
 
 if [ x"$LD_PRELOAD" = x ] ; then
-   LD_PRELOAD="@pkglibdir@/libpulsedsp.so"
+   LD_PRELOAD="@PULSEDSP_LOCATION@/libpulsedsp.so"
 else
-   LD_PRELOAD="$LD_PRELOAD @pkglibdir@/libpulsedsp.so"
+   LD_PRELOAD="$LD_PRELOAD @PULSEDSP_LOCATION@/libpulsedsp.so"
 fi
 
 export LD_PRELOAD

___
pulseaudio-commits mailing list
pulseaudio-commits@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/pulseaudio-commits

[pulseaudio-commits] Branch 'next' - configure.ac

2016-11-10 Thread Tanu Kaskinen

 configure.ac |   28 ++--
 1 file changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 116a12a83506dc7c2463df3138f44cdc16605571
Author: Philip Chimento 
Date:   Wed Nov 9 21:22:53 2016 -0800

build-sys: Move TLS check after flags additions

Any compiler flags should be set before asking the compiler to check for
thread-local storage with AX_TLS, since compiler flags (in this case
-mmacosx-version-min=10.5) can influence the outcome of that check.

diff --git a/configure.ac b/configure.ac
index 1bcdda6..809e705 100644
--- a/configure.ac
+++ b/configure.ac
@@ -502,20 +502,6 @@ AC_CACHE_CHECK([whether $CC knows _Bool],
 AS_IF([test "$pulseaudio_cv__Bool" = "yes"], AC_DEFINE([HAVE_STD_BOOL], 1, 
[Have _Bool.]))
 
 
- Thread support 
-
-AX_TLS
-AS_IF([test "$ac_cv_tls" = "__thread"],
-AC_DEFINE([SUPPORT_TLS___THREAD], 1, [Define this if the compiler supports 
__thread for Thread-Local Storage]))
-
-# Win32 build breaks with win32 pthread installed
-AS_IF([test "x$os_is_win32" != "x1"],
-  [AX_PTHREAD])
-
-AS_IF([test "x$ax_pthread_ok" = "xyes"],
-AC_DEFINE([_POSIX_PTHREAD_SEMANTICS], 1, [Needed on Solaris]))
-
-
  Check for libs 
 
 # ISO
@@ -1429,6 +1415,20 @@ AS_IF([test "x$enable_adrian_aec" != "xno"],
 AM_CONDITIONAL([HAVE_ADRIAN_EC], [test "x$HAVE_ADRIAN_EC" = "x1"])
 
 
+ Thread support 
+
+AX_TLS
+AS_IF([test "$ac_cv_tls" = "__thread"],
+AC_DEFINE([SUPPORT_TLS___THREAD], 1, [Define this if the compiler supports 
__thread for Thread-Local Storage]))
+
+# Win32 build breaks with win32 pthread installed
+AS_IF([test "x$os_is_win32" != "x1"],
+  [AX_PTHREAD])
+
+AS_IF([test "x$ax_pthread_ok" = "xyes"],
+AC_DEFINE([_POSIX_PTHREAD_SEMANTICS], 1, [Needed on Solaris]))
+
+
 
 ###
 #Output   #

___
pulseaudio-commits mailing list
pulseaudio-commits@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/pulseaudio-commits

[pulseaudio-commits] Branch 'next' - configure.ac src/Makefile.am

2015-08-11 Thread Tanu Kaskinen

 configure.ac|2 +-
 src/Makefile.am |   36 +++-
 2 files changed, 20 insertions(+), 18 deletions(-)

New commits:
commit c94076efb4f18eac31c5bac66962635848584df8
Author: Shawn Walker shawn.wal...@oracle.com
Date:   Tue Aug 11 16:22:37 2015 +0200

build-sys: don't use the nodelete linker flag on executables

The nodelete flag indicates that we don't want our libraries to be
unloaded. It's only relevant on libraries, so let's not use it for
executables. Trying to use it on executables breaks things on some
platforms.

BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=90878

diff --git a/configure.ac b/configure.ac
index e8a2de3..151e2b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -212,7 +212,7 @@ AC_SUBST([IMMEDIATE_LDFLAGS])
 # On ELF systems we don't want the libraries to be unloaded since we don't 
clean them up properly,
 # so we request the nodelete flag to be enabled.
 # On other systems, we don't really know how to do that, but it's welcome if 
somebody can tell.
-AX_APPEND_LINK_FLAGS([-Wl,-z,nodelete], [NODELETE_LDFLAGS])
+AX_APPEND_LINK_FLAGS([-Wl,-z,nodelete], [NODELETE_LDFLAGS], [-shared])
 AC_SUBST([NODELETE_LDFLAGS])
 
 # Check for the proper way to build libraries that have no undefined symbols
diff --git a/src/Makefile.am b/src/Makefile.am
index 0c54d11..839078a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -54,7 +54,9 @@ SERVER_CFLAGS = -D__INCLUDED_FROM_PULSE_AUDIO
 
 AM_LIBADD = $(PTHREAD_LIBS) $(INTLLIBS)
 AM_LDADD = $(PTHREAD_LIBS) $(INTLLIBS)
-AM_LDFLAGS = $(NODELETE_LDFLAGS)
+AM_LDFLAGS =
+# Should only be applied to libraries.
+AM_LIBLDFLAGS = $(NODELETE_LDFLAGS)
 
 if HAVE_GCOV
 AM_CFLAGS+=$(GCOV_CFLAGS)
@@ -77,7 +79,7 @@ endif
 
 FOREIGN_CFLAGS = -w
 
-MODULE_LDFLAGS = $(AM_LDFLAGS) -module -disable-static -avoid-version 
$(NOUNDEFINED_LDFLAGS)
+MODULE_LDFLAGS = $(AM_LDFLAGS) $(AM_LIBLDFLAGS) -module -disable-static 
-avoid-version $(NOUNDEFINED_LDFLAGS)
 MODULE_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINOR@.la 
libpulsecommon-@PA_MAJORMINOR@.la libpulse.la
 
 ###
@@ -720,7 +722,7 @@ libpulsecommon_@PA_MAJORMINOR@_la_SOURCES += 
pulsecore/poll-posix.c pulsecore/po
 endif
 
 libpulsecommon_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) $(LIBJSON_CFLAGS) 
$(LIBSNDFILE_CFLAGS)
-libpulsecommon_@PA_MAJORMINOR@_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version
+libpulsecommon_@PA_MAJORMINOR@_la_LDFLAGS = $(AM_LDFLAGS) $(AM_LIBLDFLAGS) 
-avoid-version
 libpulsecommon_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) $(LIBJSON_LIBS)  
$(LIBWRAP_LIBS) $(WINSOCK_LIBS) $(LTLIBICONV) $(LIBSNDFILE_LIBS)
 
 if HAVE_X11
@@ -870,7 +872,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) $(AM_LIBLDFLAGS) $(VERSIONING_LDFLAGS) 
-version-info $(LIBPULSE_VERSION_INFO)
 
 if HAVE_DBUS
 libpulse_la_CFLAGS += $(DBUS_CFLAGS)
@@ -880,12 +882,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) $(AM_LIBLDFLAGS) 
$(VERSIONING_LDFLAGS) -version-info $(LIBPULSE_SIMPLE_VERSION_INFO)
 
 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) $(AM_LIBLDFLAGS) 
$(VERSIONING_LDFLAGS) -version-info $(LIBPULSE_MAINLOOP_GLIB_VERSION_INFO)
 
 ###
 # OSS emulation   #
@@ -909,7 +911,7 @@ endif
 libpulsedsp_la_SOURCES = utils/padsp.c
 libpulsedsp_la_CFLAGS = $(AM_CFLAGS)
 libpulsedsp_la_LIBADD = $(AM_LIBADD) libpulse.la 
libpulsecommon-@PA_MAJORMINOR@.la
-libpulsedsp_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version -disable-static
+libpulsedsp_la_LDFLAGS = $(AM_LDFLAGS) $(AM_LIBLDFLAGS) -avoid-version 
-disable-static
 
 ###
 #  Daemon core library#
@@ -972,7 +974,7 @@ libpulsecore_@PA_MAJORMINOR@_la_SOURCES = \
pulsecore/database.h
 
 libpulsecore_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) $(SERVER_CFLAGS) 
$(LIBSNDFILE_CFLAGS) $(WINSOCK_CFLAGS)
-libpulsecore_@PA_MAJORMINOR@_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version
+libpulsecore_@PA_MAJORMINOR@_la_LDFLAGS = $(AM_LDFLAGS)

[pulseaudio-commits] Branch 'next' - configure.ac man/Makefile.am man/start-pulseaudio-kde.1.xml.in po/POTFILES.in src/daemon src/.gitignore src/Makefile.am

2014-01-26 Thread Tanu Kaskinen

 configure.ac  |2 -
 man/Makefile.am   |3 --
 man/start-pulseaudio-kde.1.xml.in |   48 --
 po/POTFILES.in|1 
 src/.gitignore|1 
 src/Makefile.am   |9 +++
 src/daemon/.gitignore |1 
 7 files changed, 4 insertions(+), 61 deletions(-)

New commits:
commit 46b88d9705efd9d42bd614c8a71ad003e882dd5c
Author: Tanu Kaskinen tanu.kaski...@linux.intel.com
Date:   Sun Jan 26 17:40:31 2014 +0200

Remove all references to the removed KDE files

diff --git a/configure.ac b/configure.ac
index 1d4555b..38a40a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1382,13 +1382,11 @@ man/pulse-daemon.conf.5.xml
 man/pulse-client.conf.5.xml
 man/default.pa.5.xml
 man/pulse-cli-syntax.5.xml
-man/start-pulseaudio-kde.1.xml
 man/start-pulseaudio-x11.1.xml
 ])
 
 AC_CONFIG_FILES([src/esdcompat:src/daemon/esdcompat.in], [chmod +x 
src/esdcompat])
 AC_CONFIG_FILES([src/start-pulseaudio-x11:src/daemon/start-pulseaudio-x11.in], 
[chmod +x src/start-pulseaudio-x11])
-AC_CONFIG_FILES([src/start-pulseaudio-kde:src/daemon/start-pulseaudio-kde.in], 
[chmod +x src/start-pulseaudio-kde])
 AC_CONFIG_FILES([src/client.conf:src/pulse/client.conf.in])
 AC_CONFIG_FILES([src/daemon.conf:src/daemon/daemon.conf.in],
 [m4 src/daemon.conf  src/daemon.conf.gen  mv src/daemon.conf.gen 
src/daemon.conf])
diff --git a/man/Makefile.am b/man/Makefile.am
index d0cc8e7..d80ba6a 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -32,7 +32,6 @@ noinst_DATA = \
pulse-client.conf.5.xml \
default.pa.5.xml \
pulse-cli-syntax.5.xml \
-   start-pulseaudio-kde.1.xml \
start-pulseaudio-x11.1.xml
 
 xmllint: $(noinst_DATA)
@@ -56,7 +55,6 @@ dist_man_MANS = \
pulse-client.conf.5 \
default.pa.5 \
pulse-cli-syntax.5 \
-   start-pulseaudio-kde.1 \
start-pulseaudio-x11.1
 
 CLEANFILES = \
@@ -81,7 +79,6 @@ EXTRA_DIST = \
pulse-client.conf.5.xml.in \
default.pa.5.xml.in \
pulse-cli-syntax.5.xml.in \
-   start-pulseaudio-kde.1.xml.in \
start-pulseaudio-x11.1.xml.in \
xmltoman \
xmltoman.css \
diff --git a/man/start-pulseaudio-kde.1.xml.in 
b/man/start-pulseaudio-kde.1.xml.in
deleted file mode 100644
index ef32906..000
--- a/man/start-pulseaudio-kde.1.xml.in
+++ /dev/null
@@ -1,48 +0,0 @@
-?xml version=1.0?!--*-nxml-*--
-!DOCTYPE manpage SYSTEM xmltoman.dtd
-?xml-stylesheet type=text/xsl href=xmltoman.xsl ?
-
-!--
-This file is part of PulseAudio.
-
-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.1 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 Lesser 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.
---
-
-manpage name=start-pulseaudio-kde section=1 desc=PulseAudio Sound Server 
KDE Startup Script
-
-  synopsis
-cmdstart-pulseaudio-kde [argpulseaudio options/arg]/cmd
-  /synopsis
-
-  description
-pThis script starts pulseaudio (if not already running) and loads
-module-device-manager to use KDE routing policies./p
-
-pAll arguments are directly passed to pulseaudio./p
-  /description
-
-  section name=Authors
-pThe PulseAudio Developers lt;@PACKAGE_BUGREPORT@gt;;
-PulseAudio is available from url href=@PACKAGE_URL@//p
-  /section
-
-  section name=See also
-p
-  manref name=pulseaudio section=1/
-/p
-  /section
-
-/manpage
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d06932f..f39abae 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -6,7 +6,6 @@ src/daemon/dumpmodules.c
 src/daemon/ltdl-bind-now.c
 src/daemon/main.c
 src/daemon/pulseaudio.desktop.in
-src/daemon/pulseaudio-kde.desktop.in
 src/modules/alsa/alsa-mixer.c
 src/modules/alsa/alsa-sink.c
 src/modules/alsa/alsa-source.c
diff --git a/src/.gitignore b/src/.gitignore
index 80f6f2c..2f92b44 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -22,7 +22,6 @@ pasuspender
 pax11publish
 pulseaudio
 start-pulseaudio-x11
-start-pulseaudio-kde
 *-symdef.h
 *-orc-gen.[ch]
 # tests
diff --git a/src/Makefile.am b/src/Makefile.am
index 59f0bcd..99d76ce 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -116,8 +116,7 @@ endif
 
 if HAVE_X11
 xdgautostart_in_files = \
-   daemon/pulseaudio.desktop.in \
-   daemon/pulseaudio-kde.desktop.in
+   daemon/pulseaudio.desktop.in
 xdgautostart_DATA =

[pulseaudio-commits] Branch 'next' - configure.ac src/Makefile.am src/utils

[pulseaudio-commits] Branch 'next' - configure.ac

[pulseaudio-commits] Branch 'next' - configure.ac src/Makefile.am

[pulseaudio-commits] Branch 'next' - configure.ac man/Makefile.am man/start-pulseaudio-kde.1.xml.in po/POTFILES.in src/daemon src/.gitignore src/Makefile.am

4 matches

Site Navigation

Mail list logo

Footer information