[Pkg-voip-commits] [portaudio19] 32/114: * Update to svn 20070125 (r1173) Use explicit timezone in svn export.
Benjamin Drung
bdrung at moszumanska.debian.org
Sun Dec 25 20:05:33 UTC 2016
This is an automated email from the git hooks/post-receive script.
bdrung pushed a commit to branch master
in repository portaudio19.
commit c120686fe199cd284186ec86657fec67269eb82c
Author: Mikael Magnusson <mikma at users.sourceforge.net>
Date: Thu Jan 25 12:35:35 2007 +0000
* Update to svn 20070125 (r1173)
Use explicit timezone in svn export.
---
debian/changelog | 4 +-
debian/patches/00list | 3 -
debian/patches/pa_autoconf_soundcard.dpatch | 80 ----------
debian/patches/pa_autoconf_soundcard_gen.dpatch | 197 ------------------------
debian/patches/pa_cond_ringbuffer.dpatch | 70 ---------
debian/rules | 2 +-
6 files changed, 3 insertions(+), 353 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f74054a..cc4eb8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
-portaudio19 (19+svn20070113-2) UNRELEASED; urgency=low
+portaudio19 (19+svn20070125-1) UNRELEASED; urgency=low
[ Mikael Magnusson ]
- * NOT RELEASED YET
+ * Update to svn 20070125 (r1173)
* Disable JACK and ringbuffer on all architectures except i386 and
powerpc. (Closes: #406754: FTBFS: #error Memory barriers are not
defined on this system)
diff --git a/debian/patches/00list b/debian/patches/00list
index aa0e71c..50eb438 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,4 +1 @@
01_config
-pa_autoconf_soundcard
-pa_cond_ringbuffer
-pa_autoconf_soundcard_gen
diff --git a/debian/patches/pa_autoconf_soundcard.dpatch b/debian/patches/pa_autoconf_soundcard.dpatch
deleted file mode 100644
index 9fb6f00..0000000
--- a/debian/patches/pa_autoconf_soundcard.dpatch
+++ /dev/null
@@ -1,80 +0,0 @@
-#! /bin/sh -e
-## pa_autoconf_soundcard.dpatch by <mikma at users.sourceforge.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Auto detect soundcard.h header available on the system
-## DP: sys/soundcard.h, linux/soundcard.h or machine/soundcard.h
-
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
-diff -rN -u old-working/configure.in new-working/configure.in
---- old-working/configure.in 2006-12-28 17:13:47.000000000 +0100
-+++ new-working/configure.in 2006-12-28 17:13:47.000000000 +0100
-@@ -90,6 +90,9 @@
-
- PKG_CHECK_MODULES(JACK, jack, have_jack=yes, have_jack=no)
-
-+dnl checks for header files
-+AC_CHECK_HEADERS([sys/soundcard.h linux/soundcard.h machine/soundcard.h])
-+
- dnl sizeof checks: we will need a 16-bit and a 32-bit type
-
- AC_CHECK_SIZEOF(short)
-diff -rN -u old-working/src/hostapi/oss/pa_unix_oss.c new-working/src/hostapi/oss/pa_unix_oss.c
---- old-working/src/hostapi/oss/pa_unix_oss.c 2006-12-28 17:13:47.000000000 +0100
-+++ new-working/src/hostapi/oss/pa_unix_oss.c 2006-12-28 17:13:47.000000000 +0100
-@@ -63,15 +63,17 @@
- #include <limits.h>
- #include <semaphore.h>
-
--#ifdef __FreeBSD__
-+#ifdef HAVE_SYS_SOUNDCARD_H
- # include <sys/soundcard.h>
- # define DEVICE_NAME_BASE "/dev/dsp"
--#elif defined __linux__
-+#elif defined(HAVE_LINUX_SOUNDCARD_H)
- # include <linux/soundcard.h>
- # define DEVICE_NAME_BASE "/dev/dsp"
--#else
-+#elif defined(HAVE_MACHINE_SOUNDCARD_H)
- # include <machine/soundcard.h> /* JH20010905 */
- # define DEVICE_NAME_BASE "/dev/audio"
-+#else
-+# error No sound card header file
- #endif
-
- #include "portaudio.h"
-diff -rN -u old-working/src/SConscript new-working/src/SConscript
---- old-working/src/SConscript 2006-12-28 17:13:47.000000000 +0100
-+++ new-working/src/SConscript 2006-12-28 17:13:47.000000000 +0100
-@@ -135,6 +135,12 @@
- conf.env.Append(CPPDEFINES=["HAVE_CLOCK_GETTIME"])
- if checkSymbol(conf, "time.h", symbol="nanosleep"):
- conf.env.Append(CPPDEFINES=["HAVE_NANOSLEEP"])
-+if conf.CheckCHeader("sys/soundcard.h"):
-+ conf.env.Append(CPPDEFINES=["HAVE_SYS_SOUNDCARD_H"])
-+if conf.CheckCHeader("linux/soundcard.h"):
-+ conf.env.Append(CPPDEFINES=["HAVE_LINUX_SOUNDCARD_H"])
-+if conf.CheckCHeader("machine/soundcard.h"):
-+ conf.env.Append(CPPDEFINES=["HAVE_MACHINE_SOUNDCARD_H"])
-
- # Look for needed libraries and link with them
- for lib, hdr, sym in neededLibs:
-
diff --git a/debian/patches/pa_autoconf_soundcard_gen.dpatch b/debian/patches/pa_autoconf_soundcard_gen.dpatch
deleted file mode 100644
index 0ed9145..0000000
--- a/debian/patches/pa_autoconf_soundcard_gen.dpatch
+++ /dev/null
@@ -1,197 +0,0 @@
-#! /bin/sh -e
-## pa_autoconf_soundcard_gen.dpatch by <mikma at users.sourceforge.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Autoconf generated
-
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
-diff -rN -u old-tmp/configure new-tmp/configure
---- old-tmp/configure 2007-01-13 12:01:07.000000000 +0100
-+++ new-tmp/configure 2007-01-13 12:01:07.000000000 +0100
-@@ -19712,6 +19712,149 @@
- fi
-
-
-+
-+
-+for ac_header in sys/soundcard.h linux/soundcard.h machine/soundcard.h
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+else
-+ # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ ac_header_compiler=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_header_compiler=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-+
-+# Is the header present?
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <$ac_header>
-+_ACEOF
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
-+ ac_header_preproc=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_header_preproc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-+
-+# So? What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+ yes:no: )
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
-+ ;;
-+ no:yes:* )
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+
-+ ;;
-+esac
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ eval "$as_ac_Header=\$ac_header_preproc"
-+fi
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+
-+fi
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+ cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
-+
-+
- { echo "$as_me:$LINENO: checking for short" >&5
- echo $ECHO_N "checking for short... $ECHO_C" >&6; }
- if test "${ac_cv_type_short+set}" = set; then
-@@ -21125,7 +21268,7 @@
- #define PA_USE_COREAUDIO 1
- _ACEOF
-
-- OTHER_OBJS="src/os/mac_osx/pa_mac_hostapis.o src/os/unix/pa_unix_util.o src/hostapi/coreaudio/pa_mac_core.o src/hostapi/coreaudio/pa_mac_core_utilities.o src/hostapi/coreaudio/pa_mac_core_blocking.o";
-+ OTHER_OBJS="src/os/mac_osx/pa_mac_hostapis.o src/os/unix/pa_unix_util.o src/hostapi/coreaudio/pa_mac_core.o src/hostapi/coreaudio/pa_mac_core_utilities.o src/hostapi/coreaudio/pa_mac_core_blocking.o src/common/pa_ringbuffer.o";
- LIBS="-framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon";
- PADLL="libportaudio.dylib";
- SHARED_FLAGS="-framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon -dynamiclib";
-@@ -21542,7 +21685,7 @@
- if [ $have_jack = "yes" ] && [ $with_jack != "no" ] ; then
- DLL_LIBS="$DLL_LIBS $JACK_LIBS"
- CFLAGS="$CFLAGS $JACK_CFLAGS"
-- OTHER_OBJS="$OTHER_OBJS src/hostapi/jack/pa_jack.o"
-+ OTHER_OBJS="$OTHER_OBJS src/hostapi/jack/pa_jack.o src/common/pa_ringbuffer.o"
- cat >>confdefs.h <<\_ACEOF
- #define PA_USE_JACK 1
- _ACEOF
-
diff --git a/debian/patches/pa_cond_ringbuffer.dpatch b/debian/patches/pa_cond_ringbuffer.dpatch
deleted file mode 100644
index 084aa51..0000000
--- a/debian/patches/pa_cond_ringbuffer.dpatch
+++ /dev/null
@@ -1,70 +0,0 @@
-#! /bin/sh -e
-## pa_cond_ringbuffer.dpatch by <mikma at users.sourceforge.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Conditional compile the ringbuffer only if jack or macapi is enabled.
-
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
-diff -rN -u old-working/configure.in new-working/configure.in
---- old-working/configure.in 2007-01-14 15:29:20.000000000 +0100
-+++ new-working/configure.in 2007-01-14 15:29:20.000000000 +0100
-@@ -139,7 +139,7 @@
- dnl Mac OS X configuration
-
- AC_DEFINE(PA_USE_COREAUDIO)
-- OTHER_OBJS="src/os/mac_osx/pa_mac_hostapis.o src/os/unix/pa_unix_util.o src/hostapi/coreaudio/pa_mac_core.o src/hostapi/coreaudio/pa_mac_core_utilities.o src/hostapi/coreaudio/pa_mac_core_blocking.o";
-+ OTHER_OBJS="src/os/mac_osx/pa_mac_hostapis.o src/os/unix/pa_unix_util.o src/hostapi/coreaudio/pa_mac_core.o src/hostapi/coreaudio/pa_mac_core_utilities.o src/hostapi/coreaudio/pa_mac_core_blocking.o src/common/pa_ringbuffer.o";
- LIBS="-framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon";
- PADLL="libportaudio.dylib";
- SHARED_FLAGS="-framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon -dynamiclib";
-@@ -274,7 +274,7 @@
- if [[ $have_jack = "yes" ] && [ $with_jack != "no" ]] ; then
- DLL_LIBS="$DLL_LIBS $JACK_LIBS"
- CFLAGS="$CFLAGS $JACK_CFLAGS"
-- OTHER_OBJS="$OTHER_OBJS src/hostapi/jack/pa_jack.o"
-+ OTHER_OBJS="$OTHER_OBJS src/hostapi/jack/pa_jack.o src/common/pa_ringbuffer.o"
- AC_DEFINE(PA_USE_JACK)
- fi
-
-diff -rN -u old-working/Makefile.darwin new-working/Makefile.darwin
---- old-working/Makefile.darwin 2007-01-14 15:29:20.000000000 +0100
-+++ new-working/Makefile.darwin 2007-01-14 15:29:20.000000000 +0100
-@@ -38,7 +38,7 @@
- LT_AGE=0
-
-
--OTHER_OBJS = src/os/mac_osx/pa_mac_hostapis.o src/os/unix/pa_unix_util.o src/hostapi/coreaudio/pa_mac_core.o src/hostapi/coreaudio/pa_mac_core_utilities.o src/hostapi/coreaudio/pa_mac_core_blocking.o
-+OTHER_OBJS = src/os/mac_osx/pa_mac_hostapis.o src/os/unix/pa_unix_util.o src/hostapi/coreaudio/pa_mac_core.o src/hostapi/coreaudio/pa_mac_core_utilities.o src/hostapi/coreaudio/pa_mac_core_blocking.o src/common/pa_ringbuffer.o
-
- PALIB = libportaudio.a
- PADLL = libportaudio
-diff -rN -u old-working/Makefile.in new-working/Makefile.in
---- old-working/Makefile.in 2007-01-14 15:29:20.000000000 +0100
-+++ new-working/Makefile.in 2007-01-14 15:29:20.000000000 +0100
-@@ -51,7 +51,6 @@
- src/common/pa_debugprint.o \
- src/common/pa_front.o \
- src/common/pa_process.o \
-- src/common/pa_ringbuffer.o \
- src/common/pa_skeleton.o \
- src/common/pa_stream.o \
- src/common/pa_trace.o
-
diff --git a/debian/rules b/debian/rules
index 7324c18..8aa4560 100755
--- a/debian/rules
+++ b/debian/rules
@@ -154,7 +154,7 @@ get-orig-source:
@@dh_testdir
@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
@@echo Downloading $(FILENAME) from $(URL) ...
- @@svn export -r{$(UPDATE)} $(URL) ../tarballs/$(SRCDIR)
+ @@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
--
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