[Pkg-voip-commits] r1546 - in portaudio19/trunk/debian: . patches
Mikael Magnusson
mikma-guest at costa.debian.org
Wed Apr 5 22:51:06 UTC 2006
Author: mikma-guest
Date: 2006-04-05 22:51:04 +0000 (Wed, 05 Apr 2006)
New Revision: 1546
Modified:
portaudio19/trunk/debian/changelog
portaudio19/trunk/debian/patches/40_vpath_libtool.dpatch
portaudio19/trunk/debian/patches/41_vpath_libtool_gen.dpatch
Log:
Updated from http://portaudio.com/archives/pa_snapshot_v19.tar.gz
Change to experimental dist.
Modified: portaudio19/trunk/debian/changelog
===================================================================
--- portaudio19/trunk/debian/changelog 2006-04-05 21:23:12 UTC (rev 1545)
+++ portaudio19/trunk/debian/changelog 2006-04-05 22:51:04 UTC (rev 1546)
@@ -1,14 +1,14 @@
-portaudio19 (19+cvs20060311-1) UNRELEASED; urgency=low
+portaudio19 (19+cvs20060405-1) experimental; urgency=low
* Initial release. (Closes: #328873: portaudio: please package v19)
- * Disable V18 compatibility and bump shlib dependency to 19+cvs20060311-1
+ * Disable V18 compatibility and bump shlib dependency
* Disable JACK, conflicts with programs that use RingBuffer
* 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.
- -- Mikael Magnusson <mikma at users.sourceforge.net> Wed, 5 Apr 2006 23:19:35 +0200
+ -- Mikael Magnusson <mikma at users.sourceforge.net> Thu, 6 Apr 2006 00:41:28 +0200
portaudio19 (19+20041112-3) experimental; urgency=low
Modified: portaudio19/trunk/debian/patches/40_vpath_libtool.dpatch
===================================================================
--- portaudio19/trunk/debian/patches/40_vpath_libtool.dpatch 2006-04-05 21:23:12 UTC (rev 1545)
+++ portaudio19/trunk/debian/patches/40_vpath_libtool.dpatch 2006-04-05 22:51:04 UTC (rev 1546)
@@ -5,9 +5,9 @@
## DP: Add support for vpath compilation and libtool
@DPATCH@
-diff -urNad portaudio19-19+cvs20060311~/Makefile.in portaudio19-19+cvs20060311/Makefile.in
---- portaudio19-19+cvs20060311~/Makefile.in 2006-03-18 08:48:59.000000000 +0100
-+++ portaudio19-19+cvs20060311/Makefile.in 2006-03-18 08:38:41.000000000 +0100
+diff -urNad portaudio19-19+cvs20060405~/Makefile.in portaudio19-19+cvs20060405/Makefile.in
+--- portaudio19-19+cvs20060405~/Makefile.in 2006-03-19 14:02:36.000000000 +0100
++++ portaudio19-19+cvs20060405/Makefile.in 2006-04-06 00:18:40.000000000 +0200
@@ -2,28 +2,47 @@
# PortAudio V19 Makefile.in
#
@@ -77,7 +77,7 @@
bin/debug_convert \
bin/debug_dither_calc \
bin/debug_dual \
-@@ -87,65 +107,27 @@
+@@ -87,67 +107,31 @@
bin/debug_sine \
bin/debug_sine_formats \
bin/debug_srate \
@@ -133,30 +133,36 @@
-lib/$(PADLLV): lib/ $(OBJS) Makefile $(PAINC)
- $(CC) $(SHARED_FLAGS) -o lib/$(PADLLV) $(OBJS) $(DLL_LIBS)
-+lib/$(PALIB): lib-stamp $(LTOBJS) $(MAKEFILE) $(PAINC)
-+ $(LIBTOOL) --mode=link $(CC) $(PA_LDFLAGS) -o lib/$(PALIB) $(LTOBJS) $(DLL_LIBS)
-$(TESTS): bin/%: lib/$(PALIB) Makefile $(PAINC) pa_tests/%.c
- $(CC) -o $@ $(CFLAGS) pa_tests/$*.c lib/$(PALIB) $(LIBS)
-+$(ALL_TESTS): bin/%: lib/$(PALIB) $(MAKEFILE) $(PAINC) pa_tests/%.c
-+ $(LIBTOOL) --mode=link $(CC) -o $@ $(CFLAGS) $(top_srcdir)/pa_tests/$*.c lib/$(PALIB) $(LIBS)
++lib/$(PALIB): lib-stamp $(LTOBJS) $(MAKEFILE) $(PAINC)
++ $(LIBTOOL) --mode=link $(CC) $(PA_LDFLAGS) -o lib/$(PALIB) $(LTOBJS) $(DLL_LIBS)
--install: lib/$(PALIB) lib/$(PADLLV)
+-install: lib/$(PALIB) lib/$(PADLLV) portaudio-2.0.pc
- $(INSTALL) -d $(PREFIX)/lib
- $(INSTALL) -m 644 lib/$(PADLLV) $(PREFIX)/lib/$(PADLLV)
- $(INSTALL) -m 644 lib/$(PALIB) $(PREFIX)/lib/$(PALIB)
- cd $(PREFIX)/lib && rm -f $(PADLL) && ln -s $(PADLLV) $(PADLL)
- $(INSTALL) -d $(PREFIX)/include
- $(INSTALL) -m 644 pa_common/portaudio.h $(PREFIX)/include/portaudio.h
-+install: lib/$(PALIB)
+- $(INSTALL) -d $(PREFIX)/lib/pkgconfig
+- $(INSTALL) -m 644 portaudio-2.0.pc $(PREFIX)/lib/pkgconfig/portaudio-2.0.pc
++$(ALL_TESTS): bin/%: lib/$(PALIB) $(MAKEFILE) $(PAINC) pa_tests/%.c
++ $(LIBTOOL) --mode=link $(CC) -o $@ $(CFLAGS) $(top_srcdir)/pa_tests/$*.c lib/$(PALIB) $(LIBS)
++
++
++install: lib/$(PALIB) portaudio-2.0.pc
+ $(INSTALL) -d $(DESTDIR)$(PREFIX)/lib
+ $(LIBTOOL) --mode=install $(INSTALL) lib/$(PALIB) $(DESTDIR)$(libdir)
+ $(INSTALL) -d $(DESTDIR)$(PREFIX)/include
+ $(INSTALL_DATA) -m 644 $(top_srcdir)/$(PAINC) $(DESTDIR)$(includedir)/portaudio.h
++ $(INSTALL) -d $(DESTDIR)$(PREFIX)/lib/pkgconfig
++ $(INSTALL) -m 644 portaudio-2.0.pc $(DESTDIR)$(PREFIX)/lib/pkgconfig/portaudio-2.0.pc
@echo ""
@echo "------------------------------------------------------------"
@echo "PortAudio was successfully installed."
-@@ -153,33 +135,41 @@
+@@ -155,33 +139,41 @@
@echo "On some systems (e.g. Linux) you should run 'ldconfig' now"
@echo "to make the shared object available. You may also need to"
@echo "modify your LD_LIBRARY_PATH environment variable to include"
@@ -212,9 +218,9 @@
+Makefile: Makefile.in config.status
+ $(SHELL) config.status
-diff -urNad portaudio19-19+cvs20060311~/configure.in portaudio19-19+cvs20060311/configure.in
---- portaudio19-19+cvs20060311~/configure.in 2006-03-18 08:48:59.000000000 +0100
-+++ portaudio19-19+cvs20060311/configure.in 2006-03-18 00:46:11.000000000 +0100
+diff -urNad portaudio19-19+cvs20060405~/configure.in portaudio19-19+cvs20060405/configure.in
+--- portaudio19-19+cvs20060405~/configure.in 2006-03-30 17:31:16.000000000 +0200
++++ portaudio19-19+cvs20060405/configure.in 2006-04-06 00:13:52.000000000 +0200
@@ -56,8 +56,10 @@
dnl Checks for programs.
@@ -260,7 +266,7 @@
dnl extra variables
AC_SUBST(OTHER_OBJS)
AC_SUBST(PADLL)
-@@ -94,7 +113,7 @@
+@@ -95,7 +114,7 @@
AC_SUBST(NASM)
AC_SUBST(NASMOPT)
@@ -269,7 +275,7 @@
if [[ $ac_cv_c_bigendian = "yes" ]] ; then
CFLAGS="$CFLAGS -DPA_BIG_ENDIAN"
-@@ -120,7 +139,7 @@
+@@ -121,7 +140,7 @@
echo "ASIODIR: $ASIODIR";
OTHER_OBJS="$CFLAGS pa_asio/iasiothiscallresolver.o $ASIODIR/host/asiodrivers.o $ASIODIR/common/asio.o $ASIODIR/host/mac/asioshlib.o";
@@ -278,71 +284,63 @@
CXXFLAGS="$CFLAGS";
fi
;;
-@@ -139,11 +158,11 @@
- OTHER_OBJS="pa_win_ds/pa_win_ds.o pa_win_ds/dsound_wrapper.o pa_win/pa_win_hostapis.o pa_win/pa_win_util.o";
- LIBS="-lwinmm -lm -ldsound -lole32";
+@@ -142,10 +161,10 @@
PADLL="portaudio.dll";
-- SHARED_FLAGS="-shared -mthreads";
+ THREAD_CFLAGS="-mthreads"
+ SHARED_FLAGS="-shared";
- DLL_LIBS="-lwinmm -lm -L./dx7sdk/lib -ldsound -lole32";
-+ SHARED_FLAGS="-mthreads";
+ DLL_LIBS="${DLL_LIBS} -lwinmm -lm -L./dx7sdk/lib -ldsound -lole32";
#VC98="\"/c/Program Files/Microsoft Visual Studio/VC98/Include\"";
#CFLAGS="$CFLAGS -I$VC98 -DPA_NO_WMME -DPA_NO_ASIO";
- CFLAGS="$CFLAGS -Ipa_common -I$DXDIR/include -DPA_NO_WMME -DPA_NO_ASIO" -DPA_NO_WDMKS;
-+ CFLAGS="$CFLAGS -I\$(top_srcdir)/pa_common -I$DXDIR/include -DPA_NO_WMME -DPA_NO_ASIO -DPA_NO_WDMKS";
++ CFLAGS="$CFLAGS -I\$(top_srcdir)/pa_common -I$DXDIR/include -DPA_NO_WMME -DPA_NO_ASIO" -DPA_NO_WDMKS;
elif [[ $with_winapi = "asio" ]] ; then
if [[ $with_asiodir ]] ; then
ASIODIR="$with_asiodir";
-@@ -155,9 +174,9 @@
- OTHER_OBJS="pa_asio/pa_asio.o pa_win/pa_win_hostapis.o pa_win/pa_win_util.o pa_asio/iasiothiscallresolver.o $ASIODIR/common/asio.o $ASIODIR/host/asiodrivers.o $ASIODIR/host/pc/asiolist.o";
- LIBS="-lwinmm -lm -lstdc++ -lole32 -luuid";
+@@ -159,8 +178,8 @@
PADLL="portaudio.dll";
-- SHARED_FLAGS="-shared -mthreads";
+ THREAD_CFLAGS="-mthreads"
+ SHARED_FLAGS="-shared";
- DLL_LIBS="-lwinmm -lm -lstdc++ -lole32 -luuid";
- CFLAGS="$CFLAGS -ffast-math -fomit-frame-pointer -Ipa_common -Ipa_asio -I$ASIODIR/host/pc -I$ASIODIR/common -I$ASIODIR/host -DPA_NO_WMME -DPA_NO_DS -DPA_NO_WDMKS -DWINDOWS";
-+ SHARED_FLAGS="-mthreads";
+ DLL_LIBS="${DLL_LIBS} -lwinmm -lm -lstdc++ -lole32 -luuid";
-+ CFLAGS="$CFLAGS -ffast-math -fomit-frame-pointer -I\$(top_srcdir)/pa_common -I\$(top_srcdir)/pa_asio -I$ASIODIR/host/pc -I$ASIODIR/common -I$ASIODIR/host -DPA_NO_WMME -DPA_NO_DS -DPA_NO_WDMKS -DWINDOWS";
++ CFLAGS="$CFLAGS -ffast-math -fomit-frame-pointer -I\$(top_srcdir)pa_common -I\$(top_srcdir)pa_asio -I$ASIODIR/host/pc -I$ASIODIR/common -I$ASIODIR/host -DPA_NO_WMME -DPA_NO_DS -DPA_NO_WDMKS -DWINDOWS";
CXXFLAGS="$CFLAGS";
elif [[ $with_winapi = "wdmks" ]] ; then
if [[ $with_dxdir ]] ; then
-@@ -169,18 +188,18 @@
- OTHER_OBJS="pa_win_wdmks/pa_win_wdmks.o pa_win/pa_win_hostapis.o pa_win/pa_win_util.o";
- LIBS="-lwinmm -lm -luuid -lsetupapi -lole32";
+@@ -174,18 +193,18 @@
PADLL="portaudio.dll";
-- SHARED_FLAGS="-shared -mthreads";
+ THREAD_CFLAGS="-mthreads"
+ SHARED_FLAGS="-shared";
- DLL_LIBS="-lwinmm -lm -L./dx7sdk/lib -luuid -lsetupapi -lole32";
-+ SHARED_FLAGS="-mthreads";
+ DLL_LIBS="${DLL_LIBS} -lwinmm -lm -L./dx7sdk/lib -luuid -lsetupapi -lole32";
#VC98="\"/c/Program Files/Microsoft Visual Studio/VC98/Include\"";
#CFLAGS="$CFLAGS -I$VC98 -DPA_NO_WMME -DPA_NO_ASIO";
- CFLAGS="$CFLAGS -Ipa_common -I$DXDIR/include -DPA_NO_WMME -DPA_NO_DS -DPA_NO_ASIO";
-+ CFLAGS="$CFLAGS -I\$(top_srcdir)/pa_common -I$DXDIR/include -DPA_NO_WMME -DPA_NO_DS -DPA_NO_ASIO";
++ CFLAGS="$CFLAGS -I\$(top_srcdir)pa_common -I$DXDIR/include -DPA_NO_WMME -DPA_NO_DS -DPA_NO_ASIO";
else # WMME default
OTHER_OBJS="pa_win_wmme/pa_win_wmme.o pa_win/pa_win_hostapis.o pa_win/pa_win_util.o";
LIBS="-lwinmm -lm -lstdc++ -lole32 -luuid";
PADLL="portaudio.dll";
-- SHARED_FLAGS="-shared -mthreads";
+ THREAD_CFLAGS="-mthreads"
+ SHARED_FLAGS="-shared";
- DLL_LIBS="-lwinmm";
- CFLAGS="$CFLAGS -Ipa_common -DPA_NO_DS -DPA_NO_ASIO -DPA_NO_WDMKS";
-+ SHARED_FLAGS="-mthreads";
+ DLL_LIBS="${DLL_LIBS} -lwinmm";
-+ CFLAGS="$CFLAGS -I\$(top_srcdir)/pa_common -DPA_NO_DS -DPA_NO_ASIO -DPA_NO_WDMKS";
++ CFLAGS="$CFLAGS -I\$(top_srcdir)pa_common -DPA_NO_DS -DPA_NO_ASIO -DPA_NO_WDMKS";
fi
;;
-@@ -190,8 +209,8 @@
- OTHER_OBJS="pa_win_wmme/pa_win_wmme.o";
- LIBS="-lwinmm -lm";
+@@ -197,7 +216,7 @@
PADLL="portaudio.dll";
-- SHARED_FLAGS="-shared -mthreads";
+ THREAD_CFLAGS="-mthreads"
+ SHARED_FLAGS="-shared";
- DLL_LIBS="-lwinmm";
-+ SHARED_FLAGS="-mthreads";
+ DLL_LIBS="${DLL_LIBS} -lwinmm";
;;
irix* )
-@@ -217,25 +236,23 @@
+@@ -223,25 +242,23 @@
dnl
LIBS="-lm -ldmedia -laudio -lpthread";
PADLL="libportaudio.so";
@@ -370,16 +368,11 @@
DLL_LIBS="$DLL_LIBS $JACK_LIBS"
CFLAGS="$CFLAGS $JACK_CFLAGS"
OTHER_OBJS="$OTHER_OBJS pa_jack/pa_jack.o"
-@@ -246,9 +263,10 @@
- OTHER_OBJS="$OTHER_OBJS pa_unix_oss/pa_unix_oss.o"
+@@ -253,6 +270,7 @@
AC_DEFINE(PA_USE_OSS)
fi
-- LIBS="$LIBS -lm -lpthread";
+ THREAD_CFLAGS="-pthread"
+ DLL_LIBS="$DLL_LIBS -lm -lpthread";
-+ LIBS="$LIBS -lm";
+ LIBS="$LIBS -lm -lpthread";
PADLL="libportaudio.so";
-- SHARED_FLAGS="-shared -fPIC";
-+ SHARED_FLAGS="";
-
- OTHER_OBJS="$OTHER_OBJS pa_unix/pa_unix_hostapis.o pa_unix/pa_unix_util.o"
- esac
+ SHARED_FLAGS="-shared -fPIC";
Modified: portaudio19/trunk/debian/patches/41_vpath_libtool_gen.dpatch
===================================================================
--- portaudio19/trunk/debian/patches/41_vpath_libtool_gen.dpatch 2006-04-05 21:23:12 UTC (rev 1545)
+++ portaudio19/trunk/debian/patches/41_vpath_libtool_gen.dpatch 2006-04-05 22:51:04 UTC (rev 1546)
@@ -5,9 +5,9 @@
## DP: No description.
@DPATCH@
-diff -urNad portaudio19-19+cvs20060311~/aclocal.m4 portaudio19-19+cvs20060311/aclocal.m4
---- portaudio19-19+cvs20060311~/aclocal.m4 2006-03-18 08:48:59.000000000 +0100
-+++ portaudio19-19+cvs20060311/aclocal.m4 2006-03-18 09:01:28.000000000 +0100
+diff -urNad portaudio19-19+cvs20060405~/aclocal.m4 portaudio19-19+cvs20060405/aclocal.m4
+--- portaudio19-19+cvs20060405~/aclocal.m4 2003-01-13 08:58:04.000000000 +0100
++++ portaudio19-19+cvs20060405/aclocal.m4 2006-04-06 00:24:00.000000000 +0200
@@ -1,57 +1,6350 @@
+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
@@ -6399,9 +6399,9 @@
+fi[]dnl
+])# PKG_CHECK_MODULES
-diff -urNad portaudio19-19+cvs20060311~/configure portaudio19-19+cvs20060311/configure
---- portaudio19-19+cvs20060311~/configure 2006-03-18 08:48:59.000000000 +0100
-+++ portaudio19-19+cvs20060311/configure 2006-03-18 09:01:46.000000000 +0100
+diff -urNad portaudio19-19+cvs20060405~/configure portaudio19-19+cvs20060405/configure
+--- portaudio19-19+cvs20060405~/configure 2006-03-30 17:31:16.000000000 +0200
++++ portaudio19-19+cvs20060405/configure 2006-04-06 00:24:05.000000000 +0200
@@ -1,44 +1,479 @@
#! /bin/sh
-
@@ -6892,7 +6892,7 @@
+# include <unistd.h>
+#endif"
+
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PKG_CONFIG ac_pt_PKG_CONFIG JACK_CFLAGS JACK_LIBS LT_CURRENT LT_REVISION LT_AGE OTHER_OBJS PADLL SHARED_FLAGS DLL_LIBS NASM NASMOPT LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PKG_CONFIG ac_pt_PKG_CONFIG JACK_CFLAGS JACK_LIBS LT_CURRENT LT_REVISION LT_AGE OTHER_OBJS PADLL SHARED_FLAGS THREAD_CFLAGS DLL_LIBS NASM NASMOPT LIBOBJS LTLIBOBJS'
+ac_subst_files=''
# Initialize some variables set by options.
@@ -26402,7 +26402,7 @@
/* Are we little or big endian? From Harbison&Steele. */
union
{
-@@ -1066,311 +19556,1698 @@
+@@ -1066,311 +19556,1696 @@
u.l = 1;
exit (u.c[sizeof (long) - 1] == 1);
}
@@ -27262,8 +27262,8 @@
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_SHORT $ac_cv_sizeof_short
+_ACEOF
-+
++
+echo "$as_me:$LINENO: checking for int" >&5
+echo $ECHO_N "checking for int... $ECHO_C" >&6
+if test "${ac_cv_type_int+set}" = set; then
@@ -27694,7 +27694,7 @@
+#define SIZEOF_INT $ac_cv_sizeof_int
+_ACEOF
+
-
++
+echo "$as_me:$LINENO: checking for long" >&5
+echo $ECHO_N "checking for long... $ECHO_C" >&6
+if test "${ac_cv_type_long+set}" = set; then
@@ -27745,16 +27745,12 @@
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_type_long=no
- fi
--echo "$ac_t""$ac_cv_sizeof_int" 1>&6
--cat >> confdefs.h <<EOF
--#define SIZEOF_INT $ac_cv_sizeof_int
--EOF
++fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
+echo "${ECHO_T}$ac_cv_type_long" >&6
-
++
+echo "$as_me:$LINENO: checking size of long" >&5
+echo $ECHO_N "checking size of long... $ECHO_C" >&6
+if test "${ac_cv_sizeof_long+set}" = set; then
@@ -27780,10 +27776,6 @@
+static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)];
+test_array [0] = 0
--echo $ac_n "checking size of long""... $ac_c" 1>&6
--echo "configure:1336: checking size of long" >&5
--if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
+ ;
+ return 0;
+}
@@ -27860,13 +27852,17 @@
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
-+fi
+ fi
+-echo "$ac_t""$ac_cv_sizeof_int" 1>&6
+-cat >> confdefs.h <<EOF
+-#define SIZEOF_INT $ac_cv_sizeof_int
+-EOF
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-+
+
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
@@ -27879,7 +27875,11 @@
+{
+static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)];
+test_array [0] = 0
-+
+
+-echo $ac_n "checking size of long""... $ac_c" 1>&6
+-echo "configure:1336: checking size of long" >&5
+-if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
+- echo $ac_n "(cached) $ac_c" 1>&6
+ ;
+ return 0;
+}
@@ -28141,7 +28141,7 @@
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
-+
+
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
@@ -28182,7 +28182,7 @@
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-
++
+ac_cv_lib_rt_clock_gettime=no
+fi
+rm -f conftest.err conftest.$ac_objext \
@@ -28305,15 +28305,13 @@
+
+LIBS="${save_LIBS}"
+
-+
+LT_CURRENT=2
+LT_REVISION=0
+LT_AGE=0
-+
-@@ -1379,7 +21256,12 @@
+@@ -1380,7 +21255,12 @@
@@ -28327,7 +28325,7 @@
if [ $ac_cv_c_bigendian = "yes" ] ; then
CFLAGS="$CFLAGS -DPA_BIG_ENDIAN"
-@@ -1389,10 +21271,10 @@
+@@ -1390,10 +21270,10 @@
case "${host_os}" in
darwin* )
@@ -28341,7 +28339,7 @@
OTHER_OBJS="pa_mac/pa_mac_hostapis.o pa_unix/pa_unix_util.o pa_mac_core/pa_mac_core.o";
LIBS="-framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon";
-@@ -1407,13 +21289,13 @@
+@@ -1408,13 +21288,13 @@
echo "ASIODIR: $ASIODIR";
OTHER_OBJS="$CFLAGS pa_asio/iasiothiscallresolver.o $ASIODIR/host/asiodrivers.o $ASIODIR/common/asio.o $ASIODIR/host/mac/asioshlib.o";
@@ -28357,56 +28355,50 @@
echo "WINAPI: $with_winapi"
if [ $with_winapi = "directx" ] ; then
if [ $with_dxdir ] ; then
-@@ -1425,11 +21307,11 @@
- OTHER_OBJS="pa_win_ds/pa_win_ds.o pa_win_ds/dsound_wrapper.o pa_win/pa_win_hostapis.o pa_win/pa_win_util.o";
- LIBS="-lwinmm -lm -ldsound -lole32";
+@@ -1428,10 +21308,10 @@
PADLL="portaudio.dll";
-- SHARED_FLAGS="-shared -mthreads";
+ THREAD_CFLAGS="-mthreads"
+ SHARED_FLAGS="-shared";
- DLL_LIBS="-lwinmm -lm -L./dx7sdk/lib -ldsound -lole32";
-+ SHARED_FLAGS="-mthreads";
+ DLL_LIBS="${DLL_LIBS} -lwinmm -lm -L./dx7sdk/lib -ldsound -lole32";
#VC98="\"/c/Program Files/Microsoft Visual Studio/VC98/Include\"";
#CFLAGS="$CFLAGS -I$VC98 -DPA_NO_WMME -DPA_NO_ASIO";
- CFLAGS="$CFLAGS -Ipa_common -I$DXDIR/include -DPA_NO_WMME -DPA_NO_ASIO" -DPA_NO_WDMKS;
-+ CFLAGS="$CFLAGS -I\$(top_srcdir)/pa_common -I$DXDIR/include -DPA_NO_WMME -DPA_NO_ASIO -DPA_NO_WDMKS";
++ CFLAGS="$CFLAGS -I\$(top_srcdir)/pa_common -I$DXDIR/include -DPA_NO_WMME -DPA_NO_ASIO" -DPA_NO_WDMKS;
elif [ $with_winapi = "asio" ] ; then
if [ $with_asiodir ] ; then
ASIODIR="$with_asiodir";
-@@ -1441,9 +21323,9 @@
- OTHER_OBJS="pa_asio/pa_asio.o pa_win/pa_win_hostapis.o pa_win/pa_win_util.o pa_asio/iasiothiscallresolver.o $ASIODIR/common/asio.o $ASIODIR/host/asiodrivers.o $ASIODIR/host/pc/asiolist.o";
- LIBS="-lwinmm -lm -lstdc++ -lole32 -luuid";
+@@ -1445,8 +21325,8 @@
PADLL="portaudio.dll";
-- SHARED_FLAGS="-shared -mthreads";
+ THREAD_CFLAGS="-mthreads"
+ SHARED_FLAGS="-shared";
- DLL_LIBS="-lwinmm -lm -lstdc++ -lole32 -luuid";
- CFLAGS="$CFLAGS -ffast-math -fomit-frame-pointer -Ipa_common -Ipa_asio -I$ASIODIR/host/pc -I$ASIODIR/common -I$ASIODIR/host -DPA_NO_WMME -DPA_NO_DS -DPA_NO_WDMKS -DWINDOWS";
-+ SHARED_FLAGS="-mthreads";
+ DLL_LIBS="${DLL_LIBS} -lwinmm -lm -lstdc++ -lole32 -luuid";
-+ CFLAGS="$CFLAGS -ffast-math -fomit-frame-pointer -I\$(top_srcdir)/pa_common -I\$(top_srcdir)/pa_asio -I$ASIODIR/host/pc -I$ASIODIR/common -I$ASIODIR/host -DPA_NO_WMME -DPA_NO_DS -DPA_NO_WDMKS -DWINDOWS";
++ CFLAGS="$CFLAGS -ffast-math -fomit-frame-pointer -I\$(top_srcdir)pa_common -I\$(top_srcdir)pa_asio -I$ASIODIR/host/pc -I$ASIODIR/common -I$ASIODIR/host -DPA_NO_WMME -DPA_NO_DS -DPA_NO_WDMKS -DWINDOWS";
CXXFLAGS="$CFLAGS";
elif [ $with_winapi = "wdmks" ] ; then
if [ $with_dxdir ] ; then
-@@ -1455,550 +21337,1346 @@
- OTHER_OBJS="pa_win_wdmks/pa_win_wdmks.o pa_win/pa_win_hostapis.o pa_win/pa_win_util.o";
- LIBS="-lwinmm -lm -luuid -lsetupapi -lole32";
+@@ -1460,271 +21340,381 @@
PADLL="portaudio.dll";
-- SHARED_FLAGS="-shared -mthreads";
+ THREAD_CFLAGS="-mthreads"
+ SHARED_FLAGS="-shared";
- DLL_LIBS="-lwinmm -lm -L./dx7sdk/lib -luuid -lsetupapi -lole32";
-+ SHARED_FLAGS="-mthreads";
+ DLL_LIBS="${DLL_LIBS} -lwinmm -lm -L./dx7sdk/lib -luuid -lsetupapi -lole32";
#VC98="\"/c/Program Files/Microsoft Visual Studio/VC98/Include\"";
#CFLAGS="$CFLAGS -I$VC98 -DPA_NO_WMME -DPA_NO_ASIO";
- CFLAGS="$CFLAGS -Ipa_common -I$DXDIR/include -DPA_NO_WMME -DPA_NO_DS -DPA_NO_ASIO";
-+ CFLAGS="$CFLAGS -I\$(top_srcdir)/pa_common -I$DXDIR/include -DPA_NO_WMME -DPA_NO_DS -DPA_NO_ASIO";
++ CFLAGS="$CFLAGS -I\$(top_srcdir)pa_common -I$DXDIR/include -DPA_NO_WMME -DPA_NO_DS -DPA_NO_ASIO";
else # WMME default
OTHER_OBJS="pa_win_wmme/pa_win_wmme.o pa_win/pa_win_hostapis.o pa_win/pa_win_util.o";
LIBS="-lwinmm -lm -lstdc++ -lole32 -luuid";
PADLL="portaudio.dll";
-- SHARED_FLAGS="-shared -mthreads";
+ THREAD_CFLAGS="-mthreads"
+ SHARED_FLAGS="-shared";
- DLL_LIBS="-lwinmm";
- CFLAGS="$CFLAGS -Ipa_common -DPA_NO_DS -DPA_NO_ASIO -DPA_NO_WDMKS";
-+ SHARED_FLAGS="-mthreads";
+ DLL_LIBS="${DLL_LIBS} -lwinmm";
-+ CFLAGS="$CFLAGS -I\$(top_srcdir)/pa_common -DPA_NO_DS -DPA_NO_ASIO -DPA_NO_WDMKS";
++ CFLAGS="$CFLAGS -I\$(top_srcdir)pa_common -DPA_NO_DS -DPA_NO_ASIO -DPA_NO_WDMKS";
fi
;;
@@ -28416,15 +28408,15 @@
OTHER_OBJS="pa_win_wmme/pa_win_wmme.o";
LIBS="-lwinmm -lm";
PADLL="portaudio.dll";
-- SHARED_FLAGS="-shared -mthreads";
+ THREAD_CFLAGS="-mthreads"
+ SHARED_FLAGS="-shared";
- DLL_LIBS="-lwinmm";
-+ SHARED_FLAGS="-mthreads";
+ DLL_LIBS="${DLL_LIBS} -lwinmm";
;;
irix* )
- echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
--echo "configure:1485: checking for pthread_create in -lpthread" >&5
+-echo "configure:1491: checking for pthread_create in -lpthread" >&5
-ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
@@ -28438,7 +28430,7 @@
+ ac_check_lib_save_LIBS=$LIBS
LIBS="-lpthread $LIBS"
-cat > conftest.$ac_ext <<EOF
--#line 1493 "configure"
+-#line 1499 "configure"
-#include "confdefs.h"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
@@ -28459,7 +28451,7 @@
-pthread_create()
-; return 0; }
-EOF
--if { (eval echo configure:1504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:1510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
+ builtin and then its argument prototype would still apply. */
@@ -28536,7 +28528,7 @@
fi
- echo $ac_n "checking for alOpenPort in -laudio""... $ac_c" 1>&6
--echo "configure:1533: checking for alOpenPort in -laudio" >&5
+-echo "configure:1539: checking for alOpenPort in -laudio" >&5
-ac_lib_var=`echo audio'_'alOpenPort | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
@@ -28550,7 +28542,7 @@
+ ac_check_lib_save_LIBS=$LIBS
LIBS="-laudio $LIBS"
-cat > conftest.$ac_ext <<EOF
--#line 1541 "configure"
+-#line 1547 "configure"
-#include "confdefs.h"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
@@ -28571,7 +28563,7 @@
-alOpenPort()
-; return 0; }
-EOF
--if { (eval echo configure:1552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:1558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
+ builtin and then its argument prototype would still apply. */
@@ -28648,7 +28640,7 @@
fi
- echo $ac_n "checking for dmGetUST in -ldmedia""... $ac_c" 1>&6
--echo "configure:1581: checking for dmGetUST in -ldmedia" >&5
+-echo "configure:1587: checking for dmGetUST in -ldmedia" >&5
-ac_lib_var=`echo dmedia'_'dmGetUST | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
@@ -28662,7 +28654,7 @@
+ ac_check_lib_save_LIBS=$LIBS
LIBS="-ldmedia $LIBS"
-cat > conftest.$ac_ext <<EOF
--#line 1589 "configure"
+-#line 1595 "configure"
-#include "confdefs.h"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
@@ -28683,7 +28675,7 @@
-dmGetUST()
-; return 0; }
-EOF
--if { (eval echo configure:1600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:1606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
+ builtin and then its argument prototype would still apply. */
@@ -28767,7 +28759,7 @@
+_ACEOF
- CFLAGS="$CFLAGS -D_REENTRANT"
+ THREAD_CFLAGS="-D_REENTRANT"
-
+
OTHER_OBJS="pa_sgi/pa_sgi.o pa_unix/pa_unix_hostapis.o pa_unix/pa_unix_util.o";
@@ -28782,7 +28774,7 @@
*)
-
- echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
--echo "configure:1646: checking for pthread_create in -lpthread" >&5
+-echo "configure:1652: checking for pthread_create in -lpthread" >&5
-ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
@@ -28796,7 +28788,7 @@
+ ac_check_lib_save_LIBS=$LIBS
LIBS="-lpthread $LIBS"
-cat > conftest.$ac_ext <<EOF
--#line 1654 "configure"
+-#line 1660 "configure"
-#include "confdefs.h"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
@@ -28817,7 +28809,7 @@
-pthread_create()
-; return 0; }
-EOF
--if { (eval echo configure:1665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:1671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
+ builtin and then its argument prototype would still apply. */
@@ -28926,19 +28918,18 @@
+_ACEOF
fi
-- LIBS="$LIBS -lm -lpthread";
+ THREAD_CFLAGS="-pthread"
+ DLL_LIBS="$DLL_LIBS -lm -lpthread";
-+ LIBS="$LIBS -lm";
+ LIBS="$LIBS -lm -lpthread";
PADLL="libportaudio.so";
-- SHARED_FLAGS="-shared -fPIC";
-+ SHARED_FLAGS="";
-
- OTHER_OBJS="$OTHER_OBJS pa_unix/pa_unix_hostapis.o pa_unix/pa_unix_util.o"
+ SHARED_FLAGS="-shared -fPIC";
+@@ -1733,281 +21723,967 @@
esac
+ CFLAGS="$CFLAGS $THREAD_CFLAGS"
-trap '' 1 2 15
-cat > confcache <<\EOF
-+ ac_config_files="$ac_config_files Makefile"
++ ac_config_files="$ac_config_files Makefile portaudio-2.0.pc"
+cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
@@ -29206,7 +29197,7 @@
+ as_expr=false
+fi
--trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+-trap 'rm -fr `echo "Makefile portaudio-2.0.pc" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
@@ -29260,6 +29251,7 @@
-s%@OTHER_OBJS@%$OTHER_OBJS%g
-s%@PADLL@%$PADLL%g
-s%@SHARED_FLAGS@%$SHARED_FLAGS%g
+-s%@THREAD_CFLAGS@%$THREAD_CFLAGS%g
-s%@DLL_LIBS@%$DLL_LIBS%g
-s%@NASM@%$NASM%g
-s%@NASMOPT@%$NASMOPT%g
@@ -29635,7 +29627,7 @@
+ exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+fi
--CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
+-CONFIG_FILES=\${CONFIG_FILES-"Makefile portaudio-2.0.pc"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
@@ -29656,6 +29648,7 @@
+ case "$ac_config_target" in
+ # Handling of arguments.
+ "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
++ "portaudio-2.0.pc" ) CONFIG_FILES="$CONFIG_FILES portaudio-2.0.pc" ;;
+ *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+ { (exit 1); exit 1; }; };;
@@ -29796,13 +29789,13 @@
+s, at ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
+s, at JACK_CFLAGS@,$JACK_CFLAGS,;t t
+s, at JACK_LIBS@,$JACK_LIBS,;t t
-+
+s, at LT_CURRENT@,$LT_CURRENT,;t t
+s, at LT_REVISION@,$LT_REVISION,;t t
+s, at LT_AGE@,$LT_AGE,;t t
+s, at OTHER_OBJS@,$OTHER_OBJS,;t t
+s, at PADLL@,$PADLL,;t t
+s, at SHARED_FLAGS@,$SHARED_FLAGS,;t t
++s, at THREAD_CFLAGS@,$THREAD_CFLAGS,;t t
+s, at DLL_LIBS@,$DLL_LIBS,;t t
+s, at NASM@,$NASM,;t t
+s, at NASMOPT@,$NASMOPT,;t t
@@ -30113,9 +30106,9 @@
+ $ac_cs_success || { (exit 1); exit 1; }
+fi
-diff -urNad portaudio19-19+cvs20060311~/ltmain.sh portaudio19-19+cvs20060311/ltmain.sh
---- portaudio19-19+cvs20060311~/ltmain.sh 1970-01-01 01:00:00.000000000 +0100
-+++ portaudio19-19+cvs20060311/ltmain.sh 2006-03-18 09:01:28.000000000 +0100
+diff -urNad portaudio19-19+cvs20060405~/ltmain.sh portaudio19-19+cvs20060405/ltmain.sh
+--- portaudio19-19+cvs20060405~/ltmain.sh 1970-01-01 01:00:00.000000000 +0100
++++ portaudio19-19+cvs20060405/ltmain.sh 2006-04-06 00:23:31.000000000 +0200
@@ -0,0 +1,6538 @@
+# ltmain.sh - Provide generalized library-building support services.
+# NOTE: Changing this file will not affect anything until you rerun configure.
More information about the Pkg-voip-commits
mailing list