From 3d9c215a6d55bfb1f010ee30a236956fd41294f1 Mon Sep 17 00:00:00 2001 From: davidkaroly <92124087+davidkaroly@users.noreply.github.com> Date: Sun, 7 May 2023 15:18:35 +0200 Subject: [PATCH] tenacity: update to 1.3 beta 3 (#8606) --- ...2.patchset => tenacity-1.3~beta3.patchset} | 116 +++--------------- ...beta2.recipe => tenacity-1.3~beta3.recipe} | 9 +- 2 files changed, 21 insertions(+), 104 deletions(-) rename media-sound/tenacity/patches/{tenacity-1.3~beta2.patchset => tenacity-1.3~beta3.patchset} (57%) rename media-sound/tenacity/{tenacity-1.3~beta2.recipe => tenacity-1.3~beta3.recipe} (96%) diff --git a/media-sound/tenacity/patches/tenacity-1.3~beta2.patchset b/media-sound/tenacity/patches/tenacity-1.3~beta3.patchset similarity index 57% rename from media-sound/tenacity/patches/tenacity-1.3~beta2.patchset rename to media-sound/tenacity/patches/tenacity-1.3~beta3.patchset index a5d484747..372c89cdf 100644 --- a/media-sound/tenacity/patches/tenacity-1.3~beta2.patchset +++ b/media-sound/tenacity/patches/tenacity-1.3~beta3.patchset @@ -1,31 +1,4 @@ -From 5bda751f0680b3c83c474f36d338c0c1e71e7aa2 Mon Sep 17 00:00:00 2001 -From: David Karoly -Date: Tue, 24 Jan 2023 19:45:07 +0100 -Subject: Adjust LIBDIR for Haiku - - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 71bf60c..0a63fbe 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -362,7 +362,11 @@ endif() - - set( _DEST "${_DESTDIR}" ) - set( INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" ) --set( _LIBDIR "${CMAKE_INSTALL_LIBDIR}" ) -+if( CMAKE_SYSTEM_NAME MATCHES "Haiku" ) -+ set( _LIBDIR "lib" ) -+else() -+ set( _LIBDIR "${CMAKE_INSTALL_LIBDIR}" ) -+endif() - set( _DATADIR "${CMAKE_INSTALL_DATADIR}" ) - set( _PKGLIB "${_LIBDIR}/tenacity" ) - set( _PKGDATA "${_DATADIR}/tenacity/" ) --- -2.37.3 - - -From 699211b52f98ba0d2a03de7770752ea459607029 Mon Sep 17 00:00:00 2001 +From 080b6aab3c708245da2edda563021dd90a527323 Mon Sep 17 00:00:00 2001 From: David Karoly Date: Tue, 24 Jan 2023 19:45:07 +0100 Subject: Fix GTK include paths and libs @@ -51,14 +24,14 @@ index 71bf60c..1a25628 100644 2.37.3 -From 7477e43c2a4b1147aaa557c0a0907f4bb1738d50 Mon Sep 17 00:00:00 2001 +From d8a261015bbf513c9b39b87f5ff3e9efaf0777ef Mon Sep 17 00:00:00 2001 From: David Karoly Date: Tue, 24 Jan 2023 19:45:07 +0100 Subject: Haiku: initialize XDG vars diff --git a/src/TenacityApp.cpp b/src/TenacityApp.cpp -index 57bff6e..cd02057 100644 +index d637e6a..25dd368 100644 --- a/src/TenacityApp.cpp +++ b/src/TenacityApp.cpp @@ -50,6 +50,12 @@ It handles initialization and termination by subclassing wxApp. @@ -74,9 +47,9 @@ index 57bff6e..cd02057 100644 // chmod, lstat, geteuid #ifdef __UNIX__ -@@ -498,6 +504,30 @@ int main(int argc, char *argv[]) - IMPLEMENT_APP_NO_MAIN(TenacityApp) - IMPLEMENT_WX_THEME_SUPPORT +@@ -489,6 +495,30 @@ public: + }; + }; +#ifdef __HAIKU__ +void initialize_xdg_paths(void) @@ -102,10 +75,10 @@ index 57bff6e..cd02057 100644 +} +#endif + - int main(int argc, char *argv[]) - { - wxDISABLE_DEBUG_SUPPORT(); -@@ -510,6 +540,10 @@ int main(int argc, char *argv[]) + #if defined(__WXMAC__) + + IMPLEMENT_APP_NO_MAIN(TenacityApp) +@@ -518,6 +548,10 @@ int main(int argc, char *argv[]) stdout = freopen("/dev/null", "w", stdout); stderr = freopen("/dev/null", "w", stderr); @@ -120,17 +93,17 @@ index 57bff6e..cd02057 100644 2.37.3 -From 925faa80052f5abfbf3a611995bf60d525e87115 Mon Sep 17 00:00:00 2001 +From 0f64f2daec9ba9a524ccdd29770c3bc484868161 Mon Sep 17 00:00:00 2001 From: David Karoly Date: Tue, 24 Jan 2023 19:45:07 +0100 Subject: Release sLocale smart pointer before exit. Fixes crash on exit. diff --git a/libraries/lib-strings/Languages.cpp b/libraries/lib-strings/Languages.cpp -index 15ac86e..b536cfd 100644 +index 4ec0eac..0c7d648 100644 --- a/libraries/lib-strings/Languages.cpp +++ b/libraries/lib-strings/Languages.cpp -@@ -325,6 +325,11 @@ void GetLanguages( FilePaths pathList, +@@ -328,6 +328,11 @@ void GetLanguages( FilePaths pathList, static std::unique_ptr sLocale; static wxString sLocaleName; @@ -157,10 +130,10 @@ index 81092d0..d9068f8 100644 @param tenacityPathList paths to search for .mo files, grouped into subdirectories for the different languages @param lang a language code; or if empty or "System", then default to system language. diff --git a/src/TenacityApp.cpp b/src/TenacityApp.cpp -index cd02057..b84ea3f 100644 +index 25dd368..7ea26e9 100644 --- a/src/TenacityApp.cpp +++ b/src/TenacityApp.cpp -@@ -544,7 +544,9 @@ int main(int argc, char *argv[]) +@@ -552,7 +552,9 @@ int main(int argc, char *argv[]) initialize_xdg_paths(); #endif @@ -175,7 +148,7 @@ index cd02057..b84ea3f 100644 2.37.3 -From 8db32ca3afc9d07e85962839e204d49965fe2ecd Mon Sep 17 00:00:00 2001 +From 32f3f77b8ce7ad0437f9f62d7e0d8a39b87b3d46 Mon Sep 17 00:00:00 2001 From: David Karoly Date: Tue, 7 Feb 2023 19:56:39 +0100 Subject: OverlayPanel: call RefreshRect from DrawOverlays @@ -201,60 +174,3 @@ index cfca34d..0fec289 100644 -- 2.37.3 - -From 9ad759c3e9941b0c94d3819870608c0bbb8fcf52 Mon Sep 17 00:00:00 2001 -From: David Karoly -Date: Tue, 7 Feb 2023 18:40:17 +0100 -Subject: HelpText: Remove broken link from welcome text - -Signed-off-by: David Karoly - -diff --git a/src/HelpText.cpp b/src/HelpText.cpp -index 2d1b86d..dc6af38 100644 ---- a/src/HelpText.cpp -+++ b/src/HelpText.cpp -@@ -232,9 +232,6 @@ static wxString HelpTextBuiltIn( const wxString & Key ) - << XO( - /* i18n-hint: Preserve '[[help:Main_Page|' as it's the name of a link.*/ - " [[help:Main_Page|Audacity Manual]] - if not installed locally, [[https://manual.audacityteam.org/|view online]]") -- << wxT("
  • ") -- << XO( --" [[https://github.com/tenacitytenacity/tenacity/discussions|Discussions (on GitHub)]] - ask your question directly, online.") - << wxT("

    • ") - << wxT("") - << XO("More: Visit our [[https://codeberg.org/tenacityteam/tenacity/wiki|Wiki]] for tips, tricks, extra tutorials and effects plug-ins.") --- -2.37.3 - - -From 02d752bd465179509029bf301fee0711e44068ba Mon Sep 17 00:00:00 2001 -From: Avery King -Date: Thu, 9 Feb 2023 19:24:25 -0800 -Subject: About dialog: remove PortMixer build support - -* PortMixer has been abscent in Tenacity for some time now. - -Signed-off-by: Avery King - -diff --git a/src/AboutDialog.cpp b/src/AboutDialog.cpp -index 675fb09..3560e9d 100644 ---- a/src/AboutDialog.cpp -+++ b/src/AboutDialog.cpp -@@ -788,14 +788,6 @@ void AboutDialog::PopulateInformationPage( ShuttleGui & S ) - disabled); - # endif - -- # if USE_PORTMIXER -- AddBuildinfoRow(&informationStr, wxT("PortMixer"), XO("Sound card mixer support"), -- enabled); -- # else -- AddBuildinfoRow(&informationStr, wxT("PortMixer"), XO("Sound card mixer support"), -- disabled); -- # endif -- - # if USE_SOUNDTOUCH - AddBuildinfoRow(&informationStr, wxT("SoundTouch"), XO("Pitch and Tempo Change support"), - enabled); --- -2.37.3 - diff --git a/media-sound/tenacity/tenacity-1.3~beta2.recipe b/media-sound/tenacity/tenacity-1.3~beta3.recipe similarity index 96% rename from media-sound/tenacity/tenacity-1.3~beta2.recipe rename to media-sound/tenacity/tenacity-1.3~beta3.recipe index 119ba5609..dcc6ee991 100644 --- a/media-sound/tenacity/tenacity-1.3~beta2.recipe +++ b/media-sound/tenacity/tenacity-1.3~beta3.recipe @@ -5,11 +5,11 @@ systems and is developed by a group of volunteers as open-source software." HOMEPAGE="https://tenacityaudio.org" COPYRIGHT="2021-2023 by Tenacity Team" LICENSE="GNU GPL v2" -REVISION="2" -srcGitRev="v1.3-beta2" +REVISION="1" +srcGitRev="v1.3-beta3-1" srcGitDate="31 Jan 2023" SOURCE_URI="https://codeberg.org/tenacityteam/tenacity/archive/${srcGitRev}.tar.gz" -CHECKSUM_SHA256="65f0733e4e49d2a6ac02c9f646724043b84943cb3b148d2e37f3b69017fc71fc" +CHECKSUM_SHA256="0b2c11e02e5a9393634453b1b0dd3dd878ab9e8e6fe9bf530b6696a706d08555" SOURCE_DIR="tenacity" PATCHES="tenacity-$portVersion.patchset" ADDITIONAL_FILES="tenacity.rdef.in" @@ -114,7 +114,8 @@ BUILD() -DCMAKE_BUILD_TYPE=Release \ -DAUDACITY_REV_LONG="$srcGitRev" \ -DAUDACITY_REV_TIME="$srcGitDate" \ - -DPCH=no + -DPCH=no \ + -DVST2=OFF cmake --build build $jobArgs }