[hamradio-commits] [soundmodem] 01/01: New Debian revision 0.20-2
Iain Learmonth
irl-guest at moszumanska.debian.org
Tue May 5 19:35:56 UTC 2015
This is an automated email from the git hooks/post-receive script.
irl-guest pushed a commit to branch master
in repository soundmodem.
commit e20ff3ffeb382587a5947835f87a3547495af32b
Author: Iain R. Learmonth <irl at fsfe.org>
Date: Tue May 5 20:19:43 2015 +0100
New Debian revision 0.20-2
* Added patch to include alsa.m4 from libasound2-dev to allow building
* on
non-Linux architectures.
* d/control:
- Added myself to uploaders, removed inactive uploaders.
- Fix formatting of d/control with cme.
---
.gitignore | 1 +
debian/changelog | 10 +++
debian/control | 21 ++++--
debian/patches/add-alsa-m4.patch | 146 +++++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
5 files changed, 175 insertions(+), 4 deletions(-)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..845ca06
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.pc
diff --git a/debian/changelog b/debian/changelog
index 0ae56d2..d346221 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+soundmodem (0.20-2) UNRELEASED; urgency=medium
+
+ * Added patch to include alsa.m4 from libasound2-dev to allow building on
+ non-Linux architectures.
+ * d/control:
+ - Added myself to uploaders, removed inactive uploaders.
+ - Fix formatting of d/control with cme.
+
+ -- Iain R. Learmonth <irl at fsfe.org> Tue, 05 May 2015 20:19:51 +0100
+
soundmodem (0.20-1) unstable; urgency=medium
* New upstream release
diff --git a/debian/control b/debian/control
index 6dd03a8..8cf6e44 100644
--- a/debian/control
+++ b/debian/control
@@ -1,15 +1,28 @@
Source: soundmodem
+Maintainer: Debian Hamradio Maintainers <debian-hams at lists.debian.org>
+Uploaders: Kamal Mostafa <kamal at whence.com>,
+ Jaime Robles <jaime at debian.org>,
+ Patrick Ouellette <pouelle at debian.org>,
+ Hamish Moffatt <hamish at debian.org>,
+ Colin Tuckley <colint at debian.org>
Section: hamradio
Priority: optional
-Maintainer: Debian Hamradio Maintainers <debian-hams at lists.debian.org>
-Build-Depends: debhelper (>= 9), autotools-dev, flex-old, libgtk2.0-dev, libaudiofile-dev, libasound2-dev [linux-any], libxml2-dev, libhamlib-dev, dh-autoreconf
-Uploaders: Kamal Mostafa <kamal at whence.com>, Jaime Robles <jaime at debian.org>, Patrick Ouellette <pouelle at debian.org>, Hamish Moffatt <hamish at debian.org>, Colin Tuckley <colint at debian.org>
+Build-Depends: debhelper (>= 9),
+ autotools-dev,
+ flex-old,
+ libgtk2.0-dev,
+ libaudiofile-dev,
+ libasound2-dev [linux-any],
+ libxml2-dev,
+ libhamlib-dev,
+ dh-autoreconf
Standards-Version: 3.9.6
Homepage: http://gna.org/projects/soundmodem
Package: soundmodem
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
Description: Sound Card Amateur Packet Radio Modems
This package contains the driver and diagnostic utility for the
userspace SoundModem suite by Thomas Sailer.
diff --git a/debian/patches/add-alsa-m4.patch b/debian/patches/add-alsa-m4.patch
new file mode 100644
index 0000000..8b16310
--- /dev/null
+++ b/debian/patches/add-alsa-m4.patch
@@ -0,0 +1,146 @@
+--- /dev/null
++++ soundmodem/alsa.m4
+@@ -0,0 +1,143 @@
++dnl Configure Paths for Alsa
++dnl Some modifications by Richard Boulton <richard-alsa at tartarus.org>
++dnl Christopher Lansdown <lansdoct at cs.alfred.edu>
++dnl Jaroslav Kysela <perex at perex.cz>
++dnl Last modification: $Id: alsa.m4,v 1.24 2004/09/15 18:48:07 tiwai Exp $
++dnl AM_PATH_ALSA([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
++dnl Test for libasound, and define ALSA_CFLAGS and ALSA_LIBS as appropriate.
++dnl enables arguments --with-alsa-prefix=
++dnl --with-alsa-enc-prefix=
++dnl --disable-alsatest
++dnl
++dnl For backwards compatibility, if ACTION_IF_NOT_FOUND is not specified,
++dnl and the alsa libraries are not found, a fatal AC_MSG_ERROR() will result.
++dnl
++AC_DEFUN([AM_PATH_ALSA],
++[dnl Save the original CFLAGS, LDFLAGS, and LIBS
++alsa_save_CFLAGS="$CFLAGS"
++alsa_save_LDFLAGS="$LDFLAGS"
++alsa_save_LIBS="$LIBS"
++alsa_found=yes
++
++dnl
++dnl Get the cflags and libraries for alsa
++dnl
++AC_ARG_WITH(alsa-prefix,
++[ --with-alsa-prefix=PFX Prefix where Alsa library is installed(optional)],
++[alsa_prefix="$withval"], [alsa_prefix=""])
++
++AC_ARG_WITH(alsa-inc-prefix,
++[ --with-alsa-inc-prefix=PFX Prefix where include libraries are (optional)],
++[alsa_inc_prefix="$withval"], [alsa_inc_prefix=""])
++
++dnl FIXME: this is not yet implemented
++AC_ARG_ENABLE(alsatest,
++[ --disable-alsatest Do not try to compile and run a test Alsa program],
++[enable_alsatest="$enableval"],
++[enable_alsatest=yes])
++
++dnl Add any special include directories
++AC_MSG_CHECKING(for ALSA CFLAGS)
++if test "$alsa_inc_prefix" != "" ; then
++ ALSA_CFLAGS="$ALSA_CFLAGS -I$alsa_inc_prefix"
++ CFLAGS="$CFLAGS -I$alsa_inc_prefix"
++fi
++AC_MSG_RESULT($ALSA_CFLAGS)
++
++dnl add any special lib dirs
++AC_MSG_CHECKING(for ALSA LDFLAGS)
++if test "$alsa_prefix" != "" ; then
++ ALSA_LIBS="$ALSA_LIBS -L$alsa_prefix"
++ LDFLAGS="$LDFLAGS $ALSA_LIBS"
++fi
++
++dnl add the alsa library
++ALSA_LIBS="$ALSA_LIBS -lasound -lm -ldl -lpthread"
++LIBS="$ALSA_LIBS $LIBS"
++AC_MSG_RESULT($ALSA_LIBS)
++
++dnl Check for a working version of libasound that is of the right version.
++if test "x$enable_alsatest" = "xyes"; then
++min_alsa_version=ifelse([$1], ,0.1.1,$1)
++AC_MSG_CHECKING(for libasound headers version >= $min_alsa_version)
++no_alsa=""
++ alsa_min_major_version=`echo $min_alsa_version | \
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
++ alsa_min_minor_version=`echo $min_alsa_version | \
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
++ alsa_min_micro_version=`echo $min_alsa_version | \
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
++
++AC_LANG_SAVE
++AC_LANG_C
++AC_TRY_COMPILE([
++#include <alsa/asoundlib.h>
++], [
++/* ensure backward compatibility */
++#if !defined(SND_LIB_MAJOR) && defined(SOUNDLIB_VERSION_MAJOR)
++#define SND_LIB_MAJOR SOUNDLIB_VERSION_MAJOR
++#endif
++#if !defined(SND_LIB_MINOR) && defined(SOUNDLIB_VERSION_MINOR)
++#define SND_LIB_MINOR SOUNDLIB_VERSION_MINOR
++#endif
++#if !defined(SND_LIB_SUBMINOR) && defined(SOUNDLIB_VERSION_SUBMINOR)
++#define SND_LIB_SUBMINOR SOUNDLIB_VERSION_SUBMINOR
++#endif
++
++# if(SND_LIB_MAJOR > $alsa_min_major_version)
++ exit(0);
++# else
++# if(SND_LIB_MAJOR < $alsa_min_major_version)
++# error not present
++# endif
++
++# if(SND_LIB_MINOR > $alsa_min_minor_version)
++ exit(0);
++# else
++# if(SND_LIB_MINOR < $alsa_min_minor_version)
++# error not present
++# endif
++
++# if(SND_LIB_SUBMINOR < $alsa_min_micro_version)
++# error not present
++# endif
++# endif
++# endif
++exit(0);
++],
++ [AC_MSG_RESULT(found.)],
++ [AC_MSG_RESULT(not present.)
++ ifelse([$3], , [AC_MSG_ERROR(Sufficiently new version of libasound not found.)])
++ alsa_found=no]
++)
++AC_LANG_RESTORE
++fi
++
++dnl Now that we know that we have the right version, let's see if we have the library and not just the headers.
++if test "x$enable_alsatest" = "xyes"; then
++AC_CHECK_LIB([asound], [snd_ctl_open],,
++ [ifelse([$3], , [AC_MSG_ERROR(No linkable libasound was found.)])
++ alsa_found=no]
++)
++fi
++
++if test "x$alsa_found" = "xyes" ; then
++ ifelse([$2], , :, [$2])
++ LIBS=`echo $LIBS | sed 's/-lasound//g'`
++ LIBS=`echo $LIBS | sed 's/ //'`
++ LIBS="-lasound $LIBS"
++fi
++if test "x$alsa_found" = "xno" ; then
++ ifelse([$3], , :, [$3])
++ CFLAGS="$alsa_save_CFLAGS"
++ LDFLAGS="$alsa_save_LDFLAGS"
++ LIBS="$alsa_save_LIBS"
++ ALSA_CFLAGS=""
++ ALSA_LIBS=""
++fi
++
++dnl That should be it. Now just export out symbols:
++AC_SUBST(ALSA_CFLAGS)
++AC_SUBST(ALSA_LIBS)
++])
++
diff --git a/debian/patches/series b/debian/patches/series
index 4ceeb76..36d63a4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
drop-unnecessary-libdl-linkage
fix-gcc5-errors.patch
+add-alsa-m4.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/soundmodem.git
More information about the pkg-hamradio-commits
mailing list