* [PR PATCH] audacity: simplify cross-build patch
@ 2020-12-30 2:01 ndowens
2020-12-30 2:03 ` [PR PATCH] [Updated] " ndowens
` (9 more replies)
0 siblings, 10 replies; 11+ messages in thread
From: ndowens @ 2020-12-30 2:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 426 bytes --]
There is a new pull request by ndowens against master on the void-packages repository
https://github.com/ndowens/void-packages audacity
https://github.com/void-linux/void-packages/pull/27548
audacity: simplify cross-build patch
@sgn Since you taught me slightly on how to fix autotool cross-builds, wondering what you think of this?
A patch file from https://github.com/void-linux/void-packages/pull/27548.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-audacity-27548.patch --]
[-- Type: text/x-diff, Size: 45217 bytes --]
From 32c3d54fcd5b0a15fe0ebd6c6295c97ee9c3422c Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Tue, 29 Dec 2020 19:57:38 -0600
Subject: [PATCH] audacity: simplify cross-build patch
---
.../patches/0001-fix-cross-build.patch | 336 ++++++++
srcpkgs/audacity/patches/configure.patch | 756 ------------------
srcpkgs/audacity/template | 6 +-
3 files changed, 341 insertions(+), 757 deletions(-)
create mode 100644 srcpkgs/audacity/patches/0001-fix-cross-build.patch
delete mode 100644 srcpkgs/audacity/patches/configure.patch
diff --git a/srcpkgs/audacity/patches/0001-fix-cross-build.patch b/srcpkgs/audacity/patches/0001-fix-cross-build.patch
new file mode 100644
index 00000000000..63a55c73971
--- /dev/null
+++ b/srcpkgs/audacity/patches/0001-fix-cross-build.patch
@@ -0,0 +1,336 @@
+From 5f1ac685992183d71097669b1956b2af06ad6ed0 Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Tue, 29 Dec 2020 19:44:34 -0600
+Subject: [PATCH] fix cross build
+
+Replace AC_CHECK_FILES as it is not cross-friendly
+---
+diff --git configure.ac configure.ac
+index d8a7cf1..31c1245 100644
+--- configure.ac
++++ configure.ac
+@@ -214,7 +214,7 @@ if test x$enable_sse = xyes; then
+ AX_CHECK_COMPILER_FLAGS(-msse, [SBSMS_CFLAGS="$SBSMS_CFLAGS -msse"],[AC_MSG_ERROR([Need a version of gcc with -msse])])
+ fi
+
+- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <xmmintrin.h>]], [[__m128 v,w; float p[8]; v = _mm_loadu_ps(p); _mm_storeu_ps(p,v); w = _mm_loadl_pi(w,(const __m64*)p); w = _mm_loadh_pi(w,(const __m64*)p); _mm_storel_pi((__m64 *)p, w); _mm_storeh_pi((__m64 *)p, w); v = _mm_add_ps(v,w); v = _mm_sub_ps(v,w); v = _mm_mul_ps(v,w); v = _mm_shuffle_ps(v,w,_MM_SHUFFLE(0,1,2,3)); w = _mm_set1_ps(0.0f);]])], [sse_ok=yes], [sse_ok=no])
++ AC_TRY_COMPILE([AC_LANG_PROGRAM([[#include <xmmintrin.h>]], [[__m128 v,w; float p[8]; v = _mm_loadu_ps(p); _mm_storeu_ps(p,v); w = _mm_loadl_pi(w,(const __m64*)p); w = _mm_loadh_pi(w,(const __m64*)p); _mm_storel_pi((__m64 *)p, w); _mm_storeh_pi((__m64 *)p, w); v = _mm_add_ps(v,w); v = _mm_sub_ps(v,w); v = _mm_mul_ps(v,w); v = _mm_shuffle_ps(v,w,_MM_SHUFFLE(0,1,2,3)); w = _mm_set1_ps(0.0f);]])], [sse_ok=yes], [sse_ok=no])
+
+ if test x$sse_ok = xyes; then
+ AC_DEFINE(ENABLE_SSE,1,[Define to enable sse])
+diff --git m4/audacity_checklib_ffmpeg.m4 m4/audacity_checklib_ffmpeg.m4
+index b98110f..d4754aa 100644
+--- m4/audacity_checklib_ffmpeg.m4
++++ m4/audacity_checklib_ffmpeg.m4
+@@ -35,13 +35,9 @@ AC_DEFUN([AUDACITY_CHECKLIB_FFMPEG], [
+
+ dnl see if ffmpeg is available locally, or rather that we have some headers
+ dnl in lib-src/ffmpeg/ we can use.
+- AC_CHECK_FILE(${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h,
+- avcodec_h_found="yes",
+- avcodec_h_found="no")
++ AS_IF([test -f ${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h], [avcodec_h_found=yes])
+
+- AC_CHECK_FILE(${srcdir}/lib-src/ffmpeg/libavformat/avformat.h,
+- avformat_h_found="yes",
+- avformat_h_found="no")
++ AS_IF([test -f ${srcdir}/lib-src/ffmpeg/libavformat/avformat.h], [avformat_h_found=yes])
+
+ if test "$avcodec_h_found" = "yes" -a "$avformat_h_found" = "yes"; then
+ FFMPEG_LOCAL_AVAILABLE="yes"
+diff --git m4/audacity_checklib_lame.m4 m4/audacity_checklib_lame.m4
+index 28ecd77..5794143 100644
+--- m4/audacity_checklib_lame.m4
++++ m4/audacity_checklib_lame.m4
+@@ -33,9 +33,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LAME], [
+
+ dnl see if LAME is available in the source dir
+
+- AC_CHECK_FILE(${srcdir}/lib-src/lame/lame/lame.h,
+- LAME_LOCAL_AVAILABLE="yes",
+- LAME_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/lame/lame/lame.h], [LAME_LOCAL_AVAILABLE=yes])
+
+ if test "$LAME_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([LAME headers are available in this source tree.])
+diff --git m4/audacity_checklib_libexpat.m4 m4/audacity_checklib_libexpat.m4
+index c0c88db..ffe76ac 100644
+--- m4/audacity_checklib_libexpat.m4
++++ m4/audacity_checklib_libexpat.m4
+@@ -42,9 +42,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_EXPAT], [
+
+ dnl see if expat is available in the local tree
+
+- AC_CHECK_FILE(${srcdir}/lib-src/expat/lib/expat.h,
+- EXPAT_LOCAL_AVAILABLE="yes",
+- EXPAT_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/expat/lib/expat.h], [EXPAT_LOCAL_AVAILABLE=yes])
+
+ if test "$EXPAT_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([Expat libraries are available in the local tree])
+diff --git m4/audacity_checklib_libflac.m4 m4/audacity_checklib_libflac.m4
+index 1002986..6096791 100644
+--- m4/audacity_checklib_libflac.m4
++++ m4/audacity_checklib_libflac.m4
+@@ -38,13 +38,9 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBFLAC], [
+
+ dnl see if FLAC is available in the source dir
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libflac/include/FLAC/format.h,
+- flac_h_available="yes",
+- flac_h_available="no")
++ AS_IF([test -f ${srcdir}/lib-src/libflac/include/FLAC/format.h], [flac_h_available=yes])
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libflac/include/FLAC++/decoder.h,
+- flacpp_h_available="yes",
+- flacpp_h_available="no")
++ AS_IF([test -f ${srcdir}/lib-src/libflac/include/FLAC++/decoder.h], [flacpp_h_available=yes])
+
+ if test "$flac_h_available" = "yes" -a "$flacpp_h_available" = "yes"; then
+ LIBFLAC_LOCAL_AVAILABLE="yes"
+diff --git m4/audacity_checklib_libid3tag.m4 m4/audacity_checklib_libid3tag.m4
+index b69c2cb..59e94cc 100644
+--- m4/audacity_checklib_libid3tag.m4
++++ m4/audacity_checklib_libid3tag.m4
+@@ -25,9 +25,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBID3TAG], [
+
+ dnl see if libid3tag is available in the local tree
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libid3tag/frame.h,
+- LIBID3TAG_LOCAL_AVAILABLE="yes",
+- LIBID3TAG_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/libid3tag/frame.h], [LIBID3TAG_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBID3TAG_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([libid3tag libraries are available in the local tree])
+diff --git m4/audacity_checklib_libmad.m4 m4/audacity_checklib_libmad.m4
+index 0c2d02a..d53c459 100644
+--- m4/audacity_checklib_libmad.m4
++++ m4/audacity_checklib_libmad.m4
+@@ -34,9 +34,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBMAD], [
+
+ dnl see if libmad is available in the local tree
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libmad/frame.h,
+- LIBMAD_LOCAL_AVAILABLE="yes",
+- LIBMAD_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/libmad/frame.h], [LIBMAD_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBMAD_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([libmad libraries are available in the local tree])
+diff --git m4/audacity_checklib_libnyquist.m4 m4/audacity_checklib_libnyquist.m4
+index 3f1c98f..b4af690 100644
+--- m4/audacity_checklib_libnyquist.m4
++++ m4/audacity_checklib_libnyquist.m4
+@@ -17,9 +17,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBNYQUIST], [
+
+ dnl see if Nyquist is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libnyquist/nyx.h,
+- LIBNYQUIST_LOCAL_AVAILABLE="yes",
+- LIBNYQUIST_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/libnyquist/nyx.h], [LIBNYQUIST_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBNYQUIST_LOCAL_AVAILABLE" = "yes" ; then
+ AC_MSG_NOTICE([nyquist libraries are available in the local tree])
+diff --git m4/audacity_checklib_libsbsms.m4 m4/audacity_checklib_libsbsms.m4
+index c2f80dd..a0ec94b 100644
+--- m4/audacity_checklib_libsbsms.m4
++++ m4/audacity_checklib_libsbsms.m4
+@@ -25,9 +25,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSBSMS], [
+
+ dnl see if libsbsms is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/sbsms/include/sbsms.h,
+- LIBSBSMS_LOCAL_AVAILABLE="yes",
+- LIBSBSMS_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/sbsms/include/sbsms.h], [LIBSBSMS_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBSBSMS_LOCAL_AVAILABLE" = "yes"; then
+ dnl do not build programs we don't need
+diff --git m4/audacity_checklib_libsndfile.m4 m4/audacity_checklib_libsndfile.m4
+index d49e149..e501899 100644
+--- m4/audacity_checklib_libsndfile.m4
++++ m4/audacity_checklib_libsndfile.m4
+@@ -25,9 +25,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSNDFILE], [
+
+ dnl see if libsndfile is available in the local tree
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libsndfile/src/sndfile.h.in,
+- LIBSNDFILE_LOCAL_AVAILABLE="yes",
+- LIBSNDFILE_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/libsndfile/src/sndfile.h.in], [LIBSNDFILE_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBSNDFILE_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([libsndfile libraries are available in this source tree])
+diff --git m4/audacity_checklib_libsoundtouch.m4 m4/audacity_checklib_libsoundtouch.m4
+index 0b8aa69..d8d9f58 100644
+--- m4/audacity_checklib_libsoundtouch.m4
++++ m4/audacity_checklib_libsoundtouch.m4
+@@ -40,9 +40,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSOUNDTOUCH], [
+
+ dnl see if libsoundtouch is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/soundtouch/include/SoundTouch.h,
+- LIBSOUNDTOUCH_LOCAL_AVAILABLE="yes",
+- LIBSOUNDTOUCH_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/soundtouch/include/SoundTouch.h], [LIBSOUNDTOUCH_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBSOUNDTOUCH_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([libsoundtouch libraries are available in the local tree])
+diff --git m4/audacity_checklib_libsoxr.m4 m4/audacity_checklib_libsoxr.m4
+index a331e9b..1a0702b 100644
+--- m4/audacity_checklib_libsoxr.m4
++++ m4/audacity_checklib_libsoxr.m4
+@@ -25,9 +25,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSOXR], [
+
+ dnl see if libsoxr is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libsoxr/src/soxr.h,
+- LIBSOXR_LOCAL_AVAILABLE="yes",
+- LIBSOXR_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/libsoxr/src/soxr.h], [LIBSOXR_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBSOXR_LOCAL_AVAILABLE" = "yes"; then
+ # Breaks other other libraries in Audacity tree; but why is ./configure
+diff --git m4/audacity_checklib_libtwolame.m4 m4/audacity_checklib_libtwolame.m4
+index 2d28b07..fc2a2bf 100644
+--- m4/audacity_checklib_libtwolame.m4
++++ m4/audacity_checklib_libtwolame.m4
+@@ -25,9 +25,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBTWOLAME], [
+
+ dnl see if libtwolame is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/twolame/libtwolame/twolame.h,
+- LIBTWOLAME_LOCAL_AVAILABLE="yes",
+- LIBTWOLAME_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/twolame/libtwolame/twolame.h], [LIBTWOLAME_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBTWOLAME_LOCAL_AVAILABLE" = "yes"; then
+ dnl disable programs we don't need to build
+diff --git m4/audacity_checklib_libvamp.m4 m4/audacity_checklib_libvamp.m4
+index 8a1e0e1..57dc5eb 100644
+--- m4/audacity_checklib_libvamp.m4
++++ m4/audacity_checklib_libvamp.m4
+@@ -25,9 +25,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBVAMP], [
+
+ dnl see if Vamp is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h,
+- LIBVAMP_LOCAL_AVAILABLE="yes",
+- LIBVAMP_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h], [LIBVAMP_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBVAMP_LOCAL_AVAILABLE" = "yes"; then
+ LIBVAMP_LOCAL_CONFIGURE_ARGS="--disable-programs"
+diff --git m4/audacity_checklib_libvorbis.m4 m4/audacity_checklib_libvorbis.m4
+index 0839fa9..3d8b70d 100644
+--- m4/audacity_checklib_libvorbis.m4
++++ m4/audacity_checklib_libvorbis.m4
+@@ -30,13 +30,9 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBVORBIS], [
+
+ dnl see if Vorbis is available in the source dir
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h,
+- vorbisenc_h_available="yes",
+- vorbisenc_h_available="no")
++ AS_IF([test -f ${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h], [vorbisenc_h_available=yes])
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libogg/include/ogg/ogg.h,
+- ogg_h_available="yes",
+- ogg_h_available="no")
++ AS_IF([test -f ${srcdir}/lib-src/libogg/include/ogg/ogg.h], [ogg_h_available=yes])
+
+ if test "$vorbisenc_h_available" = "yes" -a "$ogg_h_available" = "yes"; then
+ LIBVORBIS_LOCAL_AVAILABLE="yes"
+diff --git m4/audacity_checklib_lv2.m4 m4/audacity_checklib_lv2.m4
+index 78a279a..164aa6d 100644
+--- m4/audacity_checklib_lv2.m4
++++ m4/audacity_checklib_lv2.m4
+@@ -23,9 +23,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LV2], [
+
+ dnl see if LV2 is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/lv2/configure,
+- LV2_LOCAL_AVAILABLE="yes",
+- LV2_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/lv2/configure], [LV2_LOCAL_AVAILABLE=yes])
+
+ if test "$LV2_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([LV2 libraries are available in the local tree])
+diff --git m4/audacity_checklib_portaudio.m4 m4/audacity_checklib_portaudio.m4
+index 9b7674e..03d62b8 100644
+--- m4/audacity_checklib_portaudio.m4
++++ m4/audacity_checklib_portaudio.m4
+@@ -31,9 +31,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_PORTAUDIO], [
+
+ dnl see if portaudio is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/portaudio-v19/include/portaudio.h,
+- PORTAUDIO_LOCAL_AVAILABLE="yes",
+- PORTAUDIO_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/portaudio-v19/include/portaudio.h], [PORTAUDIO_LOCAL_AVAILABLE=yes])
+
+ if test "$PORTAUDIO_LOCAL_AVAILABLE" = "yes"; then
+ dnl We need to override the pkg-config check for portmixer by passing
+diff --git m4/audacity_checklib_portmidi.m4 m4/audacity_checklib_portmidi.m4
+index 4e63b1b..6db1dc6 100644
+--- m4/audacity_checklib_portmidi.m4
++++ m4/audacity_checklib_portmidi.m4
+@@ -21,9 +21,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_PORTMIDI], [
+ AC_MSG_NOTICE([portmidi library is NOT available as system library])
+ fi
+
+- AC_CHECK_FILE(${srcdir}/lib-src/portmidi/pm_common/portmidi.h,
+- PORTMIDI_LOCAL_AVAILABLE="yes",
+- PORTMIDI_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/portmidi/pm_common/portmidi.h], [PORTMIDI_LOCAL_AVAILABLE=yes])
+
+ if test "$PORTMIDI_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([portmidi library is available in the local tree])
+diff --git m4/audacity_checklib_portsmf.m4 m4/audacity_checklib_portsmf.m4
+index 9c336d8..3a31ef5 100644
+--- m4/audacity_checklib_portsmf.m4
++++ m4/audacity_checklib_portsmf.m4
+@@ -24,9 +24,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_PORTSMF], [
+ AC_MSG_NOTICE([portSMF library is NOT available as system library])
+ fi
+
+- AC_CHECK_FILE(${srcdir}/lib-src/portsmf/allegro.h,
+- PORTSMF_LOCAL_AVAILABLE="yes",
+- PORTSMF_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/portsmf/allegro.h], [PORTSMF_LOCAL_AVAILABLE=yes])
+
+ if test "$PORTSMF_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([portSMF library is available in the local tree])
+diff --git m4/audacity_checklib_widgetextra.m4 m4/audacity_checklib_widgetextra.m4
+index 4ef0f97..f857723 100644
+--- m4/audacity_checklib_widgetextra.m4
++++ m4/audacity_checklib_widgetextra.m4
+@@ -28,9 +28,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_WIDGETEXTRA], [
+
+ dnl see if libwidgetextra is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h,
+- WIDGETEXTRA_LOCAL_AVAILABLE="yes",
+- WIDGETEXTRA_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h], [WIDGETEXTRA_LOCAL_AVAILABLE=yes])
+
+ if test "$WIDGETEXTRA_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([libwidgetextra library is available in the local tree])
+--
+2.30.0
+
+diff --git configure.ac configure.ac
+index 31c1245..166a77e 100644
+--- configure.ac
++++ configure.ac
+@@ -63,7 +63,7 @@ AC_PROG_CXXCPP
+ AM_PROG_AR
+
+ LT_INIT([disable-shared])
+-
++m4_pattern_allow([^AC_LANG])
+ AC_PROG_INSTALL
+ dnl pkg-config is required for lots of things
+ AC_CHECK_PROG(HAVE_PKG_CONFIG, pkg-config, yes, no)
diff --git a/srcpkgs/audacity/patches/configure.patch b/srcpkgs/audacity/patches/configure.patch
deleted file mode 100644
index 3b9c576c3f2..00000000000
--- a/srcpkgs/audacity/patches/configure.patch
+++ /dev/null
@@ -1,756 +0,0 @@
-configure uses AC_CHECK_FILE to test for file existence which is
-cross incompatible. Changed it to simple if/else statements.
-
---- configure.orig 2017-10-26 19:44:39.000000000 +0200
-+++ configure 2017-11-09 21:23:45.099433701 +0100
-@@ -20200,29 +20200,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/expat/lib/expat.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/expat/lib/expat.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/expat/lib/expat.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/expat/lib/expat.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- EXPAT_LOCAL_AVAILABLE="yes"
--else
-- EXPAT_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/expat/lib/expat.h"; then
-+ EXPAT_LOCAL_AVAILABLE="yes"
-+ else
-+ EXPAT_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$EXPAT_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: Expat libraries are available in the local tree" >&5
-@@ -20455,53 +20437,17 @@
- $as_echo "$as_me: FFmpeg library NOT available as system library" >&6;}
- fi
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- avcodec_h_found="yes"
--else
-- avcodec_h_found="no"
--fi
--
--
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/ffmpeg/libavformat/avformat.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/ffmpeg/libavformat/avformat.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/ffmpeg/libavformat/avformat.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/ffmpeg/libavformat/avformat.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- avformat_h_found="yes"
--else
-- avformat_h_found="no"
--fi
-+ if test -f "${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h"; then
-+ avcodec_h_found="yes"
-+ else
-+ avcodec_h_found="no"
-+ fi
-
-+ if test -f "${srcdir}/lib-src/ffmpeg/libavformat/avformat.h"; then
-+ avformat_h_found="yes"
-+ else
-+ avformat_h_found="no"
-+ fi
-
- if test "$avcodec_h_found" = "yes" -a "$avformat_h_found" = "yes"; then
- FFMPEG_LOCAL_AVAILABLE="yes"
-@@ -20589,29 +20535,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/lame/lame/lame.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/lame/lame/lame.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/lame/lame/lame.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/lame/lame/lame.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LAME_LOCAL_AVAILABLE="yes"
--else
-- LAME_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/lame/lame/lame.h"; then
-+ LAME_LOCAL_AVAILABLE="yes"
-+ else
-+ LAME_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LAME_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: LAME headers are available in this source tree." >&5
-@@ -20780,53 +20708,17 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libflac/include/FLAC/format.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libflac/include/FLAC/format.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libflac/include/FLAC/format.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libflac/include/FLAC/format.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- flac_h_available="yes"
--else
-- flac_h_available="no"
--fi
--
--
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libflac/include/FLAC++/decoder.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libflac/include/FLAC++/decoder.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libflac/include/FLAC++/decoder.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libflac/include/FLAC++/decoder.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- flacpp_h_available="yes"
--else
-- flacpp_h_available="no"
--fi
-+ if test -f "${srcdir}/lib-src/libflac/include/FLAC/format.h"; then
-+ flac_h_available="yes"
-+ else
-+ flac_h_available="no"
-+ fi
-
-+ if test -f "${srcdir}/lib-src/libflac/include/FLAC++/decoder.h"; then
-+ flacpp_h_available="yes"
-+ else
-+ flacpp_h_available="no"
-+ fi
-
- if test "$flac_h_available" = "yes" -a "$flacpp_h_available" = "yes"; then
- LIBFLAC_LOCAL_AVAILABLE="yes"
-@@ -20930,29 +20822,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libid3tag/frame.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libid3tag/frame.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libid3tag/frame.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libid3tag/frame.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBID3TAG_LOCAL_AVAILABLE="yes"
--else
-- LIBID3TAG_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libid3tag/frame.h"; then
-+ LIBID3TAG_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBID3TAG_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBID3TAG_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: libid3tag libraries are available in the local tree" >&5
-@@ -21099,29 +20973,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libmad/frame.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libmad/frame.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libmad/frame.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libmad/frame.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBMAD_LOCAL_AVAILABLE="yes"
--else
-- LIBMAD_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libmad/frame.h"; then
-+ LIBMAD_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBMAD_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBMAD_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: libmad libraries are available in the local tree" >&5
-@@ -21144,29 +21000,11 @@
- LIBNYQUIST_SYSTEM_AVAILABLE="no"
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libnyquist/nyx.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libnyquist/nyx.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libnyquist/nyx.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libnyquist/nyx.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBNYQUIST_LOCAL_AVAILABLE="yes"
--else
-- LIBNYQUIST_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libnyquist/nyx.h"; then
-+ LIBNYQUIST_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBNYQUIST_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBNYQUIST_LOCAL_AVAILABLE" = "yes" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: nyquist libraries are available in the local tree" >&5
-@@ -21265,29 +21103,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/sbsms/include/sbsms.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/sbsms/include/sbsms.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/sbsms/include/sbsms.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/sbsms/include/sbsms.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBSBSMS_LOCAL_AVAILABLE="yes"
--else
-- LIBSBSMS_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/sbsms/include/sbsms.h"; then
-+ LIBSBSMS_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBSBSMS_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBSBSMS_LOCAL_AVAILABLE" = "yes"; then
- LIBSBSMS_LOCAL_CONFIGURE_ARGS="--disable-programs"
-@@ -21388,29 +21208,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libsndfile/src/sndfile.h.in" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libsndfile/src/sndfile.h.in" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libsndfile/src/sndfile.h.in... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libsndfile/src/sndfile.h.in"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBSNDFILE_LOCAL_AVAILABLE="yes"
--else
-- LIBSNDFILE_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libsndfile/src/sndfile.h.in"; then
-+ LIBSNDFILE_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBSNDFILE_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBSNDFILE_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: libsndfile libraries are available in this source tree" >&5
-@@ -21650,29 +21452,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/soundtouch/include/SoundTouch.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/soundtouch/include/SoundTouch.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/soundtouch/include/SoundTouch.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/soundtouch/include/SoundTouch.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBSOUNDTOUCH_LOCAL_AVAILABLE="yes"
--else
-- LIBSOUNDTOUCH_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/soundtouch/include/SoundTouch.h"; then
-+ LIBSOUNDTOUCH_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBSOUNDTOUCH_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBSOUNDTOUCH_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: libsoundtouch libraries are available in the local tree" >&5
-@@ -21771,29 +21555,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libsoxr/src/soxr.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libsoxr/src/soxr.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libsoxr/src/soxr.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libsoxr/src/soxr.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBSOXR_LOCAL_AVAILABLE="yes"
--else
-- LIBSOXR_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libsoxr/src/soxr.h"; then
-+ LIBSOXR_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBSOXR_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBSOXR_LOCAL_AVAILABLE" = "yes"; then
- # Breaks other other libraries in Audacity tree; but why is ./configure
-@@ -21894,29 +21660,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/twolame/libtwolame/twolame.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/twolame/libtwolame/twolame.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/twolame/libtwolame/twolame.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/twolame/libtwolame/twolame.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBTWOLAME_LOCAL_AVAILABLE="yes"
--else
-- LIBTWOLAME_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/twolame/libtwolame/twolame.h"; then
-+ LIBTWOLAME_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBTWOLAME_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBTWOLAME_LOCAL_AVAILABLE" = "yes"; then
- LIBTWOLAME_LOCAL_CONFIGURE_ARGS="--disable-programs"
-@@ -22015,29 +21763,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBVAMP_LOCAL_AVAILABLE="yes"
--else
-- LIBVAMP_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h"; then
-+ LIBVAMP_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBVAMP_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBVAMP_LOCAL_AVAILABLE" = "yes"; then
- LIBVAMP_LOCAL_CONFIGURE_ARGS="--disable-programs"
-@@ -22136,52 +21866,17 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- vorbisenc_h_available="yes"
--else
-- vorbisenc_h_available="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h"; then
-+ vorbisenc_h_available="yes"
-+ else
-+ vorbisenc_h_available="no"
-+ fi
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libogg/include/ogg/ogg.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libogg/include/ogg/ogg.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libogg/include/ogg/ogg.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libogg/include/ogg/ogg.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- ogg_h_available="yes"
--else
-- ogg_h_available="no"
--fi
-+ if test -f "${srcdir}/lib-src/libogg/include/ogg/ogg.h"; then
-+ ogg_h_available="yes"
-+ else
-+ ogg_h_available="no"
-+ fi
-
-
- if test "$vorbisenc_h_available" = "yes" -a "$ogg_h_available" = "yes"; then
-@@ -22290,29 +21985,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/lv2/configure" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/lv2/configure" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/lv2/configure... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/lv2/configure"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LV2_LOCAL_AVAILABLE="yes"
--else
-- LV2_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/lv2/configure"; then
-+ LV2_LOCAL_AVAILABLE="yes"
-+ else
-+ LV2_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LV2_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: LV2 libraries are available in the local tree" >&5
-@@ -22432,29 +22109,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/portaudio-v19/include/portaudio.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/portaudio-v19/include/portaudio.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/portaudio-v19/include/portaudio.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/portaudio-v19/include/portaudio.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- PORTAUDIO_LOCAL_AVAILABLE="yes"
--else
-- PORTAUDIO_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/portaudio-v19/include/portaudio.h"; then
-+ PORTAUDIO_LOCAL_AVAILABLE="yes"
-+ else
-+ PORTAUDIO_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$PORTAUDIO_LOCAL_AVAILABLE" = "yes"; then
- pa_dir="$(pwd)/${srcdir}/lib-src/portaudio-v19"
-@@ -22555,29 +22214,12 @@
- $as_echo "$as_me: portSMF library is NOT available as system library" >&6;}
- fi
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/portsmf/allegro.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/portsmf/allegro.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/portsmf/allegro.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/portsmf/allegro.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- PORTSMF_LOCAL_AVAILABLE="yes"
--else
-- PORTSMF_LOCAL_AVAILABLE="no"
--fi
-
-+ if test -f "${srcdir}/lib-src/portsmf/allegro.h"; then
-+ PORTSMF_LOCAL_AVAILABLE="yes"
-+ else
-+ PORTSMF_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$PORTSMF_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: portSMF library is available in the local tree" >&5
-@@ -22675,29 +22317,12 @@
- $as_echo "$as_me: portmidi library is NOT available as system library" >&6;}
- fi
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/portmidi/pm_common/portmidi.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/portmidi/pm_common/portmidi.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/portmidi/pm_common/portmidi.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/portmidi/pm_common/portmidi.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- PORTMIDI_LOCAL_AVAILABLE="yes"
--else
-- PORTMIDI_LOCAL_AVAILABLE="no"
--fi
-
-+ if test -f "${srcdir}/lib-src/portmidi/pm_common/portmidi.h"; then
-+ PORTMIDI_LOCAL_AVAILABLE="yes"
-+ else
-+ PORTMIDI_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$PORTMIDI_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: portmidi library is available in the local tree" >&5
-@@ -22795,29 +22420,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- WIDGETEXTRA_LOCAL_AVAILABLE="yes"
--else
-- WIDGETEXTRA_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h"; then
-+ WIDGETEXTRA_LOCAL_AVAILABLE="yes"
-+ else
-+ WIDGETEXTRA_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$WIDGETEXTRA_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: libwidgetextra library is available in the local tree" >&5
diff --git a/srcpkgs/audacity/template b/srcpkgs/audacity/template
index 7f4d0a49098..7f3c28f085f 100644
--- a/srcpkgs/audacity/template
+++ b/srcpkgs/audacity/template
@@ -6,7 +6,7 @@ wrksrc="${pkgname}-Audacity-${version}"
build_style=gnu-configure
configure_args="--with-ffmpeg=system --with-libsndfile=system --with-expat=system
--with-libsoxr=system --with-lame=system --with-lv2=system ac_cv_path_WX_CONFIG=wx-config-gtk3"
-hostmakedepends="pkg-config cmake gettext libtool m4 python which"
+hostmakedepends="automake pkg-config cmake gettext libtool m4 python which"
makedepends="jack-devel wxWidgets-gtk3-devel gtk+3-devel
libmad-devel soundtouch-devel libsoxr-devel
vamp-plugin-sdk-devel lame-devel libid3tag-devel libflac-devel
@@ -29,6 +29,10 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
LDFLAGS="-latomic"
fi
+pre_configure() {
+ autoreconf -fi
+}
+
post_install() {
vcopy nyquist /usr/share/audacity
vcopy plug-ins /usr/share/audacity
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] audacity: simplify cross-build patch
2020-12-30 2:01 [PR PATCH] audacity: simplify cross-build patch ndowens
@ 2020-12-30 2:03 ` ndowens
2020-12-30 2:09 ` ndowens
` (8 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: ndowens @ 2020-12-30 2:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 501 bytes --]
There is an updated pull request by ndowens against master on the void-packages repository
https://github.com/ndowens/void-packages audacity
https://github.com/void-linux/void-packages/pull/27548
audacity: simplify cross-build patch
@sgn Since you taught me slightly on how to fix autotool cross-builds, wondering what you think of this?
Built locally and seems to have linked with libs I expected it to.
A patch file from https://github.com/void-linux/void-packages/pull/27548.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-audacity-27548.patch --]
[-- Type: text/x-diff, Size: 45307 bytes --]
From 75bd3bbdd6e99d8f3fda15bb968602398f5d51a5 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Tue, 29 Dec 2020 19:57:38 -0600
Subject: [PATCH] audacity: simplify cross-build patch
---
.../patches/0001-fix-cross-build.patch | 336 ++++++++
srcpkgs/audacity/patches/configure.patch | 756 ------------------
srcpkgs/audacity/template | 9 +-
3 files changed, 341 insertions(+), 760 deletions(-)
create mode 100644 srcpkgs/audacity/patches/0001-fix-cross-build.patch
delete mode 100644 srcpkgs/audacity/patches/configure.patch
diff --git a/srcpkgs/audacity/patches/0001-fix-cross-build.patch b/srcpkgs/audacity/patches/0001-fix-cross-build.patch
new file mode 100644
index 00000000000..63a55c73971
--- /dev/null
+++ b/srcpkgs/audacity/patches/0001-fix-cross-build.patch
@@ -0,0 +1,336 @@
+From 5f1ac685992183d71097669b1956b2af06ad6ed0 Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Tue, 29 Dec 2020 19:44:34 -0600
+Subject: [PATCH] fix cross build
+
+Replace AC_CHECK_FILES as it is not cross-friendly
+---
+diff --git configure.ac configure.ac
+index d8a7cf1..31c1245 100644
+--- configure.ac
++++ configure.ac
+@@ -214,7 +214,7 @@ if test x$enable_sse = xyes; then
+ AX_CHECK_COMPILER_FLAGS(-msse, [SBSMS_CFLAGS="$SBSMS_CFLAGS -msse"],[AC_MSG_ERROR([Need a version of gcc with -msse])])
+ fi
+
+- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <xmmintrin.h>]], [[__m128 v,w; float p[8]; v = _mm_loadu_ps(p); _mm_storeu_ps(p,v); w = _mm_loadl_pi(w,(const __m64*)p); w = _mm_loadh_pi(w,(const __m64*)p); _mm_storel_pi((__m64 *)p, w); _mm_storeh_pi((__m64 *)p, w); v = _mm_add_ps(v,w); v = _mm_sub_ps(v,w); v = _mm_mul_ps(v,w); v = _mm_shuffle_ps(v,w,_MM_SHUFFLE(0,1,2,3)); w = _mm_set1_ps(0.0f);]])], [sse_ok=yes], [sse_ok=no])
++ AC_TRY_COMPILE([AC_LANG_PROGRAM([[#include <xmmintrin.h>]], [[__m128 v,w; float p[8]; v = _mm_loadu_ps(p); _mm_storeu_ps(p,v); w = _mm_loadl_pi(w,(const __m64*)p); w = _mm_loadh_pi(w,(const __m64*)p); _mm_storel_pi((__m64 *)p, w); _mm_storeh_pi((__m64 *)p, w); v = _mm_add_ps(v,w); v = _mm_sub_ps(v,w); v = _mm_mul_ps(v,w); v = _mm_shuffle_ps(v,w,_MM_SHUFFLE(0,1,2,3)); w = _mm_set1_ps(0.0f);]])], [sse_ok=yes], [sse_ok=no])
+
+ if test x$sse_ok = xyes; then
+ AC_DEFINE(ENABLE_SSE,1,[Define to enable sse])
+diff --git m4/audacity_checklib_ffmpeg.m4 m4/audacity_checklib_ffmpeg.m4
+index b98110f..d4754aa 100644
+--- m4/audacity_checklib_ffmpeg.m4
++++ m4/audacity_checklib_ffmpeg.m4
+@@ -35,13 +35,9 @@ AC_DEFUN([AUDACITY_CHECKLIB_FFMPEG], [
+
+ dnl see if ffmpeg is available locally, or rather that we have some headers
+ dnl in lib-src/ffmpeg/ we can use.
+- AC_CHECK_FILE(${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h,
+- avcodec_h_found="yes",
+- avcodec_h_found="no")
++ AS_IF([test -f ${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h], [avcodec_h_found=yes])
+
+- AC_CHECK_FILE(${srcdir}/lib-src/ffmpeg/libavformat/avformat.h,
+- avformat_h_found="yes",
+- avformat_h_found="no")
++ AS_IF([test -f ${srcdir}/lib-src/ffmpeg/libavformat/avformat.h], [avformat_h_found=yes])
+
+ if test "$avcodec_h_found" = "yes" -a "$avformat_h_found" = "yes"; then
+ FFMPEG_LOCAL_AVAILABLE="yes"
+diff --git m4/audacity_checklib_lame.m4 m4/audacity_checklib_lame.m4
+index 28ecd77..5794143 100644
+--- m4/audacity_checklib_lame.m4
++++ m4/audacity_checklib_lame.m4
+@@ -33,9 +33,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LAME], [
+
+ dnl see if LAME is available in the source dir
+
+- AC_CHECK_FILE(${srcdir}/lib-src/lame/lame/lame.h,
+- LAME_LOCAL_AVAILABLE="yes",
+- LAME_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/lame/lame/lame.h], [LAME_LOCAL_AVAILABLE=yes])
+
+ if test "$LAME_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([LAME headers are available in this source tree.])
+diff --git m4/audacity_checklib_libexpat.m4 m4/audacity_checklib_libexpat.m4
+index c0c88db..ffe76ac 100644
+--- m4/audacity_checklib_libexpat.m4
++++ m4/audacity_checklib_libexpat.m4
+@@ -42,9 +42,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_EXPAT], [
+
+ dnl see if expat is available in the local tree
+
+- AC_CHECK_FILE(${srcdir}/lib-src/expat/lib/expat.h,
+- EXPAT_LOCAL_AVAILABLE="yes",
+- EXPAT_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/expat/lib/expat.h], [EXPAT_LOCAL_AVAILABLE=yes])
+
+ if test "$EXPAT_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([Expat libraries are available in the local tree])
+diff --git m4/audacity_checklib_libflac.m4 m4/audacity_checklib_libflac.m4
+index 1002986..6096791 100644
+--- m4/audacity_checklib_libflac.m4
++++ m4/audacity_checklib_libflac.m4
+@@ -38,13 +38,9 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBFLAC], [
+
+ dnl see if FLAC is available in the source dir
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libflac/include/FLAC/format.h,
+- flac_h_available="yes",
+- flac_h_available="no")
++ AS_IF([test -f ${srcdir}/lib-src/libflac/include/FLAC/format.h], [flac_h_available=yes])
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libflac/include/FLAC++/decoder.h,
+- flacpp_h_available="yes",
+- flacpp_h_available="no")
++ AS_IF([test -f ${srcdir}/lib-src/libflac/include/FLAC++/decoder.h], [flacpp_h_available=yes])
+
+ if test "$flac_h_available" = "yes" -a "$flacpp_h_available" = "yes"; then
+ LIBFLAC_LOCAL_AVAILABLE="yes"
+diff --git m4/audacity_checklib_libid3tag.m4 m4/audacity_checklib_libid3tag.m4
+index b69c2cb..59e94cc 100644
+--- m4/audacity_checklib_libid3tag.m4
++++ m4/audacity_checklib_libid3tag.m4
+@@ -25,9 +25,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBID3TAG], [
+
+ dnl see if libid3tag is available in the local tree
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libid3tag/frame.h,
+- LIBID3TAG_LOCAL_AVAILABLE="yes",
+- LIBID3TAG_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/libid3tag/frame.h], [LIBID3TAG_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBID3TAG_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([libid3tag libraries are available in the local tree])
+diff --git m4/audacity_checklib_libmad.m4 m4/audacity_checklib_libmad.m4
+index 0c2d02a..d53c459 100644
+--- m4/audacity_checklib_libmad.m4
++++ m4/audacity_checklib_libmad.m4
+@@ -34,9 +34,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBMAD], [
+
+ dnl see if libmad is available in the local tree
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libmad/frame.h,
+- LIBMAD_LOCAL_AVAILABLE="yes",
+- LIBMAD_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/libmad/frame.h], [LIBMAD_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBMAD_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([libmad libraries are available in the local tree])
+diff --git m4/audacity_checklib_libnyquist.m4 m4/audacity_checklib_libnyquist.m4
+index 3f1c98f..b4af690 100644
+--- m4/audacity_checklib_libnyquist.m4
++++ m4/audacity_checklib_libnyquist.m4
+@@ -17,9 +17,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBNYQUIST], [
+
+ dnl see if Nyquist is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libnyquist/nyx.h,
+- LIBNYQUIST_LOCAL_AVAILABLE="yes",
+- LIBNYQUIST_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/libnyquist/nyx.h], [LIBNYQUIST_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBNYQUIST_LOCAL_AVAILABLE" = "yes" ; then
+ AC_MSG_NOTICE([nyquist libraries are available in the local tree])
+diff --git m4/audacity_checklib_libsbsms.m4 m4/audacity_checklib_libsbsms.m4
+index c2f80dd..a0ec94b 100644
+--- m4/audacity_checklib_libsbsms.m4
++++ m4/audacity_checklib_libsbsms.m4
+@@ -25,9 +25,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSBSMS], [
+
+ dnl see if libsbsms is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/sbsms/include/sbsms.h,
+- LIBSBSMS_LOCAL_AVAILABLE="yes",
+- LIBSBSMS_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/sbsms/include/sbsms.h], [LIBSBSMS_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBSBSMS_LOCAL_AVAILABLE" = "yes"; then
+ dnl do not build programs we don't need
+diff --git m4/audacity_checklib_libsndfile.m4 m4/audacity_checklib_libsndfile.m4
+index d49e149..e501899 100644
+--- m4/audacity_checklib_libsndfile.m4
++++ m4/audacity_checklib_libsndfile.m4
+@@ -25,9 +25,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSNDFILE], [
+
+ dnl see if libsndfile is available in the local tree
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libsndfile/src/sndfile.h.in,
+- LIBSNDFILE_LOCAL_AVAILABLE="yes",
+- LIBSNDFILE_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/libsndfile/src/sndfile.h.in], [LIBSNDFILE_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBSNDFILE_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([libsndfile libraries are available in this source tree])
+diff --git m4/audacity_checklib_libsoundtouch.m4 m4/audacity_checklib_libsoundtouch.m4
+index 0b8aa69..d8d9f58 100644
+--- m4/audacity_checklib_libsoundtouch.m4
++++ m4/audacity_checklib_libsoundtouch.m4
+@@ -40,9 +40,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSOUNDTOUCH], [
+
+ dnl see if libsoundtouch is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/soundtouch/include/SoundTouch.h,
+- LIBSOUNDTOUCH_LOCAL_AVAILABLE="yes",
+- LIBSOUNDTOUCH_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/soundtouch/include/SoundTouch.h], [LIBSOUNDTOUCH_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBSOUNDTOUCH_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([libsoundtouch libraries are available in the local tree])
+diff --git m4/audacity_checklib_libsoxr.m4 m4/audacity_checklib_libsoxr.m4
+index a331e9b..1a0702b 100644
+--- m4/audacity_checklib_libsoxr.m4
++++ m4/audacity_checklib_libsoxr.m4
+@@ -25,9 +25,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSOXR], [
+
+ dnl see if libsoxr is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libsoxr/src/soxr.h,
+- LIBSOXR_LOCAL_AVAILABLE="yes",
+- LIBSOXR_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/libsoxr/src/soxr.h], [LIBSOXR_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBSOXR_LOCAL_AVAILABLE" = "yes"; then
+ # Breaks other other libraries in Audacity tree; but why is ./configure
+diff --git m4/audacity_checklib_libtwolame.m4 m4/audacity_checklib_libtwolame.m4
+index 2d28b07..fc2a2bf 100644
+--- m4/audacity_checklib_libtwolame.m4
++++ m4/audacity_checklib_libtwolame.m4
+@@ -25,9 +25,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBTWOLAME], [
+
+ dnl see if libtwolame is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/twolame/libtwolame/twolame.h,
+- LIBTWOLAME_LOCAL_AVAILABLE="yes",
+- LIBTWOLAME_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/twolame/libtwolame/twolame.h], [LIBTWOLAME_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBTWOLAME_LOCAL_AVAILABLE" = "yes"; then
+ dnl disable programs we don't need to build
+diff --git m4/audacity_checklib_libvamp.m4 m4/audacity_checklib_libvamp.m4
+index 8a1e0e1..57dc5eb 100644
+--- m4/audacity_checklib_libvamp.m4
++++ m4/audacity_checklib_libvamp.m4
+@@ -25,9 +25,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBVAMP], [
+
+ dnl see if Vamp is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h,
+- LIBVAMP_LOCAL_AVAILABLE="yes",
+- LIBVAMP_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h], [LIBVAMP_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBVAMP_LOCAL_AVAILABLE" = "yes"; then
+ LIBVAMP_LOCAL_CONFIGURE_ARGS="--disable-programs"
+diff --git m4/audacity_checklib_libvorbis.m4 m4/audacity_checklib_libvorbis.m4
+index 0839fa9..3d8b70d 100644
+--- m4/audacity_checklib_libvorbis.m4
++++ m4/audacity_checklib_libvorbis.m4
+@@ -30,13 +30,9 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBVORBIS], [
+
+ dnl see if Vorbis is available in the source dir
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h,
+- vorbisenc_h_available="yes",
+- vorbisenc_h_available="no")
++ AS_IF([test -f ${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h], [vorbisenc_h_available=yes])
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libogg/include/ogg/ogg.h,
+- ogg_h_available="yes",
+- ogg_h_available="no")
++ AS_IF([test -f ${srcdir}/lib-src/libogg/include/ogg/ogg.h], [ogg_h_available=yes])
+
+ if test "$vorbisenc_h_available" = "yes" -a "$ogg_h_available" = "yes"; then
+ LIBVORBIS_LOCAL_AVAILABLE="yes"
+diff --git m4/audacity_checklib_lv2.m4 m4/audacity_checklib_lv2.m4
+index 78a279a..164aa6d 100644
+--- m4/audacity_checklib_lv2.m4
++++ m4/audacity_checklib_lv2.m4
+@@ -23,9 +23,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LV2], [
+
+ dnl see if LV2 is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/lv2/configure,
+- LV2_LOCAL_AVAILABLE="yes",
+- LV2_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/lv2/configure], [LV2_LOCAL_AVAILABLE=yes])
+
+ if test "$LV2_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([LV2 libraries are available in the local tree])
+diff --git m4/audacity_checklib_portaudio.m4 m4/audacity_checklib_portaudio.m4
+index 9b7674e..03d62b8 100644
+--- m4/audacity_checklib_portaudio.m4
++++ m4/audacity_checklib_portaudio.m4
+@@ -31,9 +31,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_PORTAUDIO], [
+
+ dnl see if portaudio is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/portaudio-v19/include/portaudio.h,
+- PORTAUDIO_LOCAL_AVAILABLE="yes",
+- PORTAUDIO_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/portaudio-v19/include/portaudio.h], [PORTAUDIO_LOCAL_AVAILABLE=yes])
+
+ if test "$PORTAUDIO_LOCAL_AVAILABLE" = "yes"; then
+ dnl We need to override the pkg-config check for portmixer by passing
+diff --git m4/audacity_checklib_portmidi.m4 m4/audacity_checklib_portmidi.m4
+index 4e63b1b..6db1dc6 100644
+--- m4/audacity_checklib_portmidi.m4
++++ m4/audacity_checklib_portmidi.m4
+@@ -21,9 +21,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_PORTMIDI], [
+ AC_MSG_NOTICE([portmidi library is NOT available as system library])
+ fi
+
+- AC_CHECK_FILE(${srcdir}/lib-src/portmidi/pm_common/portmidi.h,
+- PORTMIDI_LOCAL_AVAILABLE="yes",
+- PORTMIDI_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/portmidi/pm_common/portmidi.h], [PORTMIDI_LOCAL_AVAILABLE=yes])
+
+ if test "$PORTMIDI_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([portmidi library is available in the local tree])
+diff --git m4/audacity_checklib_portsmf.m4 m4/audacity_checklib_portsmf.m4
+index 9c336d8..3a31ef5 100644
+--- m4/audacity_checklib_portsmf.m4
++++ m4/audacity_checklib_portsmf.m4
+@@ -24,9 +24,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_PORTSMF], [
+ AC_MSG_NOTICE([portSMF library is NOT available as system library])
+ fi
+
+- AC_CHECK_FILE(${srcdir}/lib-src/portsmf/allegro.h,
+- PORTSMF_LOCAL_AVAILABLE="yes",
+- PORTSMF_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/portsmf/allegro.h], [PORTSMF_LOCAL_AVAILABLE=yes])
+
+ if test "$PORTSMF_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([portSMF library is available in the local tree])
+diff --git m4/audacity_checklib_widgetextra.m4 m4/audacity_checklib_widgetextra.m4
+index 4ef0f97..f857723 100644
+--- m4/audacity_checklib_widgetextra.m4
++++ m4/audacity_checklib_widgetextra.m4
+@@ -28,9 +28,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_WIDGETEXTRA], [
+
+ dnl see if libwidgetextra is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h,
+- WIDGETEXTRA_LOCAL_AVAILABLE="yes",
+- WIDGETEXTRA_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h], [WIDGETEXTRA_LOCAL_AVAILABLE=yes])
+
+ if test "$WIDGETEXTRA_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([libwidgetextra library is available in the local tree])
+--
+2.30.0
+
+diff --git configure.ac configure.ac
+index 31c1245..166a77e 100644
+--- configure.ac
++++ configure.ac
+@@ -63,7 +63,7 @@ AC_PROG_CXXCPP
+ AM_PROG_AR
+
+ LT_INIT([disable-shared])
+-
++m4_pattern_allow([^AC_LANG])
+ AC_PROG_INSTALL
+ dnl pkg-config is required for lots of things
+ AC_CHECK_PROG(HAVE_PKG_CONFIG, pkg-config, yes, no)
diff --git a/srcpkgs/audacity/patches/configure.patch b/srcpkgs/audacity/patches/configure.patch
deleted file mode 100644
index 3b9c576c3f2..00000000000
--- a/srcpkgs/audacity/patches/configure.patch
+++ /dev/null
@@ -1,756 +0,0 @@
-configure uses AC_CHECK_FILE to test for file existence which is
-cross incompatible. Changed it to simple if/else statements.
-
---- configure.orig 2017-10-26 19:44:39.000000000 +0200
-+++ configure 2017-11-09 21:23:45.099433701 +0100
-@@ -20200,29 +20200,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/expat/lib/expat.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/expat/lib/expat.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/expat/lib/expat.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/expat/lib/expat.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- EXPAT_LOCAL_AVAILABLE="yes"
--else
-- EXPAT_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/expat/lib/expat.h"; then
-+ EXPAT_LOCAL_AVAILABLE="yes"
-+ else
-+ EXPAT_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$EXPAT_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: Expat libraries are available in the local tree" >&5
-@@ -20455,53 +20437,17 @@
- $as_echo "$as_me: FFmpeg library NOT available as system library" >&6;}
- fi
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- avcodec_h_found="yes"
--else
-- avcodec_h_found="no"
--fi
--
--
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/ffmpeg/libavformat/avformat.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/ffmpeg/libavformat/avformat.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/ffmpeg/libavformat/avformat.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/ffmpeg/libavformat/avformat.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- avformat_h_found="yes"
--else
-- avformat_h_found="no"
--fi
-+ if test -f "${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h"; then
-+ avcodec_h_found="yes"
-+ else
-+ avcodec_h_found="no"
-+ fi
-
-+ if test -f "${srcdir}/lib-src/ffmpeg/libavformat/avformat.h"; then
-+ avformat_h_found="yes"
-+ else
-+ avformat_h_found="no"
-+ fi
-
- if test "$avcodec_h_found" = "yes" -a "$avformat_h_found" = "yes"; then
- FFMPEG_LOCAL_AVAILABLE="yes"
-@@ -20589,29 +20535,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/lame/lame/lame.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/lame/lame/lame.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/lame/lame/lame.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/lame/lame/lame.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LAME_LOCAL_AVAILABLE="yes"
--else
-- LAME_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/lame/lame/lame.h"; then
-+ LAME_LOCAL_AVAILABLE="yes"
-+ else
-+ LAME_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LAME_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: LAME headers are available in this source tree." >&5
-@@ -20780,53 +20708,17 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libflac/include/FLAC/format.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libflac/include/FLAC/format.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libflac/include/FLAC/format.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libflac/include/FLAC/format.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- flac_h_available="yes"
--else
-- flac_h_available="no"
--fi
--
--
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libflac/include/FLAC++/decoder.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libflac/include/FLAC++/decoder.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libflac/include/FLAC++/decoder.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libflac/include/FLAC++/decoder.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- flacpp_h_available="yes"
--else
-- flacpp_h_available="no"
--fi
-+ if test -f "${srcdir}/lib-src/libflac/include/FLAC/format.h"; then
-+ flac_h_available="yes"
-+ else
-+ flac_h_available="no"
-+ fi
-
-+ if test -f "${srcdir}/lib-src/libflac/include/FLAC++/decoder.h"; then
-+ flacpp_h_available="yes"
-+ else
-+ flacpp_h_available="no"
-+ fi
-
- if test "$flac_h_available" = "yes" -a "$flacpp_h_available" = "yes"; then
- LIBFLAC_LOCAL_AVAILABLE="yes"
-@@ -20930,29 +20822,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libid3tag/frame.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libid3tag/frame.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libid3tag/frame.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libid3tag/frame.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBID3TAG_LOCAL_AVAILABLE="yes"
--else
-- LIBID3TAG_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libid3tag/frame.h"; then
-+ LIBID3TAG_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBID3TAG_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBID3TAG_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: libid3tag libraries are available in the local tree" >&5
-@@ -21099,29 +20973,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libmad/frame.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libmad/frame.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libmad/frame.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libmad/frame.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBMAD_LOCAL_AVAILABLE="yes"
--else
-- LIBMAD_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libmad/frame.h"; then
-+ LIBMAD_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBMAD_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBMAD_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: libmad libraries are available in the local tree" >&5
-@@ -21144,29 +21000,11 @@
- LIBNYQUIST_SYSTEM_AVAILABLE="no"
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libnyquist/nyx.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libnyquist/nyx.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libnyquist/nyx.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libnyquist/nyx.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBNYQUIST_LOCAL_AVAILABLE="yes"
--else
-- LIBNYQUIST_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libnyquist/nyx.h"; then
-+ LIBNYQUIST_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBNYQUIST_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBNYQUIST_LOCAL_AVAILABLE" = "yes" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: nyquist libraries are available in the local tree" >&5
-@@ -21265,29 +21103,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/sbsms/include/sbsms.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/sbsms/include/sbsms.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/sbsms/include/sbsms.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/sbsms/include/sbsms.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBSBSMS_LOCAL_AVAILABLE="yes"
--else
-- LIBSBSMS_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/sbsms/include/sbsms.h"; then
-+ LIBSBSMS_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBSBSMS_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBSBSMS_LOCAL_AVAILABLE" = "yes"; then
- LIBSBSMS_LOCAL_CONFIGURE_ARGS="--disable-programs"
-@@ -21388,29 +21208,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libsndfile/src/sndfile.h.in" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libsndfile/src/sndfile.h.in" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libsndfile/src/sndfile.h.in... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libsndfile/src/sndfile.h.in"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBSNDFILE_LOCAL_AVAILABLE="yes"
--else
-- LIBSNDFILE_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libsndfile/src/sndfile.h.in"; then
-+ LIBSNDFILE_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBSNDFILE_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBSNDFILE_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: libsndfile libraries are available in this source tree" >&5
-@@ -21650,29 +21452,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/soundtouch/include/SoundTouch.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/soundtouch/include/SoundTouch.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/soundtouch/include/SoundTouch.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/soundtouch/include/SoundTouch.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBSOUNDTOUCH_LOCAL_AVAILABLE="yes"
--else
-- LIBSOUNDTOUCH_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/soundtouch/include/SoundTouch.h"; then
-+ LIBSOUNDTOUCH_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBSOUNDTOUCH_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBSOUNDTOUCH_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: libsoundtouch libraries are available in the local tree" >&5
-@@ -21771,29 +21555,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libsoxr/src/soxr.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libsoxr/src/soxr.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libsoxr/src/soxr.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libsoxr/src/soxr.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBSOXR_LOCAL_AVAILABLE="yes"
--else
-- LIBSOXR_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libsoxr/src/soxr.h"; then
-+ LIBSOXR_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBSOXR_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBSOXR_LOCAL_AVAILABLE" = "yes"; then
- # Breaks other other libraries in Audacity tree; but why is ./configure
-@@ -21894,29 +21660,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/twolame/libtwolame/twolame.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/twolame/libtwolame/twolame.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/twolame/libtwolame/twolame.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/twolame/libtwolame/twolame.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBTWOLAME_LOCAL_AVAILABLE="yes"
--else
-- LIBTWOLAME_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/twolame/libtwolame/twolame.h"; then
-+ LIBTWOLAME_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBTWOLAME_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBTWOLAME_LOCAL_AVAILABLE" = "yes"; then
- LIBTWOLAME_LOCAL_CONFIGURE_ARGS="--disable-programs"
-@@ -22015,29 +21763,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBVAMP_LOCAL_AVAILABLE="yes"
--else
-- LIBVAMP_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h"; then
-+ LIBVAMP_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBVAMP_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBVAMP_LOCAL_AVAILABLE" = "yes"; then
- LIBVAMP_LOCAL_CONFIGURE_ARGS="--disable-programs"
-@@ -22136,52 +21866,17 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- vorbisenc_h_available="yes"
--else
-- vorbisenc_h_available="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h"; then
-+ vorbisenc_h_available="yes"
-+ else
-+ vorbisenc_h_available="no"
-+ fi
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libogg/include/ogg/ogg.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libogg/include/ogg/ogg.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libogg/include/ogg/ogg.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libogg/include/ogg/ogg.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- ogg_h_available="yes"
--else
-- ogg_h_available="no"
--fi
-+ if test -f "${srcdir}/lib-src/libogg/include/ogg/ogg.h"; then
-+ ogg_h_available="yes"
-+ else
-+ ogg_h_available="no"
-+ fi
-
-
- if test "$vorbisenc_h_available" = "yes" -a "$ogg_h_available" = "yes"; then
-@@ -22290,29 +21985,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/lv2/configure" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/lv2/configure" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/lv2/configure... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/lv2/configure"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LV2_LOCAL_AVAILABLE="yes"
--else
-- LV2_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/lv2/configure"; then
-+ LV2_LOCAL_AVAILABLE="yes"
-+ else
-+ LV2_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LV2_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: LV2 libraries are available in the local tree" >&5
-@@ -22432,29 +22109,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/portaudio-v19/include/portaudio.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/portaudio-v19/include/portaudio.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/portaudio-v19/include/portaudio.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/portaudio-v19/include/portaudio.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- PORTAUDIO_LOCAL_AVAILABLE="yes"
--else
-- PORTAUDIO_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/portaudio-v19/include/portaudio.h"; then
-+ PORTAUDIO_LOCAL_AVAILABLE="yes"
-+ else
-+ PORTAUDIO_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$PORTAUDIO_LOCAL_AVAILABLE" = "yes"; then
- pa_dir="$(pwd)/${srcdir}/lib-src/portaudio-v19"
-@@ -22555,29 +22214,12 @@
- $as_echo "$as_me: portSMF library is NOT available as system library" >&6;}
- fi
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/portsmf/allegro.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/portsmf/allegro.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/portsmf/allegro.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/portsmf/allegro.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- PORTSMF_LOCAL_AVAILABLE="yes"
--else
-- PORTSMF_LOCAL_AVAILABLE="no"
--fi
-
-+ if test -f "${srcdir}/lib-src/portsmf/allegro.h"; then
-+ PORTSMF_LOCAL_AVAILABLE="yes"
-+ else
-+ PORTSMF_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$PORTSMF_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: portSMF library is available in the local tree" >&5
-@@ -22675,29 +22317,12 @@
- $as_echo "$as_me: portmidi library is NOT available as system library" >&6;}
- fi
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/portmidi/pm_common/portmidi.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/portmidi/pm_common/portmidi.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/portmidi/pm_common/portmidi.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/portmidi/pm_common/portmidi.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- PORTMIDI_LOCAL_AVAILABLE="yes"
--else
-- PORTMIDI_LOCAL_AVAILABLE="no"
--fi
-
-+ if test -f "${srcdir}/lib-src/portmidi/pm_common/portmidi.h"; then
-+ PORTMIDI_LOCAL_AVAILABLE="yes"
-+ else
-+ PORTMIDI_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$PORTMIDI_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: portmidi library is available in the local tree" >&5
-@@ -22795,29 +22420,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- WIDGETEXTRA_LOCAL_AVAILABLE="yes"
--else
-- WIDGETEXTRA_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h"; then
-+ WIDGETEXTRA_LOCAL_AVAILABLE="yes"
-+ else
-+ WIDGETEXTRA_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$WIDGETEXTRA_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: libwidgetextra library is available in the local tree" >&5
diff --git a/srcpkgs/audacity/template b/srcpkgs/audacity/template
index 7f4d0a49098..7ca7af4b357 100644
--- a/srcpkgs/audacity/template
+++ b/srcpkgs/audacity/template
@@ -6,7 +6,7 @@ wrksrc="${pkgname}-Audacity-${version}"
build_style=gnu-configure
configure_args="--with-ffmpeg=system --with-libsndfile=system --with-expat=system
--with-libsoxr=system --with-lame=system --with-lv2=system ac_cv_path_WX_CONFIG=wx-config-gtk3"
-hostmakedepends="pkg-config cmake gettext libtool m4 python which"
+hostmakedepends="automake pkg-config cmake gettext libtool m4 python which"
makedepends="jack-devel wxWidgets-gtk3-devel gtk+3-devel
libmad-devel soundtouch-devel libsoxr-devel
vamp-plugin-sdk-devel lame-devel libid3tag-devel libflac-devel
@@ -29,10 +29,11 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
LDFLAGS="-latomic"
fi
+pre_configure() {
+ autoreconf -fi
+}
+
post_install() {
vcopy nyquist /usr/share/audacity
vcopy plug-ins /usr/share/audacity
-
- rm ${DESTDIR}/usr/share/doc/${pkgname}/LICENSE.txt
- vlicense LICENSE.txt LICENSE
}
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] audacity: simplify cross-build patch
2020-12-30 2:01 [PR PATCH] audacity: simplify cross-build patch ndowens
2020-12-30 2:03 ` [PR PATCH] [Updated] " ndowens
@ 2020-12-30 2:09 ` ndowens
2020-12-30 2:32 ` [PR PATCH] [Updated] [WIP] " ndowens
` (7 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: ndowens @ 2020-12-30 2:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 501 bytes --]
There is an updated pull request by ndowens against master on the void-packages repository
https://github.com/ndowens/void-packages audacity
https://github.com/void-linux/void-packages/pull/27548
audacity: simplify cross-build patch
@sgn Since you taught me slightly on how to fix autotool cross-builds, wondering what you think of this?
Built locally and seems to have linked with libs I expected it to.
A patch file from https://github.com/void-linux/void-packages/pull/27548.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-audacity-27548.patch --]
[-- Type: text/x-diff, Size: 45313 bytes --]
From ee6cc9416a76d7b2cd4cbcb9349895b7bec75671 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Tue, 29 Dec 2020 19:57:38 -0600
Subject: [PATCH] audacity: simplify cross-build patch
---
.../patches/0001-fix-cross-build.patch | 336 ++++++++
srcpkgs/audacity/patches/configure.patch | 756 ------------------
srcpkgs/audacity/template | 9 +-
3 files changed, 341 insertions(+), 760 deletions(-)
create mode 100644 srcpkgs/audacity/patches/0001-fix-cross-build.patch
delete mode 100644 srcpkgs/audacity/patches/configure.patch
diff --git a/srcpkgs/audacity/patches/0001-fix-cross-build.patch b/srcpkgs/audacity/patches/0001-fix-cross-build.patch
new file mode 100644
index 00000000000..63a55c73971
--- /dev/null
+++ b/srcpkgs/audacity/patches/0001-fix-cross-build.patch
@@ -0,0 +1,336 @@
+From 5f1ac685992183d71097669b1956b2af06ad6ed0 Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Tue, 29 Dec 2020 19:44:34 -0600
+Subject: [PATCH] fix cross build
+
+Replace AC_CHECK_FILES as it is not cross-friendly
+---
+diff --git configure.ac configure.ac
+index d8a7cf1..31c1245 100644
+--- configure.ac
++++ configure.ac
+@@ -214,7 +214,7 @@ if test x$enable_sse = xyes; then
+ AX_CHECK_COMPILER_FLAGS(-msse, [SBSMS_CFLAGS="$SBSMS_CFLAGS -msse"],[AC_MSG_ERROR([Need a version of gcc with -msse])])
+ fi
+
+- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <xmmintrin.h>]], [[__m128 v,w; float p[8]; v = _mm_loadu_ps(p); _mm_storeu_ps(p,v); w = _mm_loadl_pi(w,(const __m64*)p); w = _mm_loadh_pi(w,(const __m64*)p); _mm_storel_pi((__m64 *)p, w); _mm_storeh_pi((__m64 *)p, w); v = _mm_add_ps(v,w); v = _mm_sub_ps(v,w); v = _mm_mul_ps(v,w); v = _mm_shuffle_ps(v,w,_MM_SHUFFLE(0,1,2,3)); w = _mm_set1_ps(0.0f);]])], [sse_ok=yes], [sse_ok=no])
++ AC_TRY_COMPILE([AC_LANG_PROGRAM([[#include <xmmintrin.h>]], [[__m128 v,w; float p[8]; v = _mm_loadu_ps(p); _mm_storeu_ps(p,v); w = _mm_loadl_pi(w,(const __m64*)p); w = _mm_loadh_pi(w,(const __m64*)p); _mm_storel_pi((__m64 *)p, w); _mm_storeh_pi((__m64 *)p, w); v = _mm_add_ps(v,w); v = _mm_sub_ps(v,w); v = _mm_mul_ps(v,w); v = _mm_shuffle_ps(v,w,_MM_SHUFFLE(0,1,2,3)); w = _mm_set1_ps(0.0f);]])], [sse_ok=yes], [sse_ok=no])
+
+ if test x$sse_ok = xyes; then
+ AC_DEFINE(ENABLE_SSE,1,[Define to enable sse])
+diff --git m4/audacity_checklib_ffmpeg.m4 m4/audacity_checklib_ffmpeg.m4
+index b98110f..d4754aa 100644
+--- m4/audacity_checklib_ffmpeg.m4
++++ m4/audacity_checklib_ffmpeg.m4
+@@ -35,13 +35,9 @@ AC_DEFUN([AUDACITY_CHECKLIB_FFMPEG], [
+
+ dnl see if ffmpeg is available locally, or rather that we have some headers
+ dnl in lib-src/ffmpeg/ we can use.
+- AC_CHECK_FILE(${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h,
+- avcodec_h_found="yes",
+- avcodec_h_found="no")
++ AS_IF([test -f ${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h], [avcodec_h_found=yes])
+
+- AC_CHECK_FILE(${srcdir}/lib-src/ffmpeg/libavformat/avformat.h,
+- avformat_h_found="yes",
+- avformat_h_found="no")
++ AS_IF([test -f ${srcdir}/lib-src/ffmpeg/libavformat/avformat.h], [avformat_h_found=yes])
+
+ if test "$avcodec_h_found" = "yes" -a "$avformat_h_found" = "yes"; then
+ FFMPEG_LOCAL_AVAILABLE="yes"
+diff --git m4/audacity_checklib_lame.m4 m4/audacity_checklib_lame.m4
+index 28ecd77..5794143 100644
+--- m4/audacity_checklib_lame.m4
++++ m4/audacity_checklib_lame.m4
+@@ -33,9 +33,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LAME], [
+
+ dnl see if LAME is available in the source dir
+
+- AC_CHECK_FILE(${srcdir}/lib-src/lame/lame/lame.h,
+- LAME_LOCAL_AVAILABLE="yes",
+- LAME_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/lame/lame/lame.h], [LAME_LOCAL_AVAILABLE=yes])
+
+ if test "$LAME_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([LAME headers are available in this source tree.])
+diff --git m4/audacity_checklib_libexpat.m4 m4/audacity_checklib_libexpat.m4
+index c0c88db..ffe76ac 100644
+--- m4/audacity_checklib_libexpat.m4
++++ m4/audacity_checklib_libexpat.m4
+@@ -42,9 +42,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_EXPAT], [
+
+ dnl see if expat is available in the local tree
+
+- AC_CHECK_FILE(${srcdir}/lib-src/expat/lib/expat.h,
+- EXPAT_LOCAL_AVAILABLE="yes",
+- EXPAT_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/expat/lib/expat.h], [EXPAT_LOCAL_AVAILABLE=yes])
+
+ if test "$EXPAT_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([Expat libraries are available in the local tree])
+diff --git m4/audacity_checklib_libflac.m4 m4/audacity_checklib_libflac.m4
+index 1002986..6096791 100644
+--- m4/audacity_checklib_libflac.m4
++++ m4/audacity_checklib_libflac.m4
+@@ -38,13 +38,9 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBFLAC], [
+
+ dnl see if FLAC is available in the source dir
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libflac/include/FLAC/format.h,
+- flac_h_available="yes",
+- flac_h_available="no")
++ AS_IF([test -f ${srcdir}/lib-src/libflac/include/FLAC/format.h], [flac_h_available=yes])
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libflac/include/FLAC++/decoder.h,
+- flacpp_h_available="yes",
+- flacpp_h_available="no")
++ AS_IF([test -f ${srcdir}/lib-src/libflac/include/FLAC++/decoder.h], [flacpp_h_available=yes])
+
+ if test "$flac_h_available" = "yes" -a "$flacpp_h_available" = "yes"; then
+ LIBFLAC_LOCAL_AVAILABLE="yes"
+diff --git m4/audacity_checklib_libid3tag.m4 m4/audacity_checklib_libid3tag.m4
+index b69c2cb..59e94cc 100644
+--- m4/audacity_checklib_libid3tag.m4
++++ m4/audacity_checklib_libid3tag.m4
+@@ -25,9 +25,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBID3TAG], [
+
+ dnl see if libid3tag is available in the local tree
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libid3tag/frame.h,
+- LIBID3TAG_LOCAL_AVAILABLE="yes",
+- LIBID3TAG_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/libid3tag/frame.h], [LIBID3TAG_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBID3TAG_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([libid3tag libraries are available in the local tree])
+diff --git m4/audacity_checklib_libmad.m4 m4/audacity_checklib_libmad.m4
+index 0c2d02a..d53c459 100644
+--- m4/audacity_checklib_libmad.m4
++++ m4/audacity_checklib_libmad.m4
+@@ -34,9 +34,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBMAD], [
+
+ dnl see if libmad is available in the local tree
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libmad/frame.h,
+- LIBMAD_LOCAL_AVAILABLE="yes",
+- LIBMAD_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/libmad/frame.h], [LIBMAD_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBMAD_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([libmad libraries are available in the local tree])
+diff --git m4/audacity_checklib_libnyquist.m4 m4/audacity_checklib_libnyquist.m4
+index 3f1c98f..b4af690 100644
+--- m4/audacity_checklib_libnyquist.m4
++++ m4/audacity_checklib_libnyquist.m4
+@@ -17,9 +17,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBNYQUIST], [
+
+ dnl see if Nyquist is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libnyquist/nyx.h,
+- LIBNYQUIST_LOCAL_AVAILABLE="yes",
+- LIBNYQUIST_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/libnyquist/nyx.h], [LIBNYQUIST_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBNYQUIST_LOCAL_AVAILABLE" = "yes" ; then
+ AC_MSG_NOTICE([nyquist libraries are available in the local tree])
+diff --git m4/audacity_checklib_libsbsms.m4 m4/audacity_checklib_libsbsms.m4
+index c2f80dd..a0ec94b 100644
+--- m4/audacity_checklib_libsbsms.m4
++++ m4/audacity_checklib_libsbsms.m4
+@@ -25,9 +25,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSBSMS], [
+
+ dnl see if libsbsms is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/sbsms/include/sbsms.h,
+- LIBSBSMS_LOCAL_AVAILABLE="yes",
+- LIBSBSMS_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/sbsms/include/sbsms.h], [LIBSBSMS_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBSBSMS_LOCAL_AVAILABLE" = "yes"; then
+ dnl do not build programs we don't need
+diff --git m4/audacity_checklib_libsndfile.m4 m4/audacity_checklib_libsndfile.m4
+index d49e149..e501899 100644
+--- m4/audacity_checklib_libsndfile.m4
++++ m4/audacity_checklib_libsndfile.m4
+@@ -25,9 +25,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSNDFILE], [
+
+ dnl see if libsndfile is available in the local tree
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libsndfile/src/sndfile.h.in,
+- LIBSNDFILE_LOCAL_AVAILABLE="yes",
+- LIBSNDFILE_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/libsndfile/src/sndfile.h.in], [LIBSNDFILE_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBSNDFILE_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([libsndfile libraries are available in this source tree])
+diff --git m4/audacity_checklib_libsoundtouch.m4 m4/audacity_checklib_libsoundtouch.m4
+index 0b8aa69..d8d9f58 100644
+--- m4/audacity_checklib_libsoundtouch.m4
++++ m4/audacity_checklib_libsoundtouch.m4
+@@ -40,9 +40,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSOUNDTOUCH], [
+
+ dnl see if libsoundtouch is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/soundtouch/include/SoundTouch.h,
+- LIBSOUNDTOUCH_LOCAL_AVAILABLE="yes",
+- LIBSOUNDTOUCH_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/soundtouch/include/SoundTouch.h], [LIBSOUNDTOUCH_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBSOUNDTOUCH_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([libsoundtouch libraries are available in the local tree])
+diff --git m4/audacity_checklib_libsoxr.m4 m4/audacity_checklib_libsoxr.m4
+index a331e9b..1a0702b 100644
+--- m4/audacity_checklib_libsoxr.m4
++++ m4/audacity_checklib_libsoxr.m4
+@@ -25,9 +25,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSOXR], [
+
+ dnl see if libsoxr is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libsoxr/src/soxr.h,
+- LIBSOXR_LOCAL_AVAILABLE="yes",
+- LIBSOXR_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/libsoxr/src/soxr.h], [LIBSOXR_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBSOXR_LOCAL_AVAILABLE" = "yes"; then
+ # Breaks other other libraries in Audacity tree; but why is ./configure
+diff --git m4/audacity_checklib_libtwolame.m4 m4/audacity_checklib_libtwolame.m4
+index 2d28b07..fc2a2bf 100644
+--- m4/audacity_checklib_libtwolame.m4
++++ m4/audacity_checklib_libtwolame.m4
+@@ -25,9 +25,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBTWOLAME], [
+
+ dnl see if libtwolame is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/twolame/libtwolame/twolame.h,
+- LIBTWOLAME_LOCAL_AVAILABLE="yes",
+- LIBTWOLAME_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/twolame/libtwolame/twolame.h], [LIBTWOLAME_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBTWOLAME_LOCAL_AVAILABLE" = "yes"; then
+ dnl disable programs we don't need to build
+diff --git m4/audacity_checklib_libvamp.m4 m4/audacity_checklib_libvamp.m4
+index 8a1e0e1..57dc5eb 100644
+--- m4/audacity_checklib_libvamp.m4
++++ m4/audacity_checklib_libvamp.m4
+@@ -25,9 +25,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBVAMP], [
+
+ dnl see if Vamp is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h,
+- LIBVAMP_LOCAL_AVAILABLE="yes",
+- LIBVAMP_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h], [LIBVAMP_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBVAMP_LOCAL_AVAILABLE" = "yes"; then
+ LIBVAMP_LOCAL_CONFIGURE_ARGS="--disable-programs"
+diff --git m4/audacity_checklib_libvorbis.m4 m4/audacity_checklib_libvorbis.m4
+index 0839fa9..3d8b70d 100644
+--- m4/audacity_checklib_libvorbis.m4
++++ m4/audacity_checklib_libvorbis.m4
+@@ -30,13 +30,9 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBVORBIS], [
+
+ dnl see if Vorbis is available in the source dir
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h,
+- vorbisenc_h_available="yes",
+- vorbisenc_h_available="no")
++ AS_IF([test -f ${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h], [vorbisenc_h_available=yes])
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libogg/include/ogg/ogg.h,
+- ogg_h_available="yes",
+- ogg_h_available="no")
++ AS_IF([test -f ${srcdir}/lib-src/libogg/include/ogg/ogg.h], [ogg_h_available=yes])
+
+ if test "$vorbisenc_h_available" = "yes" -a "$ogg_h_available" = "yes"; then
+ LIBVORBIS_LOCAL_AVAILABLE="yes"
+diff --git m4/audacity_checklib_lv2.m4 m4/audacity_checklib_lv2.m4
+index 78a279a..164aa6d 100644
+--- m4/audacity_checklib_lv2.m4
++++ m4/audacity_checklib_lv2.m4
+@@ -23,9 +23,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LV2], [
+
+ dnl see if LV2 is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/lv2/configure,
+- LV2_LOCAL_AVAILABLE="yes",
+- LV2_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/lv2/configure], [LV2_LOCAL_AVAILABLE=yes])
+
+ if test "$LV2_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([LV2 libraries are available in the local tree])
+diff --git m4/audacity_checklib_portaudio.m4 m4/audacity_checklib_portaudio.m4
+index 9b7674e..03d62b8 100644
+--- m4/audacity_checklib_portaudio.m4
++++ m4/audacity_checklib_portaudio.m4
+@@ -31,9 +31,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_PORTAUDIO], [
+
+ dnl see if portaudio is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/portaudio-v19/include/portaudio.h,
+- PORTAUDIO_LOCAL_AVAILABLE="yes",
+- PORTAUDIO_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/portaudio-v19/include/portaudio.h], [PORTAUDIO_LOCAL_AVAILABLE=yes])
+
+ if test "$PORTAUDIO_LOCAL_AVAILABLE" = "yes"; then
+ dnl We need to override the pkg-config check for portmixer by passing
+diff --git m4/audacity_checklib_portmidi.m4 m4/audacity_checklib_portmidi.m4
+index 4e63b1b..6db1dc6 100644
+--- m4/audacity_checklib_portmidi.m4
++++ m4/audacity_checklib_portmidi.m4
+@@ -21,9 +21,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_PORTMIDI], [
+ AC_MSG_NOTICE([portmidi library is NOT available as system library])
+ fi
+
+- AC_CHECK_FILE(${srcdir}/lib-src/portmidi/pm_common/portmidi.h,
+- PORTMIDI_LOCAL_AVAILABLE="yes",
+- PORTMIDI_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/portmidi/pm_common/portmidi.h], [PORTMIDI_LOCAL_AVAILABLE=yes])
+
+ if test "$PORTMIDI_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([portmidi library is available in the local tree])
+diff --git m4/audacity_checklib_portsmf.m4 m4/audacity_checklib_portsmf.m4
+index 9c336d8..3a31ef5 100644
+--- m4/audacity_checklib_portsmf.m4
++++ m4/audacity_checklib_portsmf.m4
+@@ -24,9 +24,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_PORTSMF], [
+ AC_MSG_NOTICE([portSMF library is NOT available as system library])
+ fi
+
+- AC_CHECK_FILE(${srcdir}/lib-src/portsmf/allegro.h,
+- PORTSMF_LOCAL_AVAILABLE="yes",
+- PORTSMF_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/portsmf/allegro.h], [PORTSMF_LOCAL_AVAILABLE=yes])
+
+ if test "$PORTSMF_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([portSMF library is available in the local tree])
+diff --git m4/audacity_checklib_widgetextra.m4 m4/audacity_checklib_widgetextra.m4
+index 4ef0f97..f857723 100644
+--- m4/audacity_checklib_widgetextra.m4
++++ m4/audacity_checklib_widgetextra.m4
+@@ -28,9 +28,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_WIDGETEXTRA], [
+
+ dnl see if libwidgetextra is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h,
+- WIDGETEXTRA_LOCAL_AVAILABLE="yes",
+- WIDGETEXTRA_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h], [WIDGETEXTRA_LOCAL_AVAILABLE=yes])
+
+ if test "$WIDGETEXTRA_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([libwidgetextra library is available in the local tree])
+--
+2.30.0
+
+diff --git configure.ac configure.ac
+index 31c1245..166a77e 100644
+--- configure.ac
++++ configure.ac
+@@ -63,7 +63,7 @@ AC_PROG_CXXCPP
+ AM_PROG_AR
+
+ LT_INIT([disable-shared])
+-
++m4_pattern_allow([^AC_LANG])
+ AC_PROG_INSTALL
+ dnl pkg-config is required for lots of things
+ AC_CHECK_PROG(HAVE_PKG_CONFIG, pkg-config, yes, no)
diff --git a/srcpkgs/audacity/patches/configure.patch b/srcpkgs/audacity/patches/configure.patch
deleted file mode 100644
index 3b9c576c3f2..00000000000
--- a/srcpkgs/audacity/patches/configure.patch
+++ /dev/null
@@ -1,756 +0,0 @@
-configure uses AC_CHECK_FILE to test for file existence which is
-cross incompatible. Changed it to simple if/else statements.
-
---- configure.orig 2017-10-26 19:44:39.000000000 +0200
-+++ configure 2017-11-09 21:23:45.099433701 +0100
-@@ -20200,29 +20200,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/expat/lib/expat.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/expat/lib/expat.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/expat/lib/expat.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/expat/lib/expat.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- EXPAT_LOCAL_AVAILABLE="yes"
--else
-- EXPAT_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/expat/lib/expat.h"; then
-+ EXPAT_LOCAL_AVAILABLE="yes"
-+ else
-+ EXPAT_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$EXPAT_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: Expat libraries are available in the local tree" >&5
-@@ -20455,53 +20437,17 @@
- $as_echo "$as_me: FFmpeg library NOT available as system library" >&6;}
- fi
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- avcodec_h_found="yes"
--else
-- avcodec_h_found="no"
--fi
--
--
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/ffmpeg/libavformat/avformat.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/ffmpeg/libavformat/avformat.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/ffmpeg/libavformat/avformat.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/ffmpeg/libavformat/avformat.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- avformat_h_found="yes"
--else
-- avformat_h_found="no"
--fi
-+ if test -f "${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h"; then
-+ avcodec_h_found="yes"
-+ else
-+ avcodec_h_found="no"
-+ fi
-
-+ if test -f "${srcdir}/lib-src/ffmpeg/libavformat/avformat.h"; then
-+ avformat_h_found="yes"
-+ else
-+ avformat_h_found="no"
-+ fi
-
- if test "$avcodec_h_found" = "yes" -a "$avformat_h_found" = "yes"; then
- FFMPEG_LOCAL_AVAILABLE="yes"
-@@ -20589,29 +20535,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/lame/lame/lame.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/lame/lame/lame.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/lame/lame/lame.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/lame/lame/lame.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LAME_LOCAL_AVAILABLE="yes"
--else
-- LAME_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/lame/lame/lame.h"; then
-+ LAME_LOCAL_AVAILABLE="yes"
-+ else
-+ LAME_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LAME_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: LAME headers are available in this source tree." >&5
-@@ -20780,53 +20708,17 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libflac/include/FLAC/format.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libflac/include/FLAC/format.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libflac/include/FLAC/format.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libflac/include/FLAC/format.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- flac_h_available="yes"
--else
-- flac_h_available="no"
--fi
--
--
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libflac/include/FLAC++/decoder.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libflac/include/FLAC++/decoder.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libflac/include/FLAC++/decoder.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libflac/include/FLAC++/decoder.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- flacpp_h_available="yes"
--else
-- flacpp_h_available="no"
--fi
-+ if test -f "${srcdir}/lib-src/libflac/include/FLAC/format.h"; then
-+ flac_h_available="yes"
-+ else
-+ flac_h_available="no"
-+ fi
-
-+ if test -f "${srcdir}/lib-src/libflac/include/FLAC++/decoder.h"; then
-+ flacpp_h_available="yes"
-+ else
-+ flacpp_h_available="no"
-+ fi
-
- if test "$flac_h_available" = "yes" -a "$flacpp_h_available" = "yes"; then
- LIBFLAC_LOCAL_AVAILABLE="yes"
-@@ -20930,29 +20822,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libid3tag/frame.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libid3tag/frame.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libid3tag/frame.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libid3tag/frame.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBID3TAG_LOCAL_AVAILABLE="yes"
--else
-- LIBID3TAG_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libid3tag/frame.h"; then
-+ LIBID3TAG_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBID3TAG_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBID3TAG_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: libid3tag libraries are available in the local tree" >&5
-@@ -21099,29 +20973,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libmad/frame.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libmad/frame.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libmad/frame.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libmad/frame.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBMAD_LOCAL_AVAILABLE="yes"
--else
-- LIBMAD_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libmad/frame.h"; then
-+ LIBMAD_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBMAD_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBMAD_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: libmad libraries are available in the local tree" >&5
-@@ -21144,29 +21000,11 @@
- LIBNYQUIST_SYSTEM_AVAILABLE="no"
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libnyquist/nyx.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libnyquist/nyx.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libnyquist/nyx.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libnyquist/nyx.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBNYQUIST_LOCAL_AVAILABLE="yes"
--else
-- LIBNYQUIST_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libnyquist/nyx.h"; then
-+ LIBNYQUIST_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBNYQUIST_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBNYQUIST_LOCAL_AVAILABLE" = "yes" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: nyquist libraries are available in the local tree" >&5
-@@ -21265,29 +21103,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/sbsms/include/sbsms.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/sbsms/include/sbsms.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/sbsms/include/sbsms.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/sbsms/include/sbsms.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBSBSMS_LOCAL_AVAILABLE="yes"
--else
-- LIBSBSMS_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/sbsms/include/sbsms.h"; then
-+ LIBSBSMS_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBSBSMS_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBSBSMS_LOCAL_AVAILABLE" = "yes"; then
- LIBSBSMS_LOCAL_CONFIGURE_ARGS="--disable-programs"
-@@ -21388,29 +21208,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libsndfile/src/sndfile.h.in" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libsndfile/src/sndfile.h.in" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libsndfile/src/sndfile.h.in... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libsndfile/src/sndfile.h.in"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBSNDFILE_LOCAL_AVAILABLE="yes"
--else
-- LIBSNDFILE_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libsndfile/src/sndfile.h.in"; then
-+ LIBSNDFILE_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBSNDFILE_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBSNDFILE_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: libsndfile libraries are available in this source tree" >&5
-@@ -21650,29 +21452,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/soundtouch/include/SoundTouch.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/soundtouch/include/SoundTouch.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/soundtouch/include/SoundTouch.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/soundtouch/include/SoundTouch.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBSOUNDTOUCH_LOCAL_AVAILABLE="yes"
--else
-- LIBSOUNDTOUCH_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/soundtouch/include/SoundTouch.h"; then
-+ LIBSOUNDTOUCH_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBSOUNDTOUCH_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBSOUNDTOUCH_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: libsoundtouch libraries are available in the local tree" >&5
-@@ -21771,29 +21555,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libsoxr/src/soxr.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libsoxr/src/soxr.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libsoxr/src/soxr.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libsoxr/src/soxr.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBSOXR_LOCAL_AVAILABLE="yes"
--else
-- LIBSOXR_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libsoxr/src/soxr.h"; then
-+ LIBSOXR_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBSOXR_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBSOXR_LOCAL_AVAILABLE" = "yes"; then
- # Breaks other other libraries in Audacity tree; but why is ./configure
-@@ -21894,29 +21660,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/twolame/libtwolame/twolame.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/twolame/libtwolame/twolame.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/twolame/libtwolame/twolame.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/twolame/libtwolame/twolame.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBTWOLAME_LOCAL_AVAILABLE="yes"
--else
-- LIBTWOLAME_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/twolame/libtwolame/twolame.h"; then
-+ LIBTWOLAME_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBTWOLAME_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBTWOLAME_LOCAL_AVAILABLE" = "yes"; then
- LIBTWOLAME_LOCAL_CONFIGURE_ARGS="--disable-programs"
-@@ -22015,29 +21763,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBVAMP_LOCAL_AVAILABLE="yes"
--else
-- LIBVAMP_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h"; then
-+ LIBVAMP_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBVAMP_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBVAMP_LOCAL_AVAILABLE" = "yes"; then
- LIBVAMP_LOCAL_CONFIGURE_ARGS="--disable-programs"
-@@ -22136,52 +21866,17 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- vorbisenc_h_available="yes"
--else
-- vorbisenc_h_available="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h"; then
-+ vorbisenc_h_available="yes"
-+ else
-+ vorbisenc_h_available="no"
-+ fi
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libogg/include/ogg/ogg.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libogg/include/ogg/ogg.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libogg/include/ogg/ogg.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libogg/include/ogg/ogg.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- ogg_h_available="yes"
--else
-- ogg_h_available="no"
--fi
-+ if test -f "${srcdir}/lib-src/libogg/include/ogg/ogg.h"; then
-+ ogg_h_available="yes"
-+ else
-+ ogg_h_available="no"
-+ fi
-
-
- if test "$vorbisenc_h_available" = "yes" -a "$ogg_h_available" = "yes"; then
-@@ -22290,29 +21985,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/lv2/configure" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/lv2/configure" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/lv2/configure... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/lv2/configure"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LV2_LOCAL_AVAILABLE="yes"
--else
-- LV2_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/lv2/configure"; then
-+ LV2_LOCAL_AVAILABLE="yes"
-+ else
-+ LV2_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LV2_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: LV2 libraries are available in the local tree" >&5
-@@ -22432,29 +22109,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/portaudio-v19/include/portaudio.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/portaudio-v19/include/portaudio.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/portaudio-v19/include/portaudio.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/portaudio-v19/include/portaudio.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- PORTAUDIO_LOCAL_AVAILABLE="yes"
--else
-- PORTAUDIO_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/portaudio-v19/include/portaudio.h"; then
-+ PORTAUDIO_LOCAL_AVAILABLE="yes"
-+ else
-+ PORTAUDIO_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$PORTAUDIO_LOCAL_AVAILABLE" = "yes"; then
- pa_dir="$(pwd)/${srcdir}/lib-src/portaudio-v19"
-@@ -22555,29 +22214,12 @@
- $as_echo "$as_me: portSMF library is NOT available as system library" >&6;}
- fi
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/portsmf/allegro.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/portsmf/allegro.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/portsmf/allegro.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/portsmf/allegro.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- PORTSMF_LOCAL_AVAILABLE="yes"
--else
-- PORTSMF_LOCAL_AVAILABLE="no"
--fi
-
-+ if test -f "${srcdir}/lib-src/portsmf/allegro.h"; then
-+ PORTSMF_LOCAL_AVAILABLE="yes"
-+ else
-+ PORTSMF_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$PORTSMF_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: portSMF library is available in the local tree" >&5
-@@ -22675,29 +22317,12 @@
- $as_echo "$as_me: portmidi library is NOT available as system library" >&6;}
- fi
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/portmidi/pm_common/portmidi.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/portmidi/pm_common/portmidi.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/portmidi/pm_common/portmidi.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/portmidi/pm_common/portmidi.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- PORTMIDI_LOCAL_AVAILABLE="yes"
--else
-- PORTMIDI_LOCAL_AVAILABLE="no"
--fi
-
-+ if test -f "${srcdir}/lib-src/portmidi/pm_common/portmidi.h"; then
-+ PORTMIDI_LOCAL_AVAILABLE="yes"
-+ else
-+ PORTMIDI_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$PORTMIDI_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: portmidi library is available in the local tree" >&5
-@@ -22795,29 +22420,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- WIDGETEXTRA_LOCAL_AVAILABLE="yes"
--else
-- WIDGETEXTRA_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h"; then
-+ WIDGETEXTRA_LOCAL_AVAILABLE="yes"
-+ else
-+ WIDGETEXTRA_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$WIDGETEXTRA_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: libwidgetextra library is available in the local tree" >&5
diff --git a/srcpkgs/audacity/template b/srcpkgs/audacity/template
index 7f4d0a49098..0e1310ec6fd 100644
--- a/srcpkgs/audacity/template
+++ b/srcpkgs/audacity/template
@@ -6,7 +6,7 @@ wrksrc="${pkgname}-Audacity-${version}"
build_style=gnu-configure
configure_args="--with-ffmpeg=system --with-libsndfile=system --with-expat=system
--with-libsoxr=system --with-lame=system --with-lv2=system ac_cv_path_WX_CONFIG=wx-config-gtk3"
-hostmakedepends="pkg-config cmake gettext libtool m4 python which"
+hostmakedepends="automake pkg-config cmake gettext-devel libtool m4 python which"
makedepends="jack-devel wxWidgets-gtk3-devel gtk+3-devel
libmad-devel soundtouch-devel libsoxr-devel
vamp-plugin-sdk-devel lame-devel libid3tag-devel libflac-devel
@@ -29,10 +29,11 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
LDFLAGS="-latomic"
fi
+pre_configure() {
+ autoreconf -fi
+}
+
post_install() {
vcopy nyquist /usr/share/audacity
vcopy plug-ins /usr/share/audacity
-
- rm ${DESTDIR}/usr/share/doc/${pkgname}/LICENSE.txt
- vlicense LICENSE.txt LICENSE
}
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] audacity: simplify cross-build patch
2020-12-30 2:01 [PR PATCH] audacity: simplify cross-build patch ndowens
2020-12-30 2:03 ` [PR PATCH] [Updated] " ndowens
2020-12-30 2:09 ` ndowens
@ 2020-12-30 2:32 ` ndowens
2020-12-30 3:50 ` ndowens
` (6 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: ndowens @ 2020-12-30 2:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 543 bytes --]
There is an updated pull request by ndowens against master on the void-packages repository
https://github.com/ndowens/void-packages audacity
https://github.com/void-linux/void-packages/pull/27548
[WIP] audacity: simplify cross-build patch
@sgn Since you taught me slightly on how to fix autotool cross-builds, wondering what you think of this?
Built locally and seems to have linked with libs I expected it to.
Edit: Odd locally it built fine.
A patch file from https://github.com/void-linux/void-packages/pull/27548.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-audacity-27548.patch --]
[-- Type: text/x-diff, Size: 45559 bytes --]
From df446ab46159039fbe0781b9dbef2977b8573283 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Tue, 29 Dec 2020 19:57:38 -0600
Subject: [PATCH] audacity: simplify cross-build patch
---
.../patches/0001-fix-cross-build.patch | 336 ++++++++
srcpkgs/audacity/patches/configure.patch | 756 ------------------
srcpkgs/audacity/template | 15 +-
3 files changed, 346 insertions(+), 761 deletions(-)
create mode 100644 srcpkgs/audacity/patches/0001-fix-cross-build.patch
delete mode 100644 srcpkgs/audacity/patches/configure.patch
diff --git a/srcpkgs/audacity/patches/0001-fix-cross-build.patch b/srcpkgs/audacity/patches/0001-fix-cross-build.patch
new file mode 100644
index 00000000000..63a55c73971
--- /dev/null
+++ b/srcpkgs/audacity/patches/0001-fix-cross-build.patch
@@ -0,0 +1,336 @@
+From 5f1ac685992183d71097669b1956b2af06ad6ed0 Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Tue, 29 Dec 2020 19:44:34 -0600
+Subject: [PATCH] fix cross build
+
+Replace AC_CHECK_FILES as it is not cross-friendly
+---
+diff --git configure.ac configure.ac
+index d8a7cf1..31c1245 100644
+--- configure.ac
++++ configure.ac
+@@ -214,7 +214,7 @@ if test x$enable_sse = xyes; then
+ AX_CHECK_COMPILER_FLAGS(-msse, [SBSMS_CFLAGS="$SBSMS_CFLAGS -msse"],[AC_MSG_ERROR([Need a version of gcc with -msse])])
+ fi
+
+- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <xmmintrin.h>]], [[__m128 v,w; float p[8]; v = _mm_loadu_ps(p); _mm_storeu_ps(p,v); w = _mm_loadl_pi(w,(const __m64*)p); w = _mm_loadh_pi(w,(const __m64*)p); _mm_storel_pi((__m64 *)p, w); _mm_storeh_pi((__m64 *)p, w); v = _mm_add_ps(v,w); v = _mm_sub_ps(v,w); v = _mm_mul_ps(v,w); v = _mm_shuffle_ps(v,w,_MM_SHUFFLE(0,1,2,3)); w = _mm_set1_ps(0.0f);]])], [sse_ok=yes], [sse_ok=no])
++ AC_TRY_COMPILE([AC_LANG_PROGRAM([[#include <xmmintrin.h>]], [[__m128 v,w; float p[8]; v = _mm_loadu_ps(p); _mm_storeu_ps(p,v); w = _mm_loadl_pi(w,(const __m64*)p); w = _mm_loadh_pi(w,(const __m64*)p); _mm_storel_pi((__m64 *)p, w); _mm_storeh_pi((__m64 *)p, w); v = _mm_add_ps(v,w); v = _mm_sub_ps(v,w); v = _mm_mul_ps(v,w); v = _mm_shuffle_ps(v,w,_MM_SHUFFLE(0,1,2,3)); w = _mm_set1_ps(0.0f);]])], [sse_ok=yes], [sse_ok=no])
+
+ if test x$sse_ok = xyes; then
+ AC_DEFINE(ENABLE_SSE,1,[Define to enable sse])
+diff --git m4/audacity_checklib_ffmpeg.m4 m4/audacity_checklib_ffmpeg.m4
+index b98110f..d4754aa 100644
+--- m4/audacity_checklib_ffmpeg.m4
++++ m4/audacity_checklib_ffmpeg.m4
+@@ -35,13 +35,9 @@ AC_DEFUN([AUDACITY_CHECKLIB_FFMPEG], [
+
+ dnl see if ffmpeg is available locally, or rather that we have some headers
+ dnl in lib-src/ffmpeg/ we can use.
+- AC_CHECK_FILE(${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h,
+- avcodec_h_found="yes",
+- avcodec_h_found="no")
++ AS_IF([test -f ${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h], [avcodec_h_found=yes])
+
+- AC_CHECK_FILE(${srcdir}/lib-src/ffmpeg/libavformat/avformat.h,
+- avformat_h_found="yes",
+- avformat_h_found="no")
++ AS_IF([test -f ${srcdir}/lib-src/ffmpeg/libavformat/avformat.h], [avformat_h_found=yes])
+
+ if test "$avcodec_h_found" = "yes" -a "$avformat_h_found" = "yes"; then
+ FFMPEG_LOCAL_AVAILABLE="yes"
+diff --git m4/audacity_checklib_lame.m4 m4/audacity_checklib_lame.m4
+index 28ecd77..5794143 100644
+--- m4/audacity_checklib_lame.m4
++++ m4/audacity_checklib_lame.m4
+@@ -33,9 +33,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LAME], [
+
+ dnl see if LAME is available in the source dir
+
+- AC_CHECK_FILE(${srcdir}/lib-src/lame/lame/lame.h,
+- LAME_LOCAL_AVAILABLE="yes",
+- LAME_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/lame/lame/lame.h], [LAME_LOCAL_AVAILABLE=yes])
+
+ if test "$LAME_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([LAME headers are available in this source tree.])
+diff --git m4/audacity_checklib_libexpat.m4 m4/audacity_checklib_libexpat.m4
+index c0c88db..ffe76ac 100644
+--- m4/audacity_checklib_libexpat.m4
++++ m4/audacity_checklib_libexpat.m4
+@@ -42,9 +42,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_EXPAT], [
+
+ dnl see if expat is available in the local tree
+
+- AC_CHECK_FILE(${srcdir}/lib-src/expat/lib/expat.h,
+- EXPAT_LOCAL_AVAILABLE="yes",
+- EXPAT_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/expat/lib/expat.h], [EXPAT_LOCAL_AVAILABLE=yes])
+
+ if test "$EXPAT_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([Expat libraries are available in the local tree])
+diff --git m4/audacity_checklib_libflac.m4 m4/audacity_checklib_libflac.m4
+index 1002986..6096791 100644
+--- m4/audacity_checklib_libflac.m4
++++ m4/audacity_checklib_libflac.m4
+@@ -38,13 +38,9 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBFLAC], [
+
+ dnl see if FLAC is available in the source dir
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libflac/include/FLAC/format.h,
+- flac_h_available="yes",
+- flac_h_available="no")
++ AS_IF([test -f ${srcdir}/lib-src/libflac/include/FLAC/format.h], [flac_h_available=yes])
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libflac/include/FLAC++/decoder.h,
+- flacpp_h_available="yes",
+- flacpp_h_available="no")
++ AS_IF([test -f ${srcdir}/lib-src/libflac/include/FLAC++/decoder.h], [flacpp_h_available=yes])
+
+ if test "$flac_h_available" = "yes" -a "$flacpp_h_available" = "yes"; then
+ LIBFLAC_LOCAL_AVAILABLE="yes"
+diff --git m4/audacity_checklib_libid3tag.m4 m4/audacity_checklib_libid3tag.m4
+index b69c2cb..59e94cc 100644
+--- m4/audacity_checklib_libid3tag.m4
++++ m4/audacity_checklib_libid3tag.m4
+@@ -25,9 +25,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBID3TAG], [
+
+ dnl see if libid3tag is available in the local tree
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libid3tag/frame.h,
+- LIBID3TAG_LOCAL_AVAILABLE="yes",
+- LIBID3TAG_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/libid3tag/frame.h], [LIBID3TAG_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBID3TAG_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([libid3tag libraries are available in the local tree])
+diff --git m4/audacity_checklib_libmad.m4 m4/audacity_checklib_libmad.m4
+index 0c2d02a..d53c459 100644
+--- m4/audacity_checklib_libmad.m4
++++ m4/audacity_checklib_libmad.m4
+@@ -34,9 +34,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBMAD], [
+
+ dnl see if libmad is available in the local tree
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libmad/frame.h,
+- LIBMAD_LOCAL_AVAILABLE="yes",
+- LIBMAD_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/libmad/frame.h], [LIBMAD_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBMAD_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([libmad libraries are available in the local tree])
+diff --git m4/audacity_checklib_libnyquist.m4 m4/audacity_checklib_libnyquist.m4
+index 3f1c98f..b4af690 100644
+--- m4/audacity_checklib_libnyquist.m4
++++ m4/audacity_checklib_libnyquist.m4
+@@ -17,9 +17,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBNYQUIST], [
+
+ dnl see if Nyquist is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libnyquist/nyx.h,
+- LIBNYQUIST_LOCAL_AVAILABLE="yes",
+- LIBNYQUIST_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/libnyquist/nyx.h], [LIBNYQUIST_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBNYQUIST_LOCAL_AVAILABLE" = "yes" ; then
+ AC_MSG_NOTICE([nyquist libraries are available in the local tree])
+diff --git m4/audacity_checklib_libsbsms.m4 m4/audacity_checklib_libsbsms.m4
+index c2f80dd..a0ec94b 100644
+--- m4/audacity_checklib_libsbsms.m4
++++ m4/audacity_checklib_libsbsms.m4
+@@ -25,9 +25,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSBSMS], [
+
+ dnl see if libsbsms is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/sbsms/include/sbsms.h,
+- LIBSBSMS_LOCAL_AVAILABLE="yes",
+- LIBSBSMS_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/sbsms/include/sbsms.h], [LIBSBSMS_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBSBSMS_LOCAL_AVAILABLE" = "yes"; then
+ dnl do not build programs we don't need
+diff --git m4/audacity_checklib_libsndfile.m4 m4/audacity_checklib_libsndfile.m4
+index d49e149..e501899 100644
+--- m4/audacity_checklib_libsndfile.m4
++++ m4/audacity_checklib_libsndfile.m4
+@@ -25,9 +25,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSNDFILE], [
+
+ dnl see if libsndfile is available in the local tree
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libsndfile/src/sndfile.h.in,
+- LIBSNDFILE_LOCAL_AVAILABLE="yes",
+- LIBSNDFILE_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/libsndfile/src/sndfile.h.in], [LIBSNDFILE_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBSNDFILE_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([libsndfile libraries are available in this source tree])
+diff --git m4/audacity_checklib_libsoundtouch.m4 m4/audacity_checklib_libsoundtouch.m4
+index 0b8aa69..d8d9f58 100644
+--- m4/audacity_checklib_libsoundtouch.m4
++++ m4/audacity_checklib_libsoundtouch.m4
+@@ -40,9 +40,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSOUNDTOUCH], [
+
+ dnl see if libsoundtouch is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/soundtouch/include/SoundTouch.h,
+- LIBSOUNDTOUCH_LOCAL_AVAILABLE="yes",
+- LIBSOUNDTOUCH_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/soundtouch/include/SoundTouch.h], [LIBSOUNDTOUCH_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBSOUNDTOUCH_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([libsoundtouch libraries are available in the local tree])
+diff --git m4/audacity_checklib_libsoxr.m4 m4/audacity_checklib_libsoxr.m4
+index a331e9b..1a0702b 100644
+--- m4/audacity_checklib_libsoxr.m4
++++ m4/audacity_checklib_libsoxr.m4
+@@ -25,9 +25,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSOXR], [
+
+ dnl see if libsoxr is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libsoxr/src/soxr.h,
+- LIBSOXR_LOCAL_AVAILABLE="yes",
+- LIBSOXR_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/libsoxr/src/soxr.h], [LIBSOXR_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBSOXR_LOCAL_AVAILABLE" = "yes"; then
+ # Breaks other other libraries in Audacity tree; but why is ./configure
+diff --git m4/audacity_checklib_libtwolame.m4 m4/audacity_checklib_libtwolame.m4
+index 2d28b07..fc2a2bf 100644
+--- m4/audacity_checklib_libtwolame.m4
++++ m4/audacity_checklib_libtwolame.m4
+@@ -25,9 +25,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBTWOLAME], [
+
+ dnl see if libtwolame is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/twolame/libtwolame/twolame.h,
+- LIBTWOLAME_LOCAL_AVAILABLE="yes",
+- LIBTWOLAME_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/twolame/libtwolame/twolame.h], [LIBTWOLAME_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBTWOLAME_LOCAL_AVAILABLE" = "yes"; then
+ dnl disable programs we don't need to build
+diff --git m4/audacity_checklib_libvamp.m4 m4/audacity_checklib_libvamp.m4
+index 8a1e0e1..57dc5eb 100644
+--- m4/audacity_checklib_libvamp.m4
++++ m4/audacity_checklib_libvamp.m4
+@@ -25,9 +25,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBVAMP], [
+
+ dnl see if Vamp is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h,
+- LIBVAMP_LOCAL_AVAILABLE="yes",
+- LIBVAMP_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h], [LIBVAMP_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBVAMP_LOCAL_AVAILABLE" = "yes"; then
+ LIBVAMP_LOCAL_CONFIGURE_ARGS="--disable-programs"
+diff --git m4/audacity_checklib_libvorbis.m4 m4/audacity_checklib_libvorbis.m4
+index 0839fa9..3d8b70d 100644
+--- m4/audacity_checklib_libvorbis.m4
++++ m4/audacity_checklib_libvorbis.m4
+@@ -30,13 +30,9 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBVORBIS], [
+
+ dnl see if Vorbis is available in the source dir
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h,
+- vorbisenc_h_available="yes",
+- vorbisenc_h_available="no")
++ AS_IF([test -f ${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h], [vorbisenc_h_available=yes])
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libogg/include/ogg/ogg.h,
+- ogg_h_available="yes",
+- ogg_h_available="no")
++ AS_IF([test -f ${srcdir}/lib-src/libogg/include/ogg/ogg.h], [ogg_h_available=yes])
+
+ if test "$vorbisenc_h_available" = "yes" -a "$ogg_h_available" = "yes"; then
+ LIBVORBIS_LOCAL_AVAILABLE="yes"
+diff --git m4/audacity_checklib_lv2.m4 m4/audacity_checklib_lv2.m4
+index 78a279a..164aa6d 100644
+--- m4/audacity_checklib_lv2.m4
++++ m4/audacity_checklib_lv2.m4
+@@ -23,9 +23,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LV2], [
+
+ dnl see if LV2 is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/lv2/configure,
+- LV2_LOCAL_AVAILABLE="yes",
+- LV2_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/lv2/configure], [LV2_LOCAL_AVAILABLE=yes])
+
+ if test "$LV2_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([LV2 libraries are available in the local tree])
+diff --git m4/audacity_checklib_portaudio.m4 m4/audacity_checklib_portaudio.m4
+index 9b7674e..03d62b8 100644
+--- m4/audacity_checklib_portaudio.m4
++++ m4/audacity_checklib_portaudio.m4
+@@ -31,9 +31,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_PORTAUDIO], [
+
+ dnl see if portaudio is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/portaudio-v19/include/portaudio.h,
+- PORTAUDIO_LOCAL_AVAILABLE="yes",
+- PORTAUDIO_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/portaudio-v19/include/portaudio.h], [PORTAUDIO_LOCAL_AVAILABLE=yes])
+
+ if test "$PORTAUDIO_LOCAL_AVAILABLE" = "yes"; then
+ dnl We need to override the pkg-config check for portmixer by passing
+diff --git m4/audacity_checklib_portmidi.m4 m4/audacity_checklib_portmidi.m4
+index 4e63b1b..6db1dc6 100644
+--- m4/audacity_checklib_portmidi.m4
++++ m4/audacity_checklib_portmidi.m4
+@@ -21,9 +21,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_PORTMIDI], [
+ AC_MSG_NOTICE([portmidi library is NOT available as system library])
+ fi
+
+- AC_CHECK_FILE(${srcdir}/lib-src/portmidi/pm_common/portmidi.h,
+- PORTMIDI_LOCAL_AVAILABLE="yes",
+- PORTMIDI_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/portmidi/pm_common/portmidi.h], [PORTMIDI_LOCAL_AVAILABLE=yes])
+
+ if test "$PORTMIDI_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([portmidi library is available in the local tree])
+diff --git m4/audacity_checklib_portsmf.m4 m4/audacity_checklib_portsmf.m4
+index 9c336d8..3a31ef5 100644
+--- m4/audacity_checklib_portsmf.m4
++++ m4/audacity_checklib_portsmf.m4
+@@ -24,9 +24,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_PORTSMF], [
+ AC_MSG_NOTICE([portSMF library is NOT available as system library])
+ fi
+
+- AC_CHECK_FILE(${srcdir}/lib-src/portsmf/allegro.h,
+- PORTSMF_LOCAL_AVAILABLE="yes",
+- PORTSMF_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/portsmf/allegro.h], [PORTSMF_LOCAL_AVAILABLE=yes])
+
+ if test "$PORTSMF_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([portSMF library is available in the local tree])
+diff --git m4/audacity_checklib_widgetextra.m4 m4/audacity_checklib_widgetextra.m4
+index 4ef0f97..f857723 100644
+--- m4/audacity_checklib_widgetextra.m4
++++ m4/audacity_checklib_widgetextra.m4
+@@ -28,9 +28,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_WIDGETEXTRA], [
+
+ dnl see if libwidgetextra is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h,
+- WIDGETEXTRA_LOCAL_AVAILABLE="yes",
+- WIDGETEXTRA_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h], [WIDGETEXTRA_LOCAL_AVAILABLE=yes])
+
+ if test "$WIDGETEXTRA_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([libwidgetextra library is available in the local tree])
+--
+2.30.0
+
+diff --git configure.ac configure.ac
+index 31c1245..166a77e 100644
+--- configure.ac
++++ configure.ac
+@@ -63,7 +63,7 @@ AC_PROG_CXXCPP
+ AM_PROG_AR
+
+ LT_INIT([disable-shared])
+-
++m4_pattern_allow([^AC_LANG])
+ AC_PROG_INSTALL
+ dnl pkg-config is required for lots of things
+ AC_CHECK_PROG(HAVE_PKG_CONFIG, pkg-config, yes, no)
diff --git a/srcpkgs/audacity/patches/configure.patch b/srcpkgs/audacity/patches/configure.patch
deleted file mode 100644
index 3b9c576c3f2..00000000000
--- a/srcpkgs/audacity/patches/configure.patch
+++ /dev/null
@@ -1,756 +0,0 @@
-configure uses AC_CHECK_FILE to test for file existence which is
-cross incompatible. Changed it to simple if/else statements.
-
---- configure.orig 2017-10-26 19:44:39.000000000 +0200
-+++ configure 2017-11-09 21:23:45.099433701 +0100
-@@ -20200,29 +20200,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/expat/lib/expat.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/expat/lib/expat.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/expat/lib/expat.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/expat/lib/expat.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- EXPAT_LOCAL_AVAILABLE="yes"
--else
-- EXPAT_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/expat/lib/expat.h"; then
-+ EXPAT_LOCAL_AVAILABLE="yes"
-+ else
-+ EXPAT_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$EXPAT_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: Expat libraries are available in the local tree" >&5
-@@ -20455,53 +20437,17 @@
- $as_echo "$as_me: FFmpeg library NOT available as system library" >&6;}
- fi
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- avcodec_h_found="yes"
--else
-- avcodec_h_found="no"
--fi
--
--
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/ffmpeg/libavformat/avformat.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/ffmpeg/libavformat/avformat.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/ffmpeg/libavformat/avformat.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/ffmpeg/libavformat/avformat.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- avformat_h_found="yes"
--else
-- avformat_h_found="no"
--fi
-+ if test -f "${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h"; then
-+ avcodec_h_found="yes"
-+ else
-+ avcodec_h_found="no"
-+ fi
-
-+ if test -f "${srcdir}/lib-src/ffmpeg/libavformat/avformat.h"; then
-+ avformat_h_found="yes"
-+ else
-+ avformat_h_found="no"
-+ fi
-
- if test "$avcodec_h_found" = "yes" -a "$avformat_h_found" = "yes"; then
- FFMPEG_LOCAL_AVAILABLE="yes"
-@@ -20589,29 +20535,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/lame/lame/lame.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/lame/lame/lame.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/lame/lame/lame.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/lame/lame/lame.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LAME_LOCAL_AVAILABLE="yes"
--else
-- LAME_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/lame/lame/lame.h"; then
-+ LAME_LOCAL_AVAILABLE="yes"
-+ else
-+ LAME_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LAME_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: LAME headers are available in this source tree." >&5
-@@ -20780,53 +20708,17 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libflac/include/FLAC/format.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libflac/include/FLAC/format.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libflac/include/FLAC/format.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libflac/include/FLAC/format.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- flac_h_available="yes"
--else
-- flac_h_available="no"
--fi
--
--
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libflac/include/FLAC++/decoder.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libflac/include/FLAC++/decoder.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libflac/include/FLAC++/decoder.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libflac/include/FLAC++/decoder.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- flacpp_h_available="yes"
--else
-- flacpp_h_available="no"
--fi
-+ if test -f "${srcdir}/lib-src/libflac/include/FLAC/format.h"; then
-+ flac_h_available="yes"
-+ else
-+ flac_h_available="no"
-+ fi
-
-+ if test -f "${srcdir}/lib-src/libflac/include/FLAC++/decoder.h"; then
-+ flacpp_h_available="yes"
-+ else
-+ flacpp_h_available="no"
-+ fi
-
- if test "$flac_h_available" = "yes" -a "$flacpp_h_available" = "yes"; then
- LIBFLAC_LOCAL_AVAILABLE="yes"
-@@ -20930,29 +20822,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libid3tag/frame.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libid3tag/frame.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libid3tag/frame.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libid3tag/frame.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBID3TAG_LOCAL_AVAILABLE="yes"
--else
-- LIBID3TAG_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libid3tag/frame.h"; then
-+ LIBID3TAG_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBID3TAG_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBID3TAG_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: libid3tag libraries are available in the local tree" >&5
-@@ -21099,29 +20973,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libmad/frame.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libmad/frame.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libmad/frame.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libmad/frame.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBMAD_LOCAL_AVAILABLE="yes"
--else
-- LIBMAD_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libmad/frame.h"; then
-+ LIBMAD_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBMAD_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBMAD_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: libmad libraries are available in the local tree" >&5
-@@ -21144,29 +21000,11 @@
- LIBNYQUIST_SYSTEM_AVAILABLE="no"
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libnyquist/nyx.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libnyquist/nyx.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libnyquist/nyx.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libnyquist/nyx.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBNYQUIST_LOCAL_AVAILABLE="yes"
--else
-- LIBNYQUIST_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libnyquist/nyx.h"; then
-+ LIBNYQUIST_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBNYQUIST_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBNYQUIST_LOCAL_AVAILABLE" = "yes" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: nyquist libraries are available in the local tree" >&5
-@@ -21265,29 +21103,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/sbsms/include/sbsms.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/sbsms/include/sbsms.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/sbsms/include/sbsms.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/sbsms/include/sbsms.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBSBSMS_LOCAL_AVAILABLE="yes"
--else
-- LIBSBSMS_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/sbsms/include/sbsms.h"; then
-+ LIBSBSMS_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBSBSMS_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBSBSMS_LOCAL_AVAILABLE" = "yes"; then
- LIBSBSMS_LOCAL_CONFIGURE_ARGS="--disable-programs"
-@@ -21388,29 +21208,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libsndfile/src/sndfile.h.in" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libsndfile/src/sndfile.h.in" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libsndfile/src/sndfile.h.in... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libsndfile/src/sndfile.h.in"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBSNDFILE_LOCAL_AVAILABLE="yes"
--else
-- LIBSNDFILE_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libsndfile/src/sndfile.h.in"; then
-+ LIBSNDFILE_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBSNDFILE_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBSNDFILE_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: libsndfile libraries are available in this source tree" >&5
-@@ -21650,29 +21452,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/soundtouch/include/SoundTouch.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/soundtouch/include/SoundTouch.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/soundtouch/include/SoundTouch.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/soundtouch/include/SoundTouch.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBSOUNDTOUCH_LOCAL_AVAILABLE="yes"
--else
-- LIBSOUNDTOUCH_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/soundtouch/include/SoundTouch.h"; then
-+ LIBSOUNDTOUCH_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBSOUNDTOUCH_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBSOUNDTOUCH_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: libsoundtouch libraries are available in the local tree" >&5
-@@ -21771,29 +21555,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libsoxr/src/soxr.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libsoxr/src/soxr.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libsoxr/src/soxr.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libsoxr/src/soxr.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBSOXR_LOCAL_AVAILABLE="yes"
--else
-- LIBSOXR_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libsoxr/src/soxr.h"; then
-+ LIBSOXR_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBSOXR_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBSOXR_LOCAL_AVAILABLE" = "yes"; then
- # Breaks other other libraries in Audacity tree; but why is ./configure
-@@ -21894,29 +21660,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/twolame/libtwolame/twolame.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/twolame/libtwolame/twolame.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/twolame/libtwolame/twolame.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/twolame/libtwolame/twolame.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBTWOLAME_LOCAL_AVAILABLE="yes"
--else
-- LIBTWOLAME_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/twolame/libtwolame/twolame.h"; then
-+ LIBTWOLAME_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBTWOLAME_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBTWOLAME_LOCAL_AVAILABLE" = "yes"; then
- LIBTWOLAME_LOCAL_CONFIGURE_ARGS="--disable-programs"
-@@ -22015,29 +21763,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBVAMP_LOCAL_AVAILABLE="yes"
--else
-- LIBVAMP_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h"; then
-+ LIBVAMP_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBVAMP_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBVAMP_LOCAL_AVAILABLE" = "yes"; then
- LIBVAMP_LOCAL_CONFIGURE_ARGS="--disable-programs"
-@@ -22136,52 +21866,17 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- vorbisenc_h_available="yes"
--else
-- vorbisenc_h_available="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h"; then
-+ vorbisenc_h_available="yes"
-+ else
-+ vorbisenc_h_available="no"
-+ fi
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libogg/include/ogg/ogg.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libogg/include/ogg/ogg.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libogg/include/ogg/ogg.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libogg/include/ogg/ogg.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- ogg_h_available="yes"
--else
-- ogg_h_available="no"
--fi
-+ if test -f "${srcdir}/lib-src/libogg/include/ogg/ogg.h"; then
-+ ogg_h_available="yes"
-+ else
-+ ogg_h_available="no"
-+ fi
-
-
- if test "$vorbisenc_h_available" = "yes" -a "$ogg_h_available" = "yes"; then
-@@ -22290,29 +21985,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/lv2/configure" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/lv2/configure" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/lv2/configure... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/lv2/configure"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LV2_LOCAL_AVAILABLE="yes"
--else
-- LV2_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/lv2/configure"; then
-+ LV2_LOCAL_AVAILABLE="yes"
-+ else
-+ LV2_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LV2_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: LV2 libraries are available in the local tree" >&5
-@@ -22432,29 +22109,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/portaudio-v19/include/portaudio.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/portaudio-v19/include/portaudio.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/portaudio-v19/include/portaudio.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/portaudio-v19/include/portaudio.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- PORTAUDIO_LOCAL_AVAILABLE="yes"
--else
-- PORTAUDIO_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/portaudio-v19/include/portaudio.h"; then
-+ PORTAUDIO_LOCAL_AVAILABLE="yes"
-+ else
-+ PORTAUDIO_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$PORTAUDIO_LOCAL_AVAILABLE" = "yes"; then
- pa_dir="$(pwd)/${srcdir}/lib-src/portaudio-v19"
-@@ -22555,29 +22214,12 @@
- $as_echo "$as_me: portSMF library is NOT available as system library" >&6;}
- fi
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/portsmf/allegro.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/portsmf/allegro.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/portsmf/allegro.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/portsmf/allegro.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- PORTSMF_LOCAL_AVAILABLE="yes"
--else
-- PORTSMF_LOCAL_AVAILABLE="no"
--fi
-
-+ if test -f "${srcdir}/lib-src/portsmf/allegro.h"; then
-+ PORTSMF_LOCAL_AVAILABLE="yes"
-+ else
-+ PORTSMF_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$PORTSMF_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: portSMF library is available in the local tree" >&5
-@@ -22675,29 +22317,12 @@
- $as_echo "$as_me: portmidi library is NOT available as system library" >&6;}
- fi
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/portmidi/pm_common/portmidi.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/portmidi/pm_common/portmidi.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/portmidi/pm_common/portmidi.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/portmidi/pm_common/portmidi.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- PORTMIDI_LOCAL_AVAILABLE="yes"
--else
-- PORTMIDI_LOCAL_AVAILABLE="no"
--fi
-
-+ if test -f "${srcdir}/lib-src/portmidi/pm_common/portmidi.h"; then
-+ PORTMIDI_LOCAL_AVAILABLE="yes"
-+ else
-+ PORTMIDI_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$PORTMIDI_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: portmidi library is available in the local tree" >&5
-@@ -22795,29 +22420,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- WIDGETEXTRA_LOCAL_AVAILABLE="yes"
--else
-- WIDGETEXTRA_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h"; then
-+ WIDGETEXTRA_LOCAL_AVAILABLE="yes"
-+ else
-+ WIDGETEXTRA_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$WIDGETEXTRA_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: libwidgetextra library is available in the local tree" >&5
diff --git a/srcpkgs/audacity/template b/srcpkgs/audacity/template
index 7f4d0a49098..d60cbd72063 100644
--- a/srcpkgs/audacity/template
+++ b/srcpkgs/audacity/template
@@ -6,9 +6,9 @@ wrksrc="${pkgname}-Audacity-${version}"
build_style=gnu-configure
configure_args="--with-ffmpeg=system --with-libsndfile=system --with-expat=system
--with-libsoxr=system --with-lame=system --with-lv2=system ac_cv_path_WX_CONFIG=wx-config-gtk3"
-hostmakedepends="pkg-config cmake gettext libtool m4 python which"
+hostmakedepends="automake pkg-config cmake gettext-devel libtool m4 python which"
makedepends="jack-devel wxWidgets-gtk3-devel gtk+3-devel
- libmad-devel soundtouch-devel libsoxr-devel
+ libmad-devel soundtouch-devel libsoxr-devel gettext-devel
vamp-plugin-sdk-devel lame-devel libid3tag-devel libflac-devel
ffmpeg-devel twolame-devel serd-devel lv2 lilv-devel suil-devel"
depends="desktop-file-utils hicolor-icon-theme"
@@ -29,10 +29,15 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
LDFLAGS="-latomic"
fi
+pre_configure() {
+ autoreconf -fi
+}
+
+do_check() {
+ make check || : # Gives recursive test not found
+}
+
post_install() {
vcopy nyquist /usr/share/audacity
vcopy plug-ins /usr/share/audacity
-
- rm ${DESTDIR}/usr/share/doc/${pkgname}/LICENSE.txt
- vlicense LICENSE.txt LICENSE
}
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] audacity: simplify cross-build patch
2020-12-30 2:01 [PR PATCH] audacity: simplify cross-build patch ndowens
` (2 preceding siblings ...)
2020-12-30 2:32 ` [PR PATCH] [Updated] [WIP] " ndowens
@ 2020-12-30 3:50 ` ndowens
2020-12-30 3:57 ` ndowens
` (5 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: ndowens @ 2020-12-30 3:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 543 bytes --]
There is an updated pull request by ndowens against master on the void-packages repository
https://github.com/ndowens/void-packages audacity
https://github.com/void-linux/void-packages/pull/27548
[WIP] audacity: simplify cross-build patch
@sgn Since you taught me slightly on how to fix autotool cross-builds, wondering what you think of this?
Built locally and seems to have linked with libs I expected it to.
Edit: Odd locally it built fine.
A patch file from https://github.com/void-linux/void-packages/pull/27548.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-audacity-27548.patch --]
[-- Type: text/x-diff, Size: 45553 bytes --]
From 962d59ec8e7d4e2a4e5f816526cfa8e59138ea0d Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Tue, 29 Dec 2020 19:57:38 -0600
Subject: [PATCH] audacity: simplify cross-build patch
---
.../patches/0001-fix-cross-build.patch | 336 ++++++++
srcpkgs/audacity/patches/configure.patch | 756 ------------------
srcpkgs/audacity/template | 15 +-
3 files changed, 346 insertions(+), 761 deletions(-)
create mode 100644 srcpkgs/audacity/patches/0001-fix-cross-build.patch
delete mode 100644 srcpkgs/audacity/patches/configure.patch
diff --git a/srcpkgs/audacity/patches/0001-fix-cross-build.patch b/srcpkgs/audacity/patches/0001-fix-cross-build.patch
new file mode 100644
index 00000000000..63a55c73971
--- /dev/null
+++ b/srcpkgs/audacity/patches/0001-fix-cross-build.patch
@@ -0,0 +1,336 @@
+From 5f1ac685992183d71097669b1956b2af06ad6ed0 Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Tue, 29 Dec 2020 19:44:34 -0600
+Subject: [PATCH] fix cross build
+
+Replace AC_CHECK_FILES as it is not cross-friendly
+---
+diff --git configure.ac configure.ac
+index d8a7cf1..31c1245 100644
+--- configure.ac
++++ configure.ac
+@@ -214,7 +214,7 @@ if test x$enable_sse = xyes; then
+ AX_CHECK_COMPILER_FLAGS(-msse, [SBSMS_CFLAGS="$SBSMS_CFLAGS -msse"],[AC_MSG_ERROR([Need a version of gcc with -msse])])
+ fi
+
+- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <xmmintrin.h>]], [[__m128 v,w; float p[8]; v = _mm_loadu_ps(p); _mm_storeu_ps(p,v); w = _mm_loadl_pi(w,(const __m64*)p); w = _mm_loadh_pi(w,(const __m64*)p); _mm_storel_pi((__m64 *)p, w); _mm_storeh_pi((__m64 *)p, w); v = _mm_add_ps(v,w); v = _mm_sub_ps(v,w); v = _mm_mul_ps(v,w); v = _mm_shuffle_ps(v,w,_MM_SHUFFLE(0,1,2,3)); w = _mm_set1_ps(0.0f);]])], [sse_ok=yes], [sse_ok=no])
++ AC_TRY_COMPILE([AC_LANG_PROGRAM([[#include <xmmintrin.h>]], [[__m128 v,w; float p[8]; v = _mm_loadu_ps(p); _mm_storeu_ps(p,v); w = _mm_loadl_pi(w,(const __m64*)p); w = _mm_loadh_pi(w,(const __m64*)p); _mm_storel_pi((__m64 *)p, w); _mm_storeh_pi((__m64 *)p, w); v = _mm_add_ps(v,w); v = _mm_sub_ps(v,w); v = _mm_mul_ps(v,w); v = _mm_shuffle_ps(v,w,_MM_SHUFFLE(0,1,2,3)); w = _mm_set1_ps(0.0f);]])], [sse_ok=yes], [sse_ok=no])
+
+ if test x$sse_ok = xyes; then
+ AC_DEFINE(ENABLE_SSE,1,[Define to enable sse])
+diff --git m4/audacity_checklib_ffmpeg.m4 m4/audacity_checklib_ffmpeg.m4
+index b98110f..d4754aa 100644
+--- m4/audacity_checklib_ffmpeg.m4
++++ m4/audacity_checklib_ffmpeg.m4
+@@ -35,13 +35,9 @@ AC_DEFUN([AUDACITY_CHECKLIB_FFMPEG], [
+
+ dnl see if ffmpeg is available locally, or rather that we have some headers
+ dnl in lib-src/ffmpeg/ we can use.
+- AC_CHECK_FILE(${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h,
+- avcodec_h_found="yes",
+- avcodec_h_found="no")
++ AS_IF([test -f ${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h], [avcodec_h_found=yes])
+
+- AC_CHECK_FILE(${srcdir}/lib-src/ffmpeg/libavformat/avformat.h,
+- avformat_h_found="yes",
+- avformat_h_found="no")
++ AS_IF([test -f ${srcdir}/lib-src/ffmpeg/libavformat/avformat.h], [avformat_h_found=yes])
+
+ if test "$avcodec_h_found" = "yes" -a "$avformat_h_found" = "yes"; then
+ FFMPEG_LOCAL_AVAILABLE="yes"
+diff --git m4/audacity_checklib_lame.m4 m4/audacity_checklib_lame.m4
+index 28ecd77..5794143 100644
+--- m4/audacity_checklib_lame.m4
++++ m4/audacity_checklib_lame.m4
+@@ -33,9 +33,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LAME], [
+
+ dnl see if LAME is available in the source dir
+
+- AC_CHECK_FILE(${srcdir}/lib-src/lame/lame/lame.h,
+- LAME_LOCAL_AVAILABLE="yes",
+- LAME_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/lame/lame/lame.h], [LAME_LOCAL_AVAILABLE=yes])
+
+ if test "$LAME_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([LAME headers are available in this source tree.])
+diff --git m4/audacity_checklib_libexpat.m4 m4/audacity_checklib_libexpat.m4
+index c0c88db..ffe76ac 100644
+--- m4/audacity_checklib_libexpat.m4
++++ m4/audacity_checklib_libexpat.m4
+@@ -42,9 +42,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_EXPAT], [
+
+ dnl see if expat is available in the local tree
+
+- AC_CHECK_FILE(${srcdir}/lib-src/expat/lib/expat.h,
+- EXPAT_LOCAL_AVAILABLE="yes",
+- EXPAT_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/expat/lib/expat.h], [EXPAT_LOCAL_AVAILABLE=yes])
+
+ if test "$EXPAT_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([Expat libraries are available in the local tree])
+diff --git m4/audacity_checklib_libflac.m4 m4/audacity_checklib_libflac.m4
+index 1002986..6096791 100644
+--- m4/audacity_checklib_libflac.m4
++++ m4/audacity_checklib_libflac.m4
+@@ -38,13 +38,9 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBFLAC], [
+
+ dnl see if FLAC is available in the source dir
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libflac/include/FLAC/format.h,
+- flac_h_available="yes",
+- flac_h_available="no")
++ AS_IF([test -f ${srcdir}/lib-src/libflac/include/FLAC/format.h], [flac_h_available=yes])
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libflac/include/FLAC++/decoder.h,
+- flacpp_h_available="yes",
+- flacpp_h_available="no")
++ AS_IF([test -f ${srcdir}/lib-src/libflac/include/FLAC++/decoder.h], [flacpp_h_available=yes])
+
+ if test "$flac_h_available" = "yes" -a "$flacpp_h_available" = "yes"; then
+ LIBFLAC_LOCAL_AVAILABLE="yes"
+diff --git m4/audacity_checklib_libid3tag.m4 m4/audacity_checklib_libid3tag.m4
+index b69c2cb..59e94cc 100644
+--- m4/audacity_checklib_libid3tag.m4
++++ m4/audacity_checklib_libid3tag.m4
+@@ -25,9 +25,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBID3TAG], [
+
+ dnl see if libid3tag is available in the local tree
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libid3tag/frame.h,
+- LIBID3TAG_LOCAL_AVAILABLE="yes",
+- LIBID3TAG_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/libid3tag/frame.h], [LIBID3TAG_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBID3TAG_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([libid3tag libraries are available in the local tree])
+diff --git m4/audacity_checklib_libmad.m4 m4/audacity_checklib_libmad.m4
+index 0c2d02a..d53c459 100644
+--- m4/audacity_checklib_libmad.m4
++++ m4/audacity_checklib_libmad.m4
+@@ -34,9 +34,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBMAD], [
+
+ dnl see if libmad is available in the local tree
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libmad/frame.h,
+- LIBMAD_LOCAL_AVAILABLE="yes",
+- LIBMAD_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/libmad/frame.h], [LIBMAD_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBMAD_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([libmad libraries are available in the local tree])
+diff --git m4/audacity_checklib_libnyquist.m4 m4/audacity_checklib_libnyquist.m4
+index 3f1c98f..b4af690 100644
+--- m4/audacity_checklib_libnyquist.m4
++++ m4/audacity_checklib_libnyquist.m4
+@@ -17,9 +17,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBNYQUIST], [
+
+ dnl see if Nyquist is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libnyquist/nyx.h,
+- LIBNYQUIST_LOCAL_AVAILABLE="yes",
+- LIBNYQUIST_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/libnyquist/nyx.h], [LIBNYQUIST_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBNYQUIST_LOCAL_AVAILABLE" = "yes" ; then
+ AC_MSG_NOTICE([nyquist libraries are available in the local tree])
+diff --git m4/audacity_checklib_libsbsms.m4 m4/audacity_checklib_libsbsms.m4
+index c2f80dd..a0ec94b 100644
+--- m4/audacity_checklib_libsbsms.m4
++++ m4/audacity_checklib_libsbsms.m4
+@@ -25,9 +25,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSBSMS], [
+
+ dnl see if libsbsms is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/sbsms/include/sbsms.h,
+- LIBSBSMS_LOCAL_AVAILABLE="yes",
+- LIBSBSMS_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/sbsms/include/sbsms.h], [LIBSBSMS_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBSBSMS_LOCAL_AVAILABLE" = "yes"; then
+ dnl do not build programs we don't need
+diff --git m4/audacity_checklib_libsndfile.m4 m4/audacity_checklib_libsndfile.m4
+index d49e149..e501899 100644
+--- m4/audacity_checklib_libsndfile.m4
++++ m4/audacity_checklib_libsndfile.m4
+@@ -25,9 +25,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSNDFILE], [
+
+ dnl see if libsndfile is available in the local tree
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libsndfile/src/sndfile.h.in,
+- LIBSNDFILE_LOCAL_AVAILABLE="yes",
+- LIBSNDFILE_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/libsndfile/src/sndfile.h.in], [LIBSNDFILE_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBSNDFILE_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([libsndfile libraries are available in this source tree])
+diff --git m4/audacity_checklib_libsoundtouch.m4 m4/audacity_checklib_libsoundtouch.m4
+index 0b8aa69..d8d9f58 100644
+--- m4/audacity_checklib_libsoundtouch.m4
++++ m4/audacity_checklib_libsoundtouch.m4
+@@ -40,9 +40,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSOUNDTOUCH], [
+
+ dnl see if libsoundtouch is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/soundtouch/include/SoundTouch.h,
+- LIBSOUNDTOUCH_LOCAL_AVAILABLE="yes",
+- LIBSOUNDTOUCH_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/soundtouch/include/SoundTouch.h], [LIBSOUNDTOUCH_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBSOUNDTOUCH_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([libsoundtouch libraries are available in the local tree])
+diff --git m4/audacity_checklib_libsoxr.m4 m4/audacity_checklib_libsoxr.m4
+index a331e9b..1a0702b 100644
+--- m4/audacity_checklib_libsoxr.m4
++++ m4/audacity_checklib_libsoxr.m4
+@@ -25,9 +25,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSOXR], [
+
+ dnl see if libsoxr is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libsoxr/src/soxr.h,
+- LIBSOXR_LOCAL_AVAILABLE="yes",
+- LIBSOXR_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/libsoxr/src/soxr.h], [LIBSOXR_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBSOXR_LOCAL_AVAILABLE" = "yes"; then
+ # Breaks other other libraries in Audacity tree; but why is ./configure
+diff --git m4/audacity_checklib_libtwolame.m4 m4/audacity_checklib_libtwolame.m4
+index 2d28b07..fc2a2bf 100644
+--- m4/audacity_checklib_libtwolame.m4
++++ m4/audacity_checklib_libtwolame.m4
+@@ -25,9 +25,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBTWOLAME], [
+
+ dnl see if libtwolame is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/twolame/libtwolame/twolame.h,
+- LIBTWOLAME_LOCAL_AVAILABLE="yes",
+- LIBTWOLAME_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/twolame/libtwolame/twolame.h], [LIBTWOLAME_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBTWOLAME_LOCAL_AVAILABLE" = "yes"; then
+ dnl disable programs we don't need to build
+diff --git m4/audacity_checklib_libvamp.m4 m4/audacity_checklib_libvamp.m4
+index 8a1e0e1..57dc5eb 100644
+--- m4/audacity_checklib_libvamp.m4
++++ m4/audacity_checklib_libvamp.m4
+@@ -25,9 +25,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBVAMP], [
+
+ dnl see if Vamp is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h,
+- LIBVAMP_LOCAL_AVAILABLE="yes",
+- LIBVAMP_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h], [LIBVAMP_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBVAMP_LOCAL_AVAILABLE" = "yes"; then
+ LIBVAMP_LOCAL_CONFIGURE_ARGS="--disable-programs"
+diff --git m4/audacity_checklib_libvorbis.m4 m4/audacity_checklib_libvorbis.m4
+index 0839fa9..3d8b70d 100644
+--- m4/audacity_checklib_libvorbis.m4
++++ m4/audacity_checklib_libvorbis.m4
+@@ -30,13 +30,9 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBVORBIS], [
+
+ dnl see if Vorbis is available in the source dir
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h,
+- vorbisenc_h_available="yes",
+- vorbisenc_h_available="no")
++ AS_IF([test -f ${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h], [vorbisenc_h_available=yes])
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libogg/include/ogg/ogg.h,
+- ogg_h_available="yes",
+- ogg_h_available="no")
++ AS_IF([test -f ${srcdir}/lib-src/libogg/include/ogg/ogg.h], [ogg_h_available=yes])
+
+ if test "$vorbisenc_h_available" = "yes" -a "$ogg_h_available" = "yes"; then
+ LIBVORBIS_LOCAL_AVAILABLE="yes"
+diff --git m4/audacity_checklib_lv2.m4 m4/audacity_checklib_lv2.m4
+index 78a279a..164aa6d 100644
+--- m4/audacity_checklib_lv2.m4
++++ m4/audacity_checklib_lv2.m4
+@@ -23,9 +23,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LV2], [
+
+ dnl see if LV2 is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/lv2/configure,
+- LV2_LOCAL_AVAILABLE="yes",
+- LV2_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/lv2/configure], [LV2_LOCAL_AVAILABLE=yes])
+
+ if test "$LV2_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([LV2 libraries are available in the local tree])
+diff --git m4/audacity_checklib_portaudio.m4 m4/audacity_checklib_portaudio.m4
+index 9b7674e..03d62b8 100644
+--- m4/audacity_checklib_portaudio.m4
++++ m4/audacity_checklib_portaudio.m4
+@@ -31,9 +31,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_PORTAUDIO], [
+
+ dnl see if portaudio is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/portaudio-v19/include/portaudio.h,
+- PORTAUDIO_LOCAL_AVAILABLE="yes",
+- PORTAUDIO_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/portaudio-v19/include/portaudio.h], [PORTAUDIO_LOCAL_AVAILABLE=yes])
+
+ if test "$PORTAUDIO_LOCAL_AVAILABLE" = "yes"; then
+ dnl We need to override the pkg-config check for portmixer by passing
+diff --git m4/audacity_checklib_portmidi.m4 m4/audacity_checklib_portmidi.m4
+index 4e63b1b..6db1dc6 100644
+--- m4/audacity_checklib_portmidi.m4
++++ m4/audacity_checklib_portmidi.m4
+@@ -21,9 +21,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_PORTMIDI], [
+ AC_MSG_NOTICE([portmidi library is NOT available as system library])
+ fi
+
+- AC_CHECK_FILE(${srcdir}/lib-src/portmidi/pm_common/portmidi.h,
+- PORTMIDI_LOCAL_AVAILABLE="yes",
+- PORTMIDI_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/portmidi/pm_common/portmidi.h], [PORTMIDI_LOCAL_AVAILABLE=yes])
+
+ if test "$PORTMIDI_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([portmidi library is available in the local tree])
+diff --git m4/audacity_checklib_portsmf.m4 m4/audacity_checklib_portsmf.m4
+index 9c336d8..3a31ef5 100644
+--- m4/audacity_checklib_portsmf.m4
++++ m4/audacity_checklib_portsmf.m4
+@@ -24,9 +24,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_PORTSMF], [
+ AC_MSG_NOTICE([portSMF library is NOT available as system library])
+ fi
+
+- AC_CHECK_FILE(${srcdir}/lib-src/portsmf/allegro.h,
+- PORTSMF_LOCAL_AVAILABLE="yes",
+- PORTSMF_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/portsmf/allegro.h], [PORTSMF_LOCAL_AVAILABLE=yes])
+
+ if test "$PORTSMF_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([portSMF library is available in the local tree])
+diff --git m4/audacity_checklib_widgetextra.m4 m4/audacity_checklib_widgetextra.m4
+index 4ef0f97..f857723 100644
+--- m4/audacity_checklib_widgetextra.m4
++++ m4/audacity_checklib_widgetextra.m4
+@@ -28,9 +28,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_WIDGETEXTRA], [
+
+ dnl see if libwidgetextra is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h,
+- WIDGETEXTRA_LOCAL_AVAILABLE="yes",
+- WIDGETEXTRA_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h], [WIDGETEXTRA_LOCAL_AVAILABLE=yes])
+
+ if test "$WIDGETEXTRA_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([libwidgetextra library is available in the local tree])
+--
+2.30.0
+
+diff --git configure.ac configure.ac
+index 31c1245..166a77e 100644
+--- configure.ac
++++ configure.ac
+@@ -63,7 +63,7 @@ AC_PROG_CXXCPP
+ AM_PROG_AR
+
+ LT_INIT([disable-shared])
+-
++m4_pattern_allow([^AC_LANG])
+ AC_PROG_INSTALL
+ dnl pkg-config is required for lots of things
+ AC_CHECK_PROG(HAVE_PKG_CONFIG, pkg-config, yes, no)
diff --git a/srcpkgs/audacity/patches/configure.patch b/srcpkgs/audacity/patches/configure.patch
deleted file mode 100644
index 3b9c576c3f2..00000000000
--- a/srcpkgs/audacity/patches/configure.patch
+++ /dev/null
@@ -1,756 +0,0 @@
-configure uses AC_CHECK_FILE to test for file existence which is
-cross incompatible. Changed it to simple if/else statements.
-
---- configure.orig 2017-10-26 19:44:39.000000000 +0200
-+++ configure 2017-11-09 21:23:45.099433701 +0100
-@@ -20200,29 +20200,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/expat/lib/expat.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/expat/lib/expat.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/expat/lib/expat.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/expat/lib/expat.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- EXPAT_LOCAL_AVAILABLE="yes"
--else
-- EXPAT_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/expat/lib/expat.h"; then
-+ EXPAT_LOCAL_AVAILABLE="yes"
-+ else
-+ EXPAT_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$EXPAT_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: Expat libraries are available in the local tree" >&5
-@@ -20455,53 +20437,17 @@
- $as_echo "$as_me: FFmpeg library NOT available as system library" >&6;}
- fi
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- avcodec_h_found="yes"
--else
-- avcodec_h_found="no"
--fi
--
--
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/ffmpeg/libavformat/avformat.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/ffmpeg/libavformat/avformat.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/ffmpeg/libavformat/avformat.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/ffmpeg/libavformat/avformat.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- avformat_h_found="yes"
--else
-- avformat_h_found="no"
--fi
-+ if test -f "${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h"; then
-+ avcodec_h_found="yes"
-+ else
-+ avcodec_h_found="no"
-+ fi
-
-+ if test -f "${srcdir}/lib-src/ffmpeg/libavformat/avformat.h"; then
-+ avformat_h_found="yes"
-+ else
-+ avformat_h_found="no"
-+ fi
-
- if test "$avcodec_h_found" = "yes" -a "$avformat_h_found" = "yes"; then
- FFMPEG_LOCAL_AVAILABLE="yes"
-@@ -20589,29 +20535,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/lame/lame/lame.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/lame/lame/lame.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/lame/lame/lame.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/lame/lame/lame.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LAME_LOCAL_AVAILABLE="yes"
--else
-- LAME_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/lame/lame/lame.h"; then
-+ LAME_LOCAL_AVAILABLE="yes"
-+ else
-+ LAME_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LAME_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: LAME headers are available in this source tree." >&5
-@@ -20780,53 +20708,17 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libflac/include/FLAC/format.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libflac/include/FLAC/format.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libflac/include/FLAC/format.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libflac/include/FLAC/format.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- flac_h_available="yes"
--else
-- flac_h_available="no"
--fi
--
--
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libflac/include/FLAC++/decoder.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libflac/include/FLAC++/decoder.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libflac/include/FLAC++/decoder.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libflac/include/FLAC++/decoder.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- flacpp_h_available="yes"
--else
-- flacpp_h_available="no"
--fi
-+ if test -f "${srcdir}/lib-src/libflac/include/FLAC/format.h"; then
-+ flac_h_available="yes"
-+ else
-+ flac_h_available="no"
-+ fi
-
-+ if test -f "${srcdir}/lib-src/libflac/include/FLAC++/decoder.h"; then
-+ flacpp_h_available="yes"
-+ else
-+ flacpp_h_available="no"
-+ fi
-
- if test "$flac_h_available" = "yes" -a "$flacpp_h_available" = "yes"; then
- LIBFLAC_LOCAL_AVAILABLE="yes"
-@@ -20930,29 +20822,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libid3tag/frame.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libid3tag/frame.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libid3tag/frame.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libid3tag/frame.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBID3TAG_LOCAL_AVAILABLE="yes"
--else
-- LIBID3TAG_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libid3tag/frame.h"; then
-+ LIBID3TAG_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBID3TAG_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBID3TAG_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: libid3tag libraries are available in the local tree" >&5
-@@ -21099,29 +20973,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libmad/frame.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libmad/frame.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libmad/frame.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libmad/frame.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBMAD_LOCAL_AVAILABLE="yes"
--else
-- LIBMAD_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libmad/frame.h"; then
-+ LIBMAD_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBMAD_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBMAD_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: libmad libraries are available in the local tree" >&5
-@@ -21144,29 +21000,11 @@
- LIBNYQUIST_SYSTEM_AVAILABLE="no"
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libnyquist/nyx.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libnyquist/nyx.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libnyquist/nyx.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libnyquist/nyx.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBNYQUIST_LOCAL_AVAILABLE="yes"
--else
-- LIBNYQUIST_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libnyquist/nyx.h"; then
-+ LIBNYQUIST_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBNYQUIST_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBNYQUIST_LOCAL_AVAILABLE" = "yes" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: nyquist libraries are available in the local tree" >&5
-@@ -21265,29 +21103,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/sbsms/include/sbsms.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/sbsms/include/sbsms.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/sbsms/include/sbsms.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/sbsms/include/sbsms.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBSBSMS_LOCAL_AVAILABLE="yes"
--else
-- LIBSBSMS_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/sbsms/include/sbsms.h"; then
-+ LIBSBSMS_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBSBSMS_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBSBSMS_LOCAL_AVAILABLE" = "yes"; then
- LIBSBSMS_LOCAL_CONFIGURE_ARGS="--disable-programs"
-@@ -21388,29 +21208,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libsndfile/src/sndfile.h.in" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libsndfile/src/sndfile.h.in" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libsndfile/src/sndfile.h.in... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libsndfile/src/sndfile.h.in"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBSNDFILE_LOCAL_AVAILABLE="yes"
--else
-- LIBSNDFILE_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libsndfile/src/sndfile.h.in"; then
-+ LIBSNDFILE_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBSNDFILE_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBSNDFILE_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: libsndfile libraries are available in this source tree" >&5
-@@ -21650,29 +21452,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/soundtouch/include/SoundTouch.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/soundtouch/include/SoundTouch.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/soundtouch/include/SoundTouch.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/soundtouch/include/SoundTouch.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBSOUNDTOUCH_LOCAL_AVAILABLE="yes"
--else
-- LIBSOUNDTOUCH_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/soundtouch/include/SoundTouch.h"; then
-+ LIBSOUNDTOUCH_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBSOUNDTOUCH_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBSOUNDTOUCH_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: libsoundtouch libraries are available in the local tree" >&5
-@@ -21771,29 +21555,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libsoxr/src/soxr.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libsoxr/src/soxr.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libsoxr/src/soxr.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libsoxr/src/soxr.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBSOXR_LOCAL_AVAILABLE="yes"
--else
-- LIBSOXR_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libsoxr/src/soxr.h"; then
-+ LIBSOXR_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBSOXR_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBSOXR_LOCAL_AVAILABLE" = "yes"; then
- # Breaks other other libraries in Audacity tree; but why is ./configure
-@@ -21894,29 +21660,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/twolame/libtwolame/twolame.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/twolame/libtwolame/twolame.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/twolame/libtwolame/twolame.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/twolame/libtwolame/twolame.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBTWOLAME_LOCAL_AVAILABLE="yes"
--else
-- LIBTWOLAME_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/twolame/libtwolame/twolame.h"; then
-+ LIBTWOLAME_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBTWOLAME_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBTWOLAME_LOCAL_AVAILABLE" = "yes"; then
- LIBTWOLAME_LOCAL_CONFIGURE_ARGS="--disable-programs"
-@@ -22015,29 +21763,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBVAMP_LOCAL_AVAILABLE="yes"
--else
-- LIBVAMP_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h"; then
-+ LIBVAMP_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBVAMP_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBVAMP_LOCAL_AVAILABLE" = "yes"; then
- LIBVAMP_LOCAL_CONFIGURE_ARGS="--disable-programs"
-@@ -22136,52 +21866,17 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- vorbisenc_h_available="yes"
--else
-- vorbisenc_h_available="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h"; then
-+ vorbisenc_h_available="yes"
-+ else
-+ vorbisenc_h_available="no"
-+ fi
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libogg/include/ogg/ogg.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libogg/include/ogg/ogg.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libogg/include/ogg/ogg.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libogg/include/ogg/ogg.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- ogg_h_available="yes"
--else
-- ogg_h_available="no"
--fi
-+ if test -f "${srcdir}/lib-src/libogg/include/ogg/ogg.h"; then
-+ ogg_h_available="yes"
-+ else
-+ ogg_h_available="no"
-+ fi
-
-
- if test "$vorbisenc_h_available" = "yes" -a "$ogg_h_available" = "yes"; then
-@@ -22290,29 +21985,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/lv2/configure" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/lv2/configure" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/lv2/configure... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/lv2/configure"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LV2_LOCAL_AVAILABLE="yes"
--else
-- LV2_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/lv2/configure"; then
-+ LV2_LOCAL_AVAILABLE="yes"
-+ else
-+ LV2_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LV2_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: LV2 libraries are available in the local tree" >&5
-@@ -22432,29 +22109,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/portaudio-v19/include/portaudio.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/portaudio-v19/include/portaudio.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/portaudio-v19/include/portaudio.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/portaudio-v19/include/portaudio.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- PORTAUDIO_LOCAL_AVAILABLE="yes"
--else
-- PORTAUDIO_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/portaudio-v19/include/portaudio.h"; then
-+ PORTAUDIO_LOCAL_AVAILABLE="yes"
-+ else
-+ PORTAUDIO_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$PORTAUDIO_LOCAL_AVAILABLE" = "yes"; then
- pa_dir="$(pwd)/${srcdir}/lib-src/portaudio-v19"
-@@ -22555,29 +22214,12 @@
- $as_echo "$as_me: portSMF library is NOT available as system library" >&6;}
- fi
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/portsmf/allegro.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/portsmf/allegro.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/portsmf/allegro.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/portsmf/allegro.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- PORTSMF_LOCAL_AVAILABLE="yes"
--else
-- PORTSMF_LOCAL_AVAILABLE="no"
--fi
-
-+ if test -f "${srcdir}/lib-src/portsmf/allegro.h"; then
-+ PORTSMF_LOCAL_AVAILABLE="yes"
-+ else
-+ PORTSMF_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$PORTSMF_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: portSMF library is available in the local tree" >&5
-@@ -22675,29 +22317,12 @@
- $as_echo "$as_me: portmidi library is NOT available as system library" >&6;}
- fi
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/portmidi/pm_common/portmidi.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/portmidi/pm_common/portmidi.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/portmidi/pm_common/portmidi.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/portmidi/pm_common/portmidi.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- PORTMIDI_LOCAL_AVAILABLE="yes"
--else
-- PORTMIDI_LOCAL_AVAILABLE="no"
--fi
-
-+ if test -f "${srcdir}/lib-src/portmidi/pm_common/portmidi.h"; then
-+ PORTMIDI_LOCAL_AVAILABLE="yes"
-+ else
-+ PORTMIDI_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$PORTMIDI_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: portmidi library is available in the local tree" >&5
-@@ -22795,29 +22420,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- WIDGETEXTRA_LOCAL_AVAILABLE="yes"
--else
-- WIDGETEXTRA_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h"; then
-+ WIDGETEXTRA_LOCAL_AVAILABLE="yes"
-+ else
-+ WIDGETEXTRA_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$WIDGETEXTRA_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: libwidgetextra library is available in the local tree" >&5
diff --git a/srcpkgs/audacity/template b/srcpkgs/audacity/template
index 7f4d0a49098..b31ef2fa655 100644
--- a/srcpkgs/audacity/template
+++ b/srcpkgs/audacity/template
@@ -6,9 +6,9 @@ wrksrc="${pkgname}-Audacity-${version}"
build_style=gnu-configure
configure_args="--with-ffmpeg=system --with-libsndfile=system --with-expat=system
--with-libsoxr=system --with-lame=system --with-lv2=system ac_cv_path_WX_CONFIG=wx-config-gtk3"
-hostmakedepends="pkg-config cmake gettext libtool m4 python which"
+hostmakedepends="automake pkg-config cmake gettext libtool m4 python which"
makedepends="jack-devel wxWidgets-gtk3-devel gtk+3-devel
- libmad-devel soundtouch-devel libsoxr-devel
+ libmad-devel soundtouch-devel libsoxr-devel gettext-devel
vamp-plugin-sdk-devel lame-devel libid3tag-devel libflac-devel
ffmpeg-devel twolame-devel serd-devel lv2 lilv-devel suil-devel"
depends="desktop-file-utils hicolor-icon-theme"
@@ -29,10 +29,15 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
LDFLAGS="-latomic"
fi
+pre_configure() {
+ autoreconf -fi
+}
+
+do_check() {
+ make check || : # Gives recursive test not found
+}
+
post_install() {
vcopy nyquist /usr/share/audacity
vcopy plug-ins /usr/share/audacity
-
- rm ${DESTDIR}/usr/share/doc/${pkgname}/LICENSE.txt
- vlicense LICENSE.txt LICENSE
}
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] audacity: simplify cross-build patch
2020-12-30 2:01 [PR PATCH] audacity: simplify cross-build patch ndowens
` (3 preceding siblings ...)
2020-12-30 3:50 ` ndowens
@ 2020-12-30 3:57 ` ndowens
2020-12-30 4:10 ` ndowens
` (4 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: ndowens @ 2020-12-30 3:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 543 bytes --]
There is an updated pull request by ndowens against master on the void-packages repository
https://github.com/ndowens/void-packages audacity
https://github.com/void-linux/void-packages/pull/27548
[WIP] audacity: simplify cross-build patch
@sgn Since you taught me slightly on how to fix autotool cross-builds, wondering what you think of this?
Built locally and seems to have linked with libs I expected it to.
Edit: Odd locally it built fine.
A patch file from https://github.com/void-linux/void-packages/pull/27548.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-audacity-27548.patch --]
[-- Type: text/x-diff, Size: 45567 bytes --]
From b587d92539c1a772a17722a24701b765ef9e5d76 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Tue, 29 Dec 2020 19:57:38 -0600
Subject: [PATCH] audacity: simplify cross-build patch
---
.../patches/0001-fix-cross-build.patch | 336 ++++++++
srcpkgs/audacity/patches/configure.patch | 756 ------------------
srcpkgs/audacity/template | 15 +-
3 files changed, 346 insertions(+), 761 deletions(-)
create mode 100644 srcpkgs/audacity/patches/0001-fix-cross-build.patch
delete mode 100644 srcpkgs/audacity/patches/configure.patch
diff --git a/srcpkgs/audacity/patches/0001-fix-cross-build.patch b/srcpkgs/audacity/patches/0001-fix-cross-build.patch
new file mode 100644
index 00000000000..63a55c73971
--- /dev/null
+++ b/srcpkgs/audacity/patches/0001-fix-cross-build.patch
@@ -0,0 +1,336 @@
+From 5f1ac685992183d71097669b1956b2af06ad6ed0 Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Tue, 29 Dec 2020 19:44:34 -0600
+Subject: [PATCH] fix cross build
+
+Replace AC_CHECK_FILES as it is not cross-friendly
+---
+diff --git configure.ac configure.ac
+index d8a7cf1..31c1245 100644
+--- configure.ac
++++ configure.ac
+@@ -214,7 +214,7 @@ if test x$enable_sse = xyes; then
+ AX_CHECK_COMPILER_FLAGS(-msse, [SBSMS_CFLAGS="$SBSMS_CFLAGS -msse"],[AC_MSG_ERROR([Need a version of gcc with -msse])])
+ fi
+
+- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <xmmintrin.h>]], [[__m128 v,w; float p[8]; v = _mm_loadu_ps(p); _mm_storeu_ps(p,v); w = _mm_loadl_pi(w,(const __m64*)p); w = _mm_loadh_pi(w,(const __m64*)p); _mm_storel_pi((__m64 *)p, w); _mm_storeh_pi((__m64 *)p, w); v = _mm_add_ps(v,w); v = _mm_sub_ps(v,w); v = _mm_mul_ps(v,w); v = _mm_shuffle_ps(v,w,_MM_SHUFFLE(0,1,2,3)); w = _mm_set1_ps(0.0f);]])], [sse_ok=yes], [sse_ok=no])
++ AC_TRY_COMPILE([AC_LANG_PROGRAM([[#include <xmmintrin.h>]], [[__m128 v,w; float p[8]; v = _mm_loadu_ps(p); _mm_storeu_ps(p,v); w = _mm_loadl_pi(w,(const __m64*)p); w = _mm_loadh_pi(w,(const __m64*)p); _mm_storel_pi((__m64 *)p, w); _mm_storeh_pi((__m64 *)p, w); v = _mm_add_ps(v,w); v = _mm_sub_ps(v,w); v = _mm_mul_ps(v,w); v = _mm_shuffle_ps(v,w,_MM_SHUFFLE(0,1,2,3)); w = _mm_set1_ps(0.0f);]])], [sse_ok=yes], [sse_ok=no])
+
+ if test x$sse_ok = xyes; then
+ AC_DEFINE(ENABLE_SSE,1,[Define to enable sse])
+diff --git m4/audacity_checklib_ffmpeg.m4 m4/audacity_checklib_ffmpeg.m4
+index b98110f..d4754aa 100644
+--- m4/audacity_checklib_ffmpeg.m4
++++ m4/audacity_checklib_ffmpeg.m4
+@@ -35,13 +35,9 @@ AC_DEFUN([AUDACITY_CHECKLIB_FFMPEG], [
+
+ dnl see if ffmpeg is available locally, or rather that we have some headers
+ dnl in lib-src/ffmpeg/ we can use.
+- AC_CHECK_FILE(${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h,
+- avcodec_h_found="yes",
+- avcodec_h_found="no")
++ AS_IF([test -f ${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h], [avcodec_h_found=yes])
+
+- AC_CHECK_FILE(${srcdir}/lib-src/ffmpeg/libavformat/avformat.h,
+- avformat_h_found="yes",
+- avformat_h_found="no")
++ AS_IF([test -f ${srcdir}/lib-src/ffmpeg/libavformat/avformat.h], [avformat_h_found=yes])
+
+ if test "$avcodec_h_found" = "yes" -a "$avformat_h_found" = "yes"; then
+ FFMPEG_LOCAL_AVAILABLE="yes"
+diff --git m4/audacity_checklib_lame.m4 m4/audacity_checklib_lame.m4
+index 28ecd77..5794143 100644
+--- m4/audacity_checklib_lame.m4
++++ m4/audacity_checklib_lame.m4
+@@ -33,9 +33,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LAME], [
+
+ dnl see if LAME is available in the source dir
+
+- AC_CHECK_FILE(${srcdir}/lib-src/lame/lame/lame.h,
+- LAME_LOCAL_AVAILABLE="yes",
+- LAME_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/lame/lame/lame.h], [LAME_LOCAL_AVAILABLE=yes])
+
+ if test "$LAME_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([LAME headers are available in this source tree.])
+diff --git m4/audacity_checklib_libexpat.m4 m4/audacity_checklib_libexpat.m4
+index c0c88db..ffe76ac 100644
+--- m4/audacity_checklib_libexpat.m4
++++ m4/audacity_checklib_libexpat.m4
+@@ -42,9 +42,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_EXPAT], [
+
+ dnl see if expat is available in the local tree
+
+- AC_CHECK_FILE(${srcdir}/lib-src/expat/lib/expat.h,
+- EXPAT_LOCAL_AVAILABLE="yes",
+- EXPAT_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/expat/lib/expat.h], [EXPAT_LOCAL_AVAILABLE=yes])
+
+ if test "$EXPAT_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([Expat libraries are available in the local tree])
+diff --git m4/audacity_checklib_libflac.m4 m4/audacity_checklib_libflac.m4
+index 1002986..6096791 100644
+--- m4/audacity_checklib_libflac.m4
++++ m4/audacity_checklib_libflac.m4
+@@ -38,13 +38,9 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBFLAC], [
+
+ dnl see if FLAC is available in the source dir
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libflac/include/FLAC/format.h,
+- flac_h_available="yes",
+- flac_h_available="no")
++ AS_IF([test -f ${srcdir}/lib-src/libflac/include/FLAC/format.h], [flac_h_available=yes])
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libflac/include/FLAC++/decoder.h,
+- flacpp_h_available="yes",
+- flacpp_h_available="no")
++ AS_IF([test -f ${srcdir}/lib-src/libflac/include/FLAC++/decoder.h], [flacpp_h_available=yes])
+
+ if test "$flac_h_available" = "yes" -a "$flacpp_h_available" = "yes"; then
+ LIBFLAC_LOCAL_AVAILABLE="yes"
+diff --git m4/audacity_checklib_libid3tag.m4 m4/audacity_checklib_libid3tag.m4
+index b69c2cb..59e94cc 100644
+--- m4/audacity_checklib_libid3tag.m4
++++ m4/audacity_checklib_libid3tag.m4
+@@ -25,9 +25,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBID3TAG], [
+
+ dnl see if libid3tag is available in the local tree
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libid3tag/frame.h,
+- LIBID3TAG_LOCAL_AVAILABLE="yes",
+- LIBID3TAG_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/libid3tag/frame.h], [LIBID3TAG_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBID3TAG_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([libid3tag libraries are available in the local tree])
+diff --git m4/audacity_checklib_libmad.m4 m4/audacity_checklib_libmad.m4
+index 0c2d02a..d53c459 100644
+--- m4/audacity_checklib_libmad.m4
++++ m4/audacity_checklib_libmad.m4
+@@ -34,9 +34,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBMAD], [
+
+ dnl see if libmad is available in the local tree
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libmad/frame.h,
+- LIBMAD_LOCAL_AVAILABLE="yes",
+- LIBMAD_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/libmad/frame.h], [LIBMAD_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBMAD_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([libmad libraries are available in the local tree])
+diff --git m4/audacity_checklib_libnyquist.m4 m4/audacity_checklib_libnyquist.m4
+index 3f1c98f..b4af690 100644
+--- m4/audacity_checklib_libnyquist.m4
++++ m4/audacity_checklib_libnyquist.m4
+@@ -17,9 +17,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBNYQUIST], [
+
+ dnl see if Nyquist is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libnyquist/nyx.h,
+- LIBNYQUIST_LOCAL_AVAILABLE="yes",
+- LIBNYQUIST_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/libnyquist/nyx.h], [LIBNYQUIST_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBNYQUIST_LOCAL_AVAILABLE" = "yes" ; then
+ AC_MSG_NOTICE([nyquist libraries are available in the local tree])
+diff --git m4/audacity_checklib_libsbsms.m4 m4/audacity_checklib_libsbsms.m4
+index c2f80dd..a0ec94b 100644
+--- m4/audacity_checklib_libsbsms.m4
++++ m4/audacity_checklib_libsbsms.m4
+@@ -25,9 +25,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSBSMS], [
+
+ dnl see if libsbsms is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/sbsms/include/sbsms.h,
+- LIBSBSMS_LOCAL_AVAILABLE="yes",
+- LIBSBSMS_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/sbsms/include/sbsms.h], [LIBSBSMS_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBSBSMS_LOCAL_AVAILABLE" = "yes"; then
+ dnl do not build programs we don't need
+diff --git m4/audacity_checklib_libsndfile.m4 m4/audacity_checklib_libsndfile.m4
+index d49e149..e501899 100644
+--- m4/audacity_checklib_libsndfile.m4
++++ m4/audacity_checklib_libsndfile.m4
+@@ -25,9 +25,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSNDFILE], [
+
+ dnl see if libsndfile is available in the local tree
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libsndfile/src/sndfile.h.in,
+- LIBSNDFILE_LOCAL_AVAILABLE="yes",
+- LIBSNDFILE_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/libsndfile/src/sndfile.h.in], [LIBSNDFILE_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBSNDFILE_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([libsndfile libraries are available in this source tree])
+diff --git m4/audacity_checklib_libsoundtouch.m4 m4/audacity_checklib_libsoundtouch.m4
+index 0b8aa69..d8d9f58 100644
+--- m4/audacity_checklib_libsoundtouch.m4
++++ m4/audacity_checklib_libsoundtouch.m4
+@@ -40,9 +40,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSOUNDTOUCH], [
+
+ dnl see if libsoundtouch is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/soundtouch/include/SoundTouch.h,
+- LIBSOUNDTOUCH_LOCAL_AVAILABLE="yes",
+- LIBSOUNDTOUCH_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/soundtouch/include/SoundTouch.h], [LIBSOUNDTOUCH_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBSOUNDTOUCH_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([libsoundtouch libraries are available in the local tree])
+diff --git m4/audacity_checklib_libsoxr.m4 m4/audacity_checklib_libsoxr.m4
+index a331e9b..1a0702b 100644
+--- m4/audacity_checklib_libsoxr.m4
++++ m4/audacity_checklib_libsoxr.m4
+@@ -25,9 +25,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSOXR], [
+
+ dnl see if libsoxr is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libsoxr/src/soxr.h,
+- LIBSOXR_LOCAL_AVAILABLE="yes",
+- LIBSOXR_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/libsoxr/src/soxr.h], [LIBSOXR_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBSOXR_LOCAL_AVAILABLE" = "yes"; then
+ # Breaks other other libraries in Audacity tree; but why is ./configure
+diff --git m4/audacity_checklib_libtwolame.m4 m4/audacity_checklib_libtwolame.m4
+index 2d28b07..fc2a2bf 100644
+--- m4/audacity_checklib_libtwolame.m4
++++ m4/audacity_checklib_libtwolame.m4
+@@ -25,9 +25,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBTWOLAME], [
+
+ dnl see if libtwolame is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/twolame/libtwolame/twolame.h,
+- LIBTWOLAME_LOCAL_AVAILABLE="yes",
+- LIBTWOLAME_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/twolame/libtwolame/twolame.h], [LIBTWOLAME_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBTWOLAME_LOCAL_AVAILABLE" = "yes"; then
+ dnl disable programs we don't need to build
+diff --git m4/audacity_checklib_libvamp.m4 m4/audacity_checklib_libvamp.m4
+index 8a1e0e1..57dc5eb 100644
+--- m4/audacity_checklib_libvamp.m4
++++ m4/audacity_checklib_libvamp.m4
+@@ -25,9 +25,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBVAMP], [
+
+ dnl see if Vamp is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h,
+- LIBVAMP_LOCAL_AVAILABLE="yes",
+- LIBVAMP_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h], [LIBVAMP_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBVAMP_LOCAL_AVAILABLE" = "yes"; then
+ LIBVAMP_LOCAL_CONFIGURE_ARGS="--disable-programs"
+diff --git m4/audacity_checklib_libvorbis.m4 m4/audacity_checklib_libvorbis.m4
+index 0839fa9..3d8b70d 100644
+--- m4/audacity_checklib_libvorbis.m4
++++ m4/audacity_checklib_libvorbis.m4
+@@ -30,13 +30,9 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBVORBIS], [
+
+ dnl see if Vorbis is available in the source dir
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h,
+- vorbisenc_h_available="yes",
+- vorbisenc_h_available="no")
++ AS_IF([test -f ${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h], [vorbisenc_h_available=yes])
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libogg/include/ogg/ogg.h,
+- ogg_h_available="yes",
+- ogg_h_available="no")
++ AS_IF([test -f ${srcdir}/lib-src/libogg/include/ogg/ogg.h], [ogg_h_available=yes])
+
+ if test "$vorbisenc_h_available" = "yes" -a "$ogg_h_available" = "yes"; then
+ LIBVORBIS_LOCAL_AVAILABLE="yes"
+diff --git m4/audacity_checklib_lv2.m4 m4/audacity_checklib_lv2.m4
+index 78a279a..164aa6d 100644
+--- m4/audacity_checklib_lv2.m4
++++ m4/audacity_checklib_lv2.m4
+@@ -23,9 +23,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LV2], [
+
+ dnl see if LV2 is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/lv2/configure,
+- LV2_LOCAL_AVAILABLE="yes",
+- LV2_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/lv2/configure], [LV2_LOCAL_AVAILABLE=yes])
+
+ if test "$LV2_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([LV2 libraries are available in the local tree])
+diff --git m4/audacity_checklib_portaudio.m4 m4/audacity_checklib_portaudio.m4
+index 9b7674e..03d62b8 100644
+--- m4/audacity_checklib_portaudio.m4
++++ m4/audacity_checklib_portaudio.m4
+@@ -31,9 +31,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_PORTAUDIO], [
+
+ dnl see if portaudio is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/portaudio-v19/include/portaudio.h,
+- PORTAUDIO_LOCAL_AVAILABLE="yes",
+- PORTAUDIO_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/portaudio-v19/include/portaudio.h], [PORTAUDIO_LOCAL_AVAILABLE=yes])
+
+ if test "$PORTAUDIO_LOCAL_AVAILABLE" = "yes"; then
+ dnl We need to override the pkg-config check for portmixer by passing
+diff --git m4/audacity_checklib_portmidi.m4 m4/audacity_checklib_portmidi.m4
+index 4e63b1b..6db1dc6 100644
+--- m4/audacity_checklib_portmidi.m4
++++ m4/audacity_checklib_portmidi.m4
+@@ -21,9 +21,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_PORTMIDI], [
+ AC_MSG_NOTICE([portmidi library is NOT available as system library])
+ fi
+
+- AC_CHECK_FILE(${srcdir}/lib-src/portmidi/pm_common/portmidi.h,
+- PORTMIDI_LOCAL_AVAILABLE="yes",
+- PORTMIDI_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/portmidi/pm_common/portmidi.h], [PORTMIDI_LOCAL_AVAILABLE=yes])
+
+ if test "$PORTMIDI_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([portmidi library is available in the local tree])
+diff --git m4/audacity_checklib_portsmf.m4 m4/audacity_checklib_portsmf.m4
+index 9c336d8..3a31ef5 100644
+--- m4/audacity_checklib_portsmf.m4
++++ m4/audacity_checklib_portsmf.m4
+@@ -24,9 +24,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_PORTSMF], [
+ AC_MSG_NOTICE([portSMF library is NOT available as system library])
+ fi
+
+- AC_CHECK_FILE(${srcdir}/lib-src/portsmf/allegro.h,
+- PORTSMF_LOCAL_AVAILABLE="yes",
+- PORTSMF_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/portsmf/allegro.h], [PORTSMF_LOCAL_AVAILABLE=yes])
+
+ if test "$PORTSMF_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([portSMF library is available in the local tree])
+diff --git m4/audacity_checklib_widgetextra.m4 m4/audacity_checklib_widgetextra.m4
+index 4ef0f97..f857723 100644
+--- m4/audacity_checklib_widgetextra.m4
++++ m4/audacity_checklib_widgetextra.m4
+@@ -28,9 +28,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_WIDGETEXTRA], [
+
+ dnl see if libwidgetextra is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h,
+- WIDGETEXTRA_LOCAL_AVAILABLE="yes",
+- WIDGETEXTRA_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h], [WIDGETEXTRA_LOCAL_AVAILABLE=yes])
+
+ if test "$WIDGETEXTRA_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([libwidgetextra library is available in the local tree])
+--
+2.30.0
+
+diff --git configure.ac configure.ac
+index 31c1245..166a77e 100644
+--- configure.ac
++++ configure.ac
+@@ -63,7 +63,7 @@ AC_PROG_CXXCPP
+ AM_PROG_AR
+
+ LT_INIT([disable-shared])
+-
++m4_pattern_allow([^AC_LANG])
+ AC_PROG_INSTALL
+ dnl pkg-config is required for lots of things
+ AC_CHECK_PROG(HAVE_PKG_CONFIG, pkg-config, yes, no)
diff --git a/srcpkgs/audacity/patches/configure.patch b/srcpkgs/audacity/patches/configure.patch
deleted file mode 100644
index 3b9c576c3f2..00000000000
--- a/srcpkgs/audacity/patches/configure.patch
+++ /dev/null
@@ -1,756 +0,0 @@
-configure uses AC_CHECK_FILE to test for file existence which is
-cross incompatible. Changed it to simple if/else statements.
-
---- configure.orig 2017-10-26 19:44:39.000000000 +0200
-+++ configure 2017-11-09 21:23:45.099433701 +0100
-@@ -20200,29 +20200,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/expat/lib/expat.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/expat/lib/expat.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/expat/lib/expat.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/expat/lib/expat.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- EXPAT_LOCAL_AVAILABLE="yes"
--else
-- EXPAT_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/expat/lib/expat.h"; then
-+ EXPAT_LOCAL_AVAILABLE="yes"
-+ else
-+ EXPAT_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$EXPAT_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: Expat libraries are available in the local tree" >&5
-@@ -20455,53 +20437,17 @@
- $as_echo "$as_me: FFmpeg library NOT available as system library" >&6;}
- fi
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- avcodec_h_found="yes"
--else
-- avcodec_h_found="no"
--fi
--
--
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/ffmpeg/libavformat/avformat.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/ffmpeg/libavformat/avformat.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/ffmpeg/libavformat/avformat.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/ffmpeg/libavformat/avformat.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- avformat_h_found="yes"
--else
-- avformat_h_found="no"
--fi
-+ if test -f "${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h"; then
-+ avcodec_h_found="yes"
-+ else
-+ avcodec_h_found="no"
-+ fi
-
-+ if test -f "${srcdir}/lib-src/ffmpeg/libavformat/avformat.h"; then
-+ avformat_h_found="yes"
-+ else
-+ avformat_h_found="no"
-+ fi
-
- if test "$avcodec_h_found" = "yes" -a "$avformat_h_found" = "yes"; then
- FFMPEG_LOCAL_AVAILABLE="yes"
-@@ -20589,29 +20535,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/lame/lame/lame.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/lame/lame/lame.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/lame/lame/lame.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/lame/lame/lame.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LAME_LOCAL_AVAILABLE="yes"
--else
-- LAME_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/lame/lame/lame.h"; then
-+ LAME_LOCAL_AVAILABLE="yes"
-+ else
-+ LAME_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LAME_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: LAME headers are available in this source tree." >&5
-@@ -20780,53 +20708,17 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libflac/include/FLAC/format.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libflac/include/FLAC/format.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libflac/include/FLAC/format.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libflac/include/FLAC/format.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- flac_h_available="yes"
--else
-- flac_h_available="no"
--fi
--
--
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libflac/include/FLAC++/decoder.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libflac/include/FLAC++/decoder.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libflac/include/FLAC++/decoder.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libflac/include/FLAC++/decoder.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- flacpp_h_available="yes"
--else
-- flacpp_h_available="no"
--fi
-+ if test -f "${srcdir}/lib-src/libflac/include/FLAC/format.h"; then
-+ flac_h_available="yes"
-+ else
-+ flac_h_available="no"
-+ fi
-
-+ if test -f "${srcdir}/lib-src/libflac/include/FLAC++/decoder.h"; then
-+ flacpp_h_available="yes"
-+ else
-+ flacpp_h_available="no"
-+ fi
-
- if test "$flac_h_available" = "yes" -a "$flacpp_h_available" = "yes"; then
- LIBFLAC_LOCAL_AVAILABLE="yes"
-@@ -20930,29 +20822,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libid3tag/frame.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libid3tag/frame.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libid3tag/frame.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libid3tag/frame.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBID3TAG_LOCAL_AVAILABLE="yes"
--else
-- LIBID3TAG_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libid3tag/frame.h"; then
-+ LIBID3TAG_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBID3TAG_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBID3TAG_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: libid3tag libraries are available in the local tree" >&5
-@@ -21099,29 +20973,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libmad/frame.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libmad/frame.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libmad/frame.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libmad/frame.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBMAD_LOCAL_AVAILABLE="yes"
--else
-- LIBMAD_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libmad/frame.h"; then
-+ LIBMAD_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBMAD_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBMAD_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: libmad libraries are available in the local tree" >&5
-@@ -21144,29 +21000,11 @@
- LIBNYQUIST_SYSTEM_AVAILABLE="no"
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libnyquist/nyx.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libnyquist/nyx.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libnyquist/nyx.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libnyquist/nyx.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBNYQUIST_LOCAL_AVAILABLE="yes"
--else
-- LIBNYQUIST_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libnyquist/nyx.h"; then
-+ LIBNYQUIST_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBNYQUIST_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBNYQUIST_LOCAL_AVAILABLE" = "yes" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: nyquist libraries are available in the local tree" >&5
-@@ -21265,29 +21103,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/sbsms/include/sbsms.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/sbsms/include/sbsms.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/sbsms/include/sbsms.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/sbsms/include/sbsms.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBSBSMS_LOCAL_AVAILABLE="yes"
--else
-- LIBSBSMS_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/sbsms/include/sbsms.h"; then
-+ LIBSBSMS_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBSBSMS_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBSBSMS_LOCAL_AVAILABLE" = "yes"; then
- LIBSBSMS_LOCAL_CONFIGURE_ARGS="--disable-programs"
-@@ -21388,29 +21208,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libsndfile/src/sndfile.h.in" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libsndfile/src/sndfile.h.in" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libsndfile/src/sndfile.h.in... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libsndfile/src/sndfile.h.in"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBSNDFILE_LOCAL_AVAILABLE="yes"
--else
-- LIBSNDFILE_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libsndfile/src/sndfile.h.in"; then
-+ LIBSNDFILE_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBSNDFILE_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBSNDFILE_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: libsndfile libraries are available in this source tree" >&5
-@@ -21650,29 +21452,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/soundtouch/include/SoundTouch.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/soundtouch/include/SoundTouch.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/soundtouch/include/SoundTouch.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/soundtouch/include/SoundTouch.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBSOUNDTOUCH_LOCAL_AVAILABLE="yes"
--else
-- LIBSOUNDTOUCH_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/soundtouch/include/SoundTouch.h"; then
-+ LIBSOUNDTOUCH_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBSOUNDTOUCH_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBSOUNDTOUCH_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: libsoundtouch libraries are available in the local tree" >&5
-@@ -21771,29 +21555,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libsoxr/src/soxr.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libsoxr/src/soxr.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libsoxr/src/soxr.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libsoxr/src/soxr.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBSOXR_LOCAL_AVAILABLE="yes"
--else
-- LIBSOXR_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libsoxr/src/soxr.h"; then
-+ LIBSOXR_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBSOXR_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBSOXR_LOCAL_AVAILABLE" = "yes"; then
- # Breaks other other libraries in Audacity tree; but why is ./configure
-@@ -21894,29 +21660,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/twolame/libtwolame/twolame.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/twolame/libtwolame/twolame.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/twolame/libtwolame/twolame.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/twolame/libtwolame/twolame.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBTWOLAME_LOCAL_AVAILABLE="yes"
--else
-- LIBTWOLAME_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/twolame/libtwolame/twolame.h"; then
-+ LIBTWOLAME_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBTWOLAME_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBTWOLAME_LOCAL_AVAILABLE" = "yes"; then
- LIBTWOLAME_LOCAL_CONFIGURE_ARGS="--disable-programs"
-@@ -22015,29 +21763,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBVAMP_LOCAL_AVAILABLE="yes"
--else
-- LIBVAMP_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h"; then
-+ LIBVAMP_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBVAMP_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBVAMP_LOCAL_AVAILABLE" = "yes"; then
- LIBVAMP_LOCAL_CONFIGURE_ARGS="--disable-programs"
-@@ -22136,52 +21866,17 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- vorbisenc_h_available="yes"
--else
-- vorbisenc_h_available="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h"; then
-+ vorbisenc_h_available="yes"
-+ else
-+ vorbisenc_h_available="no"
-+ fi
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libogg/include/ogg/ogg.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libogg/include/ogg/ogg.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libogg/include/ogg/ogg.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libogg/include/ogg/ogg.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- ogg_h_available="yes"
--else
-- ogg_h_available="no"
--fi
-+ if test -f "${srcdir}/lib-src/libogg/include/ogg/ogg.h"; then
-+ ogg_h_available="yes"
-+ else
-+ ogg_h_available="no"
-+ fi
-
-
- if test "$vorbisenc_h_available" = "yes" -a "$ogg_h_available" = "yes"; then
-@@ -22290,29 +21985,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/lv2/configure" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/lv2/configure" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/lv2/configure... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/lv2/configure"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LV2_LOCAL_AVAILABLE="yes"
--else
-- LV2_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/lv2/configure"; then
-+ LV2_LOCAL_AVAILABLE="yes"
-+ else
-+ LV2_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LV2_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: LV2 libraries are available in the local tree" >&5
-@@ -22432,29 +22109,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/portaudio-v19/include/portaudio.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/portaudio-v19/include/portaudio.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/portaudio-v19/include/portaudio.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/portaudio-v19/include/portaudio.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- PORTAUDIO_LOCAL_AVAILABLE="yes"
--else
-- PORTAUDIO_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/portaudio-v19/include/portaudio.h"; then
-+ PORTAUDIO_LOCAL_AVAILABLE="yes"
-+ else
-+ PORTAUDIO_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$PORTAUDIO_LOCAL_AVAILABLE" = "yes"; then
- pa_dir="$(pwd)/${srcdir}/lib-src/portaudio-v19"
-@@ -22555,29 +22214,12 @@
- $as_echo "$as_me: portSMF library is NOT available as system library" >&6;}
- fi
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/portsmf/allegro.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/portsmf/allegro.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/portsmf/allegro.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/portsmf/allegro.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- PORTSMF_LOCAL_AVAILABLE="yes"
--else
-- PORTSMF_LOCAL_AVAILABLE="no"
--fi
-
-+ if test -f "${srcdir}/lib-src/portsmf/allegro.h"; then
-+ PORTSMF_LOCAL_AVAILABLE="yes"
-+ else
-+ PORTSMF_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$PORTSMF_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: portSMF library is available in the local tree" >&5
-@@ -22675,29 +22317,12 @@
- $as_echo "$as_me: portmidi library is NOT available as system library" >&6;}
- fi
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/portmidi/pm_common/portmidi.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/portmidi/pm_common/portmidi.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/portmidi/pm_common/portmidi.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/portmidi/pm_common/portmidi.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- PORTMIDI_LOCAL_AVAILABLE="yes"
--else
-- PORTMIDI_LOCAL_AVAILABLE="no"
--fi
-
-+ if test -f "${srcdir}/lib-src/portmidi/pm_common/portmidi.h"; then
-+ PORTMIDI_LOCAL_AVAILABLE="yes"
-+ else
-+ PORTMIDI_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$PORTMIDI_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: portmidi library is available in the local tree" >&5
-@@ -22795,29 +22420,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- WIDGETEXTRA_LOCAL_AVAILABLE="yes"
--else
-- WIDGETEXTRA_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h"; then
-+ WIDGETEXTRA_LOCAL_AVAILABLE="yes"
-+ else
-+ WIDGETEXTRA_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$WIDGETEXTRA_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: libwidgetextra library is available in the local tree" >&5
diff --git a/srcpkgs/audacity/template b/srcpkgs/audacity/template
index 7f4d0a49098..6652a5d7695 100644
--- a/srcpkgs/audacity/template
+++ b/srcpkgs/audacity/template
@@ -6,9 +6,9 @@ wrksrc="${pkgname}-Audacity-${version}"
build_style=gnu-configure
configure_args="--with-ffmpeg=system --with-libsndfile=system --with-expat=system
--with-libsoxr=system --with-lame=system --with-lv2=system ac_cv_path_WX_CONFIG=wx-config-gtk3"
-hostmakedepends="pkg-config cmake gettext libtool m4 python which"
+hostmakedepends="automake pkg-config cmake gettext-devel libtool m4 python which"
makedepends="jack-devel wxWidgets-gtk3-devel gtk+3-devel
- libmad-devel soundtouch-devel libsoxr-devel
+ libmad-devel soundtouch-devel libsoxr-devel gettext-devel gettext
vamp-plugin-sdk-devel lame-devel libid3tag-devel libflac-devel
ffmpeg-devel twolame-devel serd-devel lv2 lilv-devel suil-devel"
depends="desktop-file-utils hicolor-icon-theme"
@@ -29,10 +29,15 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
LDFLAGS="-latomic"
fi
+pre_configure() {
+ autoreconf -fi
+}
+
+do_check() {
+ make check || : # Gives recursive test not found
+}
+
post_install() {
vcopy nyquist /usr/share/audacity
vcopy plug-ins /usr/share/audacity
-
- rm ${DESTDIR}/usr/share/doc/${pkgname}/LICENSE.txt
- vlicense LICENSE.txt LICENSE
}
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] audacity: simplify cross-build patch
2020-12-30 2:01 [PR PATCH] audacity: simplify cross-build patch ndowens
` (4 preceding siblings ...)
2020-12-30 3:57 ` ndowens
@ 2020-12-30 4:10 ` ndowens
2020-12-30 4:23 ` ndowens
` (3 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: ndowens @ 2020-12-30 4:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 543 bytes --]
There is an updated pull request by ndowens against master on the void-packages repository
https://github.com/ndowens/void-packages audacity
https://github.com/void-linux/void-packages/pull/27548
[WIP] audacity: simplify cross-build patch
@sgn Since you taught me slightly on how to fix autotool cross-builds, wondering what you think of this?
Built locally and seems to have linked with libs I expected it to.
Edit: Odd locally it built fine.
A patch file from https://github.com/void-linux/void-packages/pull/27548.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-audacity-27548.patch --]
[-- Type: text/x-diff, Size: 45553 bytes --]
From b09b3e1ed84467459a8ada6e7cbf093d8cf02dff Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Tue, 29 Dec 2020 19:57:38 -0600
Subject: [PATCH] audacity: simplify cross-build patch
---
.../patches/0001-fix-cross-build.patch | 336 ++++++++
srcpkgs/audacity/patches/configure.patch | 756 ------------------
srcpkgs/audacity/template | 15 +-
3 files changed, 346 insertions(+), 761 deletions(-)
create mode 100644 srcpkgs/audacity/patches/0001-fix-cross-build.patch
delete mode 100644 srcpkgs/audacity/patches/configure.patch
diff --git a/srcpkgs/audacity/patches/0001-fix-cross-build.patch b/srcpkgs/audacity/patches/0001-fix-cross-build.patch
new file mode 100644
index 00000000000..63a55c73971
--- /dev/null
+++ b/srcpkgs/audacity/patches/0001-fix-cross-build.patch
@@ -0,0 +1,336 @@
+From 5f1ac685992183d71097669b1956b2af06ad6ed0 Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Tue, 29 Dec 2020 19:44:34 -0600
+Subject: [PATCH] fix cross build
+
+Replace AC_CHECK_FILES as it is not cross-friendly
+---
+diff --git configure.ac configure.ac
+index d8a7cf1..31c1245 100644
+--- configure.ac
++++ configure.ac
+@@ -214,7 +214,7 @@ if test x$enable_sse = xyes; then
+ AX_CHECK_COMPILER_FLAGS(-msse, [SBSMS_CFLAGS="$SBSMS_CFLAGS -msse"],[AC_MSG_ERROR([Need a version of gcc with -msse])])
+ fi
+
+- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <xmmintrin.h>]], [[__m128 v,w; float p[8]; v = _mm_loadu_ps(p); _mm_storeu_ps(p,v); w = _mm_loadl_pi(w,(const __m64*)p); w = _mm_loadh_pi(w,(const __m64*)p); _mm_storel_pi((__m64 *)p, w); _mm_storeh_pi((__m64 *)p, w); v = _mm_add_ps(v,w); v = _mm_sub_ps(v,w); v = _mm_mul_ps(v,w); v = _mm_shuffle_ps(v,w,_MM_SHUFFLE(0,1,2,3)); w = _mm_set1_ps(0.0f);]])], [sse_ok=yes], [sse_ok=no])
++ AC_TRY_COMPILE([AC_LANG_PROGRAM([[#include <xmmintrin.h>]], [[__m128 v,w; float p[8]; v = _mm_loadu_ps(p); _mm_storeu_ps(p,v); w = _mm_loadl_pi(w,(const __m64*)p); w = _mm_loadh_pi(w,(const __m64*)p); _mm_storel_pi((__m64 *)p, w); _mm_storeh_pi((__m64 *)p, w); v = _mm_add_ps(v,w); v = _mm_sub_ps(v,w); v = _mm_mul_ps(v,w); v = _mm_shuffle_ps(v,w,_MM_SHUFFLE(0,1,2,3)); w = _mm_set1_ps(0.0f);]])], [sse_ok=yes], [sse_ok=no])
+
+ if test x$sse_ok = xyes; then
+ AC_DEFINE(ENABLE_SSE,1,[Define to enable sse])
+diff --git m4/audacity_checklib_ffmpeg.m4 m4/audacity_checklib_ffmpeg.m4
+index b98110f..d4754aa 100644
+--- m4/audacity_checklib_ffmpeg.m4
++++ m4/audacity_checklib_ffmpeg.m4
+@@ -35,13 +35,9 @@ AC_DEFUN([AUDACITY_CHECKLIB_FFMPEG], [
+
+ dnl see if ffmpeg is available locally, or rather that we have some headers
+ dnl in lib-src/ffmpeg/ we can use.
+- AC_CHECK_FILE(${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h,
+- avcodec_h_found="yes",
+- avcodec_h_found="no")
++ AS_IF([test -f ${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h], [avcodec_h_found=yes])
+
+- AC_CHECK_FILE(${srcdir}/lib-src/ffmpeg/libavformat/avformat.h,
+- avformat_h_found="yes",
+- avformat_h_found="no")
++ AS_IF([test -f ${srcdir}/lib-src/ffmpeg/libavformat/avformat.h], [avformat_h_found=yes])
+
+ if test "$avcodec_h_found" = "yes" -a "$avformat_h_found" = "yes"; then
+ FFMPEG_LOCAL_AVAILABLE="yes"
+diff --git m4/audacity_checklib_lame.m4 m4/audacity_checklib_lame.m4
+index 28ecd77..5794143 100644
+--- m4/audacity_checklib_lame.m4
++++ m4/audacity_checklib_lame.m4
+@@ -33,9 +33,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LAME], [
+
+ dnl see if LAME is available in the source dir
+
+- AC_CHECK_FILE(${srcdir}/lib-src/lame/lame/lame.h,
+- LAME_LOCAL_AVAILABLE="yes",
+- LAME_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/lame/lame/lame.h], [LAME_LOCAL_AVAILABLE=yes])
+
+ if test "$LAME_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([LAME headers are available in this source tree.])
+diff --git m4/audacity_checklib_libexpat.m4 m4/audacity_checklib_libexpat.m4
+index c0c88db..ffe76ac 100644
+--- m4/audacity_checklib_libexpat.m4
++++ m4/audacity_checklib_libexpat.m4
+@@ -42,9 +42,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_EXPAT], [
+
+ dnl see if expat is available in the local tree
+
+- AC_CHECK_FILE(${srcdir}/lib-src/expat/lib/expat.h,
+- EXPAT_LOCAL_AVAILABLE="yes",
+- EXPAT_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/expat/lib/expat.h], [EXPAT_LOCAL_AVAILABLE=yes])
+
+ if test "$EXPAT_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([Expat libraries are available in the local tree])
+diff --git m4/audacity_checklib_libflac.m4 m4/audacity_checklib_libflac.m4
+index 1002986..6096791 100644
+--- m4/audacity_checklib_libflac.m4
++++ m4/audacity_checklib_libflac.m4
+@@ -38,13 +38,9 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBFLAC], [
+
+ dnl see if FLAC is available in the source dir
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libflac/include/FLAC/format.h,
+- flac_h_available="yes",
+- flac_h_available="no")
++ AS_IF([test -f ${srcdir}/lib-src/libflac/include/FLAC/format.h], [flac_h_available=yes])
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libflac/include/FLAC++/decoder.h,
+- flacpp_h_available="yes",
+- flacpp_h_available="no")
++ AS_IF([test -f ${srcdir}/lib-src/libflac/include/FLAC++/decoder.h], [flacpp_h_available=yes])
+
+ if test "$flac_h_available" = "yes" -a "$flacpp_h_available" = "yes"; then
+ LIBFLAC_LOCAL_AVAILABLE="yes"
+diff --git m4/audacity_checklib_libid3tag.m4 m4/audacity_checklib_libid3tag.m4
+index b69c2cb..59e94cc 100644
+--- m4/audacity_checklib_libid3tag.m4
++++ m4/audacity_checklib_libid3tag.m4
+@@ -25,9 +25,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBID3TAG], [
+
+ dnl see if libid3tag is available in the local tree
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libid3tag/frame.h,
+- LIBID3TAG_LOCAL_AVAILABLE="yes",
+- LIBID3TAG_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/libid3tag/frame.h], [LIBID3TAG_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBID3TAG_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([libid3tag libraries are available in the local tree])
+diff --git m4/audacity_checklib_libmad.m4 m4/audacity_checklib_libmad.m4
+index 0c2d02a..d53c459 100644
+--- m4/audacity_checklib_libmad.m4
++++ m4/audacity_checklib_libmad.m4
+@@ -34,9 +34,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBMAD], [
+
+ dnl see if libmad is available in the local tree
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libmad/frame.h,
+- LIBMAD_LOCAL_AVAILABLE="yes",
+- LIBMAD_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/libmad/frame.h], [LIBMAD_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBMAD_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([libmad libraries are available in the local tree])
+diff --git m4/audacity_checklib_libnyquist.m4 m4/audacity_checklib_libnyquist.m4
+index 3f1c98f..b4af690 100644
+--- m4/audacity_checklib_libnyquist.m4
++++ m4/audacity_checklib_libnyquist.m4
+@@ -17,9 +17,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBNYQUIST], [
+
+ dnl see if Nyquist is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libnyquist/nyx.h,
+- LIBNYQUIST_LOCAL_AVAILABLE="yes",
+- LIBNYQUIST_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/libnyquist/nyx.h], [LIBNYQUIST_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBNYQUIST_LOCAL_AVAILABLE" = "yes" ; then
+ AC_MSG_NOTICE([nyquist libraries are available in the local tree])
+diff --git m4/audacity_checklib_libsbsms.m4 m4/audacity_checklib_libsbsms.m4
+index c2f80dd..a0ec94b 100644
+--- m4/audacity_checklib_libsbsms.m4
++++ m4/audacity_checklib_libsbsms.m4
+@@ -25,9 +25,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSBSMS], [
+
+ dnl see if libsbsms is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/sbsms/include/sbsms.h,
+- LIBSBSMS_LOCAL_AVAILABLE="yes",
+- LIBSBSMS_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/sbsms/include/sbsms.h], [LIBSBSMS_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBSBSMS_LOCAL_AVAILABLE" = "yes"; then
+ dnl do not build programs we don't need
+diff --git m4/audacity_checklib_libsndfile.m4 m4/audacity_checklib_libsndfile.m4
+index d49e149..e501899 100644
+--- m4/audacity_checklib_libsndfile.m4
++++ m4/audacity_checklib_libsndfile.m4
+@@ -25,9 +25,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSNDFILE], [
+
+ dnl see if libsndfile is available in the local tree
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libsndfile/src/sndfile.h.in,
+- LIBSNDFILE_LOCAL_AVAILABLE="yes",
+- LIBSNDFILE_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/libsndfile/src/sndfile.h.in], [LIBSNDFILE_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBSNDFILE_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([libsndfile libraries are available in this source tree])
+diff --git m4/audacity_checklib_libsoundtouch.m4 m4/audacity_checklib_libsoundtouch.m4
+index 0b8aa69..d8d9f58 100644
+--- m4/audacity_checklib_libsoundtouch.m4
++++ m4/audacity_checklib_libsoundtouch.m4
+@@ -40,9 +40,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSOUNDTOUCH], [
+
+ dnl see if libsoundtouch is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/soundtouch/include/SoundTouch.h,
+- LIBSOUNDTOUCH_LOCAL_AVAILABLE="yes",
+- LIBSOUNDTOUCH_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/soundtouch/include/SoundTouch.h], [LIBSOUNDTOUCH_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBSOUNDTOUCH_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([libsoundtouch libraries are available in the local tree])
+diff --git m4/audacity_checklib_libsoxr.m4 m4/audacity_checklib_libsoxr.m4
+index a331e9b..1a0702b 100644
+--- m4/audacity_checklib_libsoxr.m4
++++ m4/audacity_checklib_libsoxr.m4
+@@ -25,9 +25,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSOXR], [
+
+ dnl see if libsoxr is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libsoxr/src/soxr.h,
+- LIBSOXR_LOCAL_AVAILABLE="yes",
+- LIBSOXR_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/libsoxr/src/soxr.h], [LIBSOXR_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBSOXR_LOCAL_AVAILABLE" = "yes"; then
+ # Breaks other other libraries in Audacity tree; but why is ./configure
+diff --git m4/audacity_checklib_libtwolame.m4 m4/audacity_checklib_libtwolame.m4
+index 2d28b07..fc2a2bf 100644
+--- m4/audacity_checklib_libtwolame.m4
++++ m4/audacity_checklib_libtwolame.m4
+@@ -25,9 +25,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBTWOLAME], [
+
+ dnl see if libtwolame is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/twolame/libtwolame/twolame.h,
+- LIBTWOLAME_LOCAL_AVAILABLE="yes",
+- LIBTWOLAME_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/twolame/libtwolame/twolame.h], [LIBTWOLAME_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBTWOLAME_LOCAL_AVAILABLE" = "yes"; then
+ dnl disable programs we don't need to build
+diff --git m4/audacity_checklib_libvamp.m4 m4/audacity_checklib_libvamp.m4
+index 8a1e0e1..57dc5eb 100644
+--- m4/audacity_checklib_libvamp.m4
++++ m4/audacity_checklib_libvamp.m4
+@@ -25,9 +25,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBVAMP], [
+
+ dnl see if Vamp is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h,
+- LIBVAMP_LOCAL_AVAILABLE="yes",
+- LIBVAMP_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h], [LIBVAMP_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBVAMP_LOCAL_AVAILABLE" = "yes"; then
+ LIBVAMP_LOCAL_CONFIGURE_ARGS="--disable-programs"
+diff --git m4/audacity_checklib_libvorbis.m4 m4/audacity_checklib_libvorbis.m4
+index 0839fa9..3d8b70d 100644
+--- m4/audacity_checklib_libvorbis.m4
++++ m4/audacity_checklib_libvorbis.m4
+@@ -30,13 +30,9 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBVORBIS], [
+
+ dnl see if Vorbis is available in the source dir
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h,
+- vorbisenc_h_available="yes",
+- vorbisenc_h_available="no")
++ AS_IF([test -f ${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h], [vorbisenc_h_available=yes])
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libogg/include/ogg/ogg.h,
+- ogg_h_available="yes",
+- ogg_h_available="no")
++ AS_IF([test -f ${srcdir}/lib-src/libogg/include/ogg/ogg.h], [ogg_h_available=yes])
+
+ if test "$vorbisenc_h_available" = "yes" -a "$ogg_h_available" = "yes"; then
+ LIBVORBIS_LOCAL_AVAILABLE="yes"
+diff --git m4/audacity_checklib_lv2.m4 m4/audacity_checklib_lv2.m4
+index 78a279a..164aa6d 100644
+--- m4/audacity_checklib_lv2.m4
++++ m4/audacity_checklib_lv2.m4
+@@ -23,9 +23,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LV2], [
+
+ dnl see if LV2 is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/lv2/configure,
+- LV2_LOCAL_AVAILABLE="yes",
+- LV2_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/lv2/configure], [LV2_LOCAL_AVAILABLE=yes])
+
+ if test "$LV2_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([LV2 libraries are available in the local tree])
+diff --git m4/audacity_checklib_portaudio.m4 m4/audacity_checklib_portaudio.m4
+index 9b7674e..03d62b8 100644
+--- m4/audacity_checklib_portaudio.m4
++++ m4/audacity_checklib_portaudio.m4
+@@ -31,9 +31,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_PORTAUDIO], [
+
+ dnl see if portaudio is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/portaudio-v19/include/portaudio.h,
+- PORTAUDIO_LOCAL_AVAILABLE="yes",
+- PORTAUDIO_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/portaudio-v19/include/portaudio.h], [PORTAUDIO_LOCAL_AVAILABLE=yes])
+
+ if test "$PORTAUDIO_LOCAL_AVAILABLE" = "yes"; then
+ dnl We need to override the pkg-config check for portmixer by passing
+diff --git m4/audacity_checklib_portmidi.m4 m4/audacity_checklib_portmidi.m4
+index 4e63b1b..6db1dc6 100644
+--- m4/audacity_checklib_portmidi.m4
++++ m4/audacity_checklib_portmidi.m4
+@@ -21,9 +21,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_PORTMIDI], [
+ AC_MSG_NOTICE([portmidi library is NOT available as system library])
+ fi
+
+- AC_CHECK_FILE(${srcdir}/lib-src/portmidi/pm_common/portmidi.h,
+- PORTMIDI_LOCAL_AVAILABLE="yes",
+- PORTMIDI_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/portmidi/pm_common/portmidi.h], [PORTMIDI_LOCAL_AVAILABLE=yes])
+
+ if test "$PORTMIDI_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([portmidi library is available in the local tree])
+diff --git m4/audacity_checklib_portsmf.m4 m4/audacity_checklib_portsmf.m4
+index 9c336d8..3a31ef5 100644
+--- m4/audacity_checklib_portsmf.m4
++++ m4/audacity_checklib_portsmf.m4
+@@ -24,9 +24,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_PORTSMF], [
+ AC_MSG_NOTICE([portSMF library is NOT available as system library])
+ fi
+
+- AC_CHECK_FILE(${srcdir}/lib-src/portsmf/allegro.h,
+- PORTSMF_LOCAL_AVAILABLE="yes",
+- PORTSMF_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/portsmf/allegro.h], [PORTSMF_LOCAL_AVAILABLE=yes])
+
+ if test "$PORTSMF_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([portSMF library is available in the local tree])
+diff --git m4/audacity_checklib_widgetextra.m4 m4/audacity_checklib_widgetextra.m4
+index 4ef0f97..f857723 100644
+--- m4/audacity_checklib_widgetextra.m4
++++ m4/audacity_checklib_widgetextra.m4
+@@ -28,9 +28,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_WIDGETEXTRA], [
+
+ dnl see if libwidgetextra is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h,
+- WIDGETEXTRA_LOCAL_AVAILABLE="yes",
+- WIDGETEXTRA_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h], [WIDGETEXTRA_LOCAL_AVAILABLE=yes])
+
+ if test "$WIDGETEXTRA_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([libwidgetextra library is available in the local tree])
+--
+2.30.0
+
+diff --git configure.ac configure.ac
+index 31c1245..166a77e 100644
+--- configure.ac
++++ configure.ac
+@@ -63,7 +63,7 @@ AC_PROG_CXXCPP
+ AM_PROG_AR
+
+ LT_INIT([disable-shared])
+-
++m4_pattern_allow([^AC_LANG])
+ AC_PROG_INSTALL
+ dnl pkg-config is required for lots of things
+ AC_CHECK_PROG(HAVE_PKG_CONFIG, pkg-config, yes, no)
diff --git a/srcpkgs/audacity/patches/configure.patch b/srcpkgs/audacity/patches/configure.patch
deleted file mode 100644
index 3b9c576c3f2..00000000000
--- a/srcpkgs/audacity/patches/configure.patch
+++ /dev/null
@@ -1,756 +0,0 @@
-configure uses AC_CHECK_FILE to test for file existence which is
-cross incompatible. Changed it to simple if/else statements.
-
---- configure.orig 2017-10-26 19:44:39.000000000 +0200
-+++ configure 2017-11-09 21:23:45.099433701 +0100
-@@ -20200,29 +20200,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/expat/lib/expat.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/expat/lib/expat.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/expat/lib/expat.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/expat/lib/expat.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- EXPAT_LOCAL_AVAILABLE="yes"
--else
-- EXPAT_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/expat/lib/expat.h"; then
-+ EXPAT_LOCAL_AVAILABLE="yes"
-+ else
-+ EXPAT_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$EXPAT_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: Expat libraries are available in the local tree" >&5
-@@ -20455,53 +20437,17 @@
- $as_echo "$as_me: FFmpeg library NOT available as system library" >&6;}
- fi
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- avcodec_h_found="yes"
--else
-- avcodec_h_found="no"
--fi
--
--
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/ffmpeg/libavformat/avformat.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/ffmpeg/libavformat/avformat.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/ffmpeg/libavformat/avformat.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/ffmpeg/libavformat/avformat.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- avformat_h_found="yes"
--else
-- avformat_h_found="no"
--fi
-+ if test -f "${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h"; then
-+ avcodec_h_found="yes"
-+ else
-+ avcodec_h_found="no"
-+ fi
-
-+ if test -f "${srcdir}/lib-src/ffmpeg/libavformat/avformat.h"; then
-+ avformat_h_found="yes"
-+ else
-+ avformat_h_found="no"
-+ fi
-
- if test "$avcodec_h_found" = "yes" -a "$avformat_h_found" = "yes"; then
- FFMPEG_LOCAL_AVAILABLE="yes"
-@@ -20589,29 +20535,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/lame/lame/lame.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/lame/lame/lame.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/lame/lame/lame.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/lame/lame/lame.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LAME_LOCAL_AVAILABLE="yes"
--else
-- LAME_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/lame/lame/lame.h"; then
-+ LAME_LOCAL_AVAILABLE="yes"
-+ else
-+ LAME_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LAME_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: LAME headers are available in this source tree." >&5
-@@ -20780,53 +20708,17 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libflac/include/FLAC/format.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libflac/include/FLAC/format.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libflac/include/FLAC/format.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libflac/include/FLAC/format.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- flac_h_available="yes"
--else
-- flac_h_available="no"
--fi
--
--
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libflac/include/FLAC++/decoder.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libflac/include/FLAC++/decoder.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libflac/include/FLAC++/decoder.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libflac/include/FLAC++/decoder.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- flacpp_h_available="yes"
--else
-- flacpp_h_available="no"
--fi
-+ if test -f "${srcdir}/lib-src/libflac/include/FLAC/format.h"; then
-+ flac_h_available="yes"
-+ else
-+ flac_h_available="no"
-+ fi
-
-+ if test -f "${srcdir}/lib-src/libflac/include/FLAC++/decoder.h"; then
-+ flacpp_h_available="yes"
-+ else
-+ flacpp_h_available="no"
-+ fi
-
- if test "$flac_h_available" = "yes" -a "$flacpp_h_available" = "yes"; then
- LIBFLAC_LOCAL_AVAILABLE="yes"
-@@ -20930,29 +20822,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libid3tag/frame.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libid3tag/frame.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libid3tag/frame.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libid3tag/frame.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBID3TAG_LOCAL_AVAILABLE="yes"
--else
-- LIBID3TAG_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libid3tag/frame.h"; then
-+ LIBID3TAG_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBID3TAG_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBID3TAG_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: libid3tag libraries are available in the local tree" >&5
-@@ -21099,29 +20973,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libmad/frame.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libmad/frame.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libmad/frame.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libmad/frame.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBMAD_LOCAL_AVAILABLE="yes"
--else
-- LIBMAD_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libmad/frame.h"; then
-+ LIBMAD_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBMAD_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBMAD_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: libmad libraries are available in the local tree" >&5
-@@ -21144,29 +21000,11 @@
- LIBNYQUIST_SYSTEM_AVAILABLE="no"
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libnyquist/nyx.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libnyquist/nyx.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libnyquist/nyx.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libnyquist/nyx.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBNYQUIST_LOCAL_AVAILABLE="yes"
--else
-- LIBNYQUIST_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libnyquist/nyx.h"; then
-+ LIBNYQUIST_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBNYQUIST_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBNYQUIST_LOCAL_AVAILABLE" = "yes" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: nyquist libraries are available in the local tree" >&5
-@@ -21265,29 +21103,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/sbsms/include/sbsms.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/sbsms/include/sbsms.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/sbsms/include/sbsms.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/sbsms/include/sbsms.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBSBSMS_LOCAL_AVAILABLE="yes"
--else
-- LIBSBSMS_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/sbsms/include/sbsms.h"; then
-+ LIBSBSMS_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBSBSMS_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBSBSMS_LOCAL_AVAILABLE" = "yes"; then
- LIBSBSMS_LOCAL_CONFIGURE_ARGS="--disable-programs"
-@@ -21388,29 +21208,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libsndfile/src/sndfile.h.in" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libsndfile/src/sndfile.h.in" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libsndfile/src/sndfile.h.in... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libsndfile/src/sndfile.h.in"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBSNDFILE_LOCAL_AVAILABLE="yes"
--else
-- LIBSNDFILE_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libsndfile/src/sndfile.h.in"; then
-+ LIBSNDFILE_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBSNDFILE_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBSNDFILE_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: libsndfile libraries are available in this source tree" >&5
-@@ -21650,29 +21452,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/soundtouch/include/SoundTouch.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/soundtouch/include/SoundTouch.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/soundtouch/include/SoundTouch.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/soundtouch/include/SoundTouch.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBSOUNDTOUCH_LOCAL_AVAILABLE="yes"
--else
-- LIBSOUNDTOUCH_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/soundtouch/include/SoundTouch.h"; then
-+ LIBSOUNDTOUCH_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBSOUNDTOUCH_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBSOUNDTOUCH_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: libsoundtouch libraries are available in the local tree" >&5
-@@ -21771,29 +21555,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libsoxr/src/soxr.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libsoxr/src/soxr.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libsoxr/src/soxr.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libsoxr/src/soxr.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBSOXR_LOCAL_AVAILABLE="yes"
--else
-- LIBSOXR_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libsoxr/src/soxr.h"; then
-+ LIBSOXR_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBSOXR_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBSOXR_LOCAL_AVAILABLE" = "yes"; then
- # Breaks other other libraries in Audacity tree; but why is ./configure
-@@ -21894,29 +21660,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/twolame/libtwolame/twolame.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/twolame/libtwolame/twolame.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/twolame/libtwolame/twolame.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/twolame/libtwolame/twolame.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBTWOLAME_LOCAL_AVAILABLE="yes"
--else
-- LIBTWOLAME_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/twolame/libtwolame/twolame.h"; then
-+ LIBTWOLAME_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBTWOLAME_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBTWOLAME_LOCAL_AVAILABLE" = "yes"; then
- LIBTWOLAME_LOCAL_CONFIGURE_ARGS="--disable-programs"
-@@ -22015,29 +21763,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBVAMP_LOCAL_AVAILABLE="yes"
--else
-- LIBVAMP_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h"; then
-+ LIBVAMP_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBVAMP_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBVAMP_LOCAL_AVAILABLE" = "yes"; then
- LIBVAMP_LOCAL_CONFIGURE_ARGS="--disable-programs"
-@@ -22136,52 +21866,17 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- vorbisenc_h_available="yes"
--else
-- vorbisenc_h_available="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h"; then
-+ vorbisenc_h_available="yes"
-+ else
-+ vorbisenc_h_available="no"
-+ fi
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libogg/include/ogg/ogg.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libogg/include/ogg/ogg.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libogg/include/ogg/ogg.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libogg/include/ogg/ogg.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- ogg_h_available="yes"
--else
-- ogg_h_available="no"
--fi
-+ if test -f "${srcdir}/lib-src/libogg/include/ogg/ogg.h"; then
-+ ogg_h_available="yes"
-+ else
-+ ogg_h_available="no"
-+ fi
-
-
- if test "$vorbisenc_h_available" = "yes" -a "$ogg_h_available" = "yes"; then
-@@ -22290,29 +21985,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/lv2/configure" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/lv2/configure" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/lv2/configure... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/lv2/configure"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LV2_LOCAL_AVAILABLE="yes"
--else
-- LV2_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/lv2/configure"; then
-+ LV2_LOCAL_AVAILABLE="yes"
-+ else
-+ LV2_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LV2_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: LV2 libraries are available in the local tree" >&5
-@@ -22432,29 +22109,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/portaudio-v19/include/portaudio.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/portaudio-v19/include/portaudio.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/portaudio-v19/include/portaudio.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/portaudio-v19/include/portaudio.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- PORTAUDIO_LOCAL_AVAILABLE="yes"
--else
-- PORTAUDIO_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/portaudio-v19/include/portaudio.h"; then
-+ PORTAUDIO_LOCAL_AVAILABLE="yes"
-+ else
-+ PORTAUDIO_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$PORTAUDIO_LOCAL_AVAILABLE" = "yes"; then
- pa_dir="$(pwd)/${srcdir}/lib-src/portaudio-v19"
-@@ -22555,29 +22214,12 @@
- $as_echo "$as_me: portSMF library is NOT available as system library" >&6;}
- fi
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/portsmf/allegro.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/portsmf/allegro.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/portsmf/allegro.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/portsmf/allegro.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- PORTSMF_LOCAL_AVAILABLE="yes"
--else
-- PORTSMF_LOCAL_AVAILABLE="no"
--fi
-
-+ if test -f "${srcdir}/lib-src/portsmf/allegro.h"; then
-+ PORTSMF_LOCAL_AVAILABLE="yes"
-+ else
-+ PORTSMF_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$PORTSMF_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: portSMF library is available in the local tree" >&5
-@@ -22675,29 +22317,12 @@
- $as_echo "$as_me: portmidi library is NOT available as system library" >&6;}
- fi
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/portmidi/pm_common/portmidi.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/portmidi/pm_common/portmidi.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/portmidi/pm_common/portmidi.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/portmidi/pm_common/portmidi.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- PORTMIDI_LOCAL_AVAILABLE="yes"
--else
-- PORTMIDI_LOCAL_AVAILABLE="no"
--fi
-
-+ if test -f "${srcdir}/lib-src/portmidi/pm_common/portmidi.h"; then
-+ PORTMIDI_LOCAL_AVAILABLE="yes"
-+ else
-+ PORTMIDI_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$PORTMIDI_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: portmidi library is available in the local tree" >&5
-@@ -22795,29 +22420,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- WIDGETEXTRA_LOCAL_AVAILABLE="yes"
--else
-- WIDGETEXTRA_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h"; then
-+ WIDGETEXTRA_LOCAL_AVAILABLE="yes"
-+ else
-+ WIDGETEXTRA_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$WIDGETEXTRA_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: libwidgetextra library is available in the local tree" >&5
diff --git a/srcpkgs/audacity/template b/srcpkgs/audacity/template
index 7f4d0a49098..9971541710e 100644
--- a/srcpkgs/audacity/template
+++ b/srcpkgs/audacity/template
@@ -6,9 +6,9 @@ wrksrc="${pkgname}-Audacity-${version}"
build_style=gnu-configure
configure_args="--with-ffmpeg=system --with-libsndfile=system --with-expat=system
--with-libsoxr=system --with-lame=system --with-lv2=system ac_cv_path_WX_CONFIG=wx-config-gtk3"
-hostmakedepends="pkg-config cmake gettext libtool m4 python which"
+hostmakedepends="automake pkg-config cmake gettext-devel libtool m4 python which"
makedepends="jack-devel wxWidgets-gtk3-devel gtk+3-devel
- libmad-devel soundtouch-devel libsoxr-devel
+ libmad-devel soundtouch-devel libsoxr-devel gettext
vamp-plugin-sdk-devel lame-devel libid3tag-devel libflac-devel
ffmpeg-devel twolame-devel serd-devel lv2 lilv-devel suil-devel"
depends="desktop-file-utils hicolor-icon-theme"
@@ -29,10 +29,15 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
LDFLAGS="-latomic"
fi
+pre_configure() {
+ autoreconf -fi
+}
+
+do_check() {
+ make check || : # Gives recursive test not found
+}
+
post_install() {
vcopy nyquist /usr/share/audacity
vcopy plug-ins /usr/share/audacity
-
- rm ${DESTDIR}/usr/share/doc/${pkgname}/LICENSE.txt
- vlicense LICENSE.txt LICENSE
}
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] audacity: simplify cross-build patch
2020-12-30 2:01 [PR PATCH] audacity: simplify cross-build patch ndowens
` (5 preceding siblings ...)
2020-12-30 4:10 ` ndowens
@ 2020-12-30 4:23 ` ndowens
2020-12-30 4:35 ` ndowens
` (2 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: ndowens @ 2020-12-30 4:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 543 bytes --]
There is an updated pull request by ndowens against master on the void-packages repository
https://github.com/ndowens/void-packages audacity
https://github.com/void-linux/void-packages/pull/27548
[WIP] audacity: simplify cross-build patch
@sgn Since you taught me slightly on how to fix autotool cross-builds, wondering what you think of this?
Built locally and seems to have linked with libs I expected it to.
Edit: Odd locally it built fine.
A patch file from https://github.com/void-linux/void-packages/pull/27548.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-audacity-27548.patch --]
[-- Type: text/x-diff, Size: 45559 bytes --]
From 4d43106830b793f366513434c69849c97b45e23e Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Tue, 29 Dec 2020 19:57:38 -0600
Subject: [PATCH] audacity: simplify cross-build patch
---
.../patches/0001-fix-cross-build.patch | 336 ++++++++
srcpkgs/audacity/patches/configure.patch | 756 ------------------
srcpkgs/audacity/template | 15 +-
3 files changed, 346 insertions(+), 761 deletions(-)
create mode 100644 srcpkgs/audacity/patches/0001-fix-cross-build.patch
delete mode 100644 srcpkgs/audacity/patches/configure.patch
diff --git a/srcpkgs/audacity/patches/0001-fix-cross-build.patch b/srcpkgs/audacity/patches/0001-fix-cross-build.patch
new file mode 100644
index 00000000000..63a55c73971
--- /dev/null
+++ b/srcpkgs/audacity/patches/0001-fix-cross-build.patch
@@ -0,0 +1,336 @@
+From 5f1ac685992183d71097669b1956b2af06ad6ed0 Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Tue, 29 Dec 2020 19:44:34 -0600
+Subject: [PATCH] fix cross build
+
+Replace AC_CHECK_FILES as it is not cross-friendly
+---
+diff --git configure.ac configure.ac
+index d8a7cf1..31c1245 100644
+--- configure.ac
++++ configure.ac
+@@ -214,7 +214,7 @@ if test x$enable_sse = xyes; then
+ AX_CHECK_COMPILER_FLAGS(-msse, [SBSMS_CFLAGS="$SBSMS_CFLAGS -msse"],[AC_MSG_ERROR([Need a version of gcc with -msse])])
+ fi
+
+- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <xmmintrin.h>]], [[__m128 v,w; float p[8]; v = _mm_loadu_ps(p); _mm_storeu_ps(p,v); w = _mm_loadl_pi(w,(const __m64*)p); w = _mm_loadh_pi(w,(const __m64*)p); _mm_storel_pi((__m64 *)p, w); _mm_storeh_pi((__m64 *)p, w); v = _mm_add_ps(v,w); v = _mm_sub_ps(v,w); v = _mm_mul_ps(v,w); v = _mm_shuffle_ps(v,w,_MM_SHUFFLE(0,1,2,3)); w = _mm_set1_ps(0.0f);]])], [sse_ok=yes], [sse_ok=no])
++ AC_TRY_COMPILE([AC_LANG_PROGRAM([[#include <xmmintrin.h>]], [[__m128 v,w; float p[8]; v = _mm_loadu_ps(p); _mm_storeu_ps(p,v); w = _mm_loadl_pi(w,(const __m64*)p); w = _mm_loadh_pi(w,(const __m64*)p); _mm_storel_pi((__m64 *)p, w); _mm_storeh_pi((__m64 *)p, w); v = _mm_add_ps(v,w); v = _mm_sub_ps(v,w); v = _mm_mul_ps(v,w); v = _mm_shuffle_ps(v,w,_MM_SHUFFLE(0,1,2,3)); w = _mm_set1_ps(0.0f);]])], [sse_ok=yes], [sse_ok=no])
+
+ if test x$sse_ok = xyes; then
+ AC_DEFINE(ENABLE_SSE,1,[Define to enable sse])
+diff --git m4/audacity_checklib_ffmpeg.m4 m4/audacity_checklib_ffmpeg.m4
+index b98110f..d4754aa 100644
+--- m4/audacity_checklib_ffmpeg.m4
++++ m4/audacity_checklib_ffmpeg.m4
+@@ -35,13 +35,9 @@ AC_DEFUN([AUDACITY_CHECKLIB_FFMPEG], [
+
+ dnl see if ffmpeg is available locally, or rather that we have some headers
+ dnl in lib-src/ffmpeg/ we can use.
+- AC_CHECK_FILE(${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h,
+- avcodec_h_found="yes",
+- avcodec_h_found="no")
++ AS_IF([test -f ${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h], [avcodec_h_found=yes])
+
+- AC_CHECK_FILE(${srcdir}/lib-src/ffmpeg/libavformat/avformat.h,
+- avformat_h_found="yes",
+- avformat_h_found="no")
++ AS_IF([test -f ${srcdir}/lib-src/ffmpeg/libavformat/avformat.h], [avformat_h_found=yes])
+
+ if test "$avcodec_h_found" = "yes" -a "$avformat_h_found" = "yes"; then
+ FFMPEG_LOCAL_AVAILABLE="yes"
+diff --git m4/audacity_checklib_lame.m4 m4/audacity_checklib_lame.m4
+index 28ecd77..5794143 100644
+--- m4/audacity_checklib_lame.m4
++++ m4/audacity_checklib_lame.m4
+@@ -33,9 +33,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LAME], [
+
+ dnl see if LAME is available in the source dir
+
+- AC_CHECK_FILE(${srcdir}/lib-src/lame/lame/lame.h,
+- LAME_LOCAL_AVAILABLE="yes",
+- LAME_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/lame/lame/lame.h], [LAME_LOCAL_AVAILABLE=yes])
+
+ if test "$LAME_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([LAME headers are available in this source tree.])
+diff --git m4/audacity_checklib_libexpat.m4 m4/audacity_checklib_libexpat.m4
+index c0c88db..ffe76ac 100644
+--- m4/audacity_checklib_libexpat.m4
++++ m4/audacity_checklib_libexpat.m4
+@@ -42,9 +42,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_EXPAT], [
+
+ dnl see if expat is available in the local tree
+
+- AC_CHECK_FILE(${srcdir}/lib-src/expat/lib/expat.h,
+- EXPAT_LOCAL_AVAILABLE="yes",
+- EXPAT_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/expat/lib/expat.h], [EXPAT_LOCAL_AVAILABLE=yes])
+
+ if test "$EXPAT_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([Expat libraries are available in the local tree])
+diff --git m4/audacity_checklib_libflac.m4 m4/audacity_checklib_libflac.m4
+index 1002986..6096791 100644
+--- m4/audacity_checklib_libflac.m4
++++ m4/audacity_checklib_libflac.m4
+@@ -38,13 +38,9 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBFLAC], [
+
+ dnl see if FLAC is available in the source dir
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libflac/include/FLAC/format.h,
+- flac_h_available="yes",
+- flac_h_available="no")
++ AS_IF([test -f ${srcdir}/lib-src/libflac/include/FLAC/format.h], [flac_h_available=yes])
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libflac/include/FLAC++/decoder.h,
+- flacpp_h_available="yes",
+- flacpp_h_available="no")
++ AS_IF([test -f ${srcdir}/lib-src/libflac/include/FLAC++/decoder.h], [flacpp_h_available=yes])
+
+ if test "$flac_h_available" = "yes" -a "$flacpp_h_available" = "yes"; then
+ LIBFLAC_LOCAL_AVAILABLE="yes"
+diff --git m4/audacity_checklib_libid3tag.m4 m4/audacity_checklib_libid3tag.m4
+index b69c2cb..59e94cc 100644
+--- m4/audacity_checklib_libid3tag.m4
++++ m4/audacity_checklib_libid3tag.m4
+@@ -25,9 +25,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBID3TAG], [
+
+ dnl see if libid3tag is available in the local tree
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libid3tag/frame.h,
+- LIBID3TAG_LOCAL_AVAILABLE="yes",
+- LIBID3TAG_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/libid3tag/frame.h], [LIBID3TAG_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBID3TAG_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([libid3tag libraries are available in the local tree])
+diff --git m4/audacity_checklib_libmad.m4 m4/audacity_checklib_libmad.m4
+index 0c2d02a..d53c459 100644
+--- m4/audacity_checklib_libmad.m4
++++ m4/audacity_checklib_libmad.m4
+@@ -34,9 +34,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBMAD], [
+
+ dnl see if libmad is available in the local tree
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libmad/frame.h,
+- LIBMAD_LOCAL_AVAILABLE="yes",
+- LIBMAD_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/libmad/frame.h], [LIBMAD_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBMAD_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([libmad libraries are available in the local tree])
+diff --git m4/audacity_checklib_libnyquist.m4 m4/audacity_checklib_libnyquist.m4
+index 3f1c98f..b4af690 100644
+--- m4/audacity_checklib_libnyquist.m4
++++ m4/audacity_checklib_libnyquist.m4
+@@ -17,9 +17,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBNYQUIST], [
+
+ dnl see if Nyquist is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libnyquist/nyx.h,
+- LIBNYQUIST_LOCAL_AVAILABLE="yes",
+- LIBNYQUIST_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/libnyquist/nyx.h], [LIBNYQUIST_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBNYQUIST_LOCAL_AVAILABLE" = "yes" ; then
+ AC_MSG_NOTICE([nyquist libraries are available in the local tree])
+diff --git m4/audacity_checklib_libsbsms.m4 m4/audacity_checklib_libsbsms.m4
+index c2f80dd..a0ec94b 100644
+--- m4/audacity_checklib_libsbsms.m4
++++ m4/audacity_checklib_libsbsms.m4
+@@ -25,9 +25,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSBSMS], [
+
+ dnl see if libsbsms is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/sbsms/include/sbsms.h,
+- LIBSBSMS_LOCAL_AVAILABLE="yes",
+- LIBSBSMS_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/sbsms/include/sbsms.h], [LIBSBSMS_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBSBSMS_LOCAL_AVAILABLE" = "yes"; then
+ dnl do not build programs we don't need
+diff --git m4/audacity_checklib_libsndfile.m4 m4/audacity_checklib_libsndfile.m4
+index d49e149..e501899 100644
+--- m4/audacity_checklib_libsndfile.m4
++++ m4/audacity_checklib_libsndfile.m4
+@@ -25,9 +25,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSNDFILE], [
+
+ dnl see if libsndfile is available in the local tree
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libsndfile/src/sndfile.h.in,
+- LIBSNDFILE_LOCAL_AVAILABLE="yes",
+- LIBSNDFILE_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/libsndfile/src/sndfile.h.in], [LIBSNDFILE_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBSNDFILE_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([libsndfile libraries are available in this source tree])
+diff --git m4/audacity_checklib_libsoundtouch.m4 m4/audacity_checklib_libsoundtouch.m4
+index 0b8aa69..d8d9f58 100644
+--- m4/audacity_checklib_libsoundtouch.m4
++++ m4/audacity_checklib_libsoundtouch.m4
+@@ -40,9 +40,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSOUNDTOUCH], [
+
+ dnl see if libsoundtouch is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/soundtouch/include/SoundTouch.h,
+- LIBSOUNDTOUCH_LOCAL_AVAILABLE="yes",
+- LIBSOUNDTOUCH_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/soundtouch/include/SoundTouch.h], [LIBSOUNDTOUCH_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBSOUNDTOUCH_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([libsoundtouch libraries are available in the local tree])
+diff --git m4/audacity_checklib_libsoxr.m4 m4/audacity_checklib_libsoxr.m4
+index a331e9b..1a0702b 100644
+--- m4/audacity_checklib_libsoxr.m4
++++ m4/audacity_checklib_libsoxr.m4
+@@ -25,9 +25,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSOXR], [
+
+ dnl see if libsoxr is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libsoxr/src/soxr.h,
+- LIBSOXR_LOCAL_AVAILABLE="yes",
+- LIBSOXR_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/libsoxr/src/soxr.h], [LIBSOXR_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBSOXR_LOCAL_AVAILABLE" = "yes"; then
+ # Breaks other other libraries in Audacity tree; but why is ./configure
+diff --git m4/audacity_checklib_libtwolame.m4 m4/audacity_checklib_libtwolame.m4
+index 2d28b07..fc2a2bf 100644
+--- m4/audacity_checklib_libtwolame.m4
++++ m4/audacity_checklib_libtwolame.m4
+@@ -25,9 +25,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBTWOLAME], [
+
+ dnl see if libtwolame is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/twolame/libtwolame/twolame.h,
+- LIBTWOLAME_LOCAL_AVAILABLE="yes",
+- LIBTWOLAME_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/twolame/libtwolame/twolame.h], [LIBTWOLAME_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBTWOLAME_LOCAL_AVAILABLE" = "yes"; then
+ dnl disable programs we don't need to build
+diff --git m4/audacity_checklib_libvamp.m4 m4/audacity_checklib_libvamp.m4
+index 8a1e0e1..57dc5eb 100644
+--- m4/audacity_checklib_libvamp.m4
++++ m4/audacity_checklib_libvamp.m4
+@@ -25,9 +25,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBVAMP], [
+
+ dnl see if Vamp is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h,
+- LIBVAMP_LOCAL_AVAILABLE="yes",
+- LIBVAMP_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h], [LIBVAMP_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBVAMP_LOCAL_AVAILABLE" = "yes"; then
+ LIBVAMP_LOCAL_CONFIGURE_ARGS="--disable-programs"
+diff --git m4/audacity_checklib_libvorbis.m4 m4/audacity_checklib_libvorbis.m4
+index 0839fa9..3d8b70d 100644
+--- m4/audacity_checklib_libvorbis.m4
++++ m4/audacity_checklib_libvorbis.m4
+@@ -30,13 +30,9 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBVORBIS], [
+
+ dnl see if Vorbis is available in the source dir
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h,
+- vorbisenc_h_available="yes",
+- vorbisenc_h_available="no")
++ AS_IF([test -f ${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h], [vorbisenc_h_available=yes])
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libogg/include/ogg/ogg.h,
+- ogg_h_available="yes",
+- ogg_h_available="no")
++ AS_IF([test -f ${srcdir}/lib-src/libogg/include/ogg/ogg.h], [ogg_h_available=yes])
+
+ if test "$vorbisenc_h_available" = "yes" -a "$ogg_h_available" = "yes"; then
+ LIBVORBIS_LOCAL_AVAILABLE="yes"
+diff --git m4/audacity_checklib_lv2.m4 m4/audacity_checklib_lv2.m4
+index 78a279a..164aa6d 100644
+--- m4/audacity_checklib_lv2.m4
++++ m4/audacity_checklib_lv2.m4
+@@ -23,9 +23,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LV2], [
+
+ dnl see if LV2 is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/lv2/configure,
+- LV2_LOCAL_AVAILABLE="yes",
+- LV2_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/lv2/configure], [LV2_LOCAL_AVAILABLE=yes])
+
+ if test "$LV2_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([LV2 libraries are available in the local tree])
+diff --git m4/audacity_checklib_portaudio.m4 m4/audacity_checklib_portaudio.m4
+index 9b7674e..03d62b8 100644
+--- m4/audacity_checklib_portaudio.m4
++++ m4/audacity_checklib_portaudio.m4
+@@ -31,9 +31,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_PORTAUDIO], [
+
+ dnl see if portaudio is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/portaudio-v19/include/portaudio.h,
+- PORTAUDIO_LOCAL_AVAILABLE="yes",
+- PORTAUDIO_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/portaudio-v19/include/portaudio.h], [PORTAUDIO_LOCAL_AVAILABLE=yes])
+
+ if test "$PORTAUDIO_LOCAL_AVAILABLE" = "yes"; then
+ dnl We need to override the pkg-config check for portmixer by passing
+diff --git m4/audacity_checklib_portmidi.m4 m4/audacity_checklib_portmidi.m4
+index 4e63b1b..6db1dc6 100644
+--- m4/audacity_checklib_portmidi.m4
++++ m4/audacity_checklib_portmidi.m4
+@@ -21,9 +21,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_PORTMIDI], [
+ AC_MSG_NOTICE([portmidi library is NOT available as system library])
+ fi
+
+- AC_CHECK_FILE(${srcdir}/lib-src/portmidi/pm_common/portmidi.h,
+- PORTMIDI_LOCAL_AVAILABLE="yes",
+- PORTMIDI_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/portmidi/pm_common/portmidi.h], [PORTMIDI_LOCAL_AVAILABLE=yes])
+
+ if test "$PORTMIDI_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([portmidi library is available in the local tree])
+diff --git m4/audacity_checklib_portsmf.m4 m4/audacity_checklib_portsmf.m4
+index 9c336d8..3a31ef5 100644
+--- m4/audacity_checklib_portsmf.m4
++++ m4/audacity_checklib_portsmf.m4
+@@ -24,9 +24,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_PORTSMF], [
+ AC_MSG_NOTICE([portSMF library is NOT available as system library])
+ fi
+
+- AC_CHECK_FILE(${srcdir}/lib-src/portsmf/allegro.h,
+- PORTSMF_LOCAL_AVAILABLE="yes",
+- PORTSMF_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/portsmf/allegro.h], [PORTSMF_LOCAL_AVAILABLE=yes])
+
+ if test "$PORTSMF_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([portSMF library is available in the local tree])
+diff --git m4/audacity_checklib_widgetextra.m4 m4/audacity_checklib_widgetextra.m4
+index 4ef0f97..f857723 100644
+--- m4/audacity_checklib_widgetextra.m4
++++ m4/audacity_checklib_widgetextra.m4
+@@ -28,9 +28,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_WIDGETEXTRA], [
+
+ dnl see if libwidgetextra is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h,
+- WIDGETEXTRA_LOCAL_AVAILABLE="yes",
+- WIDGETEXTRA_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h], [WIDGETEXTRA_LOCAL_AVAILABLE=yes])
+
+ if test "$WIDGETEXTRA_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([libwidgetextra library is available in the local tree])
+--
+2.30.0
+
+diff --git configure.ac configure.ac
+index 31c1245..166a77e 100644
+--- configure.ac
++++ configure.ac
+@@ -63,7 +63,7 @@ AC_PROG_CXXCPP
+ AM_PROG_AR
+
+ LT_INIT([disable-shared])
+-
++m4_pattern_allow([^AC_LANG])
+ AC_PROG_INSTALL
+ dnl pkg-config is required for lots of things
+ AC_CHECK_PROG(HAVE_PKG_CONFIG, pkg-config, yes, no)
diff --git a/srcpkgs/audacity/patches/configure.patch b/srcpkgs/audacity/patches/configure.patch
deleted file mode 100644
index 3b9c576c3f2..00000000000
--- a/srcpkgs/audacity/patches/configure.patch
+++ /dev/null
@@ -1,756 +0,0 @@
-configure uses AC_CHECK_FILE to test for file existence which is
-cross incompatible. Changed it to simple if/else statements.
-
---- configure.orig 2017-10-26 19:44:39.000000000 +0200
-+++ configure 2017-11-09 21:23:45.099433701 +0100
-@@ -20200,29 +20200,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/expat/lib/expat.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/expat/lib/expat.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/expat/lib/expat.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/expat/lib/expat.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- EXPAT_LOCAL_AVAILABLE="yes"
--else
-- EXPAT_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/expat/lib/expat.h"; then
-+ EXPAT_LOCAL_AVAILABLE="yes"
-+ else
-+ EXPAT_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$EXPAT_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: Expat libraries are available in the local tree" >&5
-@@ -20455,53 +20437,17 @@
- $as_echo "$as_me: FFmpeg library NOT available as system library" >&6;}
- fi
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- avcodec_h_found="yes"
--else
-- avcodec_h_found="no"
--fi
--
--
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/ffmpeg/libavformat/avformat.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/ffmpeg/libavformat/avformat.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/ffmpeg/libavformat/avformat.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/ffmpeg/libavformat/avformat.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- avformat_h_found="yes"
--else
-- avformat_h_found="no"
--fi
-+ if test -f "${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h"; then
-+ avcodec_h_found="yes"
-+ else
-+ avcodec_h_found="no"
-+ fi
-
-+ if test -f "${srcdir}/lib-src/ffmpeg/libavformat/avformat.h"; then
-+ avformat_h_found="yes"
-+ else
-+ avformat_h_found="no"
-+ fi
-
- if test "$avcodec_h_found" = "yes" -a "$avformat_h_found" = "yes"; then
- FFMPEG_LOCAL_AVAILABLE="yes"
-@@ -20589,29 +20535,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/lame/lame/lame.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/lame/lame/lame.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/lame/lame/lame.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/lame/lame/lame.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LAME_LOCAL_AVAILABLE="yes"
--else
-- LAME_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/lame/lame/lame.h"; then
-+ LAME_LOCAL_AVAILABLE="yes"
-+ else
-+ LAME_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LAME_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: LAME headers are available in this source tree." >&5
-@@ -20780,53 +20708,17 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libflac/include/FLAC/format.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libflac/include/FLAC/format.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libflac/include/FLAC/format.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libflac/include/FLAC/format.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- flac_h_available="yes"
--else
-- flac_h_available="no"
--fi
--
--
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libflac/include/FLAC++/decoder.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libflac/include/FLAC++/decoder.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libflac/include/FLAC++/decoder.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libflac/include/FLAC++/decoder.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- flacpp_h_available="yes"
--else
-- flacpp_h_available="no"
--fi
-+ if test -f "${srcdir}/lib-src/libflac/include/FLAC/format.h"; then
-+ flac_h_available="yes"
-+ else
-+ flac_h_available="no"
-+ fi
-
-+ if test -f "${srcdir}/lib-src/libflac/include/FLAC++/decoder.h"; then
-+ flacpp_h_available="yes"
-+ else
-+ flacpp_h_available="no"
-+ fi
-
- if test "$flac_h_available" = "yes" -a "$flacpp_h_available" = "yes"; then
- LIBFLAC_LOCAL_AVAILABLE="yes"
-@@ -20930,29 +20822,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libid3tag/frame.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libid3tag/frame.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libid3tag/frame.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libid3tag/frame.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBID3TAG_LOCAL_AVAILABLE="yes"
--else
-- LIBID3TAG_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libid3tag/frame.h"; then
-+ LIBID3TAG_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBID3TAG_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBID3TAG_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: libid3tag libraries are available in the local tree" >&5
-@@ -21099,29 +20973,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libmad/frame.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libmad/frame.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libmad/frame.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libmad/frame.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBMAD_LOCAL_AVAILABLE="yes"
--else
-- LIBMAD_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libmad/frame.h"; then
-+ LIBMAD_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBMAD_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBMAD_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: libmad libraries are available in the local tree" >&5
-@@ -21144,29 +21000,11 @@
- LIBNYQUIST_SYSTEM_AVAILABLE="no"
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libnyquist/nyx.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libnyquist/nyx.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libnyquist/nyx.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libnyquist/nyx.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBNYQUIST_LOCAL_AVAILABLE="yes"
--else
-- LIBNYQUIST_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libnyquist/nyx.h"; then
-+ LIBNYQUIST_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBNYQUIST_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBNYQUIST_LOCAL_AVAILABLE" = "yes" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: nyquist libraries are available in the local tree" >&5
-@@ -21265,29 +21103,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/sbsms/include/sbsms.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/sbsms/include/sbsms.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/sbsms/include/sbsms.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/sbsms/include/sbsms.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBSBSMS_LOCAL_AVAILABLE="yes"
--else
-- LIBSBSMS_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/sbsms/include/sbsms.h"; then
-+ LIBSBSMS_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBSBSMS_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBSBSMS_LOCAL_AVAILABLE" = "yes"; then
- LIBSBSMS_LOCAL_CONFIGURE_ARGS="--disable-programs"
-@@ -21388,29 +21208,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libsndfile/src/sndfile.h.in" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libsndfile/src/sndfile.h.in" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libsndfile/src/sndfile.h.in... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libsndfile/src/sndfile.h.in"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBSNDFILE_LOCAL_AVAILABLE="yes"
--else
-- LIBSNDFILE_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libsndfile/src/sndfile.h.in"; then
-+ LIBSNDFILE_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBSNDFILE_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBSNDFILE_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: libsndfile libraries are available in this source tree" >&5
-@@ -21650,29 +21452,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/soundtouch/include/SoundTouch.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/soundtouch/include/SoundTouch.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/soundtouch/include/SoundTouch.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/soundtouch/include/SoundTouch.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBSOUNDTOUCH_LOCAL_AVAILABLE="yes"
--else
-- LIBSOUNDTOUCH_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/soundtouch/include/SoundTouch.h"; then
-+ LIBSOUNDTOUCH_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBSOUNDTOUCH_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBSOUNDTOUCH_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: libsoundtouch libraries are available in the local tree" >&5
-@@ -21771,29 +21555,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libsoxr/src/soxr.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libsoxr/src/soxr.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libsoxr/src/soxr.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libsoxr/src/soxr.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBSOXR_LOCAL_AVAILABLE="yes"
--else
-- LIBSOXR_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libsoxr/src/soxr.h"; then
-+ LIBSOXR_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBSOXR_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBSOXR_LOCAL_AVAILABLE" = "yes"; then
- # Breaks other other libraries in Audacity tree; but why is ./configure
-@@ -21894,29 +21660,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/twolame/libtwolame/twolame.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/twolame/libtwolame/twolame.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/twolame/libtwolame/twolame.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/twolame/libtwolame/twolame.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBTWOLAME_LOCAL_AVAILABLE="yes"
--else
-- LIBTWOLAME_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/twolame/libtwolame/twolame.h"; then
-+ LIBTWOLAME_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBTWOLAME_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBTWOLAME_LOCAL_AVAILABLE" = "yes"; then
- LIBTWOLAME_LOCAL_CONFIGURE_ARGS="--disable-programs"
-@@ -22015,29 +21763,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBVAMP_LOCAL_AVAILABLE="yes"
--else
-- LIBVAMP_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h"; then
-+ LIBVAMP_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBVAMP_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBVAMP_LOCAL_AVAILABLE" = "yes"; then
- LIBVAMP_LOCAL_CONFIGURE_ARGS="--disable-programs"
-@@ -22136,52 +21866,17 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- vorbisenc_h_available="yes"
--else
-- vorbisenc_h_available="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h"; then
-+ vorbisenc_h_available="yes"
-+ else
-+ vorbisenc_h_available="no"
-+ fi
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libogg/include/ogg/ogg.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libogg/include/ogg/ogg.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libogg/include/ogg/ogg.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libogg/include/ogg/ogg.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- ogg_h_available="yes"
--else
-- ogg_h_available="no"
--fi
-+ if test -f "${srcdir}/lib-src/libogg/include/ogg/ogg.h"; then
-+ ogg_h_available="yes"
-+ else
-+ ogg_h_available="no"
-+ fi
-
-
- if test "$vorbisenc_h_available" = "yes" -a "$ogg_h_available" = "yes"; then
-@@ -22290,29 +21985,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/lv2/configure" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/lv2/configure" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/lv2/configure... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/lv2/configure"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LV2_LOCAL_AVAILABLE="yes"
--else
-- LV2_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/lv2/configure"; then
-+ LV2_LOCAL_AVAILABLE="yes"
-+ else
-+ LV2_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LV2_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: LV2 libraries are available in the local tree" >&5
-@@ -22432,29 +22109,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/portaudio-v19/include/portaudio.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/portaudio-v19/include/portaudio.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/portaudio-v19/include/portaudio.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/portaudio-v19/include/portaudio.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- PORTAUDIO_LOCAL_AVAILABLE="yes"
--else
-- PORTAUDIO_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/portaudio-v19/include/portaudio.h"; then
-+ PORTAUDIO_LOCAL_AVAILABLE="yes"
-+ else
-+ PORTAUDIO_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$PORTAUDIO_LOCAL_AVAILABLE" = "yes"; then
- pa_dir="$(pwd)/${srcdir}/lib-src/portaudio-v19"
-@@ -22555,29 +22214,12 @@
- $as_echo "$as_me: portSMF library is NOT available as system library" >&6;}
- fi
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/portsmf/allegro.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/portsmf/allegro.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/portsmf/allegro.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/portsmf/allegro.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- PORTSMF_LOCAL_AVAILABLE="yes"
--else
-- PORTSMF_LOCAL_AVAILABLE="no"
--fi
-
-+ if test -f "${srcdir}/lib-src/portsmf/allegro.h"; then
-+ PORTSMF_LOCAL_AVAILABLE="yes"
-+ else
-+ PORTSMF_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$PORTSMF_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: portSMF library is available in the local tree" >&5
-@@ -22675,29 +22317,12 @@
- $as_echo "$as_me: portmidi library is NOT available as system library" >&6;}
- fi
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/portmidi/pm_common/portmidi.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/portmidi/pm_common/portmidi.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/portmidi/pm_common/portmidi.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/portmidi/pm_common/portmidi.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- PORTMIDI_LOCAL_AVAILABLE="yes"
--else
-- PORTMIDI_LOCAL_AVAILABLE="no"
--fi
-
-+ if test -f "${srcdir}/lib-src/portmidi/pm_common/portmidi.h"; then
-+ PORTMIDI_LOCAL_AVAILABLE="yes"
-+ else
-+ PORTMIDI_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$PORTMIDI_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: portmidi library is available in the local tree" >&5
-@@ -22795,29 +22420,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- WIDGETEXTRA_LOCAL_AVAILABLE="yes"
--else
-- WIDGETEXTRA_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h"; then
-+ WIDGETEXTRA_LOCAL_AVAILABLE="yes"
-+ else
-+ WIDGETEXTRA_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$WIDGETEXTRA_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: libwidgetextra library is available in the local tree" >&5
diff --git a/srcpkgs/audacity/template b/srcpkgs/audacity/template
index 7f4d0a49098..d60cbd72063 100644
--- a/srcpkgs/audacity/template
+++ b/srcpkgs/audacity/template
@@ -6,9 +6,9 @@ wrksrc="${pkgname}-Audacity-${version}"
build_style=gnu-configure
configure_args="--with-ffmpeg=system --with-libsndfile=system --with-expat=system
--with-libsoxr=system --with-lame=system --with-lv2=system ac_cv_path_WX_CONFIG=wx-config-gtk3"
-hostmakedepends="pkg-config cmake gettext libtool m4 python which"
+hostmakedepends="automake pkg-config cmake gettext-devel libtool m4 python which"
makedepends="jack-devel wxWidgets-gtk3-devel gtk+3-devel
- libmad-devel soundtouch-devel libsoxr-devel
+ libmad-devel soundtouch-devel libsoxr-devel gettext-devel
vamp-plugin-sdk-devel lame-devel libid3tag-devel libflac-devel
ffmpeg-devel twolame-devel serd-devel lv2 lilv-devel suil-devel"
depends="desktop-file-utils hicolor-icon-theme"
@@ -29,10 +29,15 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
LDFLAGS="-latomic"
fi
+pre_configure() {
+ autoreconf -fi
+}
+
+do_check() {
+ make check || : # Gives recursive test not found
+}
+
post_install() {
vcopy nyquist /usr/share/audacity
vcopy plug-ins /usr/share/audacity
-
- rm ${DESTDIR}/usr/share/doc/${pkgname}/LICENSE.txt
- vlicense LICENSE.txt LICENSE
}
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] audacity: simplify cross-build patch
2020-12-30 2:01 [PR PATCH] audacity: simplify cross-build patch ndowens
` (6 preceding siblings ...)
2020-12-30 4:23 ` ndowens
@ 2020-12-30 4:35 ` ndowens
2020-12-30 4:36 ` ndowens
2020-12-30 12:12 ` ndowens
9 siblings, 0 replies; 11+ messages in thread
From: ndowens @ 2020-12-30 4:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 543 bytes --]
There is an updated pull request by ndowens against master on the void-packages repository
https://github.com/ndowens/void-packages audacity
https://github.com/void-linux/void-packages/pull/27548
[WIP] audacity: simplify cross-build patch
@sgn Since you taught me slightly on how to fix autotool cross-builds, wondering what you think of this?
Built locally and seems to have linked with libs I expected it to.
Edit: Odd locally it built fine.
A patch file from https://github.com/void-linux/void-packages/pull/27548.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-audacity-27548.patch --]
[-- Type: text/x-diff, Size: 45391 bytes --]
From 30b00ea99590c9aff05f979dca0127fa31fb1df8 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Tue, 29 Dec 2020 19:57:38 -0600
Subject: [PATCH] audacity: simplify cross-build patch
---
.../patches/0001-fix-cross-build.patch | 336 ++++++++
srcpkgs/audacity/patches/configure.patch | 756 ------------------
srcpkgs/audacity/template | 13 +-
3 files changed, 345 insertions(+), 760 deletions(-)
create mode 100644 srcpkgs/audacity/patches/0001-fix-cross-build.patch
delete mode 100644 srcpkgs/audacity/patches/configure.patch
diff --git a/srcpkgs/audacity/patches/0001-fix-cross-build.patch b/srcpkgs/audacity/patches/0001-fix-cross-build.patch
new file mode 100644
index 00000000000..63a55c73971
--- /dev/null
+++ b/srcpkgs/audacity/patches/0001-fix-cross-build.patch
@@ -0,0 +1,336 @@
+From 5f1ac685992183d71097669b1956b2af06ad6ed0 Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Tue, 29 Dec 2020 19:44:34 -0600
+Subject: [PATCH] fix cross build
+
+Replace AC_CHECK_FILES as it is not cross-friendly
+---
+diff --git configure.ac configure.ac
+index d8a7cf1..31c1245 100644
+--- configure.ac
++++ configure.ac
+@@ -214,7 +214,7 @@ if test x$enable_sse = xyes; then
+ AX_CHECK_COMPILER_FLAGS(-msse, [SBSMS_CFLAGS="$SBSMS_CFLAGS -msse"],[AC_MSG_ERROR([Need a version of gcc with -msse])])
+ fi
+
+- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <xmmintrin.h>]], [[__m128 v,w; float p[8]; v = _mm_loadu_ps(p); _mm_storeu_ps(p,v); w = _mm_loadl_pi(w,(const __m64*)p); w = _mm_loadh_pi(w,(const __m64*)p); _mm_storel_pi((__m64 *)p, w); _mm_storeh_pi((__m64 *)p, w); v = _mm_add_ps(v,w); v = _mm_sub_ps(v,w); v = _mm_mul_ps(v,w); v = _mm_shuffle_ps(v,w,_MM_SHUFFLE(0,1,2,3)); w = _mm_set1_ps(0.0f);]])], [sse_ok=yes], [sse_ok=no])
++ AC_TRY_COMPILE([AC_LANG_PROGRAM([[#include <xmmintrin.h>]], [[__m128 v,w; float p[8]; v = _mm_loadu_ps(p); _mm_storeu_ps(p,v); w = _mm_loadl_pi(w,(const __m64*)p); w = _mm_loadh_pi(w,(const __m64*)p); _mm_storel_pi((__m64 *)p, w); _mm_storeh_pi((__m64 *)p, w); v = _mm_add_ps(v,w); v = _mm_sub_ps(v,w); v = _mm_mul_ps(v,w); v = _mm_shuffle_ps(v,w,_MM_SHUFFLE(0,1,2,3)); w = _mm_set1_ps(0.0f);]])], [sse_ok=yes], [sse_ok=no])
+
+ if test x$sse_ok = xyes; then
+ AC_DEFINE(ENABLE_SSE,1,[Define to enable sse])
+diff --git m4/audacity_checklib_ffmpeg.m4 m4/audacity_checklib_ffmpeg.m4
+index b98110f..d4754aa 100644
+--- m4/audacity_checklib_ffmpeg.m4
++++ m4/audacity_checklib_ffmpeg.m4
+@@ -35,13 +35,9 @@ AC_DEFUN([AUDACITY_CHECKLIB_FFMPEG], [
+
+ dnl see if ffmpeg is available locally, or rather that we have some headers
+ dnl in lib-src/ffmpeg/ we can use.
+- AC_CHECK_FILE(${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h,
+- avcodec_h_found="yes",
+- avcodec_h_found="no")
++ AS_IF([test -f ${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h], [avcodec_h_found=yes])
+
+- AC_CHECK_FILE(${srcdir}/lib-src/ffmpeg/libavformat/avformat.h,
+- avformat_h_found="yes",
+- avformat_h_found="no")
++ AS_IF([test -f ${srcdir}/lib-src/ffmpeg/libavformat/avformat.h], [avformat_h_found=yes])
+
+ if test "$avcodec_h_found" = "yes" -a "$avformat_h_found" = "yes"; then
+ FFMPEG_LOCAL_AVAILABLE="yes"
+diff --git m4/audacity_checklib_lame.m4 m4/audacity_checklib_lame.m4
+index 28ecd77..5794143 100644
+--- m4/audacity_checklib_lame.m4
++++ m4/audacity_checklib_lame.m4
+@@ -33,9 +33,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LAME], [
+
+ dnl see if LAME is available in the source dir
+
+- AC_CHECK_FILE(${srcdir}/lib-src/lame/lame/lame.h,
+- LAME_LOCAL_AVAILABLE="yes",
+- LAME_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/lame/lame/lame.h], [LAME_LOCAL_AVAILABLE=yes])
+
+ if test "$LAME_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([LAME headers are available in this source tree.])
+diff --git m4/audacity_checklib_libexpat.m4 m4/audacity_checklib_libexpat.m4
+index c0c88db..ffe76ac 100644
+--- m4/audacity_checklib_libexpat.m4
++++ m4/audacity_checklib_libexpat.m4
+@@ -42,9 +42,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_EXPAT], [
+
+ dnl see if expat is available in the local tree
+
+- AC_CHECK_FILE(${srcdir}/lib-src/expat/lib/expat.h,
+- EXPAT_LOCAL_AVAILABLE="yes",
+- EXPAT_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/expat/lib/expat.h], [EXPAT_LOCAL_AVAILABLE=yes])
+
+ if test "$EXPAT_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([Expat libraries are available in the local tree])
+diff --git m4/audacity_checklib_libflac.m4 m4/audacity_checklib_libflac.m4
+index 1002986..6096791 100644
+--- m4/audacity_checklib_libflac.m4
++++ m4/audacity_checklib_libflac.m4
+@@ -38,13 +38,9 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBFLAC], [
+
+ dnl see if FLAC is available in the source dir
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libflac/include/FLAC/format.h,
+- flac_h_available="yes",
+- flac_h_available="no")
++ AS_IF([test -f ${srcdir}/lib-src/libflac/include/FLAC/format.h], [flac_h_available=yes])
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libflac/include/FLAC++/decoder.h,
+- flacpp_h_available="yes",
+- flacpp_h_available="no")
++ AS_IF([test -f ${srcdir}/lib-src/libflac/include/FLAC++/decoder.h], [flacpp_h_available=yes])
+
+ if test "$flac_h_available" = "yes" -a "$flacpp_h_available" = "yes"; then
+ LIBFLAC_LOCAL_AVAILABLE="yes"
+diff --git m4/audacity_checklib_libid3tag.m4 m4/audacity_checklib_libid3tag.m4
+index b69c2cb..59e94cc 100644
+--- m4/audacity_checklib_libid3tag.m4
++++ m4/audacity_checklib_libid3tag.m4
+@@ -25,9 +25,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBID3TAG], [
+
+ dnl see if libid3tag is available in the local tree
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libid3tag/frame.h,
+- LIBID3TAG_LOCAL_AVAILABLE="yes",
+- LIBID3TAG_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/libid3tag/frame.h], [LIBID3TAG_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBID3TAG_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([libid3tag libraries are available in the local tree])
+diff --git m4/audacity_checklib_libmad.m4 m4/audacity_checklib_libmad.m4
+index 0c2d02a..d53c459 100644
+--- m4/audacity_checklib_libmad.m4
++++ m4/audacity_checklib_libmad.m4
+@@ -34,9 +34,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBMAD], [
+
+ dnl see if libmad is available in the local tree
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libmad/frame.h,
+- LIBMAD_LOCAL_AVAILABLE="yes",
+- LIBMAD_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/libmad/frame.h], [LIBMAD_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBMAD_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([libmad libraries are available in the local tree])
+diff --git m4/audacity_checklib_libnyquist.m4 m4/audacity_checklib_libnyquist.m4
+index 3f1c98f..b4af690 100644
+--- m4/audacity_checklib_libnyquist.m4
++++ m4/audacity_checklib_libnyquist.m4
+@@ -17,9 +17,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBNYQUIST], [
+
+ dnl see if Nyquist is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libnyquist/nyx.h,
+- LIBNYQUIST_LOCAL_AVAILABLE="yes",
+- LIBNYQUIST_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/libnyquist/nyx.h], [LIBNYQUIST_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBNYQUIST_LOCAL_AVAILABLE" = "yes" ; then
+ AC_MSG_NOTICE([nyquist libraries are available in the local tree])
+diff --git m4/audacity_checklib_libsbsms.m4 m4/audacity_checklib_libsbsms.m4
+index c2f80dd..a0ec94b 100644
+--- m4/audacity_checklib_libsbsms.m4
++++ m4/audacity_checklib_libsbsms.m4
+@@ -25,9 +25,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSBSMS], [
+
+ dnl see if libsbsms is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/sbsms/include/sbsms.h,
+- LIBSBSMS_LOCAL_AVAILABLE="yes",
+- LIBSBSMS_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/sbsms/include/sbsms.h], [LIBSBSMS_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBSBSMS_LOCAL_AVAILABLE" = "yes"; then
+ dnl do not build programs we don't need
+diff --git m4/audacity_checklib_libsndfile.m4 m4/audacity_checklib_libsndfile.m4
+index d49e149..e501899 100644
+--- m4/audacity_checklib_libsndfile.m4
++++ m4/audacity_checklib_libsndfile.m4
+@@ -25,9 +25,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSNDFILE], [
+
+ dnl see if libsndfile is available in the local tree
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libsndfile/src/sndfile.h.in,
+- LIBSNDFILE_LOCAL_AVAILABLE="yes",
+- LIBSNDFILE_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/libsndfile/src/sndfile.h.in], [LIBSNDFILE_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBSNDFILE_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([libsndfile libraries are available in this source tree])
+diff --git m4/audacity_checklib_libsoundtouch.m4 m4/audacity_checklib_libsoundtouch.m4
+index 0b8aa69..d8d9f58 100644
+--- m4/audacity_checklib_libsoundtouch.m4
++++ m4/audacity_checklib_libsoundtouch.m4
+@@ -40,9 +40,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSOUNDTOUCH], [
+
+ dnl see if libsoundtouch is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/soundtouch/include/SoundTouch.h,
+- LIBSOUNDTOUCH_LOCAL_AVAILABLE="yes",
+- LIBSOUNDTOUCH_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/soundtouch/include/SoundTouch.h], [LIBSOUNDTOUCH_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBSOUNDTOUCH_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([libsoundtouch libraries are available in the local tree])
+diff --git m4/audacity_checklib_libsoxr.m4 m4/audacity_checklib_libsoxr.m4
+index a331e9b..1a0702b 100644
+--- m4/audacity_checklib_libsoxr.m4
++++ m4/audacity_checklib_libsoxr.m4
+@@ -25,9 +25,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSOXR], [
+
+ dnl see if libsoxr is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libsoxr/src/soxr.h,
+- LIBSOXR_LOCAL_AVAILABLE="yes",
+- LIBSOXR_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/libsoxr/src/soxr.h], [LIBSOXR_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBSOXR_LOCAL_AVAILABLE" = "yes"; then
+ # Breaks other other libraries in Audacity tree; but why is ./configure
+diff --git m4/audacity_checklib_libtwolame.m4 m4/audacity_checklib_libtwolame.m4
+index 2d28b07..fc2a2bf 100644
+--- m4/audacity_checklib_libtwolame.m4
++++ m4/audacity_checklib_libtwolame.m4
+@@ -25,9 +25,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBTWOLAME], [
+
+ dnl see if libtwolame is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/twolame/libtwolame/twolame.h,
+- LIBTWOLAME_LOCAL_AVAILABLE="yes",
+- LIBTWOLAME_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/twolame/libtwolame/twolame.h], [LIBTWOLAME_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBTWOLAME_LOCAL_AVAILABLE" = "yes"; then
+ dnl disable programs we don't need to build
+diff --git m4/audacity_checklib_libvamp.m4 m4/audacity_checklib_libvamp.m4
+index 8a1e0e1..57dc5eb 100644
+--- m4/audacity_checklib_libvamp.m4
++++ m4/audacity_checklib_libvamp.m4
+@@ -25,9 +25,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBVAMP], [
+
+ dnl see if Vamp is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h,
+- LIBVAMP_LOCAL_AVAILABLE="yes",
+- LIBVAMP_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h], [LIBVAMP_LOCAL_AVAILABLE=yes])
+
+ if test "$LIBVAMP_LOCAL_AVAILABLE" = "yes"; then
+ LIBVAMP_LOCAL_CONFIGURE_ARGS="--disable-programs"
+diff --git m4/audacity_checklib_libvorbis.m4 m4/audacity_checklib_libvorbis.m4
+index 0839fa9..3d8b70d 100644
+--- m4/audacity_checklib_libvorbis.m4
++++ m4/audacity_checklib_libvorbis.m4
+@@ -30,13 +30,9 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBVORBIS], [
+
+ dnl see if Vorbis is available in the source dir
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h,
+- vorbisenc_h_available="yes",
+- vorbisenc_h_available="no")
++ AS_IF([test -f ${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h], [vorbisenc_h_available=yes])
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libogg/include/ogg/ogg.h,
+- ogg_h_available="yes",
+- ogg_h_available="no")
++ AS_IF([test -f ${srcdir}/lib-src/libogg/include/ogg/ogg.h], [ogg_h_available=yes])
+
+ if test "$vorbisenc_h_available" = "yes" -a "$ogg_h_available" = "yes"; then
+ LIBVORBIS_LOCAL_AVAILABLE="yes"
+diff --git m4/audacity_checklib_lv2.m4 m4/audacity_checklib_lv2.m4
+index 78a279a..164aa6d 100644
+--- m4/audacity_checklib_lv2.m4
++++ m4/audacity_checklib_lv2.m4
+@@ -23,9 +23,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LV2], [
+
+ dnl see if LV2 is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/lv2/configure,
+- LV2_LOCAL_AVAILABLE="yes",
+- LV2_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/lv2/configure], [LV2_LOCAL_AVAILABLE=yes])
+
+ if test "$LV2_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([LV2 libraries are available in the local tree])
+diff --git m4/audacity_checklib_portaudio.m4 m4/audacity_checklib_portaudio.m4
+index 9b7674e..03d62b8 100644
+--- m4/audacity_checklib_portaudio.m4
++++ m4/audacity_checklib_portaudio.m4
+@@ -31,9 +31,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_PORTAUDIO], [
+
+ dnl see if portaudio is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/portaudio-v19/include/portaudio.h,
+- PORTAUDIO_LOCAL_AVAILABLE="yes",
+- PORTAUDIO_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/portaudio-v19/include/portaudio.h], [PORTAUDIO_LOCAL_AVAILABLE=yes])
+
+ if test "$PORTAUDIO_LOCAL_AVAILABLE" = "yes"; then
+ dnl We need to override the pkg-config check for portmixer by passing
+diff --git m4/audacity_checklib_portmidi.m4 m4/audacity_checklib_portmidi.m4
+index 4e63b1b..6db1dc6 100644
+--- m4/audacity_checklib_portmidi.m4
++++ m4/audacity_checklib_portmidi.m4
+@@ -21,9 +21,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_PORTMIDI], [
+ AC_MSG_NOTICE([portmidi library is NOT available as system library])
+ fi
+
+- AC_CHECK_FILE(${srcdir}/lib-src/portmidi/pm_common/portmidi.h,
+- PORTMIDI_LOCAL_AVAILABLE="yes",
+- PORTMIDI_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/portmidi/pm_common/portmidi.h], [PORTMIDI_LOCAL_AVAILABLE=yes])
+
+ if test "$PORTMIDI_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([portmidi library is available in the local tree])
+diff --git m4/audacity_checklib_portsmf.m4 m4/audacity_checklib_portsmf.m4
+index 9c336d8..3a31ef5 100644
+--- m4/audacity_checklib_portsmf.m4
++++ m4/audacity_checklib_portsmf.m4
+@@ -24,9 +24,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_PORTSMF], [
+ AC_MSG_NOTICE([portSMF library is NOT available as system library])
+ fi
+
+- AC_CHECK_FILE(${srcdir}/lib-src/portsmf/allegro.h,
+- PORTSMF_LOCAL_AVAILABLE="yes",
+- PORTSMF_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/portsmf/allegro.h], [PORTSMF_LOCAL_AVAILABLE=yes])
+
+ if test "$PORTSMF_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([portSMF library is available in the local tree])
+diff --git m4/audacity_checklib_widgetextra.m4 m4/audacity_checklib_widgetextra.m4
+index 4ef0f97..f857723 100644
+--- m4/audacity_checklib_widgetextra.m4
++++ m4/audacity_checklib_widgetextra.m4
+@@ -28,9 +28,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_WIDGETEXTRA], [
+
+ dnl see if libwidgetextra is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h,
+- WIDGETEXTRA_LOCAL_AVAILABLE="yes",
+- WIDGETEXTRA_LOCAL_AVAILABLE="no")
++ AS_IF([test -f ${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h], [WIDGETEXTRA_LOCAL_AVAILABLE=yes])
+
+ if test "$WIDGETEXTRA_LOCAL_AVAILABLE" = "yes"; then
+ AC_MSG_NOTICE([libwidgetextra library is available in the local tree])
+--
+2.30.0
+
+diff --git configure.ac configure.ac
+index 31c1245..166a77e 100644
+--- configure.ac
++++ configure.ac
+@@ -63,7 +63,7 @@ AC_PROG_CXXCPP
+ AM_PROG_AR
+
+ LT_INIT([disable-shared])
+-
++m4_pattern_allow([^AC_LANG])
+ AC_PROG_INSTALL
+ dnl pkg-config is required for lots of things
+ AC_CHECK_PROG(HAVE_PKG_CONFIG, pkg-config, yes, no)
diff --git a/srcpkgs/audacity/patches/configure.patch b/srcpkgs/audacity/patches/configure.patch
deleted file mode 100644
index 3b9c576c3f2..00000000000
--- a/srcpkgs/audacity/patches/configure.patch
+++ /dev/null
@@ -1,756 +0,0 @@
-configure uses AC_CHECK_FILE to test for file existence which is
-cross incompatible. Changed it to simple if/else statements.
-
---- configure.orig 2017-10-26 19:44:39.000000000 +0200
-+++ configure 2017-11-09 21:23:45.099433701 +0100
-@@ -20200,29 +20200,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/expat/lib/expat.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/expat/lib/expat.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/expat/lib/expat.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/expat/lib/expat.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- EXPAT_LOCAL_AVAILABLE="yes"
--else
-- EXPAT_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/expat/lib/expat.h"; then
-+ EXPAT_LOCAL_AVAILABLE="yes"
-+ else
-+ EXPAT_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$EXPAT_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: Expat libraries are available in the local tree" >&5
-@@ -20455,53 +20437,17 @@
- $as_echo "$as_me: FFmpeg library NOT available as system library" >&6;}
- fi
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- avcodec_h_found="yes"
--else
-- avcodec_h_found="no"
--fi
--
--
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/ffmpeg/libavformat/avformat.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/ffmpeg/libavformat/avformat.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/ffmpeg/libavformat/avformat.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/ffmpeg/libavformat/avformat.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- avformat_h_found="yes"
--else
-- avformat_h_found="no"
--fi
-+ if test -f "${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h"; then
-+ avcodec_h_found="yes"
-+ else
-+ avcodec_h_found="no"
-+ fi
-
-+ if test -f "${srcdir}/lib-src/ffmpeg/libavformat/avformat.h"; then
-+ avformat_h_found="yes"
-+ else
-+ avformat_h_found="no"
-+ fi
-
- if test "$avcodec_h_found" = "yes" -a "$avformat_h_found" = "yes"; then
- FFMPEG_LOCAL_AVAILABLE="yes"
-@@ -20589,29 +20535,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/lame/lame/lame.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/lame/lame/lame.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/lame/lame/lame.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/lame/lame/lame.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LAME_LOCAL_AVAILABLE="yes"
--else
-- LAME_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/lame/lame/lame.h"; then
-+ LAME_LOCAL_AVAILABLE="yes"
-+ else
-+ LAME_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LAME_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: LAME headers are available in this source tree." >&5
-@@ -20780,53 +20708,17 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libflac/include/FLAC/format.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libflac/include/FLAC/format.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libflac/include/FLAC/format.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libflac/include/FLAC/format.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- flac_h_available="yes"
--else
-- flac_h_available="no"
--fi
--
--
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libflac/include/FLAC++/decoder.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libflac/include/FLAC++/decoder.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libflac/include/FLAC++/decoder.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libflac/include/FLAC++/decoder.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- flacpp_h_available="yes"
--else
-- flacpp_h_available="no"
--fi
-+ if test -f "${srcdir}/lib-src/libflac/include/FLAC/format.h"; then
-+ flac_h_available="yes"
-+ else
-+ flac_h_available="no"
-+ fi
-
-+ if test -f "${srcdir}/lib-src/libflac/include/FLAC++/decoder.h"; then
-+ flacpp_h_available="yes"
-+ else
-+ flacpp_h_available="no"
-+ fi
-
- if test "$flac_h_available" = "yes" -a "$flacpp_h_available" = "yes"; then
- LIBFLAC_LOCAL_AVAILABLE="yes"
-@@ -20930,29 +20822,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libid3tag/frame.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libid3tag/frame.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libid3tag/frame.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libid3tag/frame.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBID3TAG_LOCAL_AVAILABLE="yes"
--else
-- LIBID3TAG_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libid3tag/frame.h"; then
-+ LIBID3TAG_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBID3TAG_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBID3TAG_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: libid3tag libraries are available in the local tree" >&5
-@@ -21099,29 +20973,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libmad/frame.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libmad/frame.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libmad/frame.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libmad/frame.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBMAD_LOCAL_AVAILABLE="yes"
--else
-- LIBMAD_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libmad/frame.h"; then
-+ LIBMAD_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBMAD_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBMAD_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: libmad libraries are available in the local tree" >&5
-@@ -21144,29 +21000,11 @@
- LIBNYQUIST_SYSTEM_AVAILABLE="no"
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libnyquist/nyx.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libnyquist/nyx.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libnyquist/nyx.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libnyquist/nyx.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBNYQUIST_LOCAL_AVAILABLE="yes"
--else
-- LIBNYQUIST_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libnyquist/nyx.h"; then
-+ LIBNYQUIST_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBNYQUIST_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBNYQUIST_LOCAL_AVAILABLE" = "yes" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: nyquist libraries are available in the local tree" >&5
-@@ -21265,29 +21103,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/sbsms/include/sbsms.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/sbsms/include/sbsms.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/sbsms/include/sbsms.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/sbsms/include/sbsms.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBSBSMS_LOCAL_AVAILABLE="yes"
--else
-- LIBSBSMS_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/sbsms/include/sbsms.h"; then
-+ LIBSBSMS_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBSBSMS_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBSBSMS_LOCAL_AVAILABLE" = "yes"; then
- LIBSBSMS_LOCAL_CONFIGURE_ARGS="--disable-programs"
-@@ -21388,29 +21208,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libsndfile/src/sndfile.h.in" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libsndfile/src/sndfile.h.in" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libsndfile/src/sndfile.h.in... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libsndfile/src/sndfile.h.in"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBSNDFILE_LOCAL_AVAILABLE="yes"
--else
-- LIBSNDFILE_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libsndfile/src/sndfile.h.in"; then
-+ LIBSNDFILE_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBSNDFILE_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBSNDFILE_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: libsndfile libraries are available in this source tree" >&5
-@@ -21650,29 +21452,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/soundtouch/include/SoundTouch.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/soundtouch/include/SoundTouch.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/soundtouch/include/SoundTouch.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/soundtouch/include/SoundTouch.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBSOUNDTOUCH_LOCAL_AVAILABLE="yes"
--else
-- LIBSOUNDTOUCH_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/soundtouch/include/SoundTouch.h"; then
-+ LIBSOUNDTOUCH_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBSOUNDTOUCH_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBSOUNDTOUCH_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: libsoundtouch libraries are available in the local tree" >&5
-@@ -21771,29 +21555,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libsoxr/src/soxr.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libsoxr/src/soxr.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libsoxr/src/soxr.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libsoxr/src/soxr.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBSOXR_LOCAL_AVAILABLE="yes"
--else
-- LIBSOXR_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libsoxr/src/soxr.h"; then
-+ LIBSOXR_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBSOXR_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBSOXR_LOCAL_AVAILABLE" = "yes"; then
- # Breaks other other libraries in Audacity tree; but why is ./configure
-@@ -21894,29 +21660,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/twolame/libtwolame/twolame.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/twolame/libtwolame/twolame.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/twolame/libtwolame/twolame.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/twolame/libtwolame/twolame.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBTWOLAME_LOCAL_AVAILABLE="yes"
--else
-- LIBTWOLAME_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/twolame/libtwolame/twolame.h"; then
-+ LIBTWOLAME_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBTWOLAME_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBTWOLAME_LOCAL_AVAILABLE" = "yes"; then
- LIBTWOLAME_LOCAL_CONFIGURE_ARGS="--disable-programs"
-@@ -22015,29 +21763,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LIBVAMP_LOCAL_AVAILABLE="yes"
--else
-- LIBVAMP_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h"; then
-+ LIBVAMP_LOCAL_AVAILABLE="yes"
-+ else
-+ LIBVAMP_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LIBVAMP_LOCAL_AVAILABLE" = "yes"; then
- LIBVAMP_LOCAL_CONFIGURE_ARGS="--disable-programs"
-@@ -22136,52 +21866,17 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- vorbisenc_h_available="yes"
--else
-- vorbisenc_h_available="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h"; then
-+ vorbisenc_h_available="yes"
-+ else
-+ vorbisenc_h_available="no"
-+ fi
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/libogg/include/ogg/ogg.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/libogg/include/ogg/ogg.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/libogg/include/ogg/ogg.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/libogg/include/ogg/ogg.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- ogg_h_available="yes"
--else
-- ogg_h_available="no"
--fi
-+ if test -f "${srcdir}/lib-src/libogg/include/ogg/ogg.h"; then
-+ ogg_h_available="yes"
-+ else
-+ ogg_h_available="no"
-+ fi
-
-
- if test "$vorbisenc_h_available" = "yes" -a "$ogg_h_available" = "yes"; then
-@@ -22290,29 +21985,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/lv2/configure" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/lv2/configure" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/lv2/configure... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/lv2/configure"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- LV2_LOCAL_AVAILABLE="yes"
--else
-- LV2_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/lv2/configure"; then
-+ LV2_LOCAL_AVAILABLE="yes"
-+ else
-+ LV2_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$LV2_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: LV2 libraries are available in the local tree" >&5
-@@ -22432,29 +22109,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/portaudio-v19/include/portaudio.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/portaudio-v19/include/portaudio.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/portaudio-v19/include/portaudio.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/portaudio-v19/include/portaudio.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- PORTAUDIO_LOCAL_AVAILABLE="yes"
--else
-- PORTAUDIO_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/portaudio-v19/include/portaudio.h"; then
-+ PORTAUDIO_LOCAL_AVAILABLE="yes"
-+ else
-+ PORTAUDIO_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$PORTAUDIO_LOCAL_AVAILABLE" = "yes"; then
- pa_dir="$(pwd)/${srcdir}/lib-src/portaudio-v19"
-@@ -22555,29 +22214,12 @@
- $as_echo "$as_me: portSMF library is NOT available as system library" >&6;}
- fi
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/portsmf/allegro.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/portsmf/allegro.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/portsmf/allegro.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/portsmf/allegro.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- PORTSMF_LOCAL_AVAILABLE="yes"
--else
-- PORTSMF_LOCAL_AVAILABLE="no"
--fi
-
-+ if test -f "${srcdir}/lib-src/portsmf/allegro.h"; then
-+ PORTSMF_LOCAL_AVAILABLE="yes"
-+ else
-+ PORTSMF_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$PORTSMF_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: portSMF library is available in the local tree" >&5
-@@ -22675,29 +22317,12 @@
- $as_echo "$as_me: portmidi library is NOT available as system library" >&6;}
- fi
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/portmidi/pm_common/portmidi.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/portmidi/pm_common/portmidi.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/portmidi/pm_common/portmidi.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/portmidi/pm_common/portmidi.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- PORTMIDI_LOCAL_AVAILABLE="yes"
--else
-- PORTMIDI_LOCAL_AVAILABLE="no"
--fi
-
-+ if test -f "${srcdir}/lib-src/portmidi/pm_common/portmidi.h"; then
-+ PORTMIDI_LOCAL_AVAILABLE="yes"
-+ else
-+ PORTMIDI_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$PORTMIDI_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: portmidi library is available in the local tree" >&5
-@@ -22795,29 +22420,11 @@
- fi
-
-
-- as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h" >&5
--$as_echo_n "checking for ${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h... " >&6; }
--if eval \${$as_ac_File+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- test "$cross_compiling" = yes &&
-- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h"; then
-- eval "$as_ac_File=yes"
--else
-- eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-- WIDGETEXTRA_LOCAL_AVAILABLE="yes"
--else
-- WIDGETEXTRA_LOCAL_AVAILABLE="no"
--fi
--
-+ if test -f "${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h"; then
-+ WIDGETEXTRA_LOCAL_AVAILABLE="yes"
-+ else
-+ WIDGETEXTRA_LOCAL_AVAILABLE="no"
-+ fi
-
- if test "$WIDGETEXTRA_LOCAL_AVAILABLE" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: libwidgetextra library is available in the local tree" >&5
diff --git a/srcpkgs/audacity/template b/srcpkgs/audacity/template
index 7f4d0a49098..67feb9e7140 100644
--- a/srcpkgs/audacity/template
+++ b/srcpkgs/audacity/template
@@ -6,7 +6,7 @@ wrksrc="${pkgname}-Audacity-${version}"
build_style=gnu-configure
configure_args="--with-ffmpeg=system --with-libsndfile=system --with-expat=system
--with-libsoxr=system --with-lame=system --with-lv2=system ac_cv_path_WX_CONFIG=wx-config-gtk3"
-hostmakedepends="pkg-config cmake gettext libtool m4 python which"
+hostmakedepends="automake pkg-config cmake gettext gettext-devel libtool m4 python which"
makedepends="jack-devel wxWidgets-gtk3-devel gtk+3-devel
libmad-devel soundtouch-devel libsoxr-devel
vamp-plugin-sdk-devel lame-devel libid3tag-devel libflac-devel
@@ -29,10 +29,15 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
LDFLAGS="-latomic"
fi
+pre_configure() {
+ autoreconf -fi
+}
+
+do_check() {
+ make check || : # Gives recursive test not found
+}
+
post_install() {
vcopy nyquist /usr/share/audacity
vcopy plug-ins /usr/share/audacity
-
- rm ${DESTDIR}/usr/share/doc/${pkgname}/LICENSE.txt
- vlicense LICENSE.txt LICENSE
}
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [WIP] audacity: simplify cross-build patch
2020-12-30 2:01 [PR PATCH] audacity: simplify cross-build patch ndowens
` (7 preceding siblings ...)
2020-12-30 4:35 ` ndowens
@ 2020-12-30 4:36 ` ndowens
2020-12-30 12:12 ` ndowens
9 siblings, 0 replies; 11+ messages in thread
From: ndowens @ 2020-12-30 4:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 230 bytes --]
New comment by ndowens on void-packages repository
https://github.com/void-linux/void-packages/pull/27548#issuecomment-752324760
Comment:
Locales also build fine for inside xbps-src chroot as well. Unsure what so different here
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: audacity: simplify cross-build patch
2020-12-30 2:01 [PR PATCH] audacity: simplify cross-build patch ndowens
` (8 preceding siblings ...)
2020-12-30 4:36 ` ndowens
@ 2020-12-30 12:12 ` ndowens
9 siblings, 0 replies; 11+ messages in thread
From: ndowens @ 2020-12-30 12:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 208 bytes --]
New comment by ndowens on void-packages repository
https://github.com/void-linux/void-packages/pull/27548#issuecomment-752324760
Comment:
@leahneukirchen this is your package so asking if this is ok to you
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2020-12-30 12:12 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-30 2:01 [PR PATCH] audacity: simplify cross-build patch ndowens
2020-12-30 2:03 ` [PR PATCH] [Updated] " ndowens
2020-12-30 2:09 ` ndowens
2020-12-30 2:32 ` [PR PATCH] [Updated] [WIP] " ndowens
2020-12-30 3:50 ` ndowens
2020-12-30 3:57 ` ndowens
2020-12-30 4:10 ` ndowens
2020-12-30 4:23 ` ndowens
2020-12-30 4:35 ` ndowens
2020-12-30 4:36 ` ndowens
2020-12-30 12:12 ` ndowens
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).