From edc06307144597b94ead6d2efdf6b1bb6768ca2f Mon Sep 17 00:00:00 2001 From: davidkaroly <92124087+davidkaroly@users.noreply.github.com> Date: Sun, 6 Nov 2022 22:40:47 +0100 Subject: [PATCH] audacity: update to version 2.4.2. Still very experimental. (#7378) --- ...ity-2.3.3.recipe => audacity-2.4.2.recipe} | 17 +- .../audacity/patches/audacity-2.3.3.patchset | 318 ------------------ .../audacity/patches/audacity-2.4.2.patchset | 300 +++++++++++++++++ 3 files changed, 308 insertions(+), 327 deletions(-) rename media-sound/audacity/{audacity-2.3.3.recipe => audacity-2.4.2.recipe} (87%) delete mode 100644 media-sound/audacity/patches/audacity-2.3.3.patchset create mode 100644 media-sound/audacity/patches/audacity-2.4.2.patchset diff --git a/media-sound/audacity/audacity-2.3.3.recipe b/media-sound/audacity/audacity-2.4.2.recipe similarity index 87% rename from media-sound/audacity/audacity-2.3.3.recipe rename to media-sound/audacity/audacity-2.4.2.recipe index 020fe4f58..f1f2d8e80 100644 --- a/media-sound/audacity/audacity-2.3.3.recipe +++ b/media-sound/audacity/audacity-2.4.2.recipe @@ -8,7 +8,7 @@ COPYRIGHT="1999-2020 by Audacity Team" LICENSE="GNU GPL v2" REVISION="1" SOURCE_URI="https://github.com/audacity/audacity/archive/refs/tags/Audacity-$portVersion.tar.gz" -CHECKSUM_SHA256="404e6c49693dedc94212fc5525974058d848536025e19da31359ae02babe8bd7" +CHECKSUM_SHA256="cdb4800c8e9d1d4ca19964caf8d24000f80286ebd8a4db566c2622449744c099" SOURCE_DIR="audacity-Audacity-$portVersion" PATCHES="audacity-$portVersion.patchset" @@ -24,10 +24,11 @@ REQUIRES=" haiku$secondaryArchSuffix wxgtk$secondaryArchSuffix lib:libatk_1.0$secondaryArchSuffix - lib:libcairo$secondaryArchSuffix + lib:libatomic$secondaryArchSuffix lib:libavcodec$secondaryArchSuffix lib:libavformat$secondaryArchSuffix lib:libavutil$secondaryArchSuffix + lib:libcairo$secondaryArchSuffix lib:libexpat$secondaryArchSuffix lib:libflac$secondaryArchSuffix lib:libgdk_pixbuf_2.0$secondaryArchSuffix @@ -42,6 +43,7 @@ REQUIRES=" lib:libpango_1.0$secondaryArchSuffix lib:libsndfile$secondaryArchSuffix lib:libvorbis$secondaryArchSuffix + lib:libX11$secondaryArchSuffix lib:libz$secondaryArchSuffix " @@ -75,17 +77,14 @@ BUILD_PREREQUIRES=" cmd:wx_config$secondaryArchSuffix " -PATCH() -{ - # pthreads - sed -i 's/-pthread/-lpthread/g' lib-src/portaudio-v19/configure -} - BUILD() { mkdir -p build cd build - runConfigure ../configure --without-lv2 --without-portmixer --disable-nyquist --without-portmidi --without-midi --without-ffmpeg + cmake .. $cmakeDirArgs -DCMAKE_BUILD_TYPE=Release \ + -DUSE_MIDI=OFF \ + -Daudacity_use_pa_oss=NO -Daudacity_use_pa_jack=off \ + -Daudacity_use_ffmpeg=off -Daudacity_use_midi=off -Daudacity_use_pch=no make $jobArgs } diff --git a/media-sound/audacity/patches/audacity-2.3.3.patchset b/media-sound/audacity/patches/audacity-2.3.3.patchset deleted file mode 100644 index 222ff02ef..000000000 --- a/media-sound/audacity/patches/audacity-2.3.3.patchset +++ /dev/null @@ -1,318 +0,0 @@ -From 7025bfb24f470f5147777b0181db70db4f3d3e05 Mon Sep 17 00:00:00 2001 -From: Ken Mays -Date: Sat, 25 Dec 2021 06:19:07 +0200 -Subject: Fix OSS detect for Haiku - - -diff --git a/lib-src/portaudio-v19/configure b/lib-src/portaudio-v19/configure -index 96cd326..9758d06 100755 ---- a/lib-src/portaudio-v19/configure -+++ b/lib-src/portaudio-v19/configure -@@ -15361,7 +15361,7 @@ fi - have_libossaudio=no - have_oss=no - if test "x$with_oss" != "xno"; then -- for ac_header in sys/soundcard.h linux/soundcard.h machine/soundcard.h -+ for ac_header in private/audio/soundcard.h sys/soundcard.h linux/soundcard.h machine/soundcard.h - do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` - ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -diff --git a/lib-src/portaudio-v19/configure.in b/lib-src/portaudio-v19/configure.in -index 0f90c10..2bd8f62 100644 ---- a/lib-src/portaudio-v19/configure.in -+++ b/lib-src/portaudio-v19/configure.in -@@ -127,7 +127,7 @@ fi - have_libossaudio=no - have_oss=no - if test "x$with_oss" != "xno"; then -- AC_CHECK_HEADERS([sys/soundcard.h linux/soundcard.h machine/soundcard.h], [have_oss=yes]) -+ AC_CHECK_HEADERS([private/audio/soundcard.h sys/soundcard.h linux/soundcard.h machine/soundcard.h], [have_oss=yes]) - if test "x$have_oss" = "xyes"; then - AC_CHECK_LIB(ossaudio, _oss_ioctl, have_libossaudio=yes, have_libossaudio=no) - fi --- -2.37.3 - - -From e274215eb6ece7954ff9a74d24ae448270681031 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= -Date: Wed, 30 Jul 2014 01:38:19 +0200 -Subject: Add a case for Haiku in configure.in - - -diff --git a/lib-src/portaudio-v19/configure b/lib-src/portaudio-v19/configure -index 9758d06..27f5e2f 100755 ---- a/lib-src/portaudio-v19/configure -+++ b/lib-src/portaudio-v19/configure -@@ -16129,6 +16129,21 @@ fi - SHARED_FLAGS="" - ;; - -+ haiku* ) -+ -+ printf "%s\n" "#define PA_USE_SKELETON 1" >>confdefs.h -+ -+ -+ CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/unix" -+ # -Werror -+ LIBS="-lmedia" -+ -+ SHARED_FLAGS="$LIBS -shared" -+ #CFLAGS="$CFLAGS" -+ OTHER_OBJS="src/os/unix/pa_unix_hostapis.o src/os/unix/pa_unix_util.o" -+ PADLL="libportaudio.so" -+ ;; -+ - *) - - CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/unix" -diff --git a/lib-src/portaudio-v19/configure.in b/lib-src/portaudio-v19/configure.in -index 2bd8f62..3994c4a 100644 ---- a/lib-src/portaudio-v19/configure.in -+++ b/lib-src/portaudio-v19/configure.in -@@ -390,6 +390,22 @@ case "${host_os}" in - SHARED_FLAGS="" - ;; - -+ haiku* ) -+ dnl Haiku configuration -+ -+ dnl AC_DEFINE(PA_USE_HAIKU,1) -+ AC_DEFINE(PA_USE_SKELETON,1) -+ -+ CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/unix" -+ # -Werror -+ LIBS="-lmedia" -+ -+ SHARED_FLAGS="$LIBS -shared" -+ #CFLAGS="$CFLAGS" -+ OTHER_OBJS="src/os/unix/pa_unix_hostapis.o src/os/unix/pa_unix_util.o" -+ PADLL="libportaudio.so" -+ ;; -+ - *) - dnl Unix configuration - --- -2.37.3 - - -From 1dfdea3d18bf25c1236f5e663937c3e0b372d0e5 Mon Sep 17 00:00:00 2001 -From: David Karoly -Date: Sun, 30 Oct 2022 13:21:10 +0100 -Subject: dont build portmixer - - -diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in -index 2fbcf65..0197230 100644 ---- a/lib-src/Makefile.in -+++ b/lib-src/Makefile.in -@@ -959,7 +959,7 @@ DIST_SUBDIRS = \ - - # Note: These optional libraries will not be distributed in the source tarball. - SUBDIRS = FileDialog $(am__append_4) $(am__append_11) $(am__append_12) \ -- portmixer $(am__append_13) $(am__append_14) $(am__append_15) \ -+ $(am__append_13) $(am__append_14) $(am__append_15) \ - $(am__append_16) $(am__append_17) $(OPTIONAL_SUBDIRS) - OPTIONAL_SUBDIRS = $(am__append_1) $(am__append_2) $(am__append_3) \ - $(am__append_5) $(am__append_6) $(am__append_7) \ --- -2.37.3 - - -From 90ad5833a2f7e62480776ffd6015dac2b4b8b12f Mon Sep 17 00:00:00 2001 -From: Ian McInerney -Date: Fri, 8 Apr 2022 01:08:12 +0100 -Subject: Remove custom languages in wx 3.1.6 and above - -Basque was added as a language with identifier "eu" into wx 3.1.6, so -there is no more need to provide custom languages. Additionally, this -struct changed formatting in 3.1.6, meaning it threw a compile error -when included (so it would have to be fixed if still needed). - -diff --git a/src/AudacityApp.cpp b/src/AudacityApp.cpp -index ba4e8fa82..1519eb607 100644 ---- a/src/AudacityApp.cpp -+++ b/src/AudacityApp.cpp -@@ -1042,12 +1042,10 @@ locations of the missing files."), missingFileName); - #define WL(lang,sublang) - #endif - --#if wxCHECK_VERSION(3, 0, 1) -+#if wxCHECK_VERSION(3, 0, 1) && !wxCHECK_VERSION(3, 1, 6) - wxLanguageInfo userLangs[] = - { -- // Bosnian is defined in wxWidgets already --// { wxLANGUAGE_USER_DEFINED, wxT("bs"), WL(0, SUBLANG_DEFAULT) wxT("Bosnian"), wxLayout_LeftToRight }, -- -+ // Included upstream in version 3.1.6 - { wxLANGUAGE_USER_DEFINED, wxT("eu"), WL(0, SUBLANG_DEFAULT) wxT("Basque"), wxLayout_LeftToRight }, - }; - #endif -@@ -1350,7 +1348,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 wxCHECK_VERSION(3, 0, 1) && !wxCHECK_VERSION(3, 1, 6) - for (size_t i = 0, cnt = WXSIZEOF(userLangs); i < cnt; i++) - { - wxLocale::AddLanguage(userLangs[i]); --- -2.37.3 - - -From f001c4ed033e60f3cbfdb1db92a66b44d2939294 Mon Sep 17 00:00:00 2001 -From: Ian McInerney -Date: Fri, 8 Apr 2022 01:27:52 +0100 -Subject: 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. - -diff --git a/src/MixerBoard.cpp b/src/MixerBoard.cpp -index 48092e191..6b7803a7a 100644 ---- a/src/MixerBoard.cpp -+++ b/src/MixerBoard.cpp -@@ -1301,7 +1301,7 @@ void MixerBoard::LoadMusicalInstruments() - wxMemoryDC dc; - - for (const auto &data : table) { -- auto bmp = std::make_unique(data.bitmap,24); -+ auto bmp = std::make_unique(data.bitmap); - dc.SelectObject(*bmp); - AColor::Bevel(dc, false, bev); - mMusicalInstruments.push_back(std::make_unique( --- -2.37.3 - - -From 8e9a286e11121720385772d3caf628217c440d8e Mon Sep 17 00:00:00 2001 -From: David Karoly -Date: Sun, 30 Oct 2022 14:36:58 +0100 -Subject: kludge for ScriptCommandRelay.cpp without nyquist - - -diff --git a/src/commands/ScriptCommandRelay.cpp b/src/commands/ScriptCommandRelay.cpp -index 2976338..a135d09 100644 ---- a/src/commands/ScriptCommandRelay.cpp -+++ b/src/commands/ScriptCommandRelay.cpp -@@ -156,7 +156,8 @@ void * ExecForLisp( char * pIn ){ - - // We'll be passing it as a non-const unsigned char * - // That 'unsafe' cast is actually safe. nyq_make_opaque_string is just copying the string. -- void * pResult = nyq_reformat_aud_do_response( Str2 ); -+ //void * pResult = nyq_reformat_aud_do_response( Str2 ); -+ void * pResult = NULL; - return pResult; - }; - --- -2.37.3 - - -From ccab33f9468760a04785787281ca4a5d3187c3d5 Mon Sep 17 00:00:00 2001 -From: David Karoly -Date: Sun, 30 Oct 2022 14:38:21 +0100 -Subject: use -export-dynamic instead of -rdynamic - - -diff --git a/src/Makefile.am b/src/Makefile.am -index 469cead..9b409fe 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -82,7 +82,7 @@ audacity_CPPFLAGS = \ - audacity_CXXFLAGS = \ - -Wno-unused-local-typedefs - --audacity_LDFLAGS = -rdynamic -+audacity_LDFLAGS = -export-dynamic - audacity_LDADD = \ - $(EXPAT_LIBS) \ - $(FILEDIALOG_LIBS) \ -diff --git a/src/Makefile.in b/src/Makefile.in -index b7cacf1..e120b7f 100644 ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -1398,7 +1398,7 @@ audacity_CPPFLAGS = -std=c++11 -Wno-deprecated-declarations \ - audacity_CXXFLAGS = \ - -Wno-unused-local-typedefs - --audacity_LDFLAGS = -rdynamic -+audacity_LDFLAGS = -export-dynamic - audacity_LDADD = $(EXPAT_LIBS) $(FILEDIALOG_LIBS) $(PORTAUDIO_LIBS) \ - $(PORTMIXER_LIBS) $(SNDFILE_LIBS) $(SOXR_LIBS) \ - $(WIDGETEXTRA_LIBS) $(WX_LIBS) $(NULL) $(am__append_2) \ --- -2.37.3 - - -From 11c9ad6fc1694c8444ee597c9df265811f237fb9 Mon Sep 17 00:00:00 2001 -From: David Karoly -Date: Mon, 31 Oct 2022 10:38:30 +0100 -Subject: enable build with wxWidgets 3.2 - - -diff --git a/configure b/configure -index e9f23be..2c91b4d 100755 ---- a/configure -+++ b/configure -@@ -19916,6 +19916,9 @@ wx_version=`${WX_CONFIG} $wxconfigargs --version` - $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.2.*) -+ echo "Using wxWidgets ${wx_version} - experimental build." -+ ;; - 3.1.* | 3.0.*) - echo "Great, you're using wxWidgets ${wx_version}!" - ;; -diff --git a/configure.ac b/configure.ac -index 40fc326..0081141 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -312,6 +312,9 @@ wx_version=`${WX_CONFIG} $wxconfigargs --version` - AC_MSG_NOTICE([Checking that the chosen version of wxWidgets is 3.1.x (or 3.0.x)]) - - case "${wx_version}" in -+ 3.2.*) -+ echo "Using wxWidgets ${wx_version} - experimental build." -+ ;; - 3.1.* | 3.0.*) - echo "Great, you're using wxWidgets ${wx_version}!" - ;; -diff --git a/lib-src/lib-widget-extra/configure b/lib-src/lib-widget-extra/configure -index 6026ec0..afbbeb4 100755 ---- a/lib-src/lib-widget-extra/configure -+++ b/lib-src/lib-widget-extra/configure -@@ -16633,6 +16633,9 @@ wx_version=`${WX_CONFIG} $wxconfigargs --version` - $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.2.*) -+ echo "Using wxWidgets ${wx_version} - experimental build." -+ ;; - 3.1.* | 3.0.*) - echo "Great, you're using wxWidgets ${wx_version}!" - ;; -diff --git a/lib-src/lib-widget-extra/configure.ac b/lib-src/lib-widget-extra/configure.ac -index d711457..6a38bea 100644 ---- a/lib-src/lib-widget-extra/configure.ac -+++ b/lib-src/lib-widget-extra/configure.ac -@@ -122,6 +122,9 @@ wx_version=`${WX_CONFIG} $wxconfigargs --version` - AC_MSG_NOTICE([Checking that the chosen version of wxWidgets is 3.1.x (or 3.0.x)]) - - case "${wx_version}" in -+ 3.2.*) -+ echo "Using wxWidgets ${wx_version} - experimental build." -+ ;; - 3.1.* | 3.0.*) - echo "Great, you're using wxWidgets ${wx_version}!" - ;; --- -2.37.3 - diff --git a/media-sound/audacity/patches/audacity-2.4.2.patchset b/media-sound/audacity/patches/audacity-2.4.2.patchset new file mode 100644 index 000000000..cf4cd0247 --- /dev/null +++ b/media-sound/audacity/patches/audacity-2.4.2.patchset @@ -0,0 +1,300 @@ +From 3cd38dec6acc320d47361f78f9ec7ffa759689a9 Mon Sep 17 00:00:00 2001 +From: Ken Mays +Date: Sat, 25 Dec 2021 06:19:07 +0200 +Subject: Fix OSS detect for Haiku + + +diff --git a/lib-src/portaudio-v19/configure b/lib-src/portaudio-v19/configure +index 9d32fcc..8a2b037 100755 +--- a/lib-src/portaudio-v19/configure ++++ b/lib-src/portaudio-v19/configure +@@ -15373,7 +15373,7 @@ fi + have_libossaudio=no + have_oss=no + if test "x$with_oss" != "xno"; then +- for ac_header in sys/soundcard.h linux/soundcard.h machine/soundcard.h ++ for ac_header in private/audio/soundcard.h sys/soundcard.h linux/soundcard.h machine/soundcard.h + do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +diff --git a/lib-src/portaudio-v19/configure.in b/lib-src/portaudio-v19/configure.in +index a3628bd..e15a8c5 100644 +--- a/lib-src/portaudio-v19/configure.in ++++ b/lib-src/portaudio-v19/configure.in +@@ -127,7 +127,7 @@ fi + have_libossaudio=no + have_oss=no + if test "x$with_oss" != "xno"; then +- AC_CHECK_HEADERS([sys/soundcard.h linux/soundcard.h machine/soundcard.h], [have_oss=yes]) ++ AC_CHECK_HEADERS([private/audio/soundcard.h sys/soundcard.h linux/soundcard.h machine/soundcard.h], [have_oss=yes]) + if test "x$have_oss" = "xyes"; then + AC_CHECK_LIB(ossaudio, _oss_ioctl, have_libossaudio=yes, have_libossaudio=no) + fi +-- +2.37.3 + + +From 9c3fa9c8469622f831072843499c49dccc0969fe Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= +Date: Wed, 30 Jul 2014 01:38:19 +0200 +Subject: Add a case for Haiku in configure.in + + +diff --git a/lib-src/portaudio-v19/configure b/lib-src/portaudio-v19/configure +index 8a2b037..5853485 100755 +--- a/lib-src/portaudio-v19/configure ++++ b/lib-src/portaudio-v19/configure +@@ -16144,6 +16144,21 @@ fi + SHARED_FLAGS="" + ;; + ++ haiku* ) ++ ++ printf "%s\n" "#define PA_USE_SKELETON 1" >>confdefs.h ++ ++ ++ CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/unix" ++ # -Werror ++ LIBS="-lmedia" ++ ++ SHARED_FLAGS="$LIBS -shared" ++ #CFLAGS="$CFLAGS" ++ OTHER_OBJS="src/os/unix/pa_unix_hostapis.o src/os/unix/pa_unix_util.o" ++ PADLL="libportaudio.so" ++ ;; ++ + *) + + CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/unix" +diff --git a/lib-src/portaudio-v19/configure.in b/lib-src/portaudio-v19/configure.in +index e15a8c5..ceff5b2 100644 +--- a/lib-src/portaudio-v19/configure.in ++++ b/lib-src/portaudio-v19/configure.in +@@ -393,6 +393,22 @@ case "${host_os}" in + SHARED_FLAGS="" + ;; + ++ haiku* ) ++ dnl Haiku configuration ++ ++ dnl AC_DEFINE(PA_USE_HAIKU,1) ++ AC_DEFINE(PA_USE_SKELETON,1) ++ ++ CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/unix" ++ # -Werror ++ LIBS="-lmedia" ++ ++ SHARED_FLAGS="$LIBS -shared" ++ #CFLAGS="$CFLAGS" ++ OTHER_OBJS="src/os/unix/pa_unix_hostapis.o src/os/unix/pa_unix_util.o" ++ PADLL="libportaudio.so" ++ ;; ++ + *) + dnl Unix configuration + +-- +2.37.3 + + +From 2c8cae10a82d44f5dcc5c0ca21d91d310bac66b6 Mon Sep 17 00:00:00 2001 +From: Ian McInerney +Date: Fri, 8 Apr 2022 01:08:12 +0100 +Subject: Remove custom languages in wx 3.1.6 and above + +Basque was added as a language with identifier "eu" into wx 3.1.6, so +there is no more need to provide custom languages. Additionally, this +struct changed formatting in 3.1.6, meaning it threw a compile error +when included (so it would have to be fixed if still needed). + +diff --git a/src/AudacityApp.cpp b/src/AudacityApp.cpp +index 661ab7e..c5738eb 100644 +--- a/src/AudacityApp.cpp ++++ b/src/AudacityApp.cpp +@@ -964,12 +964,10 @@ locations of the missing files.").Format( missingFileName ) ; + #define WL(lang,sublang) + #endif + +-#if wxCHECK_VERSION(3, 0, 1) ++#if wxCHECK_VERSION(3, 0, 1) && !wxCHECK_VERSION(3, 1, 6) + wxLanguageInfo userLangs[] = + { +- // Bosnian is defined in wxWidgets already +-// { wxLANGUAGE_USER_DEFINED, wxT("bs"), WL(0, SUBLANG_DEFAULT) wxT("Bosnian"), wxLayout_LeftToRight }, +- ++ // Included upstream in version 3.1.6 + { wxLANGUAGE_USER_DEFINED, wxT("eu"), WL(0, SUBLANG_DEFAULT) wxT("Basque"), wxLayout_LeftToRight }, + }; + #endif +@@ -1270,7 +1268,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 wxCHECK_VERSION(3, 0, 1) && !wxCHECK_VERSION(3, 1, 6) + for (size_t i = 0, cnt = WXSIZEOF(userLangs); i < cnt; i++) + { + wxLocale::AddLanguage(userLangs[i]); +-- +2.37.3 + + +From f645a5ac4bc6a95d8c3bff9441c0a4dc9f9fc04a Mon Sep 17 00:00:00 2001 +From: Ian McInerney +Date: Fri, 8 Apr 2022 01:27:52 +0100 +Subject: 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. + +diff --git a/src/MixerBoard.cpp b/src/MixerBoard.cpp +index be46e63..c6d0296 100644 +--- a/src/MixerBoard.cpp ++++ b/src/MixerBoard.cpp +@@ -1304,7 +1304,7 @@ void MixerBoard::LoadMusicalInstruments() + wxMemoryDC dc; + + for (const auto &data : table) { +- auto bmp = std::make_unique(data.bitmap,24); ++ auto bmp = std::make_unique(data.bitmap); + dc.SelectObject(*bmp); + AColor::Bevel(dc, false, bev); + mMusicalInstruments.push_back(std::make_unique( +-- +2.37.3 + + +From 691abd21f920d776dd75048aeb893517635863af Mon Sep 17 00:00:00 2001 +From: Paul Licameli +Date: Fri, 14 May 2021 16:22:28 -0400 +Subject: Add #include needed to build on Fedora 34, recommended by Be-ing + + +diff --git a/include/audacity/Types.h b/include/audacity/Types.h +index e137ea9..647c829 100644 +--- a/include/audacity/Types.h ++++ b/include/audacity/Types.h +@@ -44,6 +44,7 @@ + + #include + #include ++#include + #include + #include + #include // for wxASSERT +-- +2.37.3 + + +From bf63b0cd604d836c09ec0202205c07a0a0c5f487 Mon Sep 17 00:00:00 2001 +From: David Karoly +Date: Sun, 6 Nov 2022 18:02:52 +0100 +Subject: portaudio: fix build on Haiku + + +diff --git a/cmake-proxies/portaudio-v19/CMakeLists.txt b/cmake-proxies/portaudio-v19/CMakeLists.txt +index d46ae06..5f1aa7a 100644 +--- a/cmake-proxies/portaudio-v19/CMakeLists.txt ++++ b/cmake-proxies/portaudio-v19/CMakeLists.txt +@@ -118,7 +118,7 @@ list( APPEND SOURCES + ${TARGET_ROOT}/src/hostapi/coreaudio/pa_mac_core_utilities.c + > + +- $<$: ++ $<$: + ${TARGET_ROOT}/src/os/unix/pa_unix_hostapis.c + ${TARGET_ROOT}/src/os/unix/pa_unix_util.c + > +-- +2.37.3 + + +From a8d2d4ad48cf78315dddc618d69f657ea926450e Mon Sep 17 00:00:00 2001 +From: David Karoly +Date: Sun, 6 Nov 2022 18:02:52 +0100 +Subject: nyquist: fix build on Haiku + + +diff --git a/lib-src/libnyquist/nyquist/xlisp/xlisp.h b/lib-src/libnyquist/nyquist/xlisp/xlisp.h +index 6bbf324..1daa2c6 100644 +--- a/lib-src/libnyquist/nyquist/xlisp/xlisp.h ++++ b/lib-src/libnyquist/nyquist/xlisp/xlisp.h +@@ -177,6 +177,10 @@ extern long ptrtoabs(); + #endif + #endif + ++#ifdef __HAIKU__ ++#define XL_LITTLE_ENDIAN ++#endif ++ + /* default important definitions */ + #ifndef NNODES + #define NNODES 1000 +-- +2.37.3 + + +From 8117f0a0e28851e4a25f31f125d39391015c3e65 Mon Sep 17 00:00:00 2001 +From: David Karoly +Date: Sun, 6 Nov 2022 18:02:52 +0100 +Subject: fix GTK include paths and libs + + +diff --git a/cmake-proxies/wxWidgets/CMakeLists.txt b/cmake-proxies/wxWidgets/CMakeLists.txt +index 94d19dd..6dcffc8 100644 +--- a/cmake-proxies/wxWidgets/CMakeLists.txt ++++ b/cmake-proxies/wxWidgets/CMakeLists.txt +@@ -205,6 +205,10 @@ endif() + if( "${wxTOOLKIT}" MATCHES "GTK." ) + pkg_check_modules( GTK REQUIRED IMPORTED_TARGET GLOBAL ${gtk} ) + pkg_check_modules( GLIB REQUIRED IMPORTED_TARGET GLOBAL ${glib} ) ++ ++ list( APPEND INCLUDES ${GTK_INCLUDE_DIRS} ) ++ list( APPEND LINKDIRS ${GTK_LIB_DIR} ) ++ list( APPEND LIBRARIES ${GTK_LIBRARIES} ) + endif() + + target_include_directories( ${TARGET} INTERFACE ${INCLUDES} ) +-- +2.37.3 + + +From d31d3b29e8a77b1b703cc58ee867caf6e1b37651 Mon Sep 17 00:00:00 2001 +From: David Karoly +Date: Sun, 6 Nov 2022 18:02:52 +0100 +Subject: fix build for AudioIO.cpp + + +diff --git a/src/AudioIO.cpp b/src/AudioIO.cpp +index 0187e39..feb62bf 100644 +--- a/src/AudioIO.cpp ++++ b/src/AudioIO.cpp +@@ -821,7 +821,7 @@ static double SystemTime(bool usingAlsa) + if (usingAlsa) { + struct timespec now; + // CLOCK_MONOTONIC_RAW is unaffected by NTP or adj-time +- clock_gettime(CLOCK_MONOTONIC_RAW, &now); ++ clock_gettime(CLOCK_MONOTONIC, &now); + //return now.tv_sec + now.tv_nsec * 0.000000001; + return (now.tv_sec + now.tv_nsec * 0.000000001) - streamStartTime; + } +-- +2.37.3 + + +From cffae938201f9bf330e38eba571e7207b4c35bbe Mon Sep 17 00:00:00 2001 +From: David Karoly +Date: Sun, 6 Nov 2022 18:02:52 +0100 +Subject: add dummy RevisionIdent.h + + +diff --git a/include/RevisionIdent.h b/include/RevisionIdent.h +new file mode 100644 +index 0000000..e69de29 +-- +2.37.3 +