[alsa-devel] Debian alsa-lib patches
As previously discussed, I'm posting all Debian patches against alsa-oss that were pending upstreaming.
Thanks, Jordi
[PATCH 1/3] Fix path to libaoss.so. [PATCH 2/3] Show a warning if the alsa wrapper failed. [PATCH 3/3] Add AM_MAINTAINER_MODE([enable]) to configure.in.
Fix path to libaoss.so using ${libdir} instead of ${exec_prefix}. ${libdir} has the value given at configure time and works with Debian's Multiarch implementation.
Signed-off-by: Jordi Mallach jordi@debian.org --- alsa/aoss.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/alsa/aoss.in b/alsa/aoss.in index c551431..d8e1d6d 100644 --- a/alsa/aoss.in +++ b/alsa/aoss.in @@ -6,8 +6,8 @@
if [ -d /proc/asound ]; then prefix=@prefix@ - exec_prefix=@exec_prefix@ - LD_PRELOAD=${exec_prefix}/$LIB/libaoss.so${LD_PRELOAD:+:$LD_PRELOAD} exec "$@" + libdir=@libdir@ + LD_PRELOAD=${libdir}/libaoss.so${LD_PRELOAD:+:$LD_PRELOAD} exec "$@" else exec "$@" fi
If /proc/asound is not found, throw a warning and continue without any wrapping.
Signed-off-by: Jordi Mallach jordi@debian.org --- alsa/aoss.in | 1 + 1 file changed, 1 insertion(+)
diff --git a/alsa/aoss.in b/alsa/aoss.in index d8e1d6d..564eed9 100644 --- a/alsa/aoss.in +++ b/alsa/aoss.in @@ -9,6 +9,7 @@ if [ -d /proc/asound ]; then libdir=@libdir@ LD_PRELOAD=${libdir}/libaoss.so${LD_PRELOAD:+:$LD_PRELOAD} exec "$@" else + echo "Warning: /proc/asound not found. Running without ALSA wrapper." exec "$@" fi exit 1
At Wed, 15 May 2013 18:58:06 +0200, Jordi Mallach wrote:
If /proc/asound is not found, throw a warning and continue without any wrapping.
The purpose of aoss is to make OSS apps working *transparently*. So spewing a warning at each time is a bad idea, IMO.
If a warning is justified, why don't you give a joyful success message at each time if aoss can wrap the call? :)
Takashi
Signed-off-by: Jordi Mallach jordi@debian.org
alsa/aoss.in | 1 + 1 file changed, 1 insertion(+)
diff --git a/alsa/aoss.in b/alsa/aoss.in index d8e1d6d..564eed9 100644 --- a/alsa/aoss.in +++ b/alsa/aoss.in @@ -9,6 +9,7 @@ if [ -d /proc/asound ]; then libdir=@libdir@ LD_PRELOAD=${libdir}/libaoss.so${LD_PRELOAD:+:$LD_PRELOAD} exec "$@" else
- echo "Warning: /proc/asound not found. Running without ALSA wrapper." exec "$@"
fi exit 1 -- 1.7.10.4
Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Signed-off-by: Jordi Mallach jordi@debian.org --- configure.in | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/configure.in b/configure.in index d0318e7..0afeb8a 100644 --- a/configure.in +++ b/configure.in @@ -2,6 +2,8 @@ AC_PREREQ(2.59) AC_INIT(alsa/alsa-oss.c) AM_INIT_AUTOMAKE(alsa-oss, 1.0.25)
+AM_MAINTAINER_MODE([enable]) + LIBTOOL_VERSION_INFO="0:0:0" AC_SUBST(LIBTOOL_VERSION_INFO)
El dc 15 de 05 de 2013 a les 18:58 +0200, en/na Jordi Mallach va escriure:
As previously discussed, I'm posting all Debian patches against alsa-oss that were pending upstreaming.
Regardless of the wrong subject, the patches are actually against alsa-oss.
At Wed, 15 May 2013 18:58:04 +0200, Jordi Mallach wrote:
As previously discussed, I'm posting all Debian patches against alsa-oss that were pending upstreaming.
I applied patches 1 & 3.
thanks,
Takashi
Thanks, Jordi
[PATCH 1/3] Fix path to libaoss.so. [PATCH 2/3] Show a warning if the alsa wrapper failed. [PATCH 3/3] Add AM_MAINTAINER_MODE([enable]) to configure.in. _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
participants (2)
-
Jordi Mallach -
Takashi Iwai