[SCM] audacity/master: Add portsmf-configure.patch to support using system portSMF.
bdrung at users.alioth.debian.org
bdrung at users.alioth.debian.org
Wed Feb 16 00:19:58 UTC 2011
The following commit has been merged in the master branch:
commit 1bcf7d92fd2a4928f45e8d74977a1300dd40b422
Author: Benjamin Drung <bdrung at gmail.com>
Date: Wed Feb 16 00:56:28 2011 +0100
Add portsmf-configure.patch to support using system portSMF.
diff --git a/debian/patches/configure.patch b/debian/patches/configure.patch
index a332d91..a6f194f 100644
--- a/debian/patches/configure.patch
+++ b/debian/patches/configure.patch
@@ -1039,28 +1039,85 @@ Forwarded: not-needed
PORTSMF_CFLAGS
C compiler flags for PORTSMF, overriding pkg-config
PORTSMF_LIBS
-@@ -1540,6 +1498,7 @@
- Use these variables to override the choices made by `configure' or to help
- it to find libraries and programs with nonstandard names/locations.
-
+@@ -1537,87 +1495,531 @@
+ JACK_CFLAGS C compiler flags for JACK, overriding pkg-config
+ JACK_LIBS linker flags for JACK, overriding pkg-config
+
+-Use these variables to override the choices made by `configure' or to help
+-it to find libraries and programs with nonstandard names/locations.
++Use these variables to override the choices made by `configure' or to help
++it to find libraries and programs with nonstandard names/locations.
++
+Report bugs to the package provider.
- _ACEOF
- ac_status=$?
- fi
-@@ -1603,21 +1562,464 @@
- if $ac_init_version; then
- cat <<\_ACEOF
- configure
--generated by GNU Autoconf 2.63
++_ACEOF
++ac_status=$?
++fi
++
++if test "$ac_init_help" = "recursive"; then
++ # If there are subdirs, report their specific --help.
++ for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
++ test -d "$ac_dir" ||
++ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
++ continue
++ ac_builddir=.
++
++case "$ac_dir" in
++.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
++*)
++ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
++ # A ".." for each directory in $ac_dir_suffix.
++ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
++ case $ac_top_builddir_sub in
++ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
++ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
++ esac ;;
++esac
++ac_abs_top_builddir=$ac_pwd
++ac_abs_builddir=$ac_pwd$ac_dir_suffix
++# for backward compatibility:
++ac_top_builddir=$ac_top_build_prefix
++
++case $srcdir in
++ .) # We are building in place.
++ ac_srcdir=.
++ ac_top_srcdir=$ac_top_builddir_sub
++ ac_abs_top_srcdir=$ac_pwd ;;
++ [\\/]* | ?:[\\/]* ) # Absolute name.
++ ac_srcdir=$srcdir$ac_dir_suffix;
++ ac_top_srcdir=$srcdir
++ ac_abs_top_srcdir=$srcdir ;;
++ *) # Relative name.
++ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
++ ac_top_srcdir=$ac_top_build_prefix$srcdir
++ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
++esac
++ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
++
++ cd "$ac_dir" || { ac_status=$?; continue; }
++ # Check for guested configure.
++ if test -f "$ac_srcdir/configure.gnu"; then
++ echo &&
++ $SHELL "$ac_srcdir/configure.gnu" --help=recursive
++ elif test -f "$ac_srcdir/configure"; then
++ echo &&
++ $SHELL "$ac_srcdir/configure" --help=recursive
++ else
++ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
++ fi || ac_status=$?
++ cd "$ac_pwd" || { ac_status=$?; break; }
++ done
++fi
++
++test -n "$ac_init_help" && exit $ac_status
++if $ac_init_version; then
++ cat <<\_ACEOF
++configure
+generated by GNU Autoconf 2.67
-
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
--2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++
+Copyright (C) 2010 Free Software Foundation, Inc.
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
- _ACEOF
-- exit
++This configure script is free software; the Free Software Foundation
++gives unlimited permission to copy, distribute and modify it.
++_ACEOF
+ exit
+fi
+
@@ -1314,7 +1371,7 @@ Forwarded: not-needed
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-+
+
+ ac_retval=$ac_status
+fi
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
@@ -1339,21 +1396,44 @@ Forwarded: not-needed
+/* end confdefs.h. */
+$4
+#include <$2>
-+_ACEOF
+ _ACEOF
+-ac_status=$?
+if ac_fn_cxx_try_compile "$LINENO"; then :
+ eval "$3=yes"
+else
+ eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
+ fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+
+
+-if test "$ac_init_help" = "recursive"; then
+- # If there are subdirs, report their specific --help.
+- for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+- test -d "$ac_dir" ||
+- { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+- continue
+- ac_builddir=.
+} # ac_fn_cxx_check_header_compile
-+
+
+-case "$ac_dir" in
+-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+-*)
+- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+- # A ".." for each directory in $ac_dir_suffix.
+- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+- case $ac_top_builddir_sub in
+- "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+- *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+- esac ;;
+-esac
+-ac_abs_top_builddir=$ac_pwd
+-ac_abs_builddir=$ac_pwd$ac_dir_suffix
+-# for backward compatibility:
+-ac_top_builddir=$ac_top_build_prefix
+# ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES
+# ---------------------------------------------------------
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
@@ -1388,7 +1468,22 @@ Forwarded: not-needed
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
-+
+
+-case $srcdir in
+- .) # We are building in place.
+- ac_srcdir=.
+- ac_top_srcdir=$ac_top_builddir_sub
+- ac_abs_top_srcdir=$ac_pwd ;;
+- [\\/]* | ?:[\\/]* ) # Absolute name.
+- ac_srcdir=$srcdir$ac_dir_suffix;
+- ac_top_srcdir=$srcdir
+- ac_abs_top_srcdir=$srcdir ;;
+- *) # Relative name.
+- ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+- ac_top_srcdir=$ac_top_build_prefix$srcdir
+- ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+-esac
+-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
@@ -1404,7 +1499,20 @@ Forwarded: not-needed
+rm -f conftest.err conftest.i conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
-+
+
+- cd "$ac_dir" || { ac_status=$?; continue; }
+- # Check for guested configure.
+- if test -f "$ac_srcdir/configure.gnu"; then
+- echo &&
+- $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+- elif test -f "$ac_srcdir/configure"; then
+- echo &&
+- $SHELL "$ac_srcdir/configure" --help=recursive
+- else
+- $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+- fi || ac_status=$?
+- cd "$ac_pwd" || { ac_status=$?; break; }
+- done
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in #((
+ yes:no: )
@@ -1436,11 +1544,20 @@ Forwarded: not-needed
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
-+fi
+ fi
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+
+
+-test -n "$ac_init_help" && exit $ac_status
+-if $ac_init_version; then
+- cat <<\_ACEOF
+-configure
+-generated by GNU Autoconf 2.63
+} # ac_fn_cxx_check_header_mongrel
-+
+
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+-This configure script is free software; the Free Software Foundation
+-gives unlimited permission to copy, distribute and modify it.
+# ac_fn_cxx_check_func LINENO FUNC VAR
+# ------------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
@@ -1492,15 +1609,16 @@ Forwarded: not-needed
+ ;
+ return 0;
+}
-+_ACEOF
+ _ACEOF
+- exit
+if ac_fn_cxx_try_link "$LINENO"; then :
+ eval "$3=yes"
+else
+ eval "$3=no"
- fi
++fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
-+fi
+ fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
@@ -2226,26 +2344,16 @@ Forwarded: not-needed
sed 's/^/| /' conftest.$ac_ext >&5
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }; }
-+as_fn_error 77 "C compiler cannot create executables
-+See \`config.log' for more details" "$LINENO" 5 ; }
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
- fi
+-fi
+-
+-ac_exeext=$ac_cv_exeext
-
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-+$as_echo_n "checking for C compiler default output file name... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-+$as_echo "$ac_file" >&6; }
- ac_exeext=$ac_cv_exeext
-
-# Check that the compiler produces executables we can run. If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
@@ -2270,7 +2378,8 @@ Forwarded: not-needed
- cross_compiling=yes
- else
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
@@ -2282,8 +2391,18 @@ Forwarded: not-needed
- fi
-fi
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
--
++as_fn_error 77 "C compiler cannot create executables
++See \`config.log' for more details" "$LINENO" 5 ; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
++$as_echo_n "checking for C compiler default output file name... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
++$as_echo "$ac_file" >&6; }
++ac_exeext=$ac_cv_exeext
+
rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
ac_clean_files=$ac_clean_files_save
-# Check that the compiler produces executables we can run. If not, either
@@ -3001,7 +3120,7 @@ Forwarded: not-needed
- } && test -s conftest.$ac_objext; then
+if ac_fn_cxx_try_compile "$LINENO"; then :
ac_cv_prog_cxx_g=yes
--else
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
@@ -3011,7 +3130,6 @@ Forwarded: not-needed
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+else
+ CXXFLAGS=""
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -3541,7 +3659,7 @@ Forwarded: not-needed
$as_echo_n "(cached) " >&6
else
-@@ -3852,14 +3875,10 @@
+@@ -3852,59 +3875,30 @@
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -rdynamic"
@@ -3557,11 +3675,13 @@ Forwarded: not-needed
+
int
main ()
- {
-@@ -3869,42 +3888,17 @@
- }
-
- _ACEOF
+-{
+-
+- ;
+- return 0;
+-}
+-
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -3583,6 +3703,13 @@ Forwarded: not-needed
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
++{
++
++ ;
++ return 0;
++}
++
++_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
eval "ax_cv_ld_check_flag_$flag=yes"
@@ -3966,7 +4093,7 @@ Forwarded: not-needed
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
-@@ -4356,373 +4288,63 @@
+@@ -4356,118 +4288,33 @@
return 0;
}
_ACEOF
@@ -4095,14 +4222,12 @@ Forwarded: not-needed
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
--
--fi
--
--done
--
--
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -4477,102 +4324,9 @@
+ done
+
+
-{ $as_echo "$as_me:$LINENO: checking for size_t" >&5
-$as_echo_n "checking for size_t... " >&6; }
-if test "${ac_cv_type_size_t+set}" = set; then
@@ -4192,29 +4317,22 @@ Forwarded: not-needed
-
-
-fi
--
++ac_fn_cxx_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
++if test "x$ac_cv_type_size_t" = x""yes; then :
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-$as_echo "$ac_cv_type_size_t" >&6; }
-if test "x$ac_cv_type_size_t" = x""yes; then
- :
--else
--
--cat >>confdefs.h <<_ACEOF
--#define size_t unsigned int
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
+ else
- fi
+ cat >>confdefs.h <<_ACEOF
+@@ -4585,144 +4339,12 @@
-+done
-+ac_fn_cxx_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-+if test "x$ac_cv_type_size_t" = x""yes; then :
-
--
-
-for ac_header in $ac_header_list
-do
@@ -4261,13 +4379,13 @@ Forwarded: not-needed
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
+-else
- $as_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
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
@@ -4282,9 +4400,7 @@ Forwarded: not-needed
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-+cat >>confdefs.h <<_ACEOF
-+#define size_t unsigned int
- _ACEOF
+-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -4306,14 +4422,14 @@ Forwarded: not-needed
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
- ac_header_preproc=no
- fi
-
+-fi
+-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
+-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
- yes:no: )
@@ -4336,7 +4452,7 @@ Forwarded: not-needed
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
+-
- ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
@@ -4350,12 +4466,11 @@ Forwarded: not-needed
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
+-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+
+ for ac_header in $ac_header_list
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -4534,10 +4649,12 @@ Forwarded: not-needed
/* end confdefs.h. */
int
-@@ -4918,32 +4479,9 @@
+@@ -4916,34 +4477,11 @@
+ return 0;
+ ;
return 0;
- }
- _ACEOF
+-}
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -4556,13 +4673,16 @@ Forwarded: not-needed
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_cflags_warn_all=`echo $ac_arg | sed -e 's,.*% *,,'` ; break
+- ac_cv_cflags_warn_all=`echo $ac_arg | sed -e 's,.*% *,,'` ; break
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_cflags_warn_all=`echo $ac_arg | sed -e 's,.*% *,,'` ; break
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -5835,32 +5955,39 @@ Forwarded: not-needed
withval=$with_libvorbis; LIBVORBIS_ARGUMENT=$withval
else
LIBVORBIS_ARGUMENT="unspecified"
-@@ -6381,18 +5609,14 @@
+@@ -6381,206 +5609,51 @@
- { $as_echo "$as_me:$LINENO: checking for vorbis_bitrate_addblock in -lvorbisfile" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for vorbis_bitrate_addblock in -lvorbisfile" >&5
- $as_echo_n "checking for vorbis_bitrate_addblock in -lvorbisfile... " >&6; }
+-$as_echo_n "checking for vorbis_bitrate_addblock in -lvorbisfile... " >&6; }
-if test "${ac_cv_lib_vorbisfile_vorbis_bitrate_addblock+set}" = set; then
-+if test "${ac_cv_lib_vorbisfile_vorbis_bitrate_addblock+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lvorbisfile -lvorbis -logg $LIBS"
+- $as_echo_n "(cached) " >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lvorbisfile -lvorbis -logg $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -6410,177 +5634,26 @@
- return 0;
- }
- _ACEOF
+-/* end confdefs.h. */
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char vorbis_bitrate_addblock ();
+-int
+-main ()
+-{
+-return vorbis_bitrate_addblock ();
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -5882,34 +6009,28 @@ Forwarded: not-needed
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-+if ac_fn_cxx_try_link "$LINENO"; then :
- ac_cv_lib_vorbisfile_vorbis_bitrate_addblock=yes
- else
+- ac_cv_lib_vorbisfile_vorbis_bitrate_addblock=yes
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_vorbisfile_vorbis_bitrate_addblock=no
-+ ac_cv_lib_vorbisfile_vorbis_bitrate_addblock=no
- fi
+-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
+-LIBS=$ac_check_lib_save_LIBS
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_vorbisfile_vorbis_bitrate_addblock" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_vorbisfile_vorbis_bitrate_addblock" >&5
- $as_echo "$ac_cv_lib_vorbisfile_vorbis_bitrate_addblock" >&6; }
+-$as_echo "$ac_cv_lib_vorbisfile_vorbis_bitrate_addblock" >&6; }
-if test "x$ac_cv_lib_vorbisfile_vorbis_bitrate_addblock" = x""yes; then
-+if test "x$ac_cv_lib_vorbisfile_vorbis_bitrate_addblock" = x""yes; then :
- lib_found="yes"
- else
- lib_found="no"
- fi
-
-
+- lib_found="yes"
+-else
+- lib_found="no"
+-fi
+-
+-
- if test "${ac_cv_header_vorbis_vorbisfile_h+set}" = set; then
- { $as_echo "$as_me:$LINENO: checking for vorbis/vorbisfile.h" >&5
-$as_echo_n "checking for vorbis/vorbisfile.h... " >&6; }
@@ -6029,15 +6150,54 @@ Forwarded: not-needed
-{ $as_echo "$as_me:$LINENO: checking for vorbis/vorbisfile.h" >&5
-$as_echo_n "checking for vorbis/vorbisfile.h... " >&6; }
-if test "${ac_cv_header_vorbis_vorbisfile_h+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for vorbis_bitrate_addblock in -lvorbisfile" >&5
++$as_echo_n "checking for vorbis_bitrate_addblock in -lvorbisfile... " >&6; }
++if test "${ac_cv_lib_vorbisfile_vorbis_bitrate_addblock+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
- ac_cv_header_vorbis_vorbisfile_h=$ac_header_preproc
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_vorbis_vorbisfile_h" >&5
-$as_echo "$ac_cv_header_vorbis_vorbisfile_h" >&6; }
--
--fi
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-lvorbisfile -lvorbis -logg $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
+
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
++#ifdef __cplusplus
++extern "C"
++#endif
++char vorbis_bitrate_addblock ();
++int
++main ()
++{
++return vorbis_bitrate_addblock ();
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_cxx_try_link "$LINENO"; then :
++ ac_cv_lib_vorbisfile_vorbis_bitrate_addblock=yes
++else
++ ac_cv_lib_vorbisfile_vorbis_bitrate_addblock=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_vorbisfile_vorbis_bitrate_addblock" >&5
++$as_echo "$ac_cv_lib_vorbisfile_vorbis_bitrate_addblock" >&6; }
++if test "x$ac_cv_lib_vorbisfile_vorbis_bitrate_addblock" = x""yes; then :
++ lib_found="yes"
++else
++ lib_found="no"
+ fi
-if test "x$ac_cv_header_vorbis_vorbisfile_h" = x""yes; then
++
++
+ ac_fn_cxx_check_header_mongrel "$LINENO" "vorbis/vorbisfile.h" "ac_cv_header_vorbis_vorbisfile_h" "$ac_includes_default"
+if test "x$ac_cv_header_vorbis_vorbisfile_h" = x""yes; then :
header_found="yes"
@@ -6672,56 +6832,49 @@ Forwarded: not-needed
$as_echo "$as_me: FLAC libraries are NOT available in this source tree" >&6;}
fi
-@@ -7223,222 +6083,65 @@
+@@ -7223,7 +6083,7 @@
# Check whether --with-libid3tag was given.
-if test "${with_libid3tag+set}" = set; then
+if test "${with_libid3tag+set}" = set; then :
withval=$with_libid3tag; LIBID3TAG_ARGUMENT=$withval
--else
-- LIBID3TAG_ARGUMENT="unspecified"
--fi
--
--
-- if false ; then
--
+ else
+ LIBID3TAG_ARGUMENT="unspecified"
+@@ -7232,25 +6092,19 @@
+
+ if false ; then
+
-cat >>confdefs.h <<\_ACEOF
-#define USE_LIBID3TAG 1
-_ACEOF
--
-- fi
--
--
++$as_echo "#define USE_LIBID3TAG 1" >>confdefs.h
+
+ fi
+
+
- { $as_echo "$as_me:$LINENO: checking for id3_file_open in -lid3tag" >&5
--$as_echo_n "checking for id3_file_open in -lid3tag... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for id3_file_open in -lid3tag" >&5
+ $as_echo_n "checking for id3_file_open in -lid3tag... " >&6; }
-if test "${ac_cv_lib_id3tag_id3_file_open+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lid3tag -lz $LIBS"
++if test "${ac_cv_lib_id3tag_id3_file_open+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lid3tag -lz $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char id3_file_open ();
--int
--main ()
--{
--return id3_file_open ();
-- ;
-- return 0;
--}
--_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -7268,177 +6122,26 @@
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -6743,28 +6896,34 @@ Forwarded: not-needed
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_id3tag_id3_file_open=yes
--else
++if ac_fn_cxx_try_link "$LINENO"; then :
+ ac_cv_lib_id3tag_id3_file_open=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_id3tag_id3_file_open=no
--fi
++ ac_cv_lib_id3tag_id3_file_open=no
+ fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_id3tag_id3_file_open" >&5
--$as_echo "$ac_cv_lib_id3tag_id3_file_open" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_id3tag_id3_file_open" >&5
+ $as_echo "$ac_cv_lib_id3tag_id3_file_open" >&6; }
-if test "x$ac_cv_lib_id3tag_id3_file_open" = x""yes; then
-- libid3tag_found="yes"
--else
-- libid3tag_found="no"
--fi
--
--
++if test "x$ac_cv_lib_id3tag_id3_file_open" = x""yes; then :
+ libid3tag_found="yes"
+ else
+ libid3tag_found="no"
+ fi
+
+
- if test "${ac_cv_header_id3tag_h+set}" = set; then
- { $as_echo "$as_me:$LINENO: checking for id3tag.h" >&5
-$as_echo_n "checking for id3tag.h... " >&6; }
@@ -6850,14 +7009,12 @@ Forwarded: not-needed
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-+else
-+ LIBID3TAG_ARGUMENT="unspecified"
- fi
-
+-fi
+-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
+-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
- yes:no: )
@@ -6880,66 +7037,21 @@ Forwarded: not-needed
-$as_echo "$as_me: WARNING: id3tag.h: proceeding with the preprocessor's result" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: id3tag.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: id3tag.h: in the future, the compiler will take precedence" >&2;}
-+ if false ; then
-
+-
- ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for id3tag.h" >&5
-$as_echo_n "checking for id3tag.h... " >&6; }
-if test "${ac_cv_header_id3tag_h+set}" = set; then
-+$as_echo "#define USE_LIBID3TAG 1" >>confdefs.h
-+
-+ fi
-+
-+
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for id3_file_open in -lid3tag" >&5
-+$as_echo_n "checking for id3_file_open in -lid3tag... " >&6; }
-+if test "${ac_cv_lib_id3tag_id3_file_open+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- ac_cv_header_id3tag_h=$ac_header_preproc
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_id3tag_h" >&5
-$as_echo "$ac_cv_header_id3tag_h" >&6; }
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lid3tag -lz $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char id3_file_open ();
-+int
-+main ()
-+{
-+return id3_file_open ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_link "$LINENO"; then :
-+ ac_cv_lib_id3tag_id3_file_open=yes
-+else
-+ ac_cv_lib_id3tag_id3_file_open=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_id3tag_id3_file_open" >&5
-+$as_echo "$ac_cv_lib_id3tag_id3_file_open" >&6; }
-+if test "x$ac_cv_lib_id3tag_id3_file_open" = x""yes; then :
-+ libid3tag_found="yes"
-+else
-+ libid3tag_found="no"
- fi
+-
+-fi
-if test "x$ac_cv_header_id3tag_h" = x""yes; then
-+
-+
+ ac_fn_cxx_check_header_mongrel "$LINENO" "id3tag.h" "ac_cv_header_id3tag_h" "$ac_includes_default"
+if test "x$ac_cv_header_id3tag_h" = x""yes; then :
id3tag_h_found="yes"
@@ -7726,109 +7838,59 @@ Forwarded: not-needed
pkg_cv_AVCODEC_LIBS=`$PKG_CONFIG --libs "libavcodec >= 51.53" 2>/dev/null`
else
pkg_failed=yes
-@@ -8303,7 +6964,7 @@
- # Put the nasty error message in config.log where it belongs
- echo "$AVCODEC_PKG_ERRORS" >&5
-
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- avcodec_available_system="no"
- elif test $pkg_failed = untried; then
-@@ -8311,24 +6972,24 @@
- else
- AVCODEC_CFLAGS=$pkg_cv_AVCODEC_CFLAGS
- AVCODEC_LIBS=$pkg_cv_AVCODEC_LIBS
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- avcodec_available_system="yes"
- fi
-
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for AVFORMAT" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AVFORMAT" >&5
- $as_echo_n "checking for AVFORMAT... " >&6; }
-
- if test -n "$AVFORMAT_CFLAGS"; then
- pkg_cv_AVFORMAT_CFLAGS="$AVFORMAT_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libavformat >= 52.12\"") >&5
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavformat >= 52.12\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libavformat >= 52.12") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
- pkg_cv_AVFORMAT_CFLAGS=`$PKG_CONFIG --cflags "libavformat >= 52.12" 2>/dev/null`
- else
- pkg_failed=yes
-@@ -8340,11 +7001,11 @@
- pkg_cv_AVFORMAT_LIBS="$AVFORMAT_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libavformat >= 52.12\"") >&5
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavformat >= 52.12\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libavformat >= 52.12") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
- pkg_cv_AVFORMAT_LIBS=`$PKG_CONFIG --libs "libavformat >= 52.12" 2>/dev/null`
- else
- pkg_failed=yes
-@@ -8370,7 +7031,7 @@
- # Put the nasty error message in config.log where it belongs
- echo "$AVFORMAT_PKG_ERRORS" >&5
-
-- { $as_echo "$as_me:$LINENO: result: no" >&5
+@@ -8298,54 +6959,121 @@
+ if test $_pkg_short_errors_supported = yes; then
+ AVCODEC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libavcodec >= 51.53" 2>&1`
+ else
+- AVCODEC_PKG_ERRORS=`$PKG_CONFIG --print-errors "libavcodec >= 51.53" 2>&1`
++ AVCODEC_PKG_ERRORS=`$PKG_CONFIG --print-errors "libavcodec >= 51.53" 2>&1`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$AVCODEC_PKG_ERRORS" >&5
++
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- avformat_available_system="no"
- elif test $pkg_failed = untried; then
-@@ -8378,52 +7039,122 @@
- else
- AVFORMAT_CFLAGS=$pkg_cv_AVFORMAT_CFLAGS
- AVFORMAT_LIBS=$pkg_cv_AVFORMAT_LIBS
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
++$as_echo "no" >&6; }
++ avcodec_available_system="no"
++elif test $pkg_failed = untried; then
++ avcodec_available_system="no"
++else
++ AVCODEC_CFLAGS=$pkg_cv_AVCODEC_CFLAGS
++ AVCODEC_LIBS=$pkg_cv_AVCODEC_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- avformat_available_system="yes"
- fi
-
++$as_echo "yes" >&6; }
++ avcodec_available_system="yes"
++fi
++
+pkg_failed=no
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AVUTIL" >&5
-+$as_echo_n "checking for AVUTIL... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AVFORMAT" >&5
++$as_echo_n "checking for AVFORMAT... " >&6; }
+
-+if test -n "$AVUTIL_CFLAGS"; then
-+ pkg_cv_AVUTIL_CFLAGS="$AVUTIL_CFLAGS"
++if test -n "$AVFORMAT_CFLAGS"; then
++ pkg_cv_AVFORMAT_CFLAGS="$AVFORMAT_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavutil\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "libavutil") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavformat >= 52.12\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "libavformat >= 52.12") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
-+ pkg_cv_AVUTIL_CFLAGS=`$PKG_CONFIG --cflags "libavutil" 2>/dev/null`
++ pkg_cv_AVFORMAT_CFLAGS=`$PKG_CONFIG --cflags "libavformat >= 52.12" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
-+if test -n "$AVUTIL_LIBS"; then
-+ pkg_cv_AVUTIL_LIBS="$AVUTIL_LIBS"
++if test -n "$AVFORMAT_LIBS"; then
++ pkg_cv_AVFORMAT_LIBS="$AVFORMAT_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavutil\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "libavutil") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavformat >= 52.12\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "libavformat >= 52.12") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
-+ pkg_cv_AVUTIL_LIBS=`$PKG_CONFIG --libs "libavutil" 2>/dev/null`
++ pkg_cv_AVFORMAT_LIBS=`$PKG_CONFIG --libs "libavformat >= 52.12" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
@@ -7846,26 +7908,117 @@ Forwarded: not-needed
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
-+ AVUTIL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libavutil" 2>&1`
++ AVFORMAT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libavformat >= 52.12" 2>&1`
+ else
++ AVFORMAT_PKG_ERRORS=`$PKG_CONFIG --print-errors "libavformat >= 52.12" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+- echo "$AVCODEC_PKG_ERRORS" >&5
++ echo "$AVFORMAT_PKG_ERRORS" >&5
+
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+- avcodec_available_system="no"
++ avformat_available_system="no"
+ elif test $pkg_failed = untried; then
+- avcodec_available_system="no"
++ avformat_available_system="no"
+ else
+- AVCODEC_CFLAGS=$pkg_cv_AVCODEC_CFLAGS
+- AVCODEC_LIBS=$pkg_cv_AVCODEC_LIBS
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
++ AVFORMAT_CFLAGS=$pkg_cv_AVFORMAT_CFLAGS
++ AVFORMAT_LIBS=$pkg_cv_AVFORMAT_LIBS
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+- avcodec_available_system="yes"
++ avformat_available_system="yes"
+ fi
+
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for AVFORMAT" >&5
+-$as_echo_n "checking for AVFORMAT... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AVUTIL" >&5
++$as_echo_n "checking for AVUTIL... " >&6; }
+
+-if test -n "$AVFORMAT_CFLAGS"; then
+- pkg_cv_AVFORMAT_CFLAGS="$AVFORMAT_CFLAGS"
++if test -n "$AVUTIL_CFLAGS"; then
++ pkg_cv_AVUTIL_CFLAGS="$AVUTIL_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libavformat >= 52.12\"") >&5
+- ($PKG_CONFIG --exists --print-errors "libavformat >= 52.12") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavutil\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "libavutil") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_AVFORMAT_CFLAGS=`$PKG_CONFIG --cflags "libavformat >= 52.12" 2>/dev/null`
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_AVUTIL_CFLAGS=`$PKG_CONFIG --cflags "libavutil" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+ else
+ pkg_failed=untried
+ fi
+-if test -n "$AVFORMAT_LIBS"; then
+- pkg_cv_AVFORMAT_LIBS="$AVFORMAT_LIBS"
++if test -n "$AVUTIL_LIBS"; then
++ pkg_cv_AVUTIL_LIBS="$AVUTIL_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libavformat >= 52.12\"") >&5
+- ($PKG_CONFIG --exists --print-errors "libavformat >= 52.12") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavutil\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "libavutil") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_AVFORMAT_LIBS=`$PKG_CONFIG --libs "libavformat >= 52.12" 2>/dev/null`
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_AVUTIL_LIBS=`$PKG_CONFIG --libs "libavutil" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -8363,67 +7091,70 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- AVFORMAT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libavformat >= 52.12" 2>&1`
++ AVUTIL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libavutil" 2>&1`
+ else
+- AVFORMAT_PKG_ERRORS=`$PKG_CONFIG --print-errors "libavformat >= 52.12" 2>&1`
+ AVUTIL_PKG_ERRORS=`$PKG_CONFIG --print-errors "libavutil" 2>&1`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
+ fi
+ # Put the nasty error message in config.log where it belongs
+- echo "$AVFORMAT_PKG_ERRORS" >&5
+ echo "$AVUTIL_PKG_ERRORS" >&5
-+
+
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
+ $as_echo "no" >&6; }
+- avformat_available_system="no"
+ libavutil_available_system="no"
-+elif test $pkg_failed = untried; then
+ elif test $pkg_failed = untried; then
+- avformat_available_system="no"
+ libavutil_available_system="no"
-+else
+ else
+- AVFORMAT_CFLAGS=$pkg_cv_AVFORMAT_CFLAGS
+- AVFORMAT_LIBS=$pkg_cv_AVFORMAT_LIBS
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ AVUTIL_CFLAGS=$pkg_cv_AVUTIL_CFLAGS
+ AVUTIL_LIBS=$pkg_cv_AVUTIL_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
+ $as_echo "yes" >&6; }
+- avformat_available_system="yes"
+ libavutil_available_system="yes"
-+fi
-+
+ fi
+
FFMPEG_SYSTEM_AVAILABLE="no"
if test "x$avcodec_available_system" = "xyes" ; then
if test "x$avformat_available_system" = "xyes" ; then
@@ -7981,7 +8134,7 @@ Forwarded: not-needed
$as_echo "$as_me: ffmpeg library is NOT available in the local tree" >&6;}
fi
-@@ -8480,7 +7206,7 @@
+@@ -8480,18 +7206,99 @@
# Check whether --with-midi was given.
@@ -7990,18 +8143,102 @@ Forwarded: not-needed
withval=$with_midi; PORTSMF_ARGUMENT=$withval
else
PORTSMF_ARGUMENT="unspecified"
-@@ -8488,9 +7214,7 @@
+ fi
++
if false ; then
-cat >>confdefs.h <<\_ACEOF
-#define USE_MIDI 1
-_ACEOF
+$as_echo "#define USE_MIDI 1" >>confdefs.h
++
++ fi
++
++
++
++pkg_failed=no
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PORTSMF" >&5
++$as_echo_n "checking for PORTSMF... " >&6; }
++
++if test -n "$PORTSMF_CFLAGS"; then
++ pkg_cv_PORTSMF_CFLAGS="$PORTSMF_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"portSMF\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "portSMF") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_PORTSMF_CFLAGS=`$PKG_CONFIG --cflags "portSMF" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++if test -n "$PORTSMF_LIBS"; then
++ pkg_cv_PORTSMF_LIBS="$PORTSMF_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"portSMF\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "portSMF") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_PORTSMF_LIBS=`$PKG_CONFIG --libs "portSMF" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ PORTSMF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "portSMF" 2>&1`
++ else
++ PORTSMF_PKG_ERRORS=`$PKG_CONFIG --print-errors "portSMF" 2>&1`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$PORTSMF_PKG_ERRORS" >&5
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++ portsmf_available_system="no"
++elif test $pkg_failed = untried; then
++ portsmf_available_system="no"
++else
++ PORTSMF_CFLAGS=$pkg_cv_PORTSMF_CFLAGS
++ PORTSMF_LIBS=$pkg_cv_PORTSMF_LIBS
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++ portsmf_available_system="yes"
++fi
++ if test "x$portsmf_available_system" = "xyes" ; then
++ PORTSMF_SYSTEM_AVAILABLE="yes"
++ PORTSMF_SYSTEM_LIBS=$PORTSMF_LIBS
++ PORTSMF_SYSTEM_CXXFLAGS=$PORTSMF_CFLAGS
++ PORTSMF_SYSTEM_CPPSYMBOLS="USE_MIDI"
++ { $as_echo "$as_me:${as_lineno-$LINENO}: portSMF library is available as system library" >&5
++$as_echo "$as_me: portSMF library is available as system library" >&6;}
++ else
++ PORTSMF_SYSTEM_AVAILABLE="no"
++ { $as_echo "$as_me:${as_lineno-$LINENO}: portSMF library is NOT available as system library" >&5
++$as_echo "$as_me: portSMF library is NOT available as system library" >&6;}
fi
-@@ -8547,49 +7271,9 @@
+ if test -d ${srcdir}/lib-src/portsmf ; then
+@@ -8547,49 +7354,9 @@
fi
ax_popdir=`pwd`
@@ -8053,7 +8290,7 @@ Forwarded: not-needed
ac_builddir=.
case ""${srcdir}/lib-src/portsmf"" in
-@@ -8635,7 +7319,7 @@
+@@ -8635,7 +7402,7 @@
# This should be Cygnus configure.
ax_sub_configure=$ac_aux_dir/configure
else
@@ -8062,7 +8299,7 @@ Forwarded: not-needed
$as_echo "$as_me: WARNING: no configuration information is in \"${srcdir}/lib-src/portsmf\"" >&2;}
ax_sub_configure=
fi
-@@ -8649,7 +7333,7 @@
+@@ -8649,7 +7416,7 @@
ax_sub_cache_file=$ac_top_build_prefix$cache_file ;;
esac
@@ -8071,7 +8308,7 @@ Forwarded: not-needed
$as_echo "$as_me: running $SHELL $ax_sub_configure $ax_sub_configure_args --cache-file=$ax_sub_cache_file --srcdir=$ac_srcdir" >&6;}
# The eval makes quoting arguments work.
eval "\$SHELL \"\$ax_sub_configure\" $ax_sub_configure_args \
-@@ -8657,7 +7341,7 @@
+@@ -8657,7 +7424,7 @@
fi
cd "$ax_popdir"
@@ -8080,7 +8317,7 @@ Forwarded: not-needed
$as_echo "$as_me: Done configuring in \"${srcdir}/lib-src/portsmf\"" >&6;}
fi
-@@ -8665,18 +7349,18 @@
+@@ -8665,18 +7432,18 @@
export PKG_CONFIG_PATH
pkg_failed=no
@@ -8103,7 +8340,7 @@ Forwarded: not-needed
pkg_cv_PORTSMF_CFLAGS=`$PKG_CONFIG --cflags "portSMF" 2>/dev/null`
else
pkg_failed=yes
-@@ -8688,11 +7372,11 @@
+@@ -8688,11 +7455,11 @@
pkg_cv_PORTSMF_LIBS="$PORTSMF_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -8118,7 +8355,7 @@ Forwarded: not-needed
pkg_cv_PORTSMF_LIBS=`$PKG_CONFIG --libs "portSMF" 2>/dev/null`
else
pkg_failed=yes
-@@ -8718,7 +7402,7 @@
+@@ -8718,7 +7485,7 @@
# Put the nasty error message in config.log where it belongs
echo "$PORTSMF_PKG_ERRORS" >&5
@@ -8127,7 +8364,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
portsmf_available="no"
elif test $pkg_failed = untried; then
-@@ -8726,7 +7410,7 @@
+@@ -8726,7 +7493,7 @@
else
PORTSMF_CFLAGS=$pkg_cv_PORTSMF_CFLAGS
PORTSMF_LIBS=$pkg_cv_PORTSMF_LIBS
@@ -8136,7 +8373,18 @@ Forwarded: not-needed
$as_echo "yes" >&6; }
portsmf_available="yes"
fi
-@@ -8744,7 +7428,7 @@
+@@ -8736,15 +7503,15 @@
+ PORTSMF_LOCAL_LDFLAGS=$PORTSMF_LIBS
+ PORTSMF_LOCAL_CXXFLAGS=$PORTSMF_CFLAGS
+ PORTSMF_LOCAL_CPPSYMBOLS="USE_MIDI"
+- PORTSMF_LOCAL_OPTOBJS="NoteTrack.o import/ImportMIDI.o"
+- PORTSMF_LOCAL_BUILD="portSMF"
++ PORTSMF_LOCAL_OPTOBJS="NoteTrack.o import/ImportMIDI.o"
++ PORTSMF_LOCAL_BUILD="portSMF"
+ else
+- PORTSMF_LOCAL_AVAILABLE="no"
++ PORTSMF_LOCAL_AVAILABLE="no"
+ fi
@@ -8145,7 +8393,7 @@ Forwarded: not-needed
$as_echo "$as_me: Figuring out what libraries to enable" >&6;}
lib_preference=`echo $lib_preference | tr [:lower:], "[:upper:] "`
-@@ -8761,43 +7445,37 @@
+@@ -8761,43 +7528,37 @@
if test "$AVAILABLE" = "yes" ; then
eval ${lib}_USE_${sys_or_local}="yes"
lib_activated="yes"
@@ -8197,7 +8445,7 @@ Forwarded: not-needed
fi
fi
done
-@@ -8809,39 +7487,33 @@
+@@ -8809,39 +7570,33 @@
# liblrdf
if test "$LIBSNDFILE_USE_LOCAL" != "yes" && test "$LIBSNDFILE_USE_SYSTEM" != "yes" ; then
@@ -8244,7 +8492,7 @@ Forwarded: not-needed
$as_echo "$as_me: Using libsamplerate as requested" >&6;}
fi
fi
-@@ -8892,7 +7564,7 @@
+@@ -8892,7 +7647,7 @@
# Check whether --enable-audiounits was given.
@@ -8253,7 +8501,7 @@ Forwarded: not-needed
enableval=$enable_audiounits; use_audiounits=$enableval
else
use_audiounits="auto"
-@@ -8900,7 +7572,7 @@
+@@ -8900,7 +7655,7 @@
# Check whether --enable-ladspa was given.
@@ -8262,7 +8510,7 @@ Forwarded: not-needed
enableval=$enable_ladspa; use_ladspa=$enableval
else
use_ladspa="yes"
-@@ -8908,7 +7580,7 @@
+@@ -8908,7 +7663,7 @@
# Check whether --enable-quicktime was given.
@@ -8271,7 +8519,7 @@ Forwarded: not-needed
enableval=$enable_quicktime; use_quicktime=$enableval
else
use_quicktime="auto"
-@@ -8918,7 +7590,7 @@
+@@ -8918,7 +7673,7 @@
# Check whether --with-portmixer was given.
@@ -8280,7 +8528,7 @@ Forwarded: not-needed
withval=$with_portmixer; use_portmixer=$withval
else
use_portmixer="yes"
-@@ -8927,35 +7599,27 @@
+@@ -8927,35 +7682,27 @@
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -8323,7 +8571,7 @@ Forwarded: not-needed
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
-@@ -8971,28 +7635,24 @@
+@@ -8971,28 +7718,24 @@
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
@@ -8357,7 +8605,7 @@ Forwarded: not-needed
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
-@@ -9031,14 +7691,10 @@
+@@ -9031,14 +7774,10 @@
CONFIGHEADER="configwin.h"
@@ -8374,7 +8622,7 @@ Forwarded: not-needed
AFTERBUILD=""
-@@ -9050,17 +7706,13 @@
+@@ -9050,17 +7789,13 @@
EXTRAINSTALLTARGETS="$EXTRAINSTALLTARGETS install-extra-data"
EXTRAUNINSTALLTARGETS="$EXTRAUNINSTALLTARGETS uninstall-extra-data"
@@ -8395,7 +8643,7 @@ Forwarded: not-needed
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -9085,79 +7737,50 @@
+@@ -9085,79 +7820,50 @@
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
@@ -8488,7 +8736,7 @@ Forwarded: not-needed
pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0" 2>/dev/null`
else
pkg_failed=yes
-@@ -9169,11 +7792,11 @@
+@@ -9169,11 +7875,11 @@
pkg_cv_GTK_LIBS="$GTK_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -8503,7 +8751,7 @@ Forwarded: not-needed
pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0" 2>/dev/null`
else
pkg_failed=yes
-@@ -9199,7 +7822,7 @@
+@@ -9199,7 +7905,7 @@
# Put the nasty error message in config.log where it belongs
echo "$GTK_PKG_ERRORS" >&5
@@ -8512,7 +8760,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
have_gtk=no
elif test $pkg_failed = untried; then
-@@ -9207,16 +7830,14 @@
+@@ -9207,16 +7913,14 @@
else
GTK_CFLAGS=$pkg_cv_GTK_CFLAGS
GTK_LIBS=$pkg_cv_GTK_LIBS
@@ -8531,7 +8779,7 @@ Forwarded: not-needed
CPPFLAGS="$CPPFLAGS $GTK_CFLAGS"
LIBS="$LIBS $GTK_LIBS"
-@@ -9240,18 +7861,14 @@
+@@ -9240,18 +7944,14 @@
cygwin*)
;;
*)
@@ -8553,7 +8801,7 @@ Forwarded: not-needed
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -9269,43 +7886,18 @@
+@@ -9269,43 +7969,18 @@
return 0;
}
_ACEOF
@@ -8603,7 +8851,7 @@ Forwarded: not-needed
have_alsa=yes
else
have_alsa=no
-@@ -9316,18 +7908,18 @@
+@@ -9316,18 +7991,18 @@
fi
pkg_failed=no
@@ -8626,7 +8874,7 @@ Forwarded: not-needed
pkg_cv_JACK_CFLAGS=`$PKG_CONFIG --cflags "jack" 2>/dev/null`
else
pkg_failed=yes
-@@ -9339,11 +7931,11 @@
+@@ -9339,11 +8014,11 @@
pkg_cv_JACK_LIBS="$JACK_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -8641,7 +8889,7 @@ Forwarded: not-needed
pkg_cv_JACK_LIBS=`$PKG_CONFIG --libs "jack" 2>/dev/null`
else
pkg_failed=yes
-@@ -9369,7 +7961,7 @@
+@@ -9369,7 +8044,7 @@
# Put the nasty error message in config.log where it belongs
echo "$JACK_PKG_ERRORS" >&5
@@ -8650,7 +8898,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
have_jack=no
elif test $pkg_failed = untried; then
-@@ -9377,25 +7969,21 @@
+@@ -9377,25 +8052,21 @@
else
JACK_CFLAGS=$pkg_cv_JACK_CFLAGS
JACK_LIBS=$pkg_cv_JACK_LIBS
@@ -8680,7 +8928,7 @@ Forwarded: not-needed
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -9413,43 +8001,18 @@
+@@ -9413,43 +8084,18 @@
return 0;
}
_ACEOF
@@ -8730,7 +8978,7 @@ Forwarded: not-needed
have_asihpi=yes
else
have_asihpi=no
-@@ -9458,18 +8021,14 @@
+@@ -9458,18 +8104,14 @@
if [ $have_asihpi = "yes" ] ; then
LIBS="$LIBS -lhpi"
fi
@@ -8752,7 +9000,7 @@ Forwarded: not-needed
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -9484,145 +8043,30 @@
+@@ -9484,145 +8126,30 @@
{
return clock_gettime ();
;
@@ -8919,7 +9167,7 @@ Forwarded: not-needed
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -9636,9 +8080,7 @@
+@@ -9636,9 +8163,7 @@
if [ "$use_portmixer" = "yes" ] ; then
@@ -8930,7 +9178,7 @@ Forwarded: not-needed
CXXFLAGS="-I\$(top_srcdir)/lib-src/portmixer/include $CXXFLAGS"
-@@ -9649,16 +8091,12 @@
+@@ -9649,16 +8174,12 @@
ac_configure_args="$ac_configure_args --with-pa-include=../portaudio-v19/include"
fi
@@ -8950,7 +9198,7 @@ Forwarded: not-needed
/* end confdefs.h. */
#define _ISOC9X_SOURCE 1
-@@ -9674,54 +8112,27 @@
+@@ -9674,54 +8195,27 @@
return 0;
}
_ACEOF
@@ -9012,7 +9260,7 @@ Forwarded: not-needed
/* end confdefs.h. */
#define _ISOC9X_SOURCE 1
-@@ -9737,41 +8148,18 @@
+@@ -9737,41 +8231,18 @@
return 0;
}
_ACEOF
@@ -9058,7 +9306,7 @@ Forwarded: not-needed
fi
-@@ -9782,9 +8170,7 @@
+@@ -9782,9 +8253,7 @@
OPTOBJS="$OPTOBJS effects/ladspa/LadspaEffect.o"
@@ -9069,7 +9317,7 @@ Forwarded: not-needed
case "$host_os" in
-@@ -9801,9 +8187,7 @@
+@@ -9801,9 +8270,7 @@
OPTOBJS="$OPTOBJS effects/audiounits/AudioUnitEffect.o"
@@ -9080,7 +9328,7 @@ Forwarded: not-needed
fi
-@@ -9812,9 +8196,7 @@
+@@ -9812,9 +8279,7 @@
OPTOBJS="$OPTOBJS import/ImportQTWrapper.o"
@@ -9091,7 +9339,7 @@ Forwarded: not-needed
fi
-@@ -9869,13 +8251,13 @@
+@@ -9869,13 +8334,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -9107,7 +9355,7 @@ Forwarded: not-needed
esac ;;
esac
done
-@@ -9883,8 +8265,8 @@
+@@ -9883,8 +8348,8 @@
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
@@ -9118,7 +9366,7 @@ Forwarded: not-needed
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -9907,11 +8289,11 @@
+@@ -9907,11 +8372,11 @@
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
test "x$cache_file" != "x/dev/null" &&
@@ -9132,7 +9380,7 @@ Forwarded: not-needed
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
-@@ -9925,14 +8307,15 @@
+@@ -9925,14 +8390,15 @@
ac_libobjs=
ac_ltlibobjs=
@@ -9150,7 +9398,7 @@ Forwarded: not-needed
done
LIBOBJS=$ac_libobjs
-@@ -9944,9 +8327,10 @@
+@@ -9944,9 +8410,10 @@
ac_write_fail=0
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -9163,7 +9411,7 @@ Forwarded: not-needed
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -9956,17 +8340,18 @@
+@@ -9956,17 +8423,18 @@
debug=false
ac_cs_recheck=false
ac_cs_silent=false
@@ -9189,7 +9437,7 @@ Forwarded: not-needed
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -9974,23 +8359,15 @@
+@@ -9974,23 +8442,15 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -9218,7 +9466,7 @@ Forwarded: not-needed
as_nl='
'
export as_nl
-@@ -9998,7 +8375,13 @@
+@@ -9998,7 +8458,13 @@
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
@@ -9233,7 +9481,7 @@ Forwarded: not-needed
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -10009,7 +8392,7 @@
+@@ -10009,7 +8475,7 @@
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -9242,7 +9490,7 @@ Forwarded: not-needed
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -10032,13 +8415,6 @@
+@@ -10032,13 +8498,6 @@
}
fi
@@ -9256,7 +9504,7 @@ Forwarded: not-needed
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -10048,15 +8424,15 @@
+@@ -10048,15 +8507,15 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -9275,7 +9523,7 @@ Forwarded: not-needed
IFS=$as_save_IFS
;;
-@@ -10068,12 +8444,16 @@
+@@ -10068,12 +8527,16 @@
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -9296,7 +9544,7 @@ Forwarded: not-needed
done
PS1='$ '
PS2='> '
-@@ -10085,7 +8465,89 @@
+@@ -10085,7 +8548,89 @@
LANGUAGE=C
export LANGUAGE
@@ -9387,7 +9635,7 @@ Forwarded: not-needed
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -10099,8 +8561,12 @@
+@@ -10099,8 +8644,12 @@
as_basename=false
fi
@@ -9401,7 +9649,7 @@ Forwarded: not-needed
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
-@@ -10120,76 +8586,25 @@
+@@ -10120,76 +8669,25 @@
}
s/.*/./; q'`
@@ -9489,7 +9737,7 @@ Forwarded: not-needed
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -10218,8 +8633,56 @@
+@@ -10218,8 +8716,56 @@
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -9547,7 +9795,7 @@ Forwarded: not-needed
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -10238,10 +8701,10 @@
+@@ -10238,10 +8784,10 @@
if test -d "$1"; then
test -d "$1/.";
else
@@ -9560,7 +9808,7 @@ Forwarded: not-needed
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -10256,13 +8719,19 @@
+@@ -10256,13 +8802,19 @@
exec 6>&1
@@ -9582,7 +9830,7 @@ Forwarded: not-needed
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -10293,13 +8762,15 @@
+@@ -10293,13 +8845,15 @@
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
@@ -9601,7 +9849,7 @@ Forwarded: not-needed
-q, --quiet, --silent
do not print progress messages
-d, --debug don't remove temporary files
-@@ -10315,16 +8786,17 @@
+@@ -10315,16 +8869,17 @@
Configuration headers:
$config_headers
@@ -9623,7 +9871,7 @@ Forwarded: not-needed
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-@@ -10340,11 +8812,16 @@
+@@ -10340,11 +8895,16 @@
while test $# != 0
do
case $1 in
@@ -9641,7 +9889,7 @@ Forwarded: not-needed
*)
ac_option=$1
ac_optarg=$2
-@@ -10358,27 +8835,29 @@
+@@ -10358,27 +8918,29 @@
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
$as_echo "$ac_cs_version"; exit ;;
@@ -9676,7 +9924,7 @@ Forwarded: not-needed
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -10386,11 +8865,10 @@
+@@ -10386,11 +8948,10 @@
ac_cs_silent=: ;;
# This is an error.
@@ -9691,7 +9939,7 @@ Forwarded: not-needed
ac_need_defaults=false ;;
esac
-@@ -10445,9 +8923,7 @@
+@@ -10445,9 +9006,7 @@
"lib-src/expat/Makefile") CONFIG_FILES="$CONFIG_FILES lib-src/expat/Makefile" ;;
"tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
@@ -9702,7 +9950,7 @@ Forwarded: not-needed
esac
done
-@@ -10473,7 +8949,7 @@
+@@ -10473,7 +9032,7 @@
trap 'exit_status=$?
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
@@ -9711,7 +9959,7 @@ Forwarded: not-needed
}
# Create a (secure) tmp directory for tmp files.
-@@ -10484,11 +8960,7 @@
+@@ -10484,11 +9043,7 @@
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
@@ -9724,7 +9972,7 @@ Forwarded: not-needed
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
-@@ -10496,7 +8968,13 @@
+@@ -10496,7 +9051,13 @@
if test -n "$CONFIG_FILES"; then
@@ -9739,7 +9987,7 @@ Forwarded: not-needed
ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
ac_cs_awk_cr='\\r'
-@@ -10513,24 +8991,18 @@
+@@ -10513,24 +9074,18 @@
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
@@ -9768,7 +10016,7 @@ Forwarded: not-needed
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -10552,7 +9024,7 @@
+@@ -10552,7 +9107,7 @@
t delim
:nl
h
@@ -9777,7 +10025,7 @@ Forwarded: not-needed
t more1
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
p
-@@ -10566,7 +9038,7 @@
+@@ -10566,7 +9121,7 @@
t nl
:delim
h
@@ -9786,7 +10034,7 @@ Forwarded: not-needed
t more2
s/["\\]/\\&/g; s/^/"/; s/$/"/
p
-@@ -10619,22 +9091,28 @@
+@@ -10619,22 +9174,28 @@
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -9825,7 +10073,7 @@ Forwarded: not-needed
s/^[^=]*=[ ]*$//
}'
fi
-@@ -10662,9 +9140,7 @@
+@@ -10662,9 +9223,7 @@
if test -z "$ac_t"; then
break
elif $ac_last_try; then
@@ -9836,7 +10084,7 @@ Forwarded: not-needed
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -10749,9 +9225,7 @@
+@@ -10749,9 +9308,7 @@
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -9847,7 +10095,7 @@ Forwarded: not-needed
fi # test -n "$CONFIG_HEADERS"
-@@ -10764,9 +9238,7 @@
+@@ -10764,9 +9321,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -9858,7 +10106,7 @@ Forwarded: not-needed
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -10794,12 +9266,10 @@
+@@ -10794,12 +9349,10 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -9873,7 +10121,7 @@ Forwarded: not-needed
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -10810,7 +9280,7 @@
+@@ -10810,7 +9363,7 @@
`' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
@@ -9882,7 +10130,7 @@ Forwarded: not-needed
$as_echo "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
-@@ -10823,9 +9293,7 @@
+@@ -10823,9 +9376,7 @@
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
@@ -9893,7 +10141,7 @@ Forwarded: not-needed
esac
;;
esac
-@@ -10853,47 +9321,7 @@
+@@ -10853,47 +9404,7 @@
q
}
s/.*/./; q'`
@@ -9942,7 +10190,7 @@ Forwarded: not-needed
ac_builddir=.
case "$ac_dir" in
-@@ -10945,7 +9373,6 @@
+@@ -10945,7 +9456,6 @@
# If the template does not know about datarootdir, expand it.
# FIXME: This hack should be removed a few years after 2.60.
ac_datarootdir_hack=; ac_datarootdir_seen=
@@ -9950,7 +10198,7 @@ Forwarded: not-needed
ac_sed_dataroot='
/datarootdir/ {
p
-@@ -10955,12 +9382,11 @@
+@@ -10955,12 +9465,11 @@
/@docdir@/p
/@infodir@/p
/@localedir@/p
@@ -9965,7 +10213,7 @@ Forwarded: not-needed
$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-@@ -10970,7 +9396,7 @@
+@@ -10970,7 +9479,7 @@
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
@@ -9974,7 +10222,7 @@ Forwarded: not-needed
esac
_ACEOF
-@@ -10998,26 +9424,22 @@
+@@ -10998,26 +9507,22 @@
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
@@ -10006,7 +10254,7 @@ Forwarded: not-needed
;;
:H)
#
-@@ -11028,25 +9450,19 @@
+@@ -11028,25 +9533,19 @@
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
@@ -10036,7 +10284,7 @@ Forwarded: not-needed
fi
;;
-@@ -11056,15 +9472,12 @@
+@@ -11056,15 +9555,12 @@
done # for ac_tag
@@ -10054,7 +10302,7 @@ Forwarded: not-needed
# configure is writing to config.log, and then calls config.status.
-@@ -11085,7 +9498,7 @@
+@@ -11085,7 +9581,7 @@
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
@@ -10063,7 +10311,7 @@ Forwarded: not-needed
fi
#
-@@ -11129,7 +9542,7 @@
+@@ -11129,7 +9625,7 @@
case $ac_arg in
*\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
@@ -10072,7 +10320,7 @@ Forwarded: not-needed
esac
done
-@@ -11158,49 +9571,9 @@
+@@ -11158,49 +9654,9 @@
test -d "$srcdir/$ac_dir" || continue
ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)"
@@ -10124,7 +10372,7 @@ Forwarded: not-needed
ac_builddir=.
case "$ac_dir" in
-@@ -11247,7 +9620,7 @@
+@@ -11247,7 +9703,7 @@
# This should be Cygnus configure.
ac_sub_configure=$ac_aux_dir/configure
else
@@ -10133,7 +10381,7 @@ Forwarded: not-needed
$as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
ac_sub_configure=
fi
-@@ -11261,21 +9634,19 @@
+@@ -11261,21 +9717,19 @@
ac_sub_cache_file=$ac_top_build_prefix$cache_file ;;
esac
diff --git a/debian/patches/portsmf-configure.patch b/debian/patches/portsmf-configure.patch
new file mode 100644
index 0000000..c0dbb7d
--- /dev/null
+++ b/debian/patches/portsmf-configure.patch
@@ -0,0 +1,113 @@
+Description: Support using system portSMF.
+Author: Benjamin Drung <bdrung at ubuntu.com>
+Bug: http://bugzilla.audacityteam.org/show_bug.cgi?id=284
+
+--- /dev/null
++++ b/m4/audacity_checklib_portsmf.m4
+@@ -0,0 +1,61 @@
++dnl Add Audacity / portSMF license?
++dnl
++dnl Please increment the serial number below whenever you alter this macro
++dnl for the benefit of automatic macro update systems
++# audacity_checklib_portsmf.m4 serial 1
++
++AC_DEFUN([AUDACITY_CHECKLIB_PORTSMF], [
++
++ AC_ARG_WITH(midi,
++ [AS_HELP_STRING([--with-midi],
++ [use portSMF for Midi support])],
++ PORTSMF_ARGUMENT=$withval,
++ PORTSMF_ARGUMENT="unspecified")
++
++ if false ; then
++ AC_DEFINE(USE_MIDI, 1,
++ [Define if midi support should be enabled])
++ fi
++
++ dnl see if libportsmf is installed on the system
++
++ PKG_CHECK_MODULES(PORTSMF, portSMF,
++ portsmf_available_system="yes",
++ portsmf_available_system="no")
++
++ if test "x$portsmf_available_system" = "xyes" ; then
++ PORTSMF_SYSTEM_AVAILABLE="yes"
++ PORTSMF_SYSTEM_LIBS=$PORTSMF_LIBS
++ PORTSMF_SYSTEM_CXXFLAGS=$PORTSMF_CFLAGS
++ PORTSMF_SYSTEM_CPPSYMBOLS="USE_MIDI"
++ AC_MSG_NOTICE([portSMF library is available as system library])
++ else
++ PORTSMF_SYSTEM_AVAILABLE="no"
++ AC_MSG_NOTICE([portSMF library is NOT available as system library])
++ fi
++
++ dnl we need to configure portSMF if there is a local copy
++ if test -d ${srcdir}/lib-src/portsmf ; then
++ AX_CONFIG_DIR(["${srcdir}/lib-src/portsmf"])
++ fi
++ dnl having done that we get a pkg-config file we can use
++ dnl add the directory with portSMF in to the pkg-config search path
++ PKG_CONFIG_PATH="${srcdir}/lib-src/portsmf/:$PKG_CONFIG_PATH"
++ export PKG_CONFIG_PATH
++ PKG_CHECK_MODULES(PORTSMF, portSMF,
++ portsmf_available="yes",
++ portsmf_available="no")
++
++ if test "x$portsmf_available" = "xyes" ; then
++ PORTSMF_LOCAL_AVAILABLE="yes"
++ PORTSMF_LOCAL_LDFLAGS=$PORTSMF_LIBS
++ PORTSMF_LOCAL_CXXFLAGS=$PORTSMF_CFLAGS
++ PORTSMF_LOCAL_CPPSYMBOLS="USE_MIDI"
++ dnl extra objects we can now compile
++ PORTSMF_LOCAL_OPTOBJS="NoteTrack.o import/ImportMIDI.o"
++ dnl this bit makes sure that we compile the lib-src copy
++ PORTSMF_LOCAL_BUILD="portSMF"
++ else
++ PORTSMF_LOCAL_AVAILABLE="no"
++ fi
++])
+--- a/m4/audacity_checklib_widgetextra.m4
++++ b/m4/audacity_checklib_widgetextra.m4
+@@ -35,42 +35,3 @@
+ dnl otherwise good - got it. Flags will be available for use in
+ dnl WIDGETEXTRA_LIBS and friends
+ ])
+-
+-AC_DEFUN([AUDACITY_CHECKLIB_PORTSMF], [
+-
+- AC_ARG_WITH(midi,
+- [AS_HELP_STRING([--with-midi],
+- [use portSMF for Midi support ])],
+- PORTSMF_ARGUMENT=$withval,
+- PORTSMF_ARGUMENT="unspecified")
+- if false ; then
+- AC_DEFINE(USE_MIDI, 1,
+- [Define if midi support should be enabled])
+- fi
+-
+- dnl we need to configure portSMF if there is a local copy
+- if test -d ${srcdir}/lib-src/portsmf ; then
+- AX_CONFIG_DIR(["${srcdir}/lib-src/portsmf"])
+- fi
+- dnl having done that we get a pkg-config file we can use
+- dnl add the directory with portSMF in to the pkg-config search path
+- PKG_CONFIG_PATH="${srcdir}/lib-src/portsmf/:$PKG_CONFIG_PATH"
+- export PKG_CONFIG_PATH
+- PKG_CHECK_MODULES(PORTSMF, portSMF,
+- portsmf_available="yes",
+- portsmf_available="no")
+-
+- if test "x$portsmf_available" = "xyes" ; then
+- PORTSMF_LOCAL_AVAILABLE="yes"
+- PORTSMF_LOCAL_LDFLAGS=$PORTSMF_LIBS
+- PORTSMF_LOCAL_CXXFLAGS=$PORTSMF_CFLAGS
+- PORTSMF_LOCAL_CPPSYMBOLS="USE_MIDI"
+- dnl extra objects we can now compile
+- PORTSMF_LOCAL_OPTOBJS="NoteTrack.o import/ImportMIDI.o"
+- dnl this bit makes sure that we compile the lib-src copy
+- PORTSMF_LOCAL_BUILD="portSMF"
+- else
+- PORTSMF_LOCAL_AVAILABLE="no"
+- fi
+-])
+-
diff --git a/debian/patches/series b/debian/patches/series
index c0e94d1..2641b32 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,5 @@ open-mixer.patch
fix-ftbfs-with-gcc-4.5.patch
autoreconf.patch
disable-dynamic-loading.patch
+portsmf-configure.patch
configure.patch
--
Audacity debian packaging
More information about the pkg-multimedia-commits
mailing list