[Pkg-voip-commits] [portaudio19] 02/04: Imported Debian patch 19+svn20111121-1
Victor Seva Lopez
maniac-guest at moszumanska.debian.org
Sun Aug 16 06:28:48 UTC 2015
This is an automated email from the git hooks/post-receive script.
maniac-guest pushed a commit to branch master
in repository portaudio19.
commit e7fa9e1938c19d0e24f4284965c9db6bdd0f721b
Merge: 98b48e2 f8ace2d
Author: Benjamin Drung <bdrung at debian.org>
Date: Thu Dec 8 00:03:04 2011 +0100
Imported Debian patch 19+svn20111121-1
CMakeLists.txt | 327 +
COMPILING.DARWIN | 1 -
Doxyfile | 19 +-
Doxyfile => Doxyfile.developer | 480 +-
Makefile.in | 121 +-
README.configure.txt | 22 +
README.txt | 38 +-
SConstruct | 17 +-
V19-devel-readme.txt | 129 -
aclocal.m4 | 11233 ++++---
bindings/cpp/INSTALL | 243 +-
bindings/cpp/Makefile.in | 368 +-
bindings/cpp/SConscript | 3 +-
bindings/cpp/aclocal.m4 | 11636 ++++---
bindings/cpp/bin/Makefile.am | 2 +-
bindings/cpp/bin/Makefile.in | 241 +-
bindings/cpp/build/vc6/devs_example.dsp | 2 +-
bindings/cpp/build/vc6/sine_example.dsp | 2 +-
bindings/cpp/build/vc7_1/devs_example.vcproj | 2 +-
bindings/cpp/build/vc7_1/sine_example.vcproj | 2 +-
bindings/cpp/configure | 29347 ++++++++---------
bindings/cpp/doc/Makefile.in | 141 +-
bindings/cpp/include/Makefile.in | 222 +-
bindings/cpp/lib/Makefile.in | 348 +-
build/dev-cpp/Makefile-dll | 78 -
build/dev-cpp/Makefile-static | 75 -
build/dev-cpp/portaudio-dll.dev | 209 -
build/dev-cpp/portaudio-static.dev | 209 -
build/dev-cpp/readme.txt | 23 -
build/msvc/portaudio.def | 11 +-
build/msvc/portaudio.dsp | 6 +-
build/msvc/portaudio.sln | 6 +
build/msvc/portaudio.vcproj | 823 +-
build/msvc/readme.txt | 44 +-
build/scons/SConscript_common | 4 +-
build/scons/SConscript_opts | 9 +-
cmake_support/FindASIOSDK.cmake | 41 +
cmake_support/FindDXSDK.cmake | 59 +
cmake_support/options_cmake.h.in | 31 +
.../template_portaudio.def | 96 +-
config.guess | 999 +-
config.sub | 463 +-
configure | 32521 ++++++++-----------
configure.in | 530 +-
debian/changelog | 94 +-
debian/compat | 2 +-
debian/control | 60 +-
debian/copyright | 10 +-
debian/libportaudio2.dirs | 1 -
debian/libportaudio2.install | 2 +-
debian/libportaudio2.symbols | 50 +
debian/libportaudiocpp0.install | 2 +-
debian/patches/00list | 2 -
debian/patches/01_config.dpatch | 30 -
debian/patches/20_error_handler.dpatch | 23 -
debian/patches/audacity-portmixer.patch | 322 +
debian/patches/series | 1 +
debian/portaudio19-dev.dirs | 2 -
debian/portaudio19-dev.install | 7 +-
debian/portaudio19-doc.install | 2 +-
debian/rules | 163 +-
debian/source.lintian-overrides | 1 +
debian/source/format | 1 +
debian/watch | 9 +-
depcomp | 172 +-
doc/src/api_overview.dox | 162 +
.../portaudio-external-architecture-diagram.png | Bin 0 -> 20386 bytes
doc/src/license.dox | 2 +-
doc/src/mainpage.dox | 66 +-
doc/src/srcguide.dox | 25 +-
doc/utils/checkfiledocs.py | 13 +-
{test => examples}/pa_devs.c | 23 +-
{test => examples}/pa_fuzz.c | 13 +-
.../paex_mono_asio_channel_select.c | 9 +-
test/patest_pink.c => examples/paex_pink.c | 10 +-
.../paex_read_write_wire.c | 32 +-
test/patest_record.c => examples/paex_record.c | 24 +-
test/patest_saw.c => examples/paex_saw.c | 6 +-
test/patest_sine.c => examples/paex_sine.c | 24 +-
.../paex_wmme_ac3.c | 108 +-
.../paex_wmme_surround.c | 5 +
.../paex_write_sine.c | 10 +-
.../paex_write_sine_nonint.c | 32 +-
include/pa_asio.h | 47 +-
include/pa_jack.h | 4 +-
include/pa_linux_alsa.h | 18 +-
include/pa_mac_core.h | 51 +-
include/pa_win_ds.h | 14 +-
include/pa_win_wasapi.h | 391 +
include/pa_win_waveformat.h | 23 +-
include/pa_win_wmme.h | 13 +-
include/portaudio.h | 147 +-
install-sh | 673 +-
ltmain.sh | 14907 +++++----
missing | 104 +-
qa/loopback/README.txt | 83 +
qa/loopback/src/audio_analyzer.c | 701 +
qa/loopback/src/audio_analyzer.h | 187 +
qa/loopback/src/biquad_filter.c | 122 +
qa/loopback/src/biquad_filter.h | 38 +
qa/loopback/src/paqa.c | 1601 +
qa/loopback/src/paqa_tools.c | 171 +
.../loopback/src/paqa_tools.h | 42 +-
.../pa_trace.h => qa/loopback/src/qa_tools.h | 153 +-
qa/loopback/src/test_audio_analyzer.c | 718 +
.../loopback/src/test_audio_analyzer.h | 34 +-
qa/loopback/src/write_wav.c | 242 +
qa/loopback/src/write_wav.h | 103 +
{test => qa}/paqa_devs.c | 39 +-
{test => qa}/paqa_errs.c | 164 +-
qa/paqa_latency.c | 456 +
src/SConscript | 19 +-
src/common/pa_allocation.h | 8 +-
src/common/pa_converters.c | 130 +-
src/common/pa_cpuload.c | 6 +-
src/common/pa_debugprint.c | 64 +-
src/common/pa_dither.c | 29 +-
src/common/pa_dither.h | 18 +-
src/common/pa_endianness.h | 30 +-
src/common/pa_front.c | 70 +-
src/common/pa_hostapi.h | 141 +-
src/common/pa_memorybarrier.h | 128 +
src/common/pa_process.c | 253 +-
src/common/pa_process.h | 18 +-
src/common/pa_ringbuffer.c | 206 +-
src/common/pa_ringbuffer.h | 123 +-
src/common/pa_stream.c | 10 +-
src/common/pa_stream.h | 8 +-
src/common/pa_trace.c | 4 +-
src/common/pa_trace.h | 32 +-
src/common/pa_util.h | 8 +-
src/hostapi/alsa/pa_linux_alsa.c | 1661 +-
src/hostapi/asihpi/pa_linux_asihpi.c | 5803 ++--
src/hostapi/asio/ASIO-README.txt | 64 +-
src/hostapi/asio/iasiothiscallresolver.cpp | 31 +-
src/hostapi/asio/iasiothiscallresolver.h | 2 +-
src/hostapi/asio/pa_asio.cpp | 1923 +-
src/hostapi/coreaudio/pa_mac_core.c | 1005 +-
src/hostapi/coreaudio/pa_mac_core_blocking.c | 37 +-
src/hostapi/coreaudio/pa_mac_core_blocking.h | 2 +-
src/hostapi/coreaudio/pa_mac_core_internal.h | 42 +-
src/hostapi/coreaudio/pa_mac_core_utilities.c | 416 +-
src/hostapi/coreaudio/pa_mac_core_utilities.h | 43 +-
src/hostapi/dsound/pa_win_ds.c | 1438 +-
src/hostapi/dsound/pa_win_ds_dynlink.c | 48 +-
src/hostapi/dsound/pa_win_ds_dynlink.h | 15 +-
src/hostapi/jack/pa_jack.c | 43 +-
src/hostapi/oss/pa_unix_oss.c | 178 +-
src/hostapi/skeleton/README.txt | 1 +
.../skeleton/pa_hostapi_skeleton.c} | 12 +-
.../wasapi/mingw-include/AudioSessionTypes.h | 94 +
.../mingw-include/FunctionDiscoveryKeys_devpkey.h | 186 +
src/hostapi/wasapi/mingw-include/audioclient.h | 1177 +
src/hostapi/wasapi/mingw-include/devicetopology.h | 3275 ++
src/hostapi/wasapi/mingw-include/endpointvolume.h | 620 +
.../wasapi/mingw-include/functiondiscoverykeys.h | 255 +
src/hostapi/wasapi/mingw-include/ks.h | 3666 +++
src/hostapi/wasapi/mingw-include/ksguid.h | 28 +
src/hostapi/wasapi/mingw-include/ksmedia.h | 4551 +++
src/hostapi/wasapi/mingw-include/ksproxy.h | 639 +
src/hostapi/wasapi/mingw-include/ksuuids.h | 159 +
src/hostapi/wasapi/mingw-include/mmdeviceapi.h | 929 +
src/hostapi/wasapi/mingw-include/propidl.h | 1275 +
src/hostapi/wasapi/mingw-include/propkey.h | 4274 +++
src/hostapi/wasapi/mingw-include/propkeydef.h | 26 +
src/hostapi/wasapi/mingw-include/propsys.h | 3605 ++
src/hostapi/wasapi/mingw-include/rpcsal.h | 113 +
src/hostapi/wasapi/mingw-include/sal.h | 252 +
src/hostapi/wasapi/mingw-include/sdkddkver.h | 225 +
src/hostapi/wasapi/mingw-include/shtypes.h | 468 +
src/hostapi/wasapi/mingw-include/structuredquery.h | 2478 ++
src/hostapi/wasapi/pa_win_wasapi.c | 5156 +++
src/hostapi/wasapi/pa_win_wasapi.cpp | 1911 --
src/hostapi/wasapi/readme.txt | 25 +
src/hostapi/wdmks/pa_win_wdmks.c | 63 +-
src/hostapi/wmme/pa_win_wmme.c | 805 +-
src/os/mac_osx/pa_mac_hostapis.c | 87 -
src/os/unix/pa_unix_hostapis.c | 41 +-
src/os/unix/pa_unix_util.c | 66 +-
src/os/win/pa_win_coinitialize.c | 144 +
src/os/win/pa_win_coinitialize.h | 94 +
src/os/win/pa_win_hostapis.c | 40 +-
src/os/win/pa_win_util.c | 28 +-
src/os/win/pa_win_waveformat.c | 37 +-
src/os/win/pa_win_wdmks_utils.c | 59 +-
src/os/win/pa_x86_plain_converters.c | 4 +-
src/os/win/pa_x86_plain_converters.h | 2 +-
test/README.txt | 32 +-
test/debug_convert.c | 138 -
test/debug_dual.c | 190 -
test/debug_multi_in.c | 186 -
test/debug_multi_out.c | 151 -
test/debug_record.c | 346 -
test/debug_record_reuse.c | 358 -
test/debug_sine.c | 199 -
test/debug_sine_amp.c | 164 -
test/debug_sine_formats.c | 209 -
test/debug_srate.c | 272 -
test/debug_test1.c | 114 -
test/pa_minlat.c | 49 +-
test/patest1.c | 10 +-
test/patest_buffer.c | 8 +-
test/patest_callbackstop.c | 22 +-
test/patest_clip.c | 6 +-
test/patest_converters.c | 395 +
test/patest_dither.c | 6 +-
test/patest_hang.c | 6 +-
test/patest_in_overflow.c | 6 +-
test/patest_jack_wasapi.c | 343 +
test/patest_latency.c | 6 +-
test/patest_leftright.c | 72 +-
test/patest_longsine.c | 6 +-
test/patest_many.c | 6 +-
test/patest_maxsines.c | 6 +-
test/patest_multi_sine.c | 6 +-
test/patest_out_underflow.c | 29 +-
test/patest_prime.c | 8 +-
test/patest_read_record.c | 10 +-
test/patest_sine8.c | 33 +-
test/patest_sine_channelmaps.c | 26 +-
...test_sine_channelmaps.c => patest_sine_srate.c} | 108 +-
test/patest_sine_time.c | 6 +-
test/patest_start_stop.c | 8 +-
test/patest_stop.c | 6 +-
test/patest_stop_playout.c | 45 +-
test/patest_suggested_vs_streaminfo_latency.c | 269 +
test/patest_suggested_vs_streaminfo_latency.py | 150 +
test/patest_sync.c | 6 +-
test/patest_timing.c | 6 +-
test/patest_toomanysines.c | 31 +-
test/patest_two_rates.c | 94 +-
test/patest_underflow.c | 6 +-
test/patest_wire.c | 14 +-
test/patest_wmme_find_best_latency_params.c | 518 +
...nd.c => patest_wmme_low_level_latency_params.c} | 56 +-
testcvs/changeme.txt | 10 +
236 files changed, 105519 insertions(+), 64107 deletions(-)
diff --cc debian/changelog
index 5c53e34,0000000..99819ad
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,148 -1,0 +1,218 @@@
- portaudio19 (19+svn20071022-3.2) unstable; urgency=low
++portaudio19 (19+svn20111121-1) unstable; urgency=low
+
- * Non-maintainer upload.
- * Build-depend on libjack-dev as an alternative to libjack0.100.0-dev,
- the latter is a virtual package (Closes: #603388).
++ * New upstream stable release.
++ * Refresh audacity-portmixer.patch.
++ * Drop static-lib.patch (accepted upstream).
++ * Transition to Multi-Arch: same; thanks to Gregory Hainaut for the
++ patch (Closes: #645123).
++
++ -- Benjamin Drung <bdrung at debian.org> Thu, 08 Dec 2011 00:03:04 +0100
++
++portaudio19 (19+svn20110326-2) unstable; urgency=low
+
- -- Mehdi Dogguy <mehdi at debian.org> Thu, 25 Nov 2010 13:22:09 +0100
++ * Acknowledge NMU.
++ * Use linux-any instead of hardcoded list of non-Linux architectures.
++ (Closes: #634610)
+
- portaudio19 (19+svn20071022-3.1) unstable; urgency=medium
++ -- Benjamin Drung <bdrung at debian.org> Wed, 20 Jul 2011 01:49:33 +0200
++
++portaudio19 (19+svn20110326-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
- * debian/patches
- - (series): Add *.dpatch suffix to 01.
- - (20): New. Do not define error handler because ALSA's default error
- handler prints errors to stderr. Patch tanks to Marcelo E. Magallon
- <mmagallo at debian.org>. (grave; Closes: #563192).
++ * Add debian/patches/static-lib.patch to fix generation of libportaudio.a
++ (Closes: #626307).
++
++ -- Samuel Thibault <sthibault at debian.org> Sat, 11 Jun 2011 22:52:31 +0200
++
++portaudio19 (19+svn20110326-1) unstable; urgency=low
++
++ * New upstream stable release.
++ * Update debian/watch.
++ * Refresh audacity-portmixer.patch.
++ * Bump Standards-Version to 3.9.2 (no changes required).
++
++ -- Benjamin Drung <bdrung at debian.org> Sat, 16 Apr 2011 20:29:15 +0200
++
++portaudio19 (19+svn20110317-1) unstable; urgency=low
++
++ * New upstream stable release candidate.
++
++ -- Benjamin Drung <bdrung at debian.org> Fri, 18 Mar 2011 15:05:49 +0100
++
++portaudio19 (19+svn20110302-1) unstable; urgency=low
+
- -- Jari Aalto <jari.aalto at cante.net> Thu, 28 Oct 2010 14:52:22 +0300
++ * New upstream stable release candidate.
++ * Drop patches that were accepted upstream.
++ * Refresh audacity-portmixer.patch.
++ * Add new PaAlsa_SetLibraryPathName at Base to libportaudio2 symbols.
++
++ -- Benjamin Drung <bdrung at debian.org> Sat, 05 Mar 2011 13:02:48 +0100
++
++portaudio19 (19+svn20101113-3) unstable; urgency=low
++
++ * Install headers for portAudio backends.
++
++ -- Benjamin Drung <bdrung at debian.org> Sat, 26 Feb 2011 16:01:54 +0100
++
++portaudio19 (19+svn20101113-2) unstable; urgency=low
++
++ * Export OSS functions.
++ * Disable parallel build which can lead to a build failure.
++
++ -- Benjamin Drung <bdrung at debian.org> Fri, 25 Feb 2011 00:51:02 +0100
++
++portaudio19 (19+svn20101113-1) unstable; urgency=low
++
++ [ Kilian Krause ]
++ * Alter Build-Depends from libjack0.100.0-dev to libjack-dev (Closes: #527423)
++
++ [ Benjamin Drung ]
++ * New upstream snapshot (Closes: #560111).
++ * Add myself to Uploaders.
++ * Refresh get-orig-source rule.
++ * Switch to debhelper 8 and use dh.
++ * Build agains libjack on all architectures (Closes: #472574).
++ * Bump Standards-Version to 3.9.1.
++ * Add ${misc:Depends} to dependencies.
++ * Update debian/copyright.
++ * Drop dpatch and switch to dpkg-source 3.0 (quilt) format.
++ * Replace 01_config.dpatch by running autoreconf (Closes: #558621).
++ * Add audacity-portmixer.patch for adding features needed to make portmixer
++ work with audacity.
++ * Add .symbols files to library packages.
++ * portaudio19-dev depends on libportaudiocpp0.
++ * Do not install .la file.
++ * Remove Mikael Magnusson from Uploaders. Thanks for your work.
++
++ -- Benjamin Drung <bdrung at debian.org> Mon, 21 Feb 2011 00:41:10 +0100
+
+portaudio19 (19+svn20071022-3) unstable; urgency=low
+
+ [ Patrick Matthäi ]
+ * Fixed doc-base section.
+ * Removed extra whitespaces at after the Abstract field in the doc-base.
+ Thanks lintian.
+
+ [ Mark Purcell ]
+ * paravoid fixed lintian:xs-vcs-header-in-debian-control
+ * Fix lintian:debian-watch-file-is-missing
+
+ -- Mark Purcell <msp at debian.org> Sun, 12 Oct 2008 15:35:36 +1100
+
+portaudio19 (19+svn20071022-2) unstable; urgency=low
+
+ * Vanilla 'dh_makeshlibs -a' does correct magic
+ - shlibs file incorrect: does not force dependency on libportaudiocpp0
+ (Closes: #447819)
+ * We only support upgrades from stable/etch 19+svn20060825-1, thus
+ libportaudio2 (>= 19+cvs20060311-1) is unnecssary
+
+ -- Mark Purcell <msp at debian.org> Thu, 25 Oct 2007 06:59:26 +0100
+
+portaudio19 (19+svn20071022-1) unstable; urgency=low
+
+ [ Mark Purcell ]
+ * New upstream release
+ - libportaudio2: new snapshot (Closes: #447338)
+
+ [ Kilian Krause ]
+ * Use ${binary:Version} for binNMU-safe uploads.
+ Add dpkg-dev (>= 1.13.19) to Build-Depends
+ * Don't ignore make clean errors.
+ * Fix dh_makeshlibs call. Get rid of libportaudiocpp0 binary:
+ shlibs-declares-dependency-on-other-package libportaudio2.
+ * Add Homepage field as added in dpkg-dev 1.14.6.
+
+ -- Mark Purcell <msp at debian.org> Tue, 23 Oct 2007 07:13:43 +0100
+
+portaudio19 (19+svn20070125-1) unstable; urgency=low
+
+ [ Mikael Magnusson ]
+ * Update to svn 20070125 (r1174)
+ * Disable JACK and ringbuffer on all architectures except i386 and
+ powerpc. (Closes: #406754: FTBFS: #error Memory barriers are not
+ defined on this system)
+
+ -- Mikael Magnusson <mikma at users.sourceforge.net> Sun, 25 Mar 2007 17:04:32 +0100
+
+portaudio19 (19+svn20070113-1) unstable; urgency=low
+
+ * New upstream release
+ * debian/rules: add binary-indep
+ * FTBFS on GNU/kFreeBSD (due to unsatisfied Build-Depends on
+ libasound2-dev) (Closes: #401052)
+ * FTBFS on GNU/kFreeBSD (pa_unix_oss support) (Closes: #406717)
+
+ -- Mikael Magnusson <mikma at users.sourceforge.net> Sat, 13 Jan 2007 12:18:36 +0100
+
+portaudio19 (19+svn20060825-1) unstable; urgency=low
+
+ * Initial release. (Closes: #328873: portaudio: please package v19)
+ * Disable V18 compatibility and bump shlib dependency
+ * Change SONAME to libportaudio2.so
+ * Updated debian/copyright with more copyright holders and added the
+ licence interpretation from the PortAudio web site.
+ * Updated package descriptions and added homepage url:s.
+ * Removed unused patches: 20_compat and 30_alsa.
+ * Removed patches applied by upstream: 40_vpath_libtool and
+ 41_vpath_libtool_gen.
+ * Fixed path to low_latency_tip.txt, moved by upstream.
+ * Add print-version and get-orig-source targets to rules.
+ * Include C++ bindings.
+ * Rename libportaudio2-dev to portaudio19-dev, since it contains the
+ developer files for both the libportaudio2 and libportaudiocpp0
+ packages. Also rename libportaudio2-doc to portaudio19-doc.
+ * Include C++ examples.
+ * Bump Standards-Version to 3.7.2. No changes required.
+ * Removed old documents and added doxygen generated documentation.
+ * Updated copyright, license modified by upstream.
+
+ -- Mikael Magnusson <mikma at users.sourceforge.net> Thu, 24 Aug 2006 14:23:41 +0200
+
+portaudio19 (19+20041112-3) experimental; urgency=low
+
+ * Enabled OSS and JACK
+
+ -- Mikael Magnusson <mikma at users.sourceforge.net> Tue, 1 Mar 2005 20:08:03 +0100
+
+portaudio19 (19+20041112-2) experimental; urgency=low
+
+ * Added missing depends to libportaudio19-dev: libasound2-dev, libjack-dev
+
+ -- Mikael Magnusson <mikma at users.sourceforge.net> Fri, 19 Nov 2004 00:15:00 +0100
+
+portaudio19 (19+20041112-1) experimental; urgency=low
+
+ * New upstream release
+ * VPATH support in Makefile.in
+
+ -- Mikael Magnusson <mikma at users.sourceforge.net> Sat, 13 Nov 2004 12:16:47 +0100
+
+portaudio19 (19+20041104-1) experimental; urgency=low
+
+ * New upstream release
+
+ -- Mikael Magnusson <mikma at users.sourceforge.net> Thu, 4 Nov 2004 16:46:48 +0100
+
+portaudio19 (19+20040729-2) experimental; urgency=low
+
+ * Added V18 compatibility.
+ * ALSA: Support of multiple devices for each card.
+
+ -- Mikael Magnusson <mikma at users.sourceforge.net> Wed, 3 Nov 2004 15:56:49 +0100
+
+portaudio19 (19+20040729-1) experimental; urgency=low
+
+ * -D_REENTRANT must be specified when building libraries.
+ * Enforce symbol resolution at build time with -Wl,-z,defs.
+ * Fixed CFLAGS in configure.
+ * Link with libm and libpthread.
+
+ -- Mikael Magnusson <mikma at users.sourceforge.net> Wed, 29 Sep 2004 20:24:20 +0200
+
+portaudio19 (19+20040729-0) experimental; urgency=low
+
+ * Initial Release.
+
+ -- Mikael Magnusson <mikma at users.sourceforge.net> Tue, 28 Sep 2004 14:40:10 +0200
++
diff --cc debian/compat
index b8626c4,0000000..ec63514
mode 100644,000000..100644
--- a/debian/compat
+++ b/debian/compat
@@@ -1,1 -1,0 +1,1 @@@
- 4
++9
diff --cc debian/control
index fee9d15,0000000..000b55e
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,65 -1,0 +1,81 @@@
+Source: portaudio19
+Priority: optional
+Section: sound
+Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
- Uploaders: Kilian Krause <kilian at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Mark Purcell <msp at debian.org>, Mikael Magnusson <mikma at users.sourceforge.net>
- Build-Depends: debhelper (>= 4.0.0), dpatch, autotools-dev,
- libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- libjack-dev | libjack0.100.0-dev, doxygen, dpkg-dev (>= 1.13.19)
- Standards-Version: 3.7.2
++Uploaders: Kilian Krause <kilian at debian.org>,
++ Jose Carlos Garcia Sogo <jsogo at debian.org>,
++ Mark Purcell <msp at debian.org>,
++ Benjamin Drung <bdrung at debian.org>
++Build-Depends: automake,
++ debhelper (>= 8.1.3),
++ dh-autoreconf,
++ doxygen,
++ dpkg-dev (>= 1.13.19),
++ libasound2-dev [linux-any],
++ libjack-dev
++Standards-Version: 3.9.2
+Homepage: http://www.portaudio.com/
+Vcs-Svn: svn://svn.debian.org/pkg-voip/portaudio19/trunk/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/portaudio19/?op=log
+
+Package: libportaudio2
+Section: libs
+Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends}
++Multi-Arch: same
++Pre-Depends: ${misc:Pre-Depends}
++Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Portable audio I/O - shared library
+ PortAudio is a portable audio I/O library designed for cross-platform
+ support of audio. It uses a callback mechanism to request audio
+ processing. Audio can be generated in various formats, including 32
+ bit floating point, and will be converted to the native format
+ internally.
+ .
+ This package contains the shared library.
+
++Package: libportaudiocpp0
++Section: libs
++Architecture: any
++Multi-Arch: same
++Pre-Depends: ${misc:Pre-Depends}
++Depends: ${misc:Depends}, ${shlibs:Depends}
++Description: Portable audio I/O C++ bindings - shared library
++ PortAudio is a portable audio I/O library designed for cross-platform
++ support of audio. It uses a callback mechanism to request audio
++ processing. Audio can be generated in various formats, including 32
++ bit floating point, and will be converted to the native format
++ internally.
++ .
++ This package contains the shared library of the C++ bindings.
++
+Package: portaudio19-dev
+Section: devel
+Architecture: any
- Depends: libportaudio2 (= ${binary:Version}), ${alsa-dev}, ${jack-dev}
- Conflicts: libportaudio-dev, libportaudio19-dev, libportaudio-19-dev
- Replaces: libportaudio19-dev, libportaudio-19-dev
++Depends: libasound2-dev [linux-any],
++ libjack-dev,
++ libportaudio2 (= ${binary:Version}),
++ libportaudiocpp0 (= ${binary:Version}),
++ ${misc:Depends}
++Conflicts: libportaudio-19-dev, libportaudio-dev, libportaudio19-dev
++Replaces: libportaudio-19-dev, libportaudio19-dev
+Description: Portable audio I/O - development files
+ PortAudio is a portable audio I/O library designed for cross-platform
+ support of audio. It uses a callback mechanism to request audio
+ processing. Audio can be generated in various formats, including 32
+ bit floating point, and will be converted to the native format
+ internally.
+ .
+ This package contains the development files.
+
+Package: portaudio19-doc
+Section: doc
+Architecture: all
++Depends: ${misc:Depends}
+Description: Portable audio I/O - documentation
+ PortAudio is a portable audio I/O library designed for cross-platform
+ support of audio. It uses a callback mechanism to request audio
+ processing. Audio can be generated in various formats, including 32
+ bit floating point, and will be converted to the native format
+ internally.
+ .
+ This package contains the documentation.
-
- Package: libportaudiocpp0
- Section: libs
- Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends}
- Description: Portable audio I/O C++ bindings - shared library
- PortAudio is a portable audio I/O library designed for cross-platform
- support of audio. It uses a callback mechanism to request audio
- processing. Audio can be generated in various formats, including 32
- bit floating point, and will be converted to the native format
- internally.
- .
- This package contains the shared library of the C++ bindings.
diff --cc debian/copyright
index b7b5c89,0000000..119efcd
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,51 -1,0 +1,53 @@@
+This package was debianized by Mikael Magnusson
+<mikma at users.sourceforge.net> on Mon, 12 Jul 2004 13:23:58 +0000.
+
+It was downloaded from:
+https://www.portaudio.com/repos/portaudio/branches/v19-devel
+
+Upstream Authors:
+Ross Bencina <rbencina at iprimus.com.au>
+Phil Burk <philburk at softsynth.com>
+
+Copyright:
+
+PortAudio Portable Real-Time Audio Library
- Copyright (c) 1999-2006 Ross Bencina, Phil Burk
++Copyright (c) 1999-2009 Ross Bencina
++Copyright (c) 1999-2008 Phil Burk
+Copyright (c) 1999-2000 Robert Marsanyi
- Copyright (c) 1999-2004 Andrew Baldwin
++Copyright (c) 1999-2007 Andrew Baldwin
+Copyright (c) 2002 Joshua Haberman <joshua at haberman.com>
+Copyright (c) 2003 Fred Gleason
+Copyright (c) 2004 Stefan Westerfeld <stefan at space.twc.de>
- Copyright (c) 2004-2006 Arve Knudsen <aknuds-1 at broadpark.no>
++Copyright (c) 2004-2009 Arve Knudsen <arve.knudsen at gmail.com>
+Copyright (c) 2005-2006 Ludwig Schwardt
- Copyright (c) 2006 David Viens
++Copyright (c) 2006-2007 David Viens
++Copyright (c) 2008 Kevin Kofler <kevin.kofler at chello.at>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files
+(the "Software"), to deal in the Software without restriction,
+including without limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of the Software,
+and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
+ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+The text above constitutes the entire PortAudio license; however,
+the PortAudio community also makes the following non-binding requests:
+
+Any person wishing to distribute modifications to the Software is
+requested to send the modifications to the original developer so that
+they can be incorporated into the canonical version. It is also
+requested that these non-binding requests be included along with the
+license above.
diff --cc debian/libportaudio2.install
index 0c4c235,0000000..9e7a06f
mode 100644,000000..100644
--- a/debian/libportaudio2.install
+++ b/debian/libportaudio2.install
@@@ -1,1 -1,0 +1,1 @@@
- usr/lib/libportaudio.*so.*
++usr/lib/*/libportaudio.*so.*
diff --cc debian/libportaudio2.symbols
index 0000000,0000000..bb7908f
new file mode 100644
--- /dev/null
+++ b/debian/libportaudio2.symbols
@@@ -1,0 -1,0 +1,50 @@@
++libportaudio.so.2 libportaudio2 #MINVER#
++ (arch=linux-any)PaAlsa_EnableRealtimeScheduling at Base 19+svn20101113
++ (arch=linux-any)PaAlsa_GetStreamInputCard at Base 19+svn20101113
++ (arch=linux-any)PaAlsa_GetStreamOutputCard at Base 19+svn20101113
++ (arch=linux-any)PaAlsa_Initialize at Base 19+svn20101113
++ (arch=linux-any)PaAlsa_InitializeStreamInfo at Base 19+svn20101113
++ (arch=linux-any)PaAlsa_SetLibraryPathName at Base 19+svn20110302
++ (arch=linux-any)PaAlsa_SetNumPeriods at Base 19+svn20101113
++ (arch=linux-any)PaAlsa_SetRetriesBusy at Base 19+svn20101113
++ PaJack_GetClientName at Base 19+svn20101113
++ PaJack_Initialize at Base 19+svn20101113
++ PaJack_SetClientName at Base 19+svn20101113
++ PaOSS_GetStreamInputDevice at Base 19+svn20101113-2~
++ PaOSS_GetStreamOutputDevice at Base 19+svn20101113-2~
++ PaOSS_Initialize at Base 19+svn20101113-2~
++ Pa_AbortStream at Base 19+svn20101113
++ Pa_CloseStream at Base 19+svn20101113
++ Pa_GetDefaultHostApi at Base 19+svn20101113
++ Pa_GetDefaultInputDevice at Base 19+svn20101113
++ Pa_GetDefaultOutputDevice at Base 19+svn20101113
++ Pa_GetDeviceCount at Base 19+svn20101113
++ Pa_GetDeviceInfo at Base 19+svn20101113
++ Pa_GetErrorText at Base 19+svn20101113
++ Pa_GetHostApiCount at Base 19+svn20101113
++ Pa_GetHostApiInfo at Base 19+svn20101113
++ Pa_GetLastHostErrorInfo at Base 19+svn20101113
++ Pa_GetSampleSize at Base 19+svn20101113
++ Pa_GetStreamCpuLoad at Base 19+svn20101113
++ Pa_GetStreamHostApiType at Base 19+svn20101113
++ Pa_GetStreamInfo at Base 19+svn20101113
++ Pa_GetStreamReadAvailable at Base 19+svn20101113
++ Pa_GetStreamTime at Base 19+svn20101113
++ Pa_GetStreamWriteAvailable at Base 19+svn20101113
++ Pa_GetVersion at Base 19+svn20101113
++ Pa_GetVersionText at Base 19+svn20101113
++ Pa_HostApiDeviceIndexToDeviceIndex at Base 19+svn20101113
++ Pa_HostApiTypeIdToHostApiIndex at Base 19+svn20101113
++ Pa_Initialize at Base 19+svn20101113
++ Pa_IsFormatSupported at Base 19+svn20101113
++ Pa_IsStreamActive at Base 19+svn20101113
++ Pa_IsStreamStopped at Base 19+svn20101113
++ Pa_OpenDefaultStream at Base 19+svn20101113
++ Pa_OpenStream at Base 19+svn20101113
++ Pa_ReadStream at Base 19+svn20101113
++ Pa_SetStreamFinishedCallback at Base 19+svn20101113
++ Pa_Sleep at Base 19+svn20101113
++ Pa_StartStream at Base 19+svn20101113
++ Pa_StopStream at Base 19+svn20101113
++ Pa_Terminate at Base 19+svn20101113
++ Pa_WriteStream at Base 19+svn20101113
diff --cc debian/libportaudiocpp0.install
index 5993446,0000000..34a4fa1
mode 100644,000000..100644
--- a/debian/libportaudiocpp0.install
+++ b/debian/libportaudiocpp0.install
@@@ -1,1 -1,0 +1,1 @@@
- usr/lib/libportaudiocpp.*so.*
++usr/lib/*/libportaudiocpp.*so.*
diff --cc debian/patches/audacity-portmixer.patch
index 0000000,0000000..d864b44
new file mode 100644
--- /dev/null
+++ b/debian/patches/audacity-portmixer.patch
@@@ -1,0 -1,0 +1,322 @@@
++Description: Add features needed to make portmixer work with audacity.
++Author: Audacity Team
++Last-Update: 2011-12-07
++
++--- a/include/pa_win_ds.h
+++++ b/include/pa_win_ds.h
++@@ -89,6 +89,21 @@
++
++ }PaWinDirectSoundStreamInfo;
++
+++/** Retrieve the GUID of the input device.
+++
+++ @param stream The stream to query.
+++
+++ @return A pointer to the GUID, or NULL if none.
+++*/
+++LPGUID PaWinDS_GetStreamInputGUID( PaStream* s );
+++
+++/** Retrieve the GUID of the output device.
+++
+++ @param stream The stream to query.
+++
+++ @return A pointer to the GUID, or NULL if none.
+++*/
+++LPGUID PaWinDS_GetStreamOutputGUID( PaStream* s );
++
++
++ #ifdef __cplusplus
++--- a/include/portaudio.h
+++++ b/include/portaudio.h
++@@ -1146,6 +1146,15 @@
++ signed long Pa_GetStreamWriteAvailable( PaStream* stream );
++
++
+++/** Retrieve the host type handling an open stream.
+++
+++ @return Returns a non-negative value representing the host API type
+++ handling an open stream or, a PaErrorCode (which are always negative)
+++ if PortAudio is not initialized or an error is encountered.
+++*/
+++PaHostApiTypeId Pa_GetStreamHostApiType( PaStream* stream );
+++
+++
++ /* Miscellaneous utilities */
++
++
++--- /dev/null
+++++ b/include/pa_unix_oss.h
++@@ -0,0 +1,104 @@
+++#ifndef PA_UNIX_OSS_H
+++#define PA_UNIX_OSS_H
+++
+++/*
+++ * $Id: portaudio.patch,v 1.10 2009-06-30 04:52:59 llucius Exp $
+++ * PortAudio Portable Real-Time Audio Library
+++ * OSS-specific extensions
+++ *
+++ * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
+++ *
+++ * Permission is hereby granted, free of charge, to any person obtaining
+++ * a copy of this software and associated documentation files
+++ * (the "Software"), to deal in the Software without restriction,
+++ * including without limitation the rights to use, copy, modify, merge,
+++ * publish, distribute, sublicense, and/or sell copies of the Software,
+++ * and to permit persons to whom the Software is furnished to do so,
+++ * subject to the following conditions:
+++ *
+++ * The above copyright notice and this permission notice shall be
+++ * included in all copies or substantial portions of the Software.
+++ *
+++ * Any person wishing to distribute modifications to the Software is
+++ * requested to send the modifications to the original developer so that
+++ * they can be incorporated into the canonical version.
+++ *
+++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+++ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
+++ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+++ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+++ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+++ *
+++ */
+++
+++/** @file
+++ * OSS-specific PortAudio API extension header file.
+++ */
+++
+++#ifdef __cplusplus
+++extern "C" {
+++#endif
+++
+++const char *PaOSS_GetStreamInputDevice( PaStream *s );
+++
+++const char *PaOSS_GetStreamOutputDevice( PaStream *s );
+++
+++#ifdef __cplusplus
+++}
+++#endif
+++
+++#endif
+++#ifndef PA_UNIX_OSS_H
+++#define PA_UNIX_OSS_H
+++
+++/*
+++ * $Id: portaudio.patch,v 1.10 2009-06-30 04:52:59 llucius Exp $
+++ * PortAudio Portable Real-Time Audio Library
+++ * OSS-specific extensions
+++ *
+++ * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
+++ *
+++ * Permission is hereby granted, free of charge, to any person obtaining
+++ * a copy of this software and associated documentation files
+++ * (the "Software"), to deal in the Software without restriction,
+++ * including without limitation the rights to use, copy, modify, merge,
+++ * publish, distribute, sublicense, and/or sell copies of the Software,
+++ * and to permit persons to whom the Software is furnished to do so,
+++ * subject to the following conditions:
+++ *
+++ * The above copyright notice and this permission notice shall be
+++ * included in all copies or substantial portions of the Software.
+++ *
+++ * Any person wishing to distribute modifications to the Software is
+++ * requested to send the modifications to the original developer so that
+++ * they can be incorporated into the canonical version.
+++ *
+++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+++ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
+++ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+++ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+++ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+++ *
+++ */
+++
+++/** @file
+++ * OSS-specific PortAudio API extension header file.
+++ */
+++
+++#ifdef __cplusplus
+++extern "C" {
+++#endif
+++
+++const char *PaOSS_GetStreamInputDevice( PaStream *s );
+++
+++const char *PaOSS_GetStreamOutputDevice( PaStream *s );
+++
+++#ifdef __cplusplus
+++}
+++#endif
+++
+++#endif
++--- a/src/common/pa_front.c
+++++ b/src/common/pa_front.c
++@@ -1216,8 +1216,10 @@
++ hostApiInputParametersPtr, hostApiOutputParametersPtr,
++ sampleRate, framesPerBuffer, streamFlags, streamCallback, userData );
++
++- if( result == paNoError )
+++ if( result == paNoError ) {
++ AddOpenStream( *stream );
+++ PA_STREAM_REP(*stream)->hostApiType = hostApi->info.type;
+++ }
++
++
++ PA_LOGAPI(("Pa_OpenStream returned:\n" ));
++@@ -1729,6 +1731,32 @@
++ return result;
++ }
++
+++PaHostApiTypeId Pa_GetStreamHostApiType( PaStream* stream )
+++{
+++ PaError error = PaUtil_ValidateStreamPointer( stream );
+++ PaHostApiTypeId result;
+++
+++#ifdef PA_LOG_API_CALLS
+++ PaUtil_DebugPrint("Pa_GetStreamHostApiType called:\n" );
+++ PaUtil_DebugPrint("\tPaStream* stream: 0x%p\n", stream );
+++#endif
+++
+++ if( error == paNoError )
+++ {
+++ result = PA_STREAM_REP(stream)->hostApiType;
+++ }
+++ else
+++ {
+++ result = (PaHostApiTypeId) error;
+++ }
+++
+++#ifdef PA_LOG_API_CALLS
+++ PaUtil_DebugPrint("Pa_GetStreamHostApiType returned:\n" );
+++ PaUtil_DebugPrint("\tPaError: %d ( %s )\n\n", result, Pa_GetErrorText( result ) );
+++#endif
+++
+++ return result;
+++}
++
++ PaError Pa_GetSampleSize( PaSampleFormat format )
++ {
++--- a/src/common/pa_stream.c
+++++ b/src/common/pa_stream.c
++@@ -93,6 +93,8 @@
++ streamRepresentation->streamInfo.inputLatency = 0.;
++ streamRepresentation->streamInfo.outputLatency = 0.;
++ streamRepresentation->streamInfo.sampleRate = 0.;
+++
+++ streamRepresentation->hostApiType = 0;
++ }
++
++
++--- a/src/common/pa_stream.h
+++++ b/src/common/pa_stream.h
++@@ -152,6 +152,7 @@
++ PaStreamFinishedCallback *streamFinishedCallback;
++ void *userData;
++ PaStreamInfo streamInfo;
+++ PaHostApiTypeId hostApiType;
++ } PaUtilStreamRepresentation;
++
++
++--- a/src/hostapi/coreaudio/pa_mac_core_blocking.c
+++++ b/src/hostapi/coreaudio/pa_mac_core_blocking.c
++@@ -66,6 +66,9 @@
++ #ifdef MOSX_USE_NON_ATOMIC_FLAG_BITS
++ # define OSAtomicOr32( a, b ) ( (*(b)) |= (a) )
++ # define OSAtomicAnd32( a, b ) ( (*(b)) &= (a) )
+++#elif MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_3
+++# define OSAtomicOr32( a, b ) BitOrAtomic( a, (UInt32 *) b )
+++# define OSAtomicAnd32( a, b ) BitAndAtomic( a, (UInt32 *) b )
++ #else
++ # include <libkern/OSAtomic.h>
++ #endif
++--- a/src/hostapi/alsa/pa_linux_alsa.c
+++++ b/src/hostapi/alsa/pa_linux_alsa.c
++@@ -611,6 +611,7 @@
++ StreamDirection streamDir;
++
++ snd_pcm_channel_area_t *channelAreas; /* Needed for channel adaption */
+++ int card;
++ } PaAlsaStreamComponent;
++
++ /* Implementation specific stream structure */
++@@ -1806,6 +1807,7 @@
++ {
++ PaError result = paNoError;
++ PaSampleFormat userSampleFormat = params->sampleFormat, hostSampleFormat = paNoError;
+++ snd_pcm_info_t* pcmInfo;
++ assert( params->channelCount > 0 );
++
++ /* Make sure things have an initial value */
++@@ -1826,6 +1828,9 @@
++ self->device = params->device;
++
++ PA_ENSURE( AlsaOpen( &alsaApi->baseHostApiRep, params, streamDir, &self->pcm ) );
+++
+++ snd_pcm_info_alloca( &pcmInfo );
+++ self->card = snd_pcm_info_get_card( pcmInfo );
++ self->nfds = alsa_snd_pcm_poll_descriptors_count( self->pcm );
++
++ PA_ENSURE( hostSampleFormat = PaUtil_SelectClosestAvailableFormat( GetAvailableFormats( self->pcm ), userSampleFormat ) );
++@@ -4519,9 +4524,7 @@
++ /* XXX: More descriptive error? */
++ PA_UNLESS( stream->capture.pcm, paDeviceUnavailable );
++
++- alsa_snd_pcm_info_alloca( &pcmInfo );
++- PA_ENSURE( alsa_snd_pcm_info( stream->capture.pcm, pcmInfo ) );
++- *card = alsa_snd_pcm_info_get_card( pcmInfo );
+++ *card = stream->capture.card;
++
++ error:
++ return result;
++@@ -4537,9 +4540,7 @@
++ /* XXX: More descriptive error? */
++ PA_UNLESS( stream->playback.pcm, paDeviceUnavailable );
++
++- alsa_snd_pcm_info_alloca( &pcmInfo );
++- PA_ENSURE( alsa_snd_pcm_info( stream->playback.pcm, pcmInfo ) );
++- *card = alsa_snd_pcm_info_get_card( pcmInfo );
+++ *card = stream->playback.card;
++
++ error:
++ return result;
++--- a/src/hostapi/oss/pa_unix_oss.c
+++++ b/src/hostapi/oss/pa_unix_oss.c
++@@ -2028,3 +2028,26 @@
++ #endif
++ }
++
+++const char *PaOSS_GetStreamInputDevice( PaStream* s )
+++{
+++ PaOssStream *stream = (PaOssStream*)s;
+++
+++ if( stream->capture )
+++ {
+++ return stream->capture->devName;
+++ }
+++
+++ return NULL;
+++}
+++
+++const char *PaOSS_GetStreamOutputDevice( PaStream* s )
+++{
+++ PaOssStream *stream = (PaOssStream*)s;
+++
+++ if( stream->playback )
+++ {
+++ return stream->playback->devName;
+++ }
+++
+++ return NULL;
+++}
++--- a/configure.in
+++++ b/configure.in
++@@ -365,6 +365,7 @@
++ DLL_LIBS="$DLL_LIBS -lossaudio"
++ LIBS="$LIBS -lossaudio"
++ fi
+++ INCLUDES="$INCLUDES pa_unix_oss.h"
++ AC_DEFINE(PA_USE_OSS,1)
++ fi
++
diff --cc debian/patches/series
index 0000000,0000000..ebc90e2
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++audacity-portmixer.patch
diff --cc debian/portaudio19-dev.install
index bba219c,0000000..76f28fa
mode 100644,000000..100644
--- a/debian/portaudio19-dev.install
+++ b/debian/portaudio19-dev.install
@@@ -1,5 -1,0 +1,4 @@@
+usr/include/*
- usr/lib/lib*.a
- usr/lib/lib*.so
- usr/lib/pkgconfig/*
- /usr/lib/*.la
++usr/lib/*/lib*.a
++usr/lib/*/lib*.so
++usr/lib/*/pkgconfig/*
diff --cc debian/portaudio19-doc.install
index c6c5785,0000000..22929f4
mode 100644,000000..100644
--- a/debian/portaudio19-doc.install
+++ b/debian/portaudio19-doc.install
@@@ -1,1 -1,0 +1,1 @@@
- ../../doc/html/ /usr/share/doc/portaudio19-doc/doc
++doc/html/ usr/share/doc/portaudio19-doc/doc
diff --cc debian/rules
index ec4a4fa,0000000..794b236
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,153 -1,0 +1,34 @@@
+#!/usr/bin/make -f
- # -*- makefile -*-
- # Sample debian/rules that uses debhelper.
- # GNU copyright 1997 to 1999 by Joey Hess.
+
- # Uncomment this to turn on verbose mode.
- #export DH_VERBOSE=1
++%:
++ dh $@ --with autoreconf
+
- include /usr/share/dpatch/dpatch.make
++override_dh_auto_clean:
++ dh_auto_clean
++ [ ! -f bindings/cpp/Makefile ] || $(MAKE) distclean -C bindings/cpp
++ rm -f bindings/cpp/doc/Makefile doc/html/*
+
- # These are used for cross-compiling and for saving the configure script
- # from having to guess our platform (since we know it already)
- DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
- DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
- DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
- DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
++override_dh_auto_configure:
++ dh_auto_configure -- --enable-cxx
+
++override_dh_auto_build:
++ dh_auto_build
++ doxygen
+
- CFLAGS = -Wall -g -D_REENTRANT
-
- ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
- else
- CFLAGS += -O2
- endif
- ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
- endif
-
- ifeq (linux,$(DEB_HOST_ARCH_OS))
- CONFIGURE_SOUND_ARGS = --with-oss=yes --with-alsa=yes
- DH_GENCONTROL_ARGS = -Valsa-dev="libasound2-dev"
- else
- CONFIGURE_SOUND_ARGS = --with-oss=yes --with-alsa=no
- endif
-
- #
- # pa_ringbuffer required for jack support is only guaranteed
- # SMP safe on i386 and powerpc
- #
- ENABLE_JACK = no
- ifeq (i386,$(DEB_HOST_ARCH))
- ENABLE_JACK = yes
- else
- ifeq (powerpc,$(DEB_HOST_ARCH))
- ENABLE_JACK = yes
- endif
- endif
-
- ifeq (yes,$(ENABLE_JACK))
- DH_GENCONTROL_ARGS += -Vjack-dev="libjack0.100.0-dev"
- endif
-
- CONFIGURE_SOUND_ARGS += --with-jack=$(ENABLE_JACK)
-
- DEBVERSION:=$(shell head -n 1 debian/changelog \
- | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
++DEBVERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
+UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//')
+UPDATE:=$(shell echo $(UPVERSION) | sed -e 's/^.*\+svn//')
+
+FILENAME := portaudio19_$(UPVERSION).orig.tar.gz
- URL := https://www.portaudio.com/repos/portaudio/branches/v19-devel
- SRCDIR := portaudio19-$(UPVERSION).orig
-
- autoreconf:
- aclocal
- autoconf
- libtoolize -c
- $(RM) -r autom4te.cache
-
- config: patch config.status
- config.status:
- dh_testdir
- CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-cxx $(CONFIGURE_SOUND_ARGS)
-
- build: config build-stamp
- build-stamp:
- dh_testdir
- $(MAKE) lib/libportaudio.la
- $(MAKE) -C bindings/cpp
- doxygen
- touch build-stamp
-
- clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
- [ ! -f bindings/cpp/doc/Makefile ]||$(MAKE) -C bindings/cpp/doc distclean
- [ ! -f bindings/cpp/Makefile ]||$(MAKE) -C bindings/cpp distclean
- [ ! -f Makefile ]||$(MAKE) distclean
- $(RM) -r lib/.libs
- $(RM) doc/html/*
- $(MAKE) -f $(CURDIR)/debian/rules unpatch
- dh_clean
-
- install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- install -d $(CURDIR)/debian/tmp/usr/lib
- install -d $(CURDIR)/debian/tmp/usr/include
- $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
- # Build architecture-independent files here.
- binary-indep: build install
- dh_testdir -i
- dh_testroot -i
- dh_installchangelogs -i
- dh_installdocs -i
- dh_installexamples -i
- dh_install -i --sourcedir=debian/tmp
- dh_compress -i --exclude=usr/share/doc/portaudio19-doc/docs
- dh_fixperms -i
- dh_installdeb -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-
- # Build architecture-dependent files here.
- binary-arch: build install
- dh_testdir -a
- dh_testroot -a
- dh_installchangelogs -a
- dh_installdocs -a
- dh_install -a --sourcedir=debian/tmp --list-missing
- dh_strip -a
- dh_compress -a --exclude=usr/share/doc/portaudio19-doc/docs
- dh_fixperms -a
- dh_makeshlibs -a
- dh_installdeb -a
- dh_shlibdeps -a
- dh_gencontrol -a -- $(DH_GENCONTROL_ARGS)
- dh_md5sums -a
- dh_builddeb -a
-
- print-version:
- @@echo "Debian version: $(DEBVERSION)"
- @@echo "Upstream version: $(UPVERSION)"
++URL := https://www.portaudio.com/repos/portaudio/trunk
++SRCDIR := portaudio19-$(UPVERSION)
+
+get-orig-source:
- @@dh_testdir
- @@[ -d ../tarballs/. ]||mkdir -p ../tarballs
- @@echo Downloading $(FILENAME) from $(URL) ...
- @@svn export -r{$(UPDATE)T0000Z} $(URL) ../tarballs/$(SRCDIR)
- @@echo Building snapshot tarball
- @@GZIP=-9 tar -b1 -czf ../tarballs/$(FILENAME) -C ../tarballs $(SRCDIR)
- @@echo Cleaning up
- @@rm -rf ../tarballs/$(SRCDIR)
-
- binary: binary-indep binary-arch
- .PHONY: build clean binary-indep binary-arch binary install patch unpatch config autoreconf print-version get-orig-source
++ @dh_testdir
++ @mkdir -p ../tarballs
++ @echo Downloading $(FILENAME) from $(URL) ...
++ @svn export -r{$(UPDATE)T0000Z} $(URL) ../tarballs/$(SRCDIR)
++ @echo Building snapshot tarball
++ @GZIP=-9 tar -caf ../tarballs/$(FILENAME) -C ../tarballs $(SRCDIR)
++ @echo Cleaning up
++ @rm -rf ../tarballs/$(SRCDIR)
diff --cc debian/source.lintian-overrides
index 0000000,0000000..aed9156
new file mode 100644
--- /dev/null
+++ b/debian/source.lintian-overrides
@@@ -1,0 -1,0 +1,1 @@@
++package-needs-versioned-debhelper-build-depends
diff --cc debian/source/format
index 0000000,0000000..163aaf8
new file mode 100644
--- /dev/null
+++ b/debian/source/format
@@@ -1,0 -1,0 +1,1 @@@
++3.0 (quilt)
diff --cc debian/watch
index 4774332,0000000..fc6b12e
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,8 -1,0 +1,3 @@@
- # See uscan(1) for format
-
+version=3
-
- #http://www.portaudio.com/archives/pa_stable_v19_(.*).tar.gz
-
- opts=dversionmangle=s/+svn/_/ \
- http://www.portaudio.com/archives/pa_stable_v(19_.*).tar.gz
++opts=uversionmangle=s/_/\+svn/ \
++ http://www.portaudio.com/archives/pa_stable_v(19_.*)\.t(?:ar\.)?gz
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/portaudio19.git
More information about the Pkg-voip-commits
mailing list