[SCM] audacity/master: Add PORTSMF_SYSTEM_OPTOBJS to portsmf-configure.patch.
bdrung at users.alioth.debian.org
bdrung at users.alioth.debian.org
Wed Feb 16 01:12:54 UTC 2011
The following commit has been merged in the master branch:
commit 1abb2b1397cb702b8a18f9c16906a1d8459549c3
Author: Benjamin Drung <bdrung at gmail.com>
Date: Wed Feb 16 02:03:20 2011 +0100
Add PORTSMF_SYSTEM_OPTOBJS to portsmf-configure.patch.
diff --git a/debian/patches/configure.patch b/debian/patches/configure.patch
index a6f194f..b8eafe3 100644
--- a/debian/patches/configure.patch
+++ b/debian/patches/configure.patch
@@ -8134,7 +8134,7 @@ Forwarded: not-needed
$as_echo "$as_me: ffmpeg library is NOT available in the local tree" >&6;}
fi
-@@ -8480,18 +7206,99 @@
+@@ -8480,18 +7206,100 @@
# Check whether --with-midi was given.
@@ -8226,9 +8226,10 @@ Forwarded: not-needed
+ if test "x$portsmf_available_system" = "xyes" ; then
+ PORTSMF_SYSTEM_AVAILABLE="yes"
-+ PORTSMF_SYSTEM_LIBS=$PORTSMF_LIBS
-+ PORTSMF_SYSTEM_CXXFLAGS=$PORTSMF_CFLAGS
++ PORTSMF_SYSTEM_LIBS="$PORTSMF_LIBS"
++ PORTSMF_SYSTEM_CXXFLAGS="$PORTSMF_CFLAGS"
+ PORTSMF_SYSTEM_CPPSYMBOLS="USE_MIDI"
++ PORTSMF_SYSTEM_OPTOBJS="NoteTrack.o import/ImportMIDI.o"
+ { $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
@@ -8238,7 +8239,7 @@ Forwarded: not-needed
fi
if test -d ${srcdir}/lib-src/portsmf ; then
-@@ -8547,49 +7354,9 @@
+@@ -8547,49 +7355,9 @@
fi
ax_popdir=`pwd`
@@ -8290,7 +8291,7 @@ Forwarded: not-needed
ac_builddir=.
case ""${srcdir}/lib-src/portsmf"" in
-@@ -8635,7 +7402,7 @@
+@@ -8635,7 +7403,7 @@
# This should be Cygnus configure.
ax_sub_configure=$ac_aux_dir/configure
else
@@ -8299,7 +8300,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 +7416,7 @@
+@@ -8649,7 +7417,7 @@
ax_sub_cache_file=$ac_top_build_prefix$cache_file ;;
esac
@@ -8308,7 +8309,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 +7424,7 @@
+@@ -8657,7 +7425,7 @@
fi
cd "$ax_popdir"
@@ -8317,7 +8318,7 @@ Forwarded: not-needed
$as_echo "$as_me: Done configuring in \"${srcdir}/lib-src/portsmf\"" >&6;}
fi
-@@ -8665,18 +7432,18 @@
+@@ -8665,18 +7433,18 @@
export PKG_CONFIG_PATH
pkg_failed=no
@@ -8340,7 +8341,7 @@ Forwarded: not-needed
pkg_cv_PORTSMF_CFLAGS=`$PKG_CONFIG --cflags "portSMF" 2>/dev/null`
else
pkg_failed=yes
-@@ -8688,11 +7455,11 @@
+@@ -8688,11 +7456,11 @@
pkg_cv_PORTSMF_LIBS="$PORTSMF_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -8355,7 +8356,7 @@ Forwarded: not-needed
pkg_cv_PORTSMF_LIBS=`$PKG_CONFIG --libs "portSMF" 2>/dev/null`
else
pkg_failed=yes
-@@ -8718,7 +7485,7 @@
+@@ -8718,7 +7486,7 @@
# Put the nasty error message in config.log where it belongs
echo "$PORTSMF_PKG_ERRORS" >&5
@@ -8364,7 +8365,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
portsmf_available="no"
elif test $pkg_failed = untried; then
-@@ -8726,7 +7493,7 @@
+@@ -8726,7 +7494,7 @@
else
PORTSMF_CFLAGS=$pkg_cv_PORTSMF_CFLAGS
PORTSMF_LIBS=$pkg_cv_PORTSMF_LIBS
@@ -8373,7 +8374,7 @@ Forwarded: not-needed
$as_echo "yes" >&6; }
portsmf_available="yes"
fi
-@@ -8736,15 +7503,15 @@
+@@ -8736,15 +7504,15 @@
PORTSMF_LOCAL_LDFLAGS=$PORTSMF_LIBS
PORTSMF_LOCAL_CXXFLAGS=$PORTSMF_CFLAGS
PORTSMF_LOCAL_CPPSYMBOLS="USE_MIDI"
@@ -8393,7 +8394,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 +7528,37 @@
+@@ -8761,43 +7529,37 @@
if test "$AVAILABLE" = "yes" ; then
eval ${lib}_USE_${sys_or_local}="yes"
lib_activated="yes"
@@ -8445,7 +8446,7 @@ Forwarded: not-needed
fi
fi
done
-@@ -8809,39 +7570,33 @@
+@@ -8809,39 +7571,33 @@
# liblrdf
if test "$LIBSNDFILE_USE_LOCAL" != "yes" && test "$LIBSNDFILE_USE_SYSTEM" != "yes" ; then
@@ -8492,7 +8493,7 @@ Forwarded: not-needed
$as_echo "$as_me: Using libsamplerate as requested" >&6;}
fi
fi
-@@ -8892,7 +7647,7 @@
+@@ -8892,7 +7648,7 @@
# Check whether --enable-audiounits was given.
@@ -8501,7 +8502,7 @@ Forwarded: not-needed
enableval=$enable_audiounits; use_audiounits=$enableval
else
use_audiounits="auto"
-@@ -8900,7 +7655,7 @@
+@@ -8900,7 +7656,7 @@
# Check whether --enable-ladspa was given.
@@ -8510,7 +8511,7 @@ Forwarded: not-needed
enableval=$enable_ladspa; use_ladspa=$enableval
else
use_ladspa="yes"
-@@ -8908,7 +7663,7 @@
+@@ -8908,7 +7664,7 @@
# Check whether --enable-quicktime was given.
@@ -8519,7 +8520,7 @@ Forwarded: not-needed
enableval=$enable_quicktime; use_quicktime=$enableval
else
use_quicktime="auto"
-@@ -8918,7 +7673,7 @@
+@@ -8918,7 +7674,7 @@
# Check whether --with-portmixer was given.
@@ -8528,7 +8529,7 @@ Forwarded: not-needed
withval=$with_portmixer; use_portmixer=$withval
else
use_portmixer="yes"
-@@ -8927,35 +7682,27 @@
+@@ -8927,35 +7683,27 @@
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -8571,7 +8572,7 @@ Forwarded: not-needed
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
-@@ -8971,28 +7718,24 @@
+@@ -8971,28 +7719,24 @@
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
@@ -8605,7 +8606,7 @@ Forwarded: not-needed
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
-@@ -9031,14 +7774,10 @@
+@@ -9031,14 +7775,10 @@
CONFIGHEADER="configwin.h"
@@ -8622,7 +8623,7 @@ Forwarded: not-needed
AFTERBUILD=""
-@@ -9050,17 +7789,13 @@
+@@ -9050,17 +7790,13 @@
EXTRAINSTALLTARGETS="$EXTRAINSTALLTARGETS install-extra-data"
EXTRAUNINSTALLTARGETS="$EXTRAUNINSTALLTARGETS uninstall-extra-data"
@@ -8643,7 +8644,7 @@ Forwarded: not-needed
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -9085,79 +7820,50 @@
+@@ -9085,79 +7821,50 @@
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
@@ -8736,7 +8737,7 @@ Forwarded: not-needed
pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0" 2>/dev/null`
else
pkg_failed=yes
-@@ -9169,11 +7875,11 @@
+@@ -9169,11 +7876,11 @@
pkg_cv_GTK_LIBS="$GTK_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -8751,7 +8752,7 @@ Forwarded: not-needed
pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0" 2>/dev/null`
else
pkg_failed=yes
-@@ -9199,7 +7905,7 @@
+@@ -9199,7 +7906,7 @@
# Put the nasty error message in config.log where it belongs
echo "$GTK_PKG_ERRORS" >&5
@@ -8760,7 +8761,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
have_gtk=no
elif test $pkg_failed = untried; then
-@@ -9207,16 +7913,14 @@
+@@ -9207,16 +7914,14 @@
else
GTK_CFLAGS=$pkg_cv_GTK_CFLAGS
GTK_LIBS=$pkg_cv_GTK_LIBS
@@ -8779,7 +8780,7 @@ Forwarded: not-needed
CPPFLAGS="$CPPFLAGS $GTK_CFLAGS"
LIBS="$LIBS $GTK_LIBS"
-@@ -9240,18 +7944,14 @@
+@@ -9240,18 +7945,14 @@
cygwin*)
;;
*)
@@ -8801,7 +8802,7 @@ Forwarded: not-needed
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -9269,43 +7969,18 @@
+@@ -9269,43 +7970,18 @@
return 0;
}
_ACEOF
@@ -8851,7 +8852,7 @@ Forwarded: not-needed
have_alsa=yes
else
have_alsa=no
-@@ -9316,18 +7991,18 @@
+@@ -9316,18 +7992,18 @@
fi
pkg_failed=no
@@ -8874,7 +8875,7 @@ Forwarded: not-needed
pkg_cv_JACK_CFLAGS=`$PKG_CONFIG --cflags "jack" 2>/dev/null`
else
pkg_failed=yes
-@@ -9339,11 +8014,11 @@
+@@ -9339,11 +8015,11 @@
pkg_cv_JACK_LIBS="$JACK_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -8889,7 +8890,7 @@ Forwarded: not-needed
pkg_cv_JACK_LIBS=`$PKG_CONFIG --libs "jack" 2>/dev/null`
else
pkg_failed=yes
-@@ -9369,7 +8044,7 @@
+@@ -9369,7 +8045,7 @@
# Put the nasty error message in config.log where it belongs
echo "$JACK_PKG_ERRORS" >&5
@@ -8898,7 +8899,7 @@ Forwarded: not-needed
$as_echo "no" >&6; }
have_jack=no
elif test $pkg_failed = untried; then
-@@ -9377,25 +8052,21 @@
+@@ -9377,25 +8053,21 @@
else
JACK_CFLAGS=$pkg_cv_JACK_CFLAGS
JACK_LIBS=$pkg_cv_JACK_LIBS
@@ -8928,7 +8929,7 @@ Forwarded: not-needed
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -9413,43 +8084,18 @@
+@@ -9413,43 +8085,18 @@
return 0;
}
_ACEOF
@@ -8978,7 +8979,7 @@ Forwarded: not-needed
have_asihpi=yes
else
have_asihpi=no
-@@ -9458,18 +8104,14 @@
+@@ -9458,18 +8105,14 @@
if [ $have_asihpi = "yes" ] ; then
LIBS="$LIBS -lhpi"
fi
@@ -9000,7 +9001,7 @@ Forwarded: not-needed
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -9484,145 +8126,30 @@
+@@ -9484,145 +8127,30 @@
{
return clock_gettime ();
;
@@ -9167,7 +9168,7 @@ Forwarded: not-needed
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -9636,9 +8163,7 @@
+@@ -9636,9 +8164,7 @@
if [ "$use_portmixer" = "yes" ] ; then
@@ -9178,7 +9179,7 @@ Forwarded: not-needed
CXXFLAGS="-I\$(top_srcdir)/lib-src/portmixer/include $CXXFLAGS"
-@@ -9649,16 +8174,12 @@
+@@ -9649,16 +8175,12 @@
ac_configure_args="$ac_configure_args --with-pa-include=../portaudio-v19/include"
fi
@@ -9198,7 +9199,7 @@ Forwarded: not-needed
/* end confdefs.h. */
#define _ISOC9X_SOURCE 1
-@@ -9674,54 +8195,27 @@
+@@ -9674,54 +8196,27 @@
return 0;
}
_ACEOF
@@ -9260,7 +9261,7 @@ Forwarded: not-needed
/* end confdefs.h. */
#define _ISOC9X_SOURCE 1
-@@ -9737,41 +8231,18 @@
+@@ -9737,41 +8232,18 @@
return 0;
}
_ACEOF
@@ -9306,7 +9307,7 @@ Forwarded: not-needed
fi
-@@ -9782,9 +8253,7 @@
+@@ -9782,9 +8254,7 @@
OPTOBJS="$OPTOBJS effects/ladspa/LadspaEffect.o"
@@ -9317,7 +9318,7 @@ Forwarded: not-needed
case "$host_os" in
-@@ -9801,9 +8270,7 @@
+@@ -9801,9 +8271,7 @@
OPTOBJS="$OPTOBJS effects/audiounits/AudioUnitEffect.o"
@@ -9328,7 +9329,7 @@ Forwarded: not-needed
fi
-@@ -9812,9 +8279,7 @@
+@@ -9812,9 +8280,7 @@
OPTOBJS="$OPTOBJS import/ImportQTWrapper.o"
@@ -9339,7 +9340,7 @@ Forwarded: not-needed
fi
-@@ -9869,13 +8334,13 @@
+@@ -9869,13 +8335,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -9355,7 +9356,7 @@ Forwarded: not-needed
esac ;;
esac
done
-@@ -9883,8 +8348,8 @@
+@@ -9883,8 +8349,8 @@
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
@@ -9366,7 +9367,7 @@ Forwarded: not-needed
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -9907,11 +8372,11 @@
+@@ -9907,11 +8373,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" &&
@@ -9380,7 +9381,7 @@ Forwarded: not-needed
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
-@@ -9925,14 +8390,15 @@
+@@ -9925,14 +8391,15 @@
ac_libobjs=
ac_ltlibobjs=
@@ -9398,7 +9399,7 @@ Forwarded: not-needed
done
LIBOBJS=$ac_libobjs
-@@ -9944,9 +8410,10 @@
+@@ -9944,9 +8411,10 @@
ac_write_fail=0
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -9411,7 +9412,7 @@ Forwarded: not-needed
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -9956,17 +8423,18 @@
+@@ -9956,17 +8424,18 @@
debug=false
ac_cs_recheck=false
ac_cs_silent=false
@@ -9437,7 +9438,7 @@ Forwarded: not-needed
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -9974,23 +8442,15 @@
+@@ -9974,23 +8443,15 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -9466,7 +9467,7 @@ Forwarded: not-needed
as_nl='
'
export as_nl
-@@ -9998,7 +8458,13 @@
+@@ -9998,7 +8459,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
@@ -9481,7 +9482,7 @@ Forwarded: not-needed
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -10009,7 +8475,7 @@
+@@ -10009,7 +8476,7 @@
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -9490,7 +9491,7 @@ Forwarded: not-needed
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -10032,13 +8498,6 @@
+@@ -10032,13 +8499,6 @@
}
fi
@@ -9504,7 +9505,7 @@ Forwarded: not-needed
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -10048,15 +8507,15 @@
+@@ -10048,15 +8508,15 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -9523,7 +9524,7 @@ Forwarded: not-needed
IFS=$as_save_IFS
;;
-@@ -10068,12 +8527,16 @@
+@@ -10068,12 +8528,16 @@
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -9544,7 +9545,7 @@ Forwarded: not-needed
done
PS1='$ '
PS2='> '
-@@ -10085,7 +8548,89 @@
+@@ -10085,7 +8549,89 @@
LANGUAGE=C
export LANGUAGE
@@ -9635,7 +9636,7 @@ Forwarded: not-needed
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -10099,8 +8644,12 @@
+@@ -10099,8 +8645,12 @@
as_basename=false
fi
@@ -9649,7 +9650,7 @@ Forwarded: not-needed
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
-@@ -10120,76 +8669,25 @@
+@@ -10120,76 +8670,25 @@
}
s/.*/./; q'`
@@ -9737,7 +9738,7 @@ Forwarded: not-needed
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -10218,8 +8716,56 @@
+@@ -10218,8 +8717,56 @@
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -9795,7 +9796,7 @@ Forwarded: not-needed
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -10238,10 +8784,10 @@
+@@ -10238,10 +8785,10 @@
if test -d "$1"; then
test -d "$1/.";
else
@@ -9808,7 +9809,7 @@ Forwarded: not-needed
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -10256,13 +8802,19 @@
+@@ -10256,13 +8803,19 @@
exec 6>&1
@@ -9830,7 +9831,7 @@ Forwarded: not-needed
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -10293,13 +8845,15 @@
+@@ -10293,13 +8846,15 @@
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
@@ -9849,7 +9850,7 @@ Forwarded: not-needed
-q, --quiet, --silent
do not print progress messages
-d, --debug don't remove temporary files
-@@ -10315,16 +8869,17 @@
+@@ -10315,16 +8870,17 @@
Configuration headers:
$config_headers
@@ -9871,7 +9872,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 +8895,16 @@
+@@ -10340,11 +8896,16 @@
while test $# != 0
do
case $1 in
@@ -9889,7 +9890,7 @@ Forwarded: not-needed
*)
ac_option=$1
ac_optarg=$2
-@@ -10358,27 +8918,29 @@
+@@ -10358,27 +8919,29 @@
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
$as_echo "$ac_cs_version"; exit ;;
@@ -9924,7 +9925,7 @@ Forwarded: not-needed
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -10386,11 +8948,10 @@
+@@ -10386,11 +8949,10 @@
ac_cs_silent=: ;;
# This is an error.
@@ -9939,7 +9940,7 @@ Forwarded: not-needed
ac_need_defaults=false ;;
esac
-@@ -10445,9 +9006,7 @@
+@@ -10445,9 +9007,7 @@
"lib-src/expat/Makefile") CONFIG_FILES="$CONFIG_FILES lib-src/expat/Makefile" ;;
"tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
@@ -9950,7 +9951,7 @@ Forwarded: not-needed
esac
done
-@@ -10473,7 +9032,7 @@
+@@ -10473,7 +9033,7 @@
trap 'exit_status=$?
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
@@ -9959,7 +9960,7 @@ Forwarded: not-needed
}
# Create a (secure) tmp directory for tmp files.
-@@ -10484,11 +9043,7 @@
+@@ -10484,11 +9044,7 @@
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
@@ -9972,7 +9973,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 +9051,13 @@
+@@ -10496,7 +9052,13 @@
if test -n "$CONFIG_FILES"; then
@@ -9987,7 +9988,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 +9074,18 @@
+@@ -10513,24 +9075,18 @@
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
@@ -10016,7 +10017,7 @@ Forwarded: not-needed
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -10552,7 +9107,7 @@
+@@ -10552,7 +9108,7 @@
t delim
:nl
h
@@ -10025,7 +10026,7 @@ Forwarded: not-needed
t more1
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
p
-@@ -10566,7 +9121,7 @@
+@@ -10566,7 +9122,7 @@
t nl
:delim
h
@@ -10034,7 +10035,7 @@ Forwarded: not-needed
t more2
s/["\\]/\\&/g; s/^/"/; s/$/"/
p
-@@ -10619,22 +9174,28 @@
+@@ -10619,22 +9175,28 @@
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -10073,7 +10074,7 @@ Forwarded: not-needed
s/^[^=]*=[ ]*$//
}'
fi
-@@ -10662,9 +9223,7 @@
+@@ -10662,9 +9224,7 @@
if test -z "$ac_t"; then
break
elif $ac_last_try; then
@@ -10084,7 +10085,7 @@ Forwarded: not-needed
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -10749,9 +9308,7 @@
+@@ -10749,9 +9309,7 @@
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -10095,7 +10096,7 @@ Forwarded: not-needed
fi # test -n "$CONFIG_HEADERS"
-@@ -10764,9 +9321,7 @@
+@@ -10764,9 +9322,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -10106,7 +10107,7 @@ Forwarded: not-needed
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -10794,12 +9349,10 @@
+@@ -10794,12 +9350,10 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -10121,7 +10122,7 @@ Forwarded: not-needed
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -10810,7 +9363,7 @@
+@@ -10810,7 +9364,7 @@
`' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
@@ -10130,7 +10131,7 @@ Forwarded: not-needed
$as_echo "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
-@@ -10823,9 +9376,7 @@
+@@ -10823,9 +9377,7 @@
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
@@ -10141,7 +10142,7 @@ Forwarded: not-needed
esac
;;
esac
-@@ -10853,47 +9404,7 @@
+@@ -10853,47 +9405,7 @@
q
}
s/.*/./; q'`
@@ -10190,7 +10191,7 @@ Forwarded: not-needed
ac_builddir=.
case "$ac_dir" in
-@@ -10945,7 +9456,6 @@
+@@ -10945,7 +9457,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=
@@ -10198,7 +10199,7 @@ Forwarded: not-needed
ac_sed_dataroot='
/datarootdir/ {
p
-@@ -10955,12 +9465,11 @@
+@@ -10955,12 +9466,11 @@
/@docdir@/p
/@infodir@/p
/@localedir@/p
@@ -10213,7 +10214,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 +9479,7 @@
+@@ -10970,7 +9480,7 @@
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
@@ -10222,7 +10223,7 @@ Forwarded: not-needed
esac
_ACEOF
-@@ -10998,26 +9507,22 @@
+@@ -10998,26 +9508,22 @@
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
@@ -10254,7 +10255,7 @@ Forwarded: not-needed
;;
:H)
#
-@@ -11028,25 +9533,19 @@
+@@ -11028,25 +9534,19 @@
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
@@ -10284,7 +10285,7 @@ Forwarded: not-needed
fi
;;
-@@ -11056,15 +9555,12 @@
+@@ -11056,15 +9556,12 @@
done # for ac_tag
@@ -10302,7 +10303,7 @@ Forwarded: not-needed
# configure is writing to config.log, and then calls config.status.
-@@ -11085,7 +9581,7 @@
+@@ -11085,7 +9582,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.
@@ -10311,7 +10312,7 @@ Forwarded: not-needed
fi
#
-@@ -11129,7 +9625,7 @@
+@@ -11129,7 +9626,7 @@
case $ac_arg in
*\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
@@ -10320,7 +10321,7 @@ Forwarded: not-needed
esac
done
-@@ -11158,49 +9654,9 @@
+@@ -11158,49 +9655,9 @@
test -d "$srcdir/$ac_dir" || continue
ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)"
@@ -10372,7 +10373,7 @@ Forwarded: not-needed
ac_builddir=.
case "$ac_dir" in
-@@ -11247,7 +9703,7 @@
+@@ -11247,7 +9704,7 @@
# This should be Cygnus configure.
ac_sub_configure=$ac_aux_dir/configure
else
@@ -10381,7 +10382,7 @@ Forwarded: not-needed
$as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
ac_sub_configure=
fi
-@@ -11261,21 +9717,19 @@
+@@ -11261,21 +9718,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
index c0dbb7d..0dc2564 100644
--- a/debian/patches/portsmf-configure.patch
+++ b/debian/patches/portsmf-configure.patch
@@ -4,7 +4,7 @@ Bug: http://bugzilla.audacityteam.org/show_bug.cgi?id=284
--- /dev/null
+++ b/m4/audacity_checklib_portsmf.m4
-@@ -0,0 +1,61 @@
+@@ -0,0 +1,63 @@
+dnl Add Audacity / portSMF license?
+dnl
+dnl Please increment the serial number below whenever you alter this macro
@@ -32,9 +32,11 @@ Bug: http://bugzilla.audacityteam.org/show_bug.cgi?id=284
+
+ if test "x$portsmf_available_system" = "xyes" ; then
+ PORTSMF_SYSTEM_AVAILABLE="yes"
-+ PORTSMF_SYSTEM_LIBS=$PORTSMF_LIBS
-+ PORTSMF_SYSTEM_CXXFLAGS=$PORTSMF_CFLAGS
++ PORTSMF_SYSTEM_LIBS="$PORTSMF_LIBS"
++ PORTSMF_SYSTEM_CXXFLAGS="$PORTSMF_CFLAGS"
+ PORTSMF_SYSTEM_CPPSYMBOLS="USE_MIDI"
++ dnl extra objects we can now compile
++ PORTSMF_SYSTEM_OPTOBJS="NoteTrack.o import/ImportMIDI.o"
+ AC_MSG_NOTICE([portSMF library is available as system library])
+ else
+ PORTSMF_SYSTEM_AVAILABLE="no"
--
Audacity debian packaging
More information about the pkg-multimedia-commits
mailing list