* [PR PATCH] audacity: update to 3.3.3.
@ 2023-10-09 10:38 ii8
2023-10-09 10:56 ` [PR PATCH] [Updated] " ii8
` (19 more replies)
0 siblings, 20 replies; 21+ messages in thread
From: ii8 @ 2023-10-09 10:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 538 bytes --]
There is a new pull request by ii8 against master on the void-packages repository
https://github.com/ii8/void-packages audacity
https://github.com/void-linux/void-packages/pull/46524
audacity: update to 3.3.3.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
- I built this PR locally for these architectures:
- armv6l-musl
A patch file from https://github.com/void-linux/void-packages/pull/46524.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-audacity-46524.patch --]
[-- Type: text/x-diff, Size: 35291 bytes --]
From 1a337b5de5c036eccab8b2a70d50f6649be44209 Mon Sep 17 00:00:00 2001
From: murray <murray.calavera@protonmail.com>
Date: Mon, 9 Oct 2023 11:35:24 +0100
Subject: [PATCH] audacity: update to 3.3.3.
---
srcpkgs/audacity/patches/configure.patch | 756 ------------------
srcpkgs/audacity/patches/wx-3.2.patch | 26 -
.../patches/wx-widget-has-basque.patch | 22 -
srcpkgs/audacity/patches/wxbitmap.patch | 31 -
srcpkgs/audacity/template | 52 +-
5 files changed, 26 insertions(+), 861 deletions(-)
delete mode 100644 srcpkgs/audacity/patches/configure.patch
delete mode 100644 srcpkgs/audacity/patches/wx-3.2.patch
delete mode 100644 srcpkgs/audacity/patches/wx-widget-has-basque.patch
delete mode 100644 srcpkgs/audacity/patches/wxbitmap.patch
diff --git a/srcpkgs/audacity/patches/configure.patch b/srcpkgs/audacity/patches/configure.patch
deleted file mode 100644
index 50a29a26f888a..0000000000000
--- 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.
-
---- a/configure 2017-10-26 19:44:39.000000000 +0200
-+++ b/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/patches/wx-3.2.patch b/srcpkgs/audacity/patches/wx-3.2.patch
deleted file mode 100644
index d42ae09f30f6e..0000000000000
--- a/srcpkgs/audacity/patches/wx-3.2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: audacity-Audacity-2.4.1/configure
-===================================================================
---- audacity-Audacity-2.4.1.orig/configure
-+++ audacity-Audacity-2.4.1/configure
-@@ -19918,7 +19918,7 @@ wx_version=`${WX_CONFIG} $wxconfigargs -
- $as_echo "$as_me: Checking that the chosen version of wxWidgets is 3.1.x (or 3.0.x)" >&6;}
-
- case "${wx_version}" in
-- 3.1.* | 3.0.*)
-+ 3.2.* | 3.1.* | 3.0.*)
- echo "Great, you're using wxWidgets ${wx_version}!"
- ;;
- *)
-Index: audacity-Audacity-2.4.1/lib-src/lib-widget-extra/configure
-===================================================================
---- audacity-Audacity-2.4.1.orig/lib-src/lib-widget-extra/configure
-+++ audacity-Audacity-2.4.1/lib-src/lib-widget-extra/configure
-@@ -16633,7 +16633,7 @@ wx_version=`${WX_CONFIG} $wxconfigargs -
- $as_echo "$as_me: Checking that the chosen version of wxWidgets is 3.1.x (or 3.0.x)" >&6;}
-
- case "${wx_version}" in
-- 3.1.* | 3.0.*)
-+ 3.2.* | 3.1.* | 3.0.*)
- echo "Great, you're using wxWidgets ${wx_version}!"
- ;;
- *)
diff --git a/srcpkgs/audacity/patches/wx-widget-has-basque.patch b/srcpkgs/audacity/patches/wx-widget-has-basque.patch
deleted file mode 100644
index 4dd24e79ec8e2..0000000000000
--- a/srcpkgs/audacity/patches/wx-widget-has-basque.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: audacity-Audacity-2.4.1/src/AudacityApp.cpp
-===================================================================
---- audacity-Audacity-2.4.1.orig/src/AudacityApp.cpp
-+++ audacity-Audacity-2.4.1/src/AudacityApp.cpp
-@@ -1102,7 +1102,7 @@ locations of the missing files.").Format
- #define WL(lang,sublang)
- #endif
-
--#if wxCHECK_VERSION(3, 0, 1)
-+#if 0
- wxLanguageInfo userLangs[] =
- {
- // Bosnian is defined in wxWidgets already
-@@ -1366,7 +1366,7 @@ bool AudacityApp::OnInit()
- //
- // TODO: The whole Language initialization really need to be reworked.
- // It's all over the place.
--#if wxCHECK_VERSION(3, 0, 1)
-+#if 0
- for (size_t i = 0, cnt = WXSIZEOF(userLangs); i < cnt; i++)
- {
- wxLocale::AddLanguage(userLangs[i]);
diff --git a/srcpkgs/audacity/patches/wxbitmap.patch b/srcpkgs/audacity/patches/wxbitmap.patch
deleted file mode 100644
index af18bd1cb6524..0000000000000
--- a/srcpkgs/audacity/patches/wxbitmap.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 55383fccd0c281b4f189d9b07699b21bb802c736 Mon Sep 17 00:00:00 2001
-From: Ian McInerney <ian.s.mcinerney@ieee.org>
-Date: Fri, 8 Apr 2022 01:27:52 +0100
-Subject: [PATCH] Call the proper wxBitmap constructor for XPM data
-
-wxBitmap back to at least 3.0.0 did not have a constructor for an XPM
-image that took a size parameter, it would only take the XPM data
-itself.
-
-I don't know how this compiled until now, but it doesn't anymore when
-the size is included and built against wx 3.1.6 in Fedora.
----
- src/MixerBoard.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
- Technically this patch is under GPLv3+ because it was contributed after
- re licensing
-
-diff --git a/src/MixerBoard.cpp b/src/MixerBoard.cpp
-index 54b5f146cc7..7fe81615474 100644
---- a/src/MixerBoard.cpp
-+++ b/src/MixerBoard.cpp
-@@ -1307,7 +1307,7 @@ void MixerBoard::LoadMusicalInstruments()
- wxMemoryDC dc;
-
- for (const auto &data : table) {
-- auto bmp = std::make_unique<wxBitmap>(data.bitmap,24);
-+ auto bmp = std::make_unique<wxBitmap>(data.bitmap);
- dc.SelectObject(*bmp);
- AColor::Bevel(dc, false, bev);
- mMusicalInstruments.push_back(std::make_unique<MusicalInstrument>(
diff --git a/srcpkgs/audacity/template b/srcpkgs/audacity/template
index e79971d69d016..b2c51ebb3a40e 100644
--- a/srcpkgs/audacity/template
+++ b/srcpkgs/audacity/template
@@ -1,39 +1,39 @@
# Template file for 'audacity'
pkgname=audacity
-version=2.4.1
-revision=3
-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 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
- ffmpeg-devel twolame-devel serd-devel lv2 lilv-devel suil-devel"
+version=3.3.3
+revision=1
+build_style=cmake
+build_helper="cmake-wxWidgets-gtk3 qemu"
+configure_args="-Daudacity_use_ffmpeg=loaded -Daudacity_lib_preference=system
+ -Daudacity_obey_system_dependencies=On -Daudacity_conan_enabled=Off
+ -Daudacity_use_portsmf=local -Daudacity_use_sbsms=local
+ -Daudacity_has_vst3=no"
+hostmakedepends="pkg-config gettext"
+makedepends="wxWidgets-gtk3-devel gtk+3-devel expat-devel lame-devel
+ libsoxr-devel portaudio-devel sqlite-devel libcurl-devel ffmpeg-devel
+ libid3tag-devel libmad-devel vamp-plugin-sdk-devel libogg-devel
+ libvorbis-devel libflac-devel lilv-devel lv2 serd-devel sord-devel
+ sratom-devel suil-devel portmidi-devel soundtouch-devel twolame-devel
+ zlib-devel libuuid-devel jack-devel wavpack-devel libsndfile-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Graphical cross-platform audio editor"
maintainer="Orphaned <orphan@voidlinux.org>"
-# Patches are GPL3+, so bump the license for the whole package
license="GPL-3.0-or-later"
homepage="https://www.audacityteam.org"
-distfiles="https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz"
-checksum=50240f07471373a7e5c2df65cc26eeeaaced9a0850ad1f95cb795f171ea3009f
+distfiles="https://github.com/audacity/audacity/releases/download/Audacity-${version}/audacity-sources-${version}.tar.gz"
+checksum=3d9ff1fc6a0ecd6591f19445c77c80774d364b268da652760829cf3598e08071
-case "$XBPS_TARGET_MACHINE" in
- i686*|x86_64*) ;;
- *) configure_args+=" --disable-sse" ;;
-esac
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
- LDFLAGS="-latomic"
-fi
-
-CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+pre_build() {
+ if [ "$CROSS_BUILD" ]; then
+ mkdir -p ${wrksrc}/${build_wrksrc}/scripts
+ echo "#!/bin/sh" > ${wrksrc}/${build_wrksrc}/scripts/image-compiler
+ echo "/usr/bin/qemu-${XBPS_TARGET_QEMU_MACHINE}-static ${wrksrc}/${build_wrksrc}/Release/bin/image-compiler \$@" >> ${wrksrc}/${build_wrksrc}/scripts/image-compiler
+ chmod +x ${wrksrc}/${build_wrksrc}/scripts/image-compiler
+ export PATH="${wrksrc}/${build_wrksrc}/scripts/:$PATH"
+ fi
+}
post_install() {
- vcopy nyquist /usr/share/audacity
- vcopy plug-ins /usr/share/audacity
-
rm ${DESTDIR}/usr/share/doc/audacity/LICENSE.txt
vlicense LICENSE.txt LICENSE
}
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] audacity: update to 3.3.3.
2023-10-09 10:38 [PR PATCH] audacity: update to 3.3.3 ii8
@ 2023-10-09 10:56 ` ii8
2023-10-09 11:00 ` ii8
` (18 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: ii8 @ 2023-10-09 10:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 543 bytes --]
There is an updated pull request by ii8 against master on the void-packages repository
https://github.com/ii8/void-packages audacity
https://github.com/void-linux/void-packages/pull/46524
audacity: update to 3.3.3.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
- I built this PR locally for these architectures:
- armv6l-musl
A patch file from https://github.com/void-linux/void-packages/pull/46524.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-audacity-46524.patch --]
[-- Type: text/x-diff, Size: 35348 bytes --]
From 6d386e4d3d5b5f841b9de1e90cbd3bfb3e2d680b Mon Sep 17 00:00:00 2001
From: murray <murray.calavera@protonmail.com>
Date: Mon, 9 Oct 2023 11:35:24 +0100
Subject: [PATCH] audacity: update to 3.3.3.
---
srcpkgs/audacity/patches/configure.patch | 756 ------------------
srcpkgs/audacity/patches/wx-3.2.patch | 26 -
.../patches/wx-widget-has-basque.patch | 22 -
srcpkgs/audacity/patches/wxbitmap.patch | 31 -
srcpkgs/audacity/template | 55 +-
5 files changed, 27 insertions(+), 863 deletions(-)
delete mode 100644 srcpkgs/audacity/patches/configure.patch
delete mode 100644 srcpkgs/audacity/patches/wx-3.2.patch
delete mode 100644 srcpkgs/audacity/patches/wx-widget-has-basque.patch
delete mode 100644 srcpkgs/audacity/patches/wxbitmap.patch
diff --git a/srcpkgs/audacity/patches/configure.patch b/srcpkgs/audacity/patches/configure.patch
deleted file mode 100644
index 50a29a26f888a..0000000000000
--- 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.
-
---- a/configure 2017-10-26 19:44:39.000000000 +0200
-+++ b/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/patches/wx-3.2.patch b/srcpkgs/audacity/patches/wx-3.2.patch
deleted file mode 100644
index d42ae09f30f6e..0000000000000
--- a/srcpkgs/audacity/patches/wx-3.2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: audacity-Audacity-2.4.1/configure
-===================================================================
---- audacity-Audacity-2.4.1.orig/configure
-+++ audacity-Audacity-2.4.1/configure
-@@ -19918,7 +19918,7 @@ wx_version=`${WX_CONFIG} $wxconfigargs -
- $as_echo "$as_me: Checking that the chosen version of wxWidgets is 3.1.x (or 3.0.x)" >&6;}
-
- case "${wx_version}" in
-- 3.1.* | 3.0.*)
-+ 3.2.* | 3.1.* | 3.0.*)
- echo "Great, you're using wxWidgets ${wx_version}!"
- ;;
- *)
-Index: audacity-Audacity-2.4.1/lib-src/lib-widget-extra/configure
-===================================================================
---- audacity-Audacity-2.4.1.orig/lib-src/lib-widget-extra/configure
-+++ audacity-Audacity-2.4.1/lib-src/lib-widget-extra/configure
-@@ -16633,7 +16633,7 @@ wx_version=`${WX_CONFIG} $wxconfigargs -
- $as_echo "$as_me: Checking that the chosen version of wxWidgets is 3.1.x (or 3.0.x)" >&6;}
-
- case "${wx_version}" in
-- 3.1.* | 3.0.*)
-+ 3.2.* | 3.1.* | 3.0.*)
- echo "Great, you're using wxWidgets ${wx_version}!"
- ;;
- *)
diff --git a/srcpkgs/audacity/patches/wx-widget-has-basque.patch b/srcpkgs/audacity/patches/wx-widget-has-basque.patch
deleted file mode 100644
index 4dd24e79ec8e2..0000000000000
--- a/srcpkgs/audacity/patches/wx-widget-has-basque.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: audacity-Audacity-2.4.1/src/AudacityApp.cpp
-===================================================================
---- audacity-Audacity-2.4.1.orig/src/AudacityApp.cpp
-+++ audacity-Audacity-2.4.1/src/AudacityApp.cpp
-@@ -1102,7 +1102,7 @@ locations of the missing files.").Format
- #define WL(lang,sublang)
- #endif
-
--#if wxCHECK_VERSION(3, 0, 1)
-+#if 0
- wxLanguageInfo userLangs[] =
- {
- // Bosnian is defined in wxWidgets already
-@@ -1366,7 +1366,7 @@ bool AudacityApp::OnInit()
- //
- // TODO: The whole Language initialization really need to be reworked.
- // It's all over the place.
--#if wxCHECK_VERSION(3, 0, 1)
-+#if 0
- for (size_t i = 0, cnt = WXSIZEOF(userLangs); i < cnt; i++)
- {
- wxLocale::AddLanguage(userLangs[i]);
diff --git a/srcpkgs/audacity/patches/wxbitmap.patch b/srcpkgs/audacity/patches/wxbitmap.patch
deleted file mode 100644
index af18bd1cb6524..0000000000000
--- a/srcpkgs/audacity/patches/wxbitmap.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 55383fccd0c281b4f189d9b07699b21bb802c736 Mon Sep 17 00:00:00 2001
-From: Ian McInerney <ian.s.mcinerney@ieee.org>
-Date: Fri, 8 Apr 2022 01:27:52 +0100
-Subject: [PATCH] Call the proper wxBitmap constructor for XPM data
-
-wxBitmap back to at least 3.0.0 did not have a constructor for an XPM
-image that took a size parameter, it would only take the XPM data
-itself.
-
-I don't know how this compiled until now, but it doesn't anymore when
-the size is included and built against wx 3.1.6 in Fedora.
----
- src/MixerBoard.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
- Technically this patch is under GPLv3+ because it was contributed after
- re licensing
-
-diff --git a/src/MixerBoard.cpp b/src/MixerBoard.cpp
-index 54b5f146cc7..7fe81615474 100644
---- a/src/MixerBoard.cpp
-+++ b/src/MixerBoard.cpp
-@@ -1307,7 +1307,7 @@ void MixerBoard::LoadMusicalInstruments()
- wxMemoryDC dc;
-
- for (const auto &data : table) {
-- auto bmp = std::make_unique<wxBitmap>(data.bitmap,24);
-+ auto bmp = std::make_unique<wxBitmap>(data.bitmap);
- dc.SelectObject(*bmp);
- AColor::Bevel(dc, false, bev);
- mMusicalInstruments.push_back(std::make_unique<MusicalInstrument>(
diff --git a/srcpkgs/audacity/template b/srcpkgs/audacity/template
index e79971d69d016..af4b22e53b492 100644
--- a/srcpkgs/audacity/template
+++ b/srcpkgs/audacity/template
@@ -1,39 +1,38 @@
# Template file for 'audacity'
pkgname=audacity
-version=2.4.1
-revision=3
-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 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
- ffmpeg-devel twolame-devel serd-devel lv2 lilv-devel suil-devel"
+version=3.3.3
+revision=1
+build_style=cmake
+build_helper="cmake-wxWidgets-gtk3 qemu"
+configure_args="-Daudacity_use_ffmpeg=loaded -Daudacity_lib_preference=system
+ -Daudacity_obey_system_dependencies=On -Daudacity_conan_enabled=Off
+ -Daudacity_use_portsmf=local -Daudacity_use_sbsms=local
+ -Daudacity_has_vst3=no"
+hostmakedepends="pkg-config gettext"
+makedepends="wxWidgets-gtk3-devel gtk+3-devel expat-devel lame-devel
+ libsoxr-devel portaudio-devel sqlite-devel libcurl-devel ffmpeg-devel
+ libid3tag-devel libmad-devel vamp-plugin-sdk-devel libogg-devel
+ libvorbis-devel libflac-devel lilv-devel lv2 serd-devel sord-devel
+ sratom-devel suil-devel portmidi-devel soundtouch-devel twolame-devel
+ zlib-devel libuuid-devel jack-devel wavpack-devel libsndfile-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Graphical cross-platform audio editor"
maintainer="Orphaned <orphan@voidlinux.org>"
-# Patches are GPL3+, so bump the license for the whole package
-license="GPL-3.0-or-later"
+license="GPL-2.0-or-later, GPL-3.0-or-later, CC-BY-3.0"
homepage="https://www.audacityteam.org"
-distfiles="https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz"
-checksum=50240f07471373a7e5c2df65cc26eeeaaced9a0850ad1f95cb795f171ea3009f
+distfiles="https://github.com/audacity/audacity/releases/download/Audacity-${version}/audacity-sources-${version}.tar.gz"
+checksum=3d9ff1fc6a0ecd6591f19445c77c80774d364b268da652760829cf3598e08071
-case "$XBPS_TARGET_MACHINE" in
- i686*|x86_64*) ;;
- *) configure_args+=" --disable-sse" ;;
-esac
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
- LDFLAGS="-latomic"
-fi
-
-CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+pre_build() {
+ if [ "$CROSS_BUILD" ]; then
+ mkdir -p ${wrksrc}/${build_wrksrc}/scripts
+ echo "#!/bin/sh" > ${wrksrc}/${build_wrksrc}/scripts/image-compiler
+ echo "/usr/bin/qemu-${XBPS_TARGET_QEMU_MACHINE}-static ${wrksrc}/${build_wrksrc}/Release/bin/image-compiler \$@" >> ${wrksrc}/${build_wrksrc}/scripts/image-compiler
+ chmod +x ${wrksrc}/${build_wrksrc}/scripts/image-compiler
+ export PATH="${wrksrc}/${build_wrksrc}/scripts/:$PATH"
+ fi
+}
post_install() {
- vcopy nyquist /usr/share/audacity
- vcopy plug-ins /usr/share/audacity
-
rm ${DESTDIR}/usr/share/doc/audacity/LICENSE.txt
- vlicense LICENSE.txt LICENSE
}
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] audacity: update to 3.3.3.
2023-10-09 10:38 [PR PATCH] audacity: update to 3.3.3 ii8
2023-10-09 10:56 ` [PR PATCH] [Updated] " ii8
@ 2023-10-09 11:00 ` ii8
2023-10-09 12:05 ` [PR REVIEW] " ahesford
` (17 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: ii8 @ 2023-10-09 11:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 543 bytes --]
There is an updated pull request by ii8 against master on the void-packages repository
https://github.com/ii8/void-packages audacity
https://github.com/void-linux/void-packages/pull/46524
audacity: update to 3.3.3.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
- I built this PR locally for these architectures:
- armv6l-musl
A patch file from https://github.com/void-linux/void-packages/pull/46524.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-audacity-46524.patch --]
[-- Type: text/x-diff, Size: 35340 bytes --]
From 7db11ea9ce71c2ce2ee18ca860bf92c3697eb876 Mon Sep 17 00:00:00 2001
From: murray <murray.calavera@protonmail.com>
Date: Mon, 9 Oct 2023 11:35:24 +0100
Subject: [PATCH] audacity: update to 3.3.3.
---
srcpkgs/audacity/patches/configure.patch | 756 ------------------
srcpkgs/audacity/patches/wx-3.2.patch | 26 -
.../patches/wx-widget-has-basque.patch | 22 -
srcpkgs/audacity/patches/wxbitmap.patch | 31 -
srcpkgs/audacity/template | 55 +-
5 files changed, 27 insertions(+), 863 deletions(-)
delete mode 100644 srcpkgs/audacity/patches/configure.patch
delete mode 100644 srcpkgs/audacity/patches/wx-3.2.patch
delete mode 100644 srcpkgs/audacity/patches/wx-widget-has-basque.patch
delete mode 100644 srcpkgs/audacity/patches/wxbitmap.patch
diff --git a/srcpkgs/audacity/patches/configure.patch b/srcpkgs/audacity/patches/configure.patch
deleted file mode 100644
index 50a29a26f888a..0000000000000
--- 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.
-
---- a/configure 2017-10-26 19:44:39.000000000 +0200
-+++ b/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/patches/wx-3.2.patch b/srcpkgs/audacity/patches/wx-3.2.patch
deleted file mode 100644
index d42ae09f30f6e..0000000000000
--- a/srcpkgs/audacity/patches/wx-3.2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: audacity-Audacity-2.4.1/configure
-===================================================================
---- audacity-Audacity-2.4.1.orig/configure
-+++ audacity-Audacity-2.4.1/configure
-@@ -19918,7 +19918,7 @@ wx_version=`${WX_CONFIG} $wxconfigargs -
- $as_echo "$as_me: Checking that the chosen version of wxWidgets is 3.1.x (or 3.0.x)" >&6;}
-
- case "${wx_version}" in
-- 3.1.* | 3.0.*)
-+ 3.2.* | 3.1.* | 3.0.*)
- echo "Great, you're using wxWidgets ${wx_version}!"
- ;;
- *)
-Index: audacity-Audacity-2.4.1/lib-src/lib-widget-extra/configure
-===================================================================
---- audacity-Audacity-2.4.1.orig/lib-src/lib-widget-extra/configure
-+++ audacity-Audacity-2.4.1/lib-src/lib-widget-extra/configure
-@@ -16633,7 +16633,7 @@ wx_version=`${WX_CONFIG} $wxconfigargs -
- $as_echo "$as_me: Checking that the chosen version of wxWidgets is 3.1.x (or 3.0.x)" >&6;}
-
- case "${wx_version}" in
-- 3.1.* | 3.0.*)
-+ 3.2.* | 3.1.* | 3.0.*)
- echo "Great, you're using wxWidgets ${wx_version}!"
- ;;
- *)
diff --git a/srcpkgs/audacity/patches/wx-widget-has-basque.patch b/srcpkgs/audacity/patches/wx-widget-has-basque.patch
deleted file mode 100644
index 4dd24e79ec8e2..0000000000000
--- a/srcpkgs/audacity/patches/wx-widget-has-basque.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: audacity-Audacity-2.4.1/src/AudacityApp.cpp
-===================================================================
---- audacity-Audacity-2.4.1.orig/src/AudacityApp.cpp
-+++ audacity-Audacity-2.4.1/src/AudacityApp.cpp
-@@ -1102,7 +1102,7 @@ locations of the missing files.").Format
- #define WL(lang,sublang)
- #endif
-
--#if wxCHECK_VERSION(3, 0, 1)
-+#if 0
- wxLanguageInfo userLangs[] =
- {
- // Bosnian is defined in wxWidgets already
-@@ -1366,7 +1366,7 @@ bool AudacityApp::OnInit()
- //
- // TODO: The whole Language initialization really need to be reworked.
- // It's all over the place.
--#if wxCHECK_VERSION(3, 0, 1)
-+#if 0
- for (size_t i = 0, cnt = WXSIZEOF(userLangs); i < cnt; i++)
- {
- wxLocale::AddLanguage(userLangs[i]);
diff --git a/srcpkgs/audacity/patches/wxbitmap.patch b/srcpkgs/audacity/patches/wxbitmap.patch
deleted file mode 100644
index af18bd1cb6524..0000000000000
--- a/srcpkgs/audacity/patches/wxbitmap.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 55383fccd0c281b4f189d9b07699b21bb802c736 Mon Sep 17 00:00:00 2001
-From: Ian McInerney <ian.s.mcinerney@ieee.org>
-Date: Fri, 8 Apr 2022 01:27:52 +0100
-Subject: [PATCH] Call the proper wxBitmap constructor for XPM data
-
-wxBitmap back to at least 3.0.0 did not have a constructor for an XPM
-image that took a size parameter, it would only take the XPM data
-itself.
-
-I don't know how this compiled until now, but it doesn't anymore when
-the size is included and built against wx 3.1.6 in Fedora.
----
- src/MixerBoard.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
- Technically this patch is under GPLv3+ because it was contributed after
- re licensing
-
-diff --git a/src/MixerBoard.cpp b/src/MixerBoard.cpp
-index 54b5f146cc7..7fe81615474 100644
---- a/src/MixerBoard.cpp
-+++ b/src/MixerBoard.cpp
-@@ -1307,7 +1307,7 @@ void MixerBoard::LoadMusicalInstruments()
- wxMemoryDC dc;
-
- for (const auto &data : table) {
-- auto bmp = std::make_unique<wxBitmap>(data.bitmap,24);
-+ auto bmp = std::make_unique<wxBitmap>(data.bitmap);
- dc.SelectObject(*bmp);
- AColor::Bevel(dc, false, bev);
- mMusicalInstruments.push_back(std::make_unique<MusicalInstrument>(
diff --git a/srcpkgs/audacity/template b/srcpkgs/audacity/template
index e79971d69d016..5f6c94d1fdf82 100644
--- a/srcpkgs/audacity/template
+++ b/srcpkgs/audacity/template
@@ -1,39 +1,38 @@
# Template file for 'audacity'
pkgname=audacity
-version=2.4.1
-revision=3
-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 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
- ffmpeg-devel twolame-devel serd-devel lv2 lilv-devel suil-devel"
+version=3.3.3
+revision=1
+build_style=cmake
+build_helper="cmake-wxWidgets-gtk3 qemu"
+configure_args="-Daudacity_use_ffmpeg=loaded -Daudacity_lib_preference=system
+ -Daudacity_obey_system_dependencies=On -Daudacity_conan_enabled=Off
+ -Daudacity_use_portsmf=local -Daudacity_use_sbsms=local
+ -Daudacity_has_vst3=no"
+hostmakedepends="pkg-config gettext"
+makedepends="wxWidgets-gtk3-devel gtk+3-devel expat-devel lame-devel
+ libsoxr-devel portaudio-devel sqlite-devel libcurl-devel ffmpeg-devel
+ libid3tag-devel libmad-devel vamp-plugin-sdk-devel libogg-devel
+ libvorbis-devel libflac-devel lilv-devel lv2 serd-devel sord-devel
+ sratom-devel suil-devel portmidi-devel soundtouch-devel twolame-devel
+ zlib-devel libuuid-devel jack-devel wavpack-devel libsndfile-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Graphical cross-platform audio editor"
maintainer="Orphaned <orphan@voidlinux.org>"
-# Patches are GPL3+, so bump the license for the whole package
-license="GPL-3.0-or-later"
+license="GPL-2.0-or-later, GPL-3.0-or-later, CC-BY-3.0"
homepage="https://www.audacityteam.org"
-distfiles="https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz"
-checksum=50240f07471373a7e5c2df65cc26eeeaaced9a0850ad1f95cb795f171ea3009f
+distfiles="https://github.com/audacity/audacity/releases/download/Audacity-${version}/audacity-sources-${version}.tar.gz"
+checksum=3d9ff1fc6a0ecd6591f19445c77c80774d364b268da652760829cf3598e08071
-case "$XBPS_TARGET_MACHINE" in
- i686*|x86_64*) ;;
- *) configure_args+=" --disable-sse" ;;
-esac
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
- LDFLAGS="-latomic"
-fi
-
-CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+pre_build() {
+ if [ "$CROSS_BUILD" ]; then
+ mkdir -p ${wrksrc}/${build_wrksrc}/scripts
+ echo "#!/bin/sh" > ${wrksrc}/${build_wrksrc}/scripts/image-compiler
+ echo "/usr/bin/qemu-${XBPS_TARGET_QEMU_MACHINE}-static ${wrksrc}/${build_wrksrc}/Release/bin/image-compiler \$@" >> ${wrksrc}/${build_wrksrc}/scripts/image-compiler
+ chmod +x ${wrksrc}/${build_wrksrc}/scripts/image-compiler
+ export PATH="${wrksrc}/${build_wrksrc}/scripts/:$PATH"
+ fi
+}
post_install() {
- vcopy nyquist /usr/share/audacity
- vcopy plug-ins /usr/share/audacity
-
rm ${DESTDIR}/usr/share/doc/audacity/LICENSE.txt
- vlicense LICENSE.txt LICENSE
}
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR REVIEW] audacity: update to 3.3.3.
2023-10-09 10:38 [PR PATCH] audacity: update to 3.3.3 ii8
` (6 preceding siblings ...)
2023-10-09 12:05 ` ahesford
@ 2023-10-09 12:05 ` ahesford
2023-10-09 12:05 ` ahesford
` (11 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: ahesford @ 2023-10-09 12:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 271 bytes --]
New review comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/46524#discussion_r1350203772
Comment:
```suggestion
-Daudacity_obey_system_dependencies=ON -Daudacity_conan_enabled=OFF
```
All-caps Booleans are idiomatic.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR REVIEW] audacity: update to 3.3.3.
2023-10-09 10:38 [PR PATCH] audacity: update to 3.3.3 ii8
` (3 preceding siblings ...)
2023-10-09 12:05 ` ahesford
@ 2023-10-09 12:05 ` ahesford
2023-10-09 12:05 ` ahesford
` (14 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: ahesford @ 2023-10-09 12:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 319 bytes --]
New review comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/46524#discussion_r1350210208
Comment:
This should be in `pre_configure` so the wrapper is rendered alongside the other XBPS wrappers for cross-compilation, and can be inspected before running the build stage.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR REVIEW] audacity: update to 3.3.3.
2023-10-09 10:38 [PR PATCH] audacity: update to 3.3.3 ii8
` (4 preceding siblings ...)
2023-10-09 12:05 ` ahesford
@ 2023-10-09 12:05 ` ahesford
2023-10-09 12:05 ` ahesford
` (13 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: ahesford @ 2023-10-09 12:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 174 bytes --]
New review comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/46524#discussion_r1350215904
Comment:
No need for this anymore.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR REVIEW] audacity: update to 3.3.3.
2023-10-09 10:38 [PR PATCH] audacity: update to 3.3.3 ii8
` (2 preceding siblings ...)
2023-10-09 12:05 ` [PR REVIEW] " ahesford
@ 2023-10-09 12:05 ` ahesford
2023-10-09 12:05 ` ahesford
` (15 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: ahesford @ 2023-10-09 12:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 246 bytes --]
New review comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/46524#discussion_r1350211034
Comment:
Use `$XBPS_WRAPPERDIR`; it already exists, it's already in the path, and that's its very purpose.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR REVIEW] audacity: update to 3.3.3.
2023-10-09 10:38 [PR PATCH] audacity: update to 3.3.3 ii8
2023-10-09 10:56 ` [PR PATCH] [Updated] " ii8
2023-10-09 11:00 ` ii8
@ 2023-10-09 12:05 ` ahesford
2023-10-09 12:05 ` ahesford
` (16 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: ahesford @ 2023-10-09 12:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 170 bytes --]
New review comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/46524#discussion_r1350205851
Comment:
Why was this removed?
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR REVIEW] audacity: update to 3.3.3.
2023-10-09 10:38 [PR PATCH] audacity: update to 3.3.3 ii8
` (5 preceding siblings ...)
2023-10-09 12:05 ` ahesford
@ 2023-10-09 12:05 ` ahesford
2023-10-09 12:05 ` ahesford
` (12 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: ahesford @ 2023-10-09 12:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 407 bytes --]
New review comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/46524#discussion_r1350215367
Comment:
This should be an indented HEREDOC for legibility.
```suggestion
cat > "${XBPS_WRAPPERDIR}/image-compiler" <<-EOF
#!/bin/sh
/usr/bin/qemu-${XBPS_TARGET_QEMU_MACHINE}-static "${wrksrc}/${build_wrksrc}/Release/bin/image-compiler" "\$@"
EOF
```
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR REVIEW] audacity: update to 3.3.3.
2023-10-09 10:38 [PR PATCH] audacity: update to 3.3.3 ii8
` (7 preceding siblings ...)
2023-10-09 12:05 ` ahesford
@ 2023-10-09 12:05 ` ahesford
2023-10-09 14:08 ` [PR PATCH] [Updated] " ii8
` (10 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: ahesford @ 2023-10-09 12:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 267 bytes --]
New review comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/46524#discussion_r1350217007
Comment:
Use full numeric permissions for predictability.
```suggestion
chmod 0755 "${XBPS_WRAPPERDIR}/image-compiler"
```
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] audacity: update to 3.3.3.
2023-10-09 10:38 [PR PATCH] audacity: update to 3.3.3 ii8
` (8 preceding siblings ...)
2023-10-09 12:05 ` ahesford
@ 2023-10-09 14:08 ` ii8
2023-10-09 14:25 ` ii8
` (9 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: ii8 @ 2023-10-09 14:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 565 bytes --]
There is an updated pull request by ii8 against master on the void-packages repository
https://github.com/ii8/void-packages audacity
https://github.com/void-linux/void-packages/pull/46524
audacity: update to 3.3.3.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
- I built this PR locally for these architectures:
- armv6l-musl
- i686
- armv7l
A patch file from https://github.com/void-linux/void-packages/pull/46524.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-audacity-46524.patch --]
[-- Type: text/x-diff, Size: 35454 bytes --]
From 615d2087ca2c552c4cbc6af4c5f72fe6fab92d91 Mon Sep 17 00:00:00 2001
From: murray <murray.calavera@protonmail.com>
Date: Mon, 9 Oct 2023 11:35:24 +0100
Subject: [PATCH] audacity: update to 3.3.3.
---
srcpkgs/audacity/patches/configure.patch | 756 ------------------
srcpkgs/audacity/patches/wx-3.2.patch | 26 -
.../patches/wx-widget-has-basque.patch | 22 -
srcpkgs/audacity/patches/wxbitmap.patch | 31 -
srcpkgs/audacity/template | 55 +-
5 files changed, 29 insertions(+), 861 deletions(-)
delete mode 100644 srcpkgs/audacity/patches/configure.patch
delete mode 100644 srcpkgs/audacity/patches/wx-3.2.patch
delete mode 100644 srcpkgs/audacity/patches/wx-widget-has-basque.patch
delete mode 100644 srcpkgs/audacity/patches/wxbitmap.patch
diff --git a/srcpkgs/audacity/patches/configure.patch b/srcpkgs/audacity/patches/configure.patch
deleted file mode 100644
index 50a29a26f888a..0000000000000
--- 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.
-
---- a/configure 2017-10-26 19:44:39.000000000 +0200
-+++ b/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/patches/wx-3.2.patch b/srcpkgs/audacity/patches/wx-3.2.patch
deleted file mode 100644
index d42ae09f30f6e..0000000000000
--- a/srcpkgs/audacity/patches/wx-3.2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: audacity-Audacity-2.4.1/configure
-===================================================================
---- audacity-Audacity-2.4.1.orig/configure
-+++ audacity-Audacity-2.4.1/configure
-@@ -19918,7 +19918,7 @@ wx_version=`${WX_CONFIG} $wxconfigargs -
- $as_echo "$as_me: Checking that the chosen version of wxWidgets is 3.1.x (or 3.0.x)" >&6;}
-
- case "${wx_version}" in
-- 3.1.* | 3.0.*)
-+ 3.2.* | 3.1.* | 3.0.*)
- echo "Great, you're using wxWidgets ${wx_version}!"
- ;;
- *)
-Index: audacity-Audacity-2.4.1/lib-src/lib-widget-extra/configure
-===================================================================
---- audacity-Audacity-2.4.1.orig/lib-src/lib-widget-extra/configure
-+++ audacity-Audacity-2.4.1/lib-src/lib-widget-extra/configure
-@@ -16633,7 +16633,7 @@ wx_version=`${WX_CONFIG} $wxconfigargs -
- $as_echo "$as_me: Checking that the chosen version of wxWidgets is 3.1.x (or 3.0.x)" >&6;}
-
- case "${wx_version}" in
-- 3.1.* | 3.0.*)
-+ 3.2.* | 3.1.* | 3.0.*)
- echo "Great, you're using wxWidgets ${wx_version}!"
- ;;
- *)
diff --git a/srcpkgs/audacity/patches/wx-widget-has-basque.patch b/srcpkgs/audacity/patches/wx-widget-has-basque.patch
deleted file mode 100644
index 4dd24e79ec8e2..0000000000000
--- a/srcpkgs/audacity/patches/wx-widget-has-basque.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: audacity-Audacity-2.4.1/src/AudacityApp.cpp
-===================================================================
---- audacity-Audacity-2.4.1.orig/src/AudacityApp.cpp
-+++ audacity-Audacity-2.4.1/src/AudacityApp.cpp
-@@ -1102,7 +1102,7 @@ locations of the missing files.").Format
- #define WL(lang,sublang)
- #endif
-
--#if wxCHECK_VERSION(3, 0, 1)
-+#if 0
- wxLanguageInfo userLangs[] =
- {
- // Bosnian is defined in wxWidgets already
-@@ -1366,7 +1366,7 @@ bool AudacityApp::OnInit()
- //
- // TODO: The whole Language initialization really need to be reworked.
- // It's all over the place.
--#if wxCHECK_VERSION(3, 0, 1)
-+#if 0
- for (size_t i = 0, cnt = WXSIZEOF(userLangs); i < cnt; i++)
- {
- wxLocale::AddLanguage(userLangs[i]);
diff --git a/srcpkgs/audacity/patches/wxbitmap.patch b/srcpkgs/audacity/patches/wxbitmap.patch
deleted file mode 100644
index af18bd1cb6524..0000000000000
--- a/srcpkgs/audacity/patches/wxbitmap.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 55383fccd0c281b4f189d9b07699b21bb802c736 Mon Sep 17 00:00:00 2001
-From: Ian McInerney <ian.s.mcinerney@ieee.org>
-Date: Fri, 8 Apr 2022 01:27:52 +0100
-Subject: [PATCH] Call the proper wxBitmap constructor for XPM data
-
-wxBitmap back to at least 3.0.0 did not have a constructor for an XPM
-image that took a size parameter, it would only take the XPM data
-itself.
-
-I don't know how this compiled until now, but it doesn't anymore when
-the size is included and built against wx 3.1.6 in Fedora.
----
- src/MixerBoard.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
- Technically this patch is under GPLv3+ because it was contributed after
- re licensing
-
-diff --git a/src/MixerBoard.cpp b/src/MixerBoard.cpp
-index 54b5f146cc7..7fe81615474 100644
---- a/src/MixerBoard.cpp
-+++ b/src/MixerBoard.cpp
-@@ -1307,7 +1307,7 @@ void MixerBoard::LoadMusicalInstruments()
- wxMemoryDC dc;
-
- for (const auto &data : table) {
-- auto bmp = std::make_unique<wxBitmap>(data.bitmap,24);
-+ auto bmp = std::make_unique<wxBitmap>(data.bitmap);
- dc.SelectObject(*bmp);
- AColor::Bevel(dc, false, bev);
- mMusicalInstruments.push_back(std::make_unique<MusicalInstrument>(
diff --git a/srcpkgs/audacity/template b/srcpkgs/audacity/template
index e79971d69d016..963e2279c426a 100644
--- a/srcpkgs/audacity/template
+++ b/srcpkgs/audacity/template
@@ -1,39 +1,42 @@
# Template file for 'audacity'
pkgname=audacity
-version=2.4.1
-revision=3
-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 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
- ffmpeg-devel twolame-devel serd-devel lv2 lilv-devel suil-devel"
+version=3.3.3
+revision=1
+build_style=cmake
+build_helper="cmake-wxWidgets-gtk3 qemu"
+configure_args="-Daudacity_use_ffmpeg=loaded -Daudacity_lib_preference=system
+ -Daudacity_obey_system_dependencies=On -Daudacity_conan_enabled=Off
+ -Daudacity_use_portsmf=local -Daudacity_use_sbsms=local
+ -Daudacity_has_vst3=no"
+hostmakedepends="pkg-config gettext"
+makedepends="wxWidgets-gtk3-devel gtk+3-devel expat-devel lame-devel
+ libsoxr-devel portaudio-devel sqlite-devel libcurl-devel ffmpeg-devel
+ libid3tag-devel libmad-devel vamp-plugin-sdk-devel libogg-devel
+ libvorbis-devel libflac-devel lilv-devel lv2 serd-devel sord-devel
+ sratom-devel suil-devel portmidi-devel soundtouch-devel twolame-devel
+ zlib-devel libuuid-devel jack-devel wavpack-devel libsndfile-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Graphical cross-platform audio editor"
maintainer="Orphaned <orphan@voidlinux.org>"
-# Patches are GPL3+, so bump the license for the whole package
-license="GPL-3.0-or-later"
+license="GPL-2.0-or-later, GPL-3.0-or-later, CC-BY-3.0"
homepage="https://www.audacityteam.org"
-distfiles="https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz"
-checksum=50240f07471373a7e5c2df65cc26eeeaaced9a0850ad1f95cb795f171ea3009f
+distfiles="https://github.com/audacity/audacity/releases/download/Audacity-${version}/audacity-sources-${version}.tar.gz"
+checksum=3d9ff1fc6a0ecd6591f19445c77c80774d364b268da652760829cf3598e08071
-case "$XBPS_TARGET_MACHINE" in
- i686*|x86_64*) ;;
- *) configure_args+=" --disable-sse" ;;
-esac
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
- LDFLAGS="-latomic"
+if [ "$XBPS_TARGET_LIBC" = glibc ] && [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
+ CXXFLAGS="-D_FILE_OFFSET_BITS=64"
fi
-CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+pre_build() {
+ if [ "$CROSS_BUILD" ]; then
+ mkdir -p ${wrksrc}/${build_wrksrc}/scripts
+ echo "#!/bin/sh" > ${wrksrc}/${build_wrksrc}/scripts/image-compiler
+ echo "/usr/bin/qemu-${XBPS_TARGET_QEMU_MACHINE}-static ${wrksrc}/${build_wrksrc}/Release/bin/image-compiler \$@" >> ${wrksrc}/${build_wrksrc}/scripts/image-compiler
+ chmod +x ${wrksrc}/${build_wrksrc}/scripts/image-compiler
+ export PATH="${wrksrc}/${build_wrksrc}/scripts/:$PATH"
+ fi
+}
post_install() {
- vcopy nyquist /usr/share/audacity
- vcopy plug-ins /usr/share/audacity
-
rm ${DESTDIR}/usr/share/doc/audacity/LICENSE.txt
- vlicense LICENSE.txt LICENSE
}
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] audacity: update to 3.3.3.
2023-10-09 10:38 [PR PATCH] audacity: update to 3.3.3 ii8
` (9 preceding siblings ...)
2023-10-09 14:08 ` [PR PATCH] [Updated] " ii8
@ 2023-10-09 14:25 ` ii8
2023-10-09 14:35 ` [PR REVIEW] " ii8
` (8 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: ii8 @ 2023-10-09 14:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 565 bytes --]
There is an updated pull request by ii8 against master on the void-packages repository
https://github.com/ii8/void-packages audacity
https://github.com/void-linux/void-packages/pull/46524
audacity: update to 3.3.3.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
- I built this PR locally for these architectures:
- armv6l-musl
- i686
- armv7l
A patch file from https://github.com/void-linux/void-packages/pull/46524.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-audacity-46524.patch --]
[-- Type: text/x-diff, Size: 35287 bytes --]
From 1ec126225ecc8e083c2228efcd649253f70f9988 Mon Sep 17 00:00:00 2001
From: murray <murray.calavera@protonmail.com>
Date: Mon, 9 Oct 2023 11:35:24 +0100
Subject: [PATCH] audacity: update to 3.3.3.
---
srcpkgs/audacity/patches/configure.patch | 756 ------------------
srcpkgs/audacity/patches/wx-3.2.patch | 26 -
.../patches/wx-widget-has-basque.patch | 22 -
srcpkgs/audacity/patches/wxbitmap.patch | 31 -
srcpkgs/audacity/template | 55 +-
5 files changed, 29 insertions(+), 861 deletions(-)
delete mode 100644 srcpkgs/audacity/patches/configure.patch
delete mode 100644 srcpkgs/audacity/patches/wx-3.2.patch
delete mode 100644 srcpkgs/audacity/patches/wx-widget-has-basque.patch
delete mode 100644 srcpkgs/audacity/patches/wxbitmap.patch
diff --git a/srcpkgs/audacity/patches/configure.patch b/srcpkgs/audacity/patches/configure.patch
deleted file mode 100644
index 50a29a26f888a..0000000000000
--- 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.
-
---- a/configure 2017-10-26 19:44:39.000000000 +0200
-+++ b/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/patches/wx-3.2.patch b/srcpkgs/audacity/patches/wx-3.2.patch
deleted file mode 100644
index d42ae09f30f6e..0000000000000
--- a/srcpkgs/audacity/patches/wx-3.2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: audacity-Audacity-2.4.1/configure
-===================================================================
---- audacity-Audacity-2.4.1.orig/configure
-+++ audacity-Audacity-2.4.1/configure
-@@ -19918,7 +19918,7 @@ wx_version=`${WX_CONFIG} $wxconfigargs -
- $as_echo "$as_me: Checking that the chosen version of wxWidgets is 3.1.x (or 3.0.x)" >&6;}
-
- case "${wx_version}" in
-- 3.1.* | 3.0.*)
-+ 3.2.* | 3.1.* | 3.0.*)
- echo "Great, you're using wxWidgets ${wx_version}!"
- ;;
- *)
-Index: audacity-Audacity-2.4.1/lib-src/lib-widget-extra/configure
-===================================================================
---- audacity-Audacity-2.4.1.orig/lib-src/lib-widget-extra/configure
-+++ audacity-Audacity-2.4.1/lib-src/lib-widget-extra/configure
-@@ -16633,7 +16633,7 @@ wx_version=`${WX_CONFIG} $wxconfigargs -
- $as_echo "$as_me: Checking that the chosen version of wxWidgets is 3.1.x (or 3.0.x)" >&6;}
-
- case "${wx_version}" in
-- 3.1.* | 3.0.*)
-+ 3.2.* | 3.1.* | 3.0.*)
- echo "Great, you're using wxWidgets ${wx_version}!"
- ;;
- *)
diff --git a/srcpkgs/audacity/patches/wx-widget-has-basque.patch b/srcpkgs/audacity/patches/wx-widget-has-basque.patch
deleted file mode 100644
index 4dd24e79ec8e2..0000000000000
--- a/srcpkgs/audacity/patches/wx-widget-has-basque.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: audacity-Audacity-2.4.1/src/AudacityApp.cpp
-===================================================================
---- audacity-Audacity-2.4.1.orig/src/AudacityApp.cpp
-+++ audacity-Audacity-2.4.1/src/AudacityApp.cpp
-@@ -1102,7 +1102,7 @@ locations of the missing files.").Format
- #define WL(lang,sublang)
- #endif
-
--#if wxCHECK_VERSION(3, 0, 1)
-+#if 0
- wxLanguageInfo userLangs[] =
- {
- // Bosnian is defined in wxWidgets already
-@@ -1366,7 +1366,7 @@ bool AudacityApp::OnInit()
- //
- // TODO: The whole Language initialization really need to be reworked.
- // It's all over the place.
--#if wxCHECK_VERSION(3, 0, 1)
-+#if 0
- for (size_t i = 0, cnt = WXSIZEOF(userLangs); i < cnt; i++)
- {
- wxLocale::AddLanguage(userLangs[i]);
diff --git a/srcpkgs/audacity/patches/wxbitmap.patch b/srcpkgs/audacity/patches/wxbitmap.patch
deleted file mode 100644
index af18bd1cb6524..0000000000000
--- a/srcpkgs/audacity/patches/wxbitmap.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 55383fccd0c281b4f189d9b07699b21bb802c736 Mon Sep 17 00:00:00 2001
-From: Ian McInerney <ian.s.mcinerney@ieee.org>
-Date: Fri, 8 Apr 2022 01:27:52 +0100
-Subject: [PATCH] Call the proper wxBitmap constructor for XPM data
-
-wxBitmap back to at least 3.0.0 did not have a constructor for an XPM
-image that took a size parameter, it would only take the XPM data
-itself.
-
-I don't know how this compiled until now, but it doesn't anymore when
-the size is included and built against wx 3.1.6 in Fedora.
----
- src/MixerBoard.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
- Technically this patch is under GPLv3+ because it was contributed after
- re licensing
-
-diff --git a/src/MixerBoard.cpp b/src/MixerBoard.cpp
-index 54b5f146cc7..7fe81615474 100644
---- a/src/MixerBoard.cpp
-+++ b/src/MixerBoard.cpp
-@@ -1307,7 +1307,7 @@ void MixerBoard::LoadMusicalInstruments()
- wxMemoryDC dc;
-
- for (const auto &data : table) {
-- auto bmp = std::make_unique<wxBitmap>(data.bitmap,24);
-+ auto bmp = std::make_unique<wxBitmap>(data.bitmap);
- dc.SelectObject(*bmp);
- AColor::Bevel(dc, false, bev);
- mMusicalInstruments.push_back(std::make_unique<MusicalInstrument>(
diff --git a/srcpkgs/audacity/template b/srcpkgs/audacity/template
index e79971d69d016..d96c9766b4209 100644
--- a/srcpkgs/audacity/template
+++ b/srcpkgs/audacity/template
@@ -1,39 +1,42 @@
# Template file for 'audacity'
pkgname=audacity
-version=2.4.1
-revision=3
-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 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
- ffmpeg-devel twolame-devel serd-devel lv2 lilv-devel suil-devel"
+version=3.3.3
+revision=1
+build_style=cmake
+build_helper="cmake-wxWidgets-gtk3 qemu"
+configure_args="-Daudacity_use_ffmpeg=loaded -Daudacity_lib_preference=system
+ -Daudacity_obey_system_dependencies=ON -Daudacity_conan_enabled=OFF
+ -Daudacity_use_portsmf=local -Daudacity_use_sbsms=local
+ -Daudacity_has_vst3=no"
+hostmakedepends="pkg-config gettext"
+makedepends="wxWidgets-gtk3-devel gtk+3-devel expat-devel lame-devel
+ libsoxr-devel portaudio-devel sqlite-devel libcurl-devel ffmpeg-devel
+ libid3tag-devel libmad-devel vamp-plugin-sdk-devel libogg-devel
+ libvorbis-devel libflac-devel lilv-devel lv2 serd-devel sord-devel
+ sratom-devel suil-devel portmidi-devel soundtouch-devel twolame-devel
+ zlib-devel libuuid-devel jack-devel wavpack-devel libsndfile-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Graphical cross-platform audio editor"
maintainer="Orphaned <orphan@voidlinux.org>"
-# Patches are GPL3+, so bump the license for the whole package
-license="GPL-3.0-or-later"
+license="GPL-2.0-or-later, GPL-3.0-or-later, CC-BY-3.0"
homepage="https://www.audacityteam.org"
-distfiles="https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz"
-checksum=50240f07471373a7e5c2df65cc26eeeaaced9a0850ad1f95cb795f171ea3009f
+distfiles="https://github.com/audacity/audacity/releases/download/Audacity-${version}/audacity-sources-${version}.tar.gz"
+checksum=3d9ff1fc6a0ecd6591f19445c77c80774d364b268da652760829cf3598e08071
-case "$XBPS_TARGET_MACHINE" in
- i686*|x86_64*) ;;
- *) configure_args+=" --disable-sse" ;;
-esac
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
- LDFLAGS="-latomic"
+if [ "$XBPS_TARGET_LIBC" = glibc ] && [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
+ CXXFLAGS="-D_FILE_OFFSET_BITS=64"
fi
-CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+pre_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ cat > "${XBPS_WRAPPERDIR}/image-compiler" <<-EOF
+ #!/bin/sh
+ /usr/bin/qemu-${XBPS_TARGET_QEMU_MACHINE}-static ${wrksrc}/${build_wrksrc}/Release/bin/image-compiler "\$@"
+ EOF
+ chmod 0755 "${XBPS_WRAPPERDIR}/image-compiler"
+ fi
+}
post_install() {
- vcopy nyquist /usr/share/audacity
- vcopy plug-ins /usr/share/audacity
-
rm ${DESTDIR}/usr/share/doc/audacity/LICENSE.txt
- vlicense LICENSE.txt LICENSE
}
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR REVIEW] audacity: update to 3.3.3.
2023-10-09 10:38 [PR PATCH] audacity: update to 3.3.3 ii8
` (10 preceding siblings ...)
2023-10-09 14:25 ` ii8
@ 2023-10-09 14:35 ` ii8
2023-10-09 15:12 ` ii8
` (7 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: ii8 @ 2023-10-09 14:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 264 bytes --]
New review comment by ii8 on void-packages repository
https://github.com/void-linux/void-packages/pull/46524#discussion_r1350393479
Comment:
`_LARGEFILE_SOURCE` is redundant. I've added `_FILE_OFFSET_BITS=64` again only for those targets where it has an effect.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: audacity: update to 3.3.3.
2023-10-09 10:38 [PR PATCH] audacity: update to 3.3.3 ii8
` (11 preceding siblings ...)
2023-10-09 14:35 ` [PR REVIEW] " ii8
@ 2023-10-09 15:12 ` ii8
2023-10-09 15:25 ` [PR PATCH] [Updated] " ii8
` (6 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: ii8 @ 2023-10-09 15:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 579 bytes --]
New comment by ii8 on void-packages repository
https://github.com/void-linux/void-packages/pull/46524#issuecomment-1753197847
Comment:
The i686 build is failing, it uses ninja which depends on python and the python tests are failing.
Should I just use make instead of ninja:
```sh
if [ "$XBPS_TARGET_MACHINE" = i686 ]; then
export CMAKE_GENERATOR="Unix Makefiles"
make_cmd=make
fi
```
or is there a better way to fix that?
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] audacity: update to 3.3.3.
2023-10-09 10:38 [PR PATCH] audacity: update to 3.3.3 ii8
` (12 preceding siblings ...)
2023-10-09 15:12 ` ii8
@ 2023-10-09 15:25 ` ii8
2023-10-09 15:26 ` ii8
` (5 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: ii8 @ 2023-10-09 15:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 565 bytes --]
There is an updated pull request by ii8 against master on the void-packages repository
https://github.com/ii8/void-packages audacity
https://github.com/void-linux/void-packages/pull/46524
audacity: update to 3.3.3.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
- I built this PR locally for these architectures:
- armv6l-musl
- i686
- armv7l
A patch file from https://github.com/void-linux/void-packages/pull/46524.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-audacity-46524.patch --]
[-- Type: text/x-diff, Size: 35295 bytes --]
From 9d6c2f52c3759cf3db50ae4fdf3b44edd53f3cec Mon Sep 17 00:00:00 2001
From: murray <murray.calavera@protonmail.com>
Date: Mon, 9 Oct 2023 11:35:24 +0100
Subject: [PATCH] audacity: update to 3.3.3.
---
srcpkgs/audacity/patches/configure.patch | 756 ------------------
srcpkgs/audacity/patches/wx-3.2.patch | 26 -
.../patches/wx-widget-has-basque.patch | 22 -
srcpkgs/audacity/patches/wxbitmap.patch | 31 -
srcpkgs/audacity/template | 55 +-
5 files changed, 29 insertions(+), 861 deletions(-)
delete mode 100644 srcpkgs/audacity/patches/configure.patch
delete mode 100644 srcpkgs/audacity/patches/wx-3.2.patch
delete mode 100644 srcpkgs/audacity/patches/wx-widget-has-basque.patch
delete mode 100644 srcpkgs/audacity/patches/wxbitmap.patch
diff --git a/srcpkgs/audacity/patches/configure.patch b/srcpkgs/audacity/patches/configure.patch
deleted file mode 100644
index 50a29a26f888a..0000000000000
--- 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.
-
---- a/configure 2017-10-26 19:44:39.000000000 +0200
-+++ b/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/patches/wx-3.2.patch b/srcpkgs/audacity/patches/wx-3.2.patch
deleted file mode 100644
index d42ae09f30f6e..0000000000000
--- a/srcpkgs/audacity/patches/wx-3.2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: audacity-Audacity-2.4.1/configure
-===================================================================
---- audacity-Audacity-2.4.1.orig/configure
-+++ audacity-Audacity-2.4.1/configure
-@@ -19918,7 +19918,7 @@ wx_version=`${WX_CONFIG} $wxconfigargs -
- $as_echo "$as_me: Checking that the chosen version of wxWidgets is 3.1.x (or 3.0.x)" >&6;}
-
- case "${wx_version}" in
-- 3.1.* | 3.0.*)
-+ 3.2.* | 3.1.* | 3.0.*)
- echo "Great, you're using wxWidgets ${wx_version}!"
- ;;
- *)
-Index: audacity-Audacity-2.4.1/lib-src/lib-widget-extra/configure
-===================================================================
---- audacity-Audacity-2.4.1.orig/lib-src/lib-widget-extra/configure
-+++ audacity-Audacity-2.4.1/lib-src/lib-widget-extra/configure
-@@ -16633,7 +16633,7 @@ wx_version=`${WX_CONFIG} $wxconfigargs -
- $as_echo "$as_me: Checking that the chosen version of wxWidgets is 3.1.x (or 3.0.x)" >&6;}
-
- case "${wx_version}" in
-- 3.1.* | 3.0.*)
-+ 3.2.* | 3.1.* | 3.0.*)
- echo "Great, you're using wxWidgets ${wx_version}!"
- ;;
- *)
diff --git a/srcpkgs/audacity/patches/wx-widget-has-basque.patch b/srcpkgs/audacity/patches/wx-widget-has-basque.patch
deleted file mode 100644
index 4dd24e79ec8e2..0000000000000
--- a/srcpkgs/audacity/patches/wx-widget-has-basque.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: audacity-Audacity-2.4.1/src/AudacityApp.cpp
-===================================================================
---- audacity-Audacity-2.4.1.orig/src/AudacityApp.cpp
-+++ audacity-Audacity-2.4.1/src/AudacityApp.cpp
-@@ -1102,7 +1102,7 @@ locations of the missing files.").Format
- #define WL(lang,sublang)
- #endif
-
--#if wxCHECK_VERSION(3, 0, 1)
-+#if 0
- wxLanguageInfo userLangs[] =
- {
- // Bosnian is defined in wxWidgets already
-@@ -1366,7 +1366,7 @@ bool AudacityApp::OnInit()
- //
- // TODO: The whole Language initialization really need to be reworked.
- // It's all over the place.
--#if wxCHECK_VERSION(3, 0, 1)
-+#if 0
- for (size_t i = 0, cnt = WXSIZEOF(userLangs); i < cnt; i++)
- {
- wxLocale::AddLanguage(userLangs[i]);
diff --git a/srcpkgs/audacity/patches/wxbitmap.patch b/srcpkgs/audacity/patches/wxbitmap.patch
deleted file mode 100644
index af18bd1cb6524..0000000000000
--- a/srcpkgs/audacity/patches/wxbitmap.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 55383fccd0c281b4f189d9b07699b21bb802c736 Mon Sep 17 00:00:00 2001
-From: Ian McInerney <ian.s.mcinerney@ieee.org>
-Date: Fri, 8 Apr 2022 01:27:52 +0100
-Subject: [PATCH] Call the proper wxBitmap constructor for XPM data
-
-wxBitmap back to at least 3.0.0 did not have a constructor for an XPM
-image that took a size parameter, it would only take the XPM data
-itself.
-
-I don't know how this compiled until now, but it doesn't anymore when
-the size is included and built against wx 3.1.6 in Fedora.
----
- src/MixerBoard.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
- Technically this patch is under GPLv3+ because it was contributed after
- re licensing
-
-diff --git a/src/MixerBoard.cpp b/src/MixerBoard.cpp
-index 54b5f146cc7..7fe81615474 100644
---- a/src/MixerBoard.cpp
-+++ b/src/MixerBoard.cpp
-@@ -1307,7 +1307,7 @@ void MixerBoard::LoadMusicalInstruments()
- wxMemoryDC dc;
-
- for (const auto &data : table) {
-- auto bmp = std::make_unique<wxBitmap>(data.bitmap,24);
-+ auto bmp = std::make_unique<wxBitmap>(data.bitmap);
- dc.SelectObject(*bmp);
- AColor::Bevel(dc, false, bev);
- mMusicalInstruments.push_back(std::make_unique<MusicalInstrument>(
diff --git a/srcpkgs/audacity/template b/srcpkgs/audacity/template
index e79971d69d016..a3368bd5c5358 100644
--- a/srcpkgs/audacity/template
+++ b/srcpkgs/audacity/template
@@ -1,39 +1,42 @@
# Template file for 'audacity'
pkgname=audacity
-version=2.4.1
-revision=3
-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 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
- ffmpeg-devel twolame-devel serd-devel lv2 lilv-devel suil-devel"
+version=3.3.3
+revision=1
+build_style=cmake
+build_helper="cmake-wxWidgets-gtk3 qemu"
+configure_args="-Daudacity_use_ffmpeg=loaded -Daudacity_lib_preference=system
+ -Daudacity_obey_system_dependencies=ON -Daudacity_conan_enabled=OFF
+ -Daudacity_use_portsmf=local -Daudacity_use_sbsms=local
+ -Daudacity_has_vst3=no"
+hostmakedepends="pkg-config gettext python3"
+makedepends="wxWidgets-gtk3-devel gtk+3-devel expat-devel lame-devel
+ libsoxr-devel portaudio-devel sqlite-devel libcurl-devel ffmpeg-devel
+ libid3tag-devel libmad-devel vamp-plugin-sdk-devel libogg-devel
+ libvorbis-devel libflac-devel lilv-devel lv2 serd-devel sord-devel
+ sratom-devel suil-devel portmidi-devel soundtouch-devel twolame-devel
+ zlib-devel libuuid-devel jack-devel wavpack-devel libsndfile-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Graphical cross-platform audio editor"
maintainer="Orphaned <orphan@voidlinux.org>"
-# Patches are GPL3+, so bump the license for the whole package
-license="GPL-3.0-or-later"
+license="GPL-2.0-or-later, GPL-3.0-or-later, CC-BY-3.0"
homepage="https://www.audacityteam.org"
-distfiles="https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz"
-checksum=50240f07471373a7e5c2df65cc26eeeaaced9a0850ad1f95cb795f171ea3009f
+distfiles="https://github.com/audacity/audacity/releases/download/Audacity-${version}/audacity-sources-${version}.tar.gz"
+checksum=3d9ff1fc6a0ecd6591f19445c77c80774d364b268da652760829cf3598e08071
-case "$XBPS_TARGET_MACHINE" in
- i686*|x86_64*) ;;
- *) configure_args+=" --disable-sse" ;;
-esac
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
- LDFLAGS="-latomic"
+if [ "$XBPS_TARGET_LIBC" = glibc ] && [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
+ CXXFLAGS="-D_FILE_OFFSET_BITS=64"
fi
-CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+pre_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ cat > "${XBPS_WRAPPERDIR}/image-compiler" <<-EOF
+ #!/bin/sh
+ /usr/bin/qemu-${XBPS_TARGET_QEMU_MACHINE}-static ${wrksrc}/${build_wrksrc}/Release/bin/image-compiler "\$@"
+ EOF
+ chmod 0755 "${XBPS_WRAPPERDIR}/image-compiler"
+ fi
+}
post_install() {
- vcopy nyquist /usr/share/audacity
- vcopy plug-ins /usr/share/audacity
-
rm ${DESTDIR}/usr/share/doc/audacity/LICENSE.txt
- vlicense LICENSE.txt LICENSE
}
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: audacity: update to 3.3.3.
2023-10-09 10:38 [PR PATCH] audacity: update to 3.3.3 ii8
` (13 preceding siblings ...)
2023-10-09 15:25 ` [PR PATCH] [Updated] " ii8
@ 2023-10-09 15:26 ` ii8
2023-10-09 15:44 ` ahesford
` (4 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: ii8 @ 2023-10-09 15:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 656 bytes --]
New comment by ii8 on void-packages repository
https://github.com/void-linux/void-packages/pull/46524#issuecomment-1753197847
Comment:
The i686 build is failing, it uses ninja which depends on python and the python tests are failing.
Should I just use make instead of ninja:
```sh
if [ "$XBPS_TARGET_MACHINE" = i686 ]; then
export CMAKE_GENERATOR="Unix Makefiles"
make_cmd=make
fi
```
or is there a better way to fix that?
edit: never mind I need python anyway to make the manual, that won't help
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: audacity: update to 3.3.3.
2023-10-09 10:38 [PR PATCH] audacity: update to 3.3.3 ii8
` (14 preceding siblings ...)
2023-10-09 15:26 ` ii8
@ 2023-10-09 15:44 ` ahesford
2023-10-11 12:13 ` [PR REVIEW] " ahesford
` (3 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: ahesford @ 2023-10-09 15:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 273 bytes --]
New comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/46524#issuecomment-1753253311
Comment:
Your test is failing because we are in the middle of a massive Python update; the problem is ephemeral and not related to this PR.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR REVIEW] audacity: update to 3.3.3.
2023-10-09 10:38 [PR PATCH] audacity: update to 3.3.3 ii8
` (15 preceding siblings ...)
2023-10-09 15:44 ` ahesford
@ 2023-10-11 12:13 ` ahesford
2023-10-11 14:04 ` [PR PATCH] [Updated] " ii8
` (2 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: ahesford @ 2023-10-11 12:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 277 bytes --]
New review comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/46524#discussion_r1354869910
Comment:
There's no need for the guard; we have several templates that add these flags, and we always just add them to CXXFLAGS globally.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] audacity: update to 3.3.3.
2023-10-09 10:38 [PR PATCH] audacity: update to 3.3.3 ii8
` (16 preceding siblings ...)
2023-10-11 12:13 ` [PR REVIEW] " ahesford
@ 2023-10-11 14:04 ` ii8
2023-10-13 1:44 ` ii8
2023-10-13 3:31 ` [PR PATCH] [Merged]: " ahesford
19 siblings, 0 replies; 21+ messages in thread
From: ii8 @ 2023-10-11 14:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 565 bytes --]
There is an updated pull request by ii8 against master on the void-packages repository
https://github.com/ii8/void-packages audacity
https://github.com/void-linux/void-packages/pull/46524
audacity: update to 3.3.3.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
- I built this PR locally for these architectures:
- armv6l-musl
- i686
- armv7l
A patch file from https://github.com/void-linux/void-packages/pull/46524.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-audacity-46524.patch --]
[-- Type: text/x-diff, Size: 35216 bytes --]
From cb0ce238397cfebc02c9d2807ce70f412391025a Mon Sep 17 00:00:00 2001
From: murray <murray.calavera@protonmail.com>
Date: Mon, 9 Oct 2023 11:35:24 +0100
Subject: [PATCH] audacity: update to 3.3.3.
---
srcpkgs/audacity/patches/configure.patch | 756 ------------------
srcpkgs/audacity/patches/wx-3.2.patch | 26 -
.../patches/wx-widget-has-basque.patch | 22 -
srcpkgs/audacity/patches/wxbitmap.patch | 31 -
srcpkgs/audacity/template | 55 +-
5 files changed, 28 insertions(+), 862 deletions(-)
delete mode 100644 srcpkgs/audacity/patches/configure.patch
delete mode 100644 srcpkgs/audacity/patches/wx-3.2.patch
delete mode 100644 srcpkgs/audacity/patches/wx-widget-has-basque.patch
delete mode 100644 srcpkgs/audacity/patches/wxbitmap.patch
diff --git a/srcpkgs/audacity/patches/configure.patch b/srcpkgs/audacity/patches/configure.patch
deleted file mode 100644
index 50a29a26f888a..0000000000000
--- 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.
-
---- a/configure 2017-10-26 19:44:39.000000000 +0200
-+++ b/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/patches/wx-3.2.patch b/srcpkgs/audacity/patches/wx-3.2.patch
deleted file mode 100644
index d42ae09f30f6e..0000000000000
--- a/srcpkgs/audacity/patches/wx-3.2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: audacity-Audacity-2.4.1/configure
-===================================================================
---- audacity-Audacity-2.4.1.orig/configure
-+++ audacity-Audacity-2.4.1/configure
-@@ -19918,7 +19918,7 @@ wx_version=`${WX_CONFIG} $wxconfigargs -
- $as_echo "$as_me: Checking that the chosen version of wxWidgets is 3.1.x (or 3.0.x)" >&6;}
-
- case "${wx_version}" in
-- 3.1.* | 3.0.*)
-+ 3.2.* | 3.1.* | 3.0.*)
- echo "Great, you're using wxWidgets ${wx_version}!"
- ;;
- *)
-Index: audacity-Audacity-2.4.1/lib-src/lib-widget-extra/configure
-===================================================================
---- audacity-Audacity-2.4.1.orig/lib-src/lib-widget-extra/configure
-+++ audacity-Audacity-2.4.1/lib-src/lib-widget-extra/configure
-@@ -16633,7 +16633,7 @@ wx_version=`${WX_CONFIG} $wxconfigargs -
- $as_echo "$as_me: Checking that the chosen version of wxWidgets is 3.1.x (or 3.0.x)" >&6;}
-
- case "${wx_version}" in
-- 3.1.* | 3.0.*)
-+ 3.2.* | 3.1.* | 3.0.*)
- echo "Great, you're using wxWidgets ${wx_version}!"
- ;;
- *)
diff --git a/srcpkgs/audacity/patches/wx-widget-has-basque.patch b/srcpkgs/audacity/patches/wx-widget-has-basque.patch
deleted file mode 100644
index 4dd24e79ec8e2..0000000000000
--- a/srcpkgs/audacity/patches/wx-widget-has-basque.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: audacity-Audacity-2.4.1/src/AudacityApp.cpp
-===================================================================
---- audacity-Audacity-2.4.1.orig/src/AudacityApp.cpp
-+++ audacity-Audacity-2.4.1/src/AudacityApp.cpp
-@@ -1102,7 +1102,7 @@ locations of the missing files.").Format
- #define WL(lang,sublang)
- #endif
-
--#if wxCHECK_VERSION(3, 0, 1)
-+#if 0
- wxLanguageInfo userLangs[] =
- {
- // Bosnian is defined in wxWidgets already
-@@ -1366,7 +1366,7 @@ bool AudacityApp::OnInit()
- //
- // TODO: The whole Language initialization really need to be reworked.
- // It's all over the place.
--#if wxCHECK_VERSION(3, 0, 1)
-+#if 0
- for (size_t i = 0, cnt = WXSIZEOF(userLangs); i < cnt; i++)
- {
- wxLocale::AddLanguage(userLangs[i]);
diff --git a/srcpkgs/audacity/patches/wxbitmap.patch b/srcpkgs/audacity/patches/wxbitmap.patch
deleted file mode 100644
index af18bd1cb6524..0000000000000
--- a/srcpkgs/audacity/patches/wxbitmap.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 55383fccd0c281b4f189d9b07699b21bb802c736 Mon Sep 17 00:00:00 2001
-From: Ian McInerney <ian.s.mcinerney@ieee.org>
-Date: Fri, 8 Apr 2022 01:27:52 +0100
-Subject: [PATCH] Call the proper wxBitmap constructor for XPM data
-
-wxBitmap back to at least 3.0.0 did not have a constructor for an XPM
-image that took a size parameter, it would only take the XPM data
-itself.
-
-I don't know how this compiled until now, but it doesn't anymore when
-the size is included and built against wx 3.1.6 in Fedora.
----
- src/MixerBoard.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
- Technically this patch is under GPLv3+ because it was contributed after
- re licensing
-
-diff --git a/src/MixerBoard.cpp b/src/MixerBoard.cpp
-index 54b5f146cc7..7fe81615474 100644
---- a/src/MixerBoard.cpp
-+++ b/src/MixerBoard.cpp
-@@ -1307,7 +1307,7 @@ void MixerBoard::LoadMusicalInstruments()
- wxMemoryDC dc;
-
- for (const auto &data : table) {
-- auto bmp = std::make_unique<wxBitmap>(data.bitmap,24);
-+ auto bmp = std::make_unique<wxBitmap>(data.bitmap);
- dc.SelectObject(*bmp);
- AColor::Bevel(dc, false, bev);
- mMusicalInstruments.push_back(std::make_unique<MusicalInstrument>(
diff --git a/srcpkgs/audacity/template b/srcpkgs/audacity/template
index e79971d69d016..73314e6232bd6 100644
--- a/srcpkgs/audacity/template
+++ b/srcpkgs/audacity/template
@@ -1,39 +1,40 @@
# Template file for 'audacity'
pkgname=audacity
-version=2.4.1
-revision=3
-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 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
- ffmpeg-devel twolame-devel serd-devel lv2 lilv-devel suil-devel"
+version=3.3.3
+revision=1
+build_style=cmake
+build_helper="cmake-wxWidgets-gtk3 qemu"
+configure_args="-Daudacity_use_ffmpeg=loaded -Daudacity_lib_preference=system
+ -Daudacity_obey_system_dependencies=ON -Daudacity_conan_enabled=OFF
+ -Daudacity_use_portsmf=local -Daudacity_use_sbsms=local
+ -Daudacity_has_vst3=no"
+hostmakedepends="pkg-config gettext python3"
+makedepends="wxWidgets-gtk3-devel gtk+3-devel expat-devel lame-devel
+ libsoxr-devel portaudio-devel sqlite-devel libcurl-devel ffmpeg-devel
+ libid3tag-devel libmad-devel vamp-plugin-sdk-devel libogg-devel
+ libvorbis-devel libflac-devel lilv-devel lv2 serd-devel sord-devel
+ sratom-devel suil-devel portmidi-devel soundtouch-devel twolame-devel
+ zlib-devel libuuid-devel jack-devel wavpack-devel libsndfile-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Graphical cross-platform audio editor"
maintainer="Orphaned <orphan@voidlinux.org>"
-# Patches are GPL3+, so bump the license for the whole package
-license="GPL-3.0-or-later"
+license="GPL-2.0-or-later, GPL-3.0-or-later, CC-BY-3.0"
homepage="https://www.audacityteam.org"
-distfiles="https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz"
-checksum=50240f07471373a7e5c2df65cc26eeeaaced9a0850ad1f95cb795f171ea3009f
+distfiles="https://github.com/audacity/audacity/releases/download/Audacity-${version}/audacity-sources-${version}.tar.gz"
+checksum=3d9ff1fc6a0ecd6591f19445c77c80774d364b268da652760829cf3598e08071
-case "$XBPS_TARGET_MACHINE" in
- i686*|x86_64*) ;;
- *) configure_args+=" --disable-sse" ;;
-esac
+CXXFLAGS="-D_FILE_OFFSET_BITS=64"
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
- LDFLAGS="-latomic"
-fi
-
-CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+pre_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ cat > "${XBPS_WRAPPERDIR}/image-compiler" <<-EOF
+ #!/bin/sh
+ /usr/bin/qemu-${XBPS_TARGET_QEMU_MACHINE}-static ${wrksrc}/${build_wrksrc}/Release/bin/image-compiler "\$@"
+ EOF
+ chmod 0755 "${XBPS_WRAPPERDIR}/image-compiler"
+ fi
+}
post_install() {
- vcopy nyquist /usr/share/audacity
- vcopy plug-ins /usr/share/audacity
-
rm ${DESTDIR}/usr/share/doc/audacity/LICENSE.txt
- vlicense LICENSE.txt LICENSE
}
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: audacity: update to 3.3.3.
2023-10-09 10:38 [PR PATCH] audacity: update to 3.3.3 ii8
` (17 preceding siblings ...)
2023-10-11 14:04 ` [PR PATCH] [Updated] " ii8
@ 2023-10-13 1:44 ` ii8
2023-10-13 3:31 ` [PR PATCH] [Merged]: " ahesford
19 siblings, 0 replies; 21+ messages in thread
From: ii8 @ 2023-10-13 1:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 186 bytes --]
New comment by ii8 on void-packages repository
https://github.com/void-linux/void-packages/pull/46524#issuecomment-1760640193
Comment:
Previous attempts for reference: #44662, #40508
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Merged]: audacity: update to 3.3.3.
2023-10-09 10:38 [PR PATCH] audacity: update to 3.3.3 ii8
` (18 preceding siblings ...)
2023-10-13 1:44 ` ii8
@ 2023-10-13 3:31 ` ahesford
19 siblings, 0 replies; 21+ messages in thread
From: ahesford @ 2023-10-13 3:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 416 bytes --]
There's a merged pull request on the void-packages repository
audacity: update to 3.3.3.
https://github.com/void-linux/void-packages/pull/46524
Description:
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
- I built this PR locally for these architectures:
- armv6l-musl
- i686
- armv7l
^ permalink raw reply [flat|nested] 21+ messages in thread
end of thread, other threads:[~2023-10-13 3:31 UTC | newest]
Thread overview: 21+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-09 10:38 [PR PATCH] audacity: update to 3.3.3 ii8
2023-10-09 10:56 ` [PR PATCH] [Updated] " ii8
2023-10-09 11:00 ` ii8
2023-10-09 12:05 ` [PR REVIEW] " ahesford
2023-10-09 12:05 ` ahesford
2023-10-09 12:05 ` ahesford
2023-10-09 12:05 ` ahesford
2023-10-09 12:05 ` ahesford
2023-10-09 12:05 ` ahesford
2023-10-09 12:05 ` ahesford
2023-10-09 14:08 ` [PR PATCH] [Updated] " ii8
2023-10-09 14:25 ` ii8
2023-10-09 14:35 ` [PR REVIEW] " ii8
2023-10-09 15:12 ` ii8
2023-10-09 15:25 ` [PR PATCH] [Updated] " ii8
2023-10-09 15:26 ` ii8
2023-10-09 15:44 ` ahesford
2023-10-11 12:13 ` [PR REVIEW] " ahesford
2023-10-11 14:04 ` [PR PATCH] [Updated] " ii8
2023-10-13 1:44 ` ii8
2023-10-13 3:31 ` [PR PATCH] [Merged]: " ahesford
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).