diff --git a/media-sound/audacity/audacity-3.1.3.recipe b/media-sound/audacity/audacity-3.2.1.recipe similarity index 91% rename from media-sound/audacity/audacity-3.1.3.recipe rename to media-sound/audacity/audacity-3.2.1.recipe index c03a020c3..eecd7512e 100644 --- a/media-sound/audacity/audacity-3.1.3.recipe +++ b/media-sound/audacity/audacity-3.2.1.recipe @@ -4,11 +4,11 @@ recording tasks such as making ringtones, mixing stero tracks, transferring \ tapes and records to computer or CD, splitting recordings into separate \ tracks and more." HOMEPAGE="https://www.audacityteam.org" -COPYRIGHT="1999-2021 by Audacity Team" +COPYRIGHT="1999-2022 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="07aed333a20b8df381d5c0a167840883fff8ef65f5e5f71e654c0925d6c60de8" +CHECKSUM_SHA256="cbded508d26dba809bbacc5d16da35f89a8ee32ba8622c0555e0577130eac609" SOURCE_DIR="audacity-Audacity-$portVersion" PATCHES="audacity-$portVersion.patchset" @@ -38,8 +38,8 @@ REQUIRES=" lib:libiconv$secondaryArchSuffix lib:libid3tag$secondaryArchSuffix lib:libintl$secondaryArchSuffix - lib:libmad$secondaryArchSuffix lib:libmp3lame$secondaryArchSuffix + lib:libmpg123$secondaryArchSuffix lib:libogg$secondaryArchSuffix lib:libopus$secondaryArchSuffix lib:libpango_1.0$secondaryArchSuffix @@ -48,6 +48,7 @@ REQUIRES=" lib:libsndfile$secondaryArchSuffix lib:libuuid$secondaryArchSuffix lib:libvorbis$secondaryArchSuffix + lib:libwavpack$secondaryArchSuffix lib:libX11$secondaryArchSuffix lib:libz$secondaryArchSuffix " @@ -65,8 +66,8 @@ BUILD_REQUIRES=" devel:libiconv$secondaryArchSuffix devel:libid3tag$secondaryArchSuffix devel:libintl$secondaryArchSuffix - devel:libmad$secondaryArchSuffix devel:libmp3lame$secondaryArchSuffix + devel:libmpg123$secondaryArchSuffix devel:libogg$secondaryArchSuffix devel:libopus$secondaryArchSuffix devel:libportaudio$secondaryArchSuffix @@ -74,6 +75,7 @@ BUILD_REQUIRES=" devel:libsndfile$secondaryArchSuffix devel:libuuid$secondaryArchSuffix devel:libvorbis$secondaryArchSuffix + devel:libwavpack$secondaryArchSuffix devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" @@ -100,6 +102,7 @@ BUILD() $cmakeDirArgs \ -DCMAKE_BUILD_TYPE=Release \ -Daudacity_conan_enabled=Off \ + -Daudacity_has_vst3=Off \ -Daudacity_use_pch=no \ -Daudacity_use_vst=no cmake --build build $jobArgs diff --git a/media-sound/audacity/patches/audacity-3.1.3.patchset b/media-sound/audacity/patches/audacity-3.2.1.patchset similarity index 61% rename from media-sound/audacity/patches/audacity-3.1.3.patchset rename to media-sound/audacity/patches/audacity-3.2.1.patchset index 9df2a06db..38fb87a76 100644 --- a/media-sound/audacity/patches/audacity-3.1.3.patchset +++ b/media-sound/audacity/patches/audacity-3.2.1.patchset @@ -1,82 +1,11 @@ -From 4260b97c697d780999812ae4fb19f2c6e51fe0b7 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 13b50e8..7d45fd2 100644 ---- a/src/AudacityApp.cpp -+++ b/src/AudacityApp.cpp -@@ -991,12 +991,10 @@ void AudacityApp::OnTimer(wxTimerEvent& WXUNUSED(event)) - #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 -@@ -1317,7 +1315,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 1ba608cd73bc261de59e3d61fee64cdd8f7b0a0a 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 0f3c67b..b5b9e6b 100644 ---- a/src/MixerBoard.cpp -+++ b/src/MixerBoard.cpp -@@ -1314,7 +1314,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 5b158a877e36331823d11ee6306b14f1ce8c2554 Mon Sep 17 00:00:00 2001 +From 0db8a9d4ddd5a7c0caecf3171e0fadc7664991a7 Mon Sep 17 00:00:00 2001 From: David Karoly Date: Mon, 7 Nov 2022 14:27:23 +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 44d52c3..e43f2ce 100644 +index 3134849..8fd29ea 100644 --- a/lib-src/libnyquist/nyquist/xlisp/xlisp.h +++ b/lib-src/libnyquist/nyquist/xlisp/xlisp.h @@ -27,6 +27,10 @@ extern "C" { @@ -90,7 +19,7 @@ index 44d52c3..e43f2ce 100644 /* NNODES number of nodes to allocate in each request (1000) */ /* EDEPTH evaluation stack depth (2000) */ /* ADEPTH argument stack depth (1000) */ -@@ -188,6 +192,10 @@ extern long ptrtoabs(); +@@ -197,6 +201,10 @@ extern long ptrtoabs(); #endif #endif @@ -105,7 +34,7 @@ index 44d52c3..e43f2ce 100644 2.37.3 -From e6836c68bfa510ed9ec077b7672ffbd8a4b6729b Mon Sep 17 00:00:00 2001 +From d0766df944233131ddbd22e9756ecde3214efd88 Mon Sep 17 00:00:00 2001 From: David Karoly Date: Mon, 7 Nov 2022 14:17:48 +0100 Subject: portmixer: fix build on Haiku @@ -164,14 +93,14 @@ index 978f27b..eb44dce 100644 2.37.3 -From 495fe0214fe2a8f1595b197f990068092e5f45b0 Mon Sep 17 00:00:00 2001 +From 39ee375d523daf5da8c168136034d5bb7c856f10 Mon Sep 17 00:00:00 2001 From: David Karoly Date: Mon, 7 Nov 2022 15:09:44 +0100 Subject: MIDIPlay: fix build on Haiku diff --git a/src/MIDIPlay.cpp b/src/MIDIPlay.cpp -index 788e431..aba6288 100644 +index 620bb85..e1ee067 100644 --- a/src/MIDIPlay.cpp +++ b/src/MIDIPlay.cpp @@ -486,7 +486,7 @@ static double streamStartTime = 0; // bias system time to small number @@ -187,7 +116,7 @@ index 788e431..aba6288 100644 2.37.3 -From 5d6f5d180b7883738fcd29d5ec2cda46fa5cbab6 Mon Sep 17 00:00:00 2001 +From 0d08d82f4f6bb4b5a035b75dd616296bf09be87c Mon Sep 17 00:00:00 2001 From: David Karoly Date: Mon, 7 Nov 2022 15:06:14 +0100 Subject: fix GTK include paths and libs @@ -211,17 +140,17 @@ index 4b35e89..e5a909c 100644 2.37.3 -From 0ba846266c5b827e648860e6e886507c4b35bf8c Mon Sep 17 00:00:00 2001 +From b52f860b324dd5f22c51e33a761ecf1e06930440 Mon Sep 17 00:00:00 2001 From: David Karoly Date: Mon, 7 Nov 2022 14:33:10 +0100 Subject: adjust install rules for Haiku diff --git a/CMakeLists.txt b/CMakeLists.txt -index 430ec6e..01b978c 100644 +index 3aa5ef8..c547b68 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -344,7 +344,7 @@ set( _EXEDIR "${_DEST}" ) +@@ -397,7 +397,7 @@ set( _EXEDIR "${_DEST}" ) # Setup RPATH handling set( CMAKE_BUILD_RPATH "${_DEST}/${_PKGLIB}" ) set( CMAKE_BUILD_WITH_INSTALL_RPATH FALSE ) @@ -231,42 +160,36 @@ index 430ec6e..01b978c 100644 # Adjust them for the Mac diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index f6468cd..7378eb3 100644 +index 7b90c1b..91ca320 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -1229,6 +1229,8 @@ elseif( CMAKE_SYSTEM_NAME MATCHES "Darwin" ) - set_target_property_all( "Wrapper" RUNTIME_OUTPUT_DIRECTORY "${_EXEDIR}" ) - organize_source( "${WRAPPER_ROOT}" "mac" "${WRAPPER_SOURCES}" ) - +@@ -1429,6 +1429,8 @@ elseif( CMAKE_SYSTEM_NAME MATCHES "Darwin" ) + ${CMAKE_COMMAND} -E copy $ "${_EXEDIR}/Wrapper" + POST_BUILD + ) +elseif( CMAKE_SYSTEM_NAME MATCHES "Haiku" ) + set_target_property_all( ${TARGET} RUNTIME_OUTPUT_DIRECTORY "${_DEST}" ) else() - set_target_property_all( ${TARGET} RUNTIME_OUTPUT_DIRECTORY "${_DEST}" ) + set_target_properties( + ${TARGET} +@@ -1632,8 +1634,10 @@ else() + install( CODE "set( _LIBDIR \"${_LIBDIR}\")" ) + install( SCRIPT "${CMAKE_SOURCE_DIR}/scripts/build/linux/fix_rpath.cmake" ) -@@ -1368,6 +1370,18 @@ else() - install( TARGETS ${TARGET} - DESTINATION "." - RESOURCE DESTINATION "${_APPDIR}/Resources" ) -+ elseif( CMAKE_SYSTEM_NAME MATCHES "Haiku" ) -+ install( TARGETS ${TARGET} RUNTIME ) -+ install( DIRECTORY "${_DEST}/${_LIBDIR}/" -+ DESTINATION "${_LIBDIR}" -+ USE_SOURCE_PERMISSIONS -+ FILES_MATCHING PATTERN "*.so*" ) -+ install( FILES "${topdir}/LICENSE.txt" "${topdir}/README.txt" -+ DESTINATION "${_DATADIR}/doc/${AUDACITY_NAME}" ) -+ install( FILES "${_SRCDIR}/audacity.xml" -+ DESTINATION "${_DATADIR}/mime/packages" ) -+ install( FILES "${topdir}/presets/EQDefaultCurves.xml" -+ DESTINATION "${_PKGDATA}" ) - else() - install( TARGETS ${TARGET} RUNTIME ) - install( DIRECTORY "${_DEST}/${_LIBDIR}/" +- install( FILES "${_INTDIR}/audacity.desktop" +- DESTINATION "${_DATADIR}/applications" ) ++ if( NOT CMAKE_SYSTEM_NAME MATCHES "Haiku" ) ++ install( FILES "${_INTDIR}/audacity.desktop" ++ DESTINATION "${_DATADIR}/applications" ) ++ endif() + install( FILES "${topdir}/LICENSE.txt" "${topdir}/README.txt" + DESTINATION "${_DATADIR}/doc/${AUDACITY_NAME}" ) + install( FILES "${_SRCDIR}/audacity.xml" -- 2.37.3 -From 34335b8df5ee17ceb58267e6e10aadc932624012 Mon Sep 17 00:00:00 2001 +From f5406cb928e6407544462556acbaa6dd7c451f3e Mon Sep 17 00:00:00 2001 From: David Karoly Date: Thu, 17 Nov 2022 20:54:07 +0100 Subject: Adapt shm to Haiku @@ -274,10 +197,10 @@ Subject: Adapt shm to Haiku This implementation is based on the haikuports patch for postgresql and qt5/qt6 diff --git a/src/AudacityApp.cpp b/src/AudacityApp.cpp -index 7d45fd2..c8f1c02 100644 +index 58a5a16..4cf8f32 100644 --- a/src/AudacityApp.cpp +++ b/src/AudacityApp.cpp -@@ -1923,7 +1923,69 @@ bool AudacityApp::CreateSingleInstanceChecker(const wxString &dir) +@@ -1900,7 +1900,69 @@ bool AudacityApp::CreateSingleInstanceChecker(const wxString &dir) #include #include