tenacity: update to 1.3beta2 (#7874)

This commit is contained in:
davidkaroly
2023-02-22 08:01:01 +01:00
committed by GitHub
parent 63caf60a1d
commit c8dc00c227
2 changed files with 68 additions and 34 deletions

View File

@@ -25,17 +25,17 @@ index 71bf60c..0a63fbe 100644
2.37.3
From 1552f3d4a760d10854390c2055ed718803d0dc91 Mon Sep 17 00:00:00 2001
From 699211b52f98ba0d2a03de7770752ea459607029 Mon Sep 17 00:00:00 2001
From: David Karoly <david.karoly@outlook.com>
Date: Tue, 24 Jan 2023 19:45:07 +0100
Subject: Fix GTK include paths and libs
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0a63fbe..23e1e6b 100644
index 71bf60c..1a25628 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -750,6 +750,11 @@ if(NOT TARGET wxWidgets::wxWidgets)
@@ -746,6 +746,11 @@ if(NOT TARGET wxWidgets::wxWidgets)
add_library(wxWidgets::wxWidgets INTERFACE IMPORTED)
target_link_libraries(wxWidgets::wxWidgets INTERFACE ${wxWidgets_LIBRARIES})
target_compile_definitions(wxWidgets::wxWidgets INTERFACE ${wxWidgets_DEFINITIONS} ${wxWidgets_DEFINITIONS_DEBUG})
@@ -51,7 +51,7 @@ index 0a63fbe..23e1e6b 100644
2.37.3
From dd984e544e8528ac6ce057ebe279e6d001724cd0 Mon Sep 17 00:00:00 2001
From 7477e43c2a4b1147aaa557c0a0907f4bb1738d50 Mon Sep 17 00:00:00 2001
From: David Karoly <david.karoly@outlook.com>
Date: Tue, 24 Jan 2023 19:45:07 +0100
Subject: Haiku: initialize XDG vars
@@ -120,7 +120,7 @@ index 57bff6e..cd02057 100644
2.37.3
From 6d7aa4415e1f8e72840a8b6192ab63ad5da8e932 Mon Sep 17 00:00:00 2001
From 925faa80052f5abfbf3a611995bf60d525e87115 Mon Sep 17 00:00:00 2001
From: David Karoly <david.karoly@outlook.com>
Date: Tue, 24 Jan 2023 19:45:07 +0100
Subject: Release sLocale smart pointer before exit. Fixes crash on exit.
@@ -175,30 +175,7 @@ index cd02057..b84ea3f 100644
2.37.3
From b88772605e00220d6f1885c34c501b00583fa506 Mon Sep 17 00:00:00 2001
From: David Karoly <david.karoly@outlook.com>
Date: Tue, 24 Jan 2023 19:45:07 +0100
Subject: Fix broken link in welcome dialog box
diff --git a/src/HelpText.cpp b/src/HelpText.cpp
index 2d1b86d..0cf239a 100644
--- a/src/HelpText.cpp
+++ b/src/HelpText.cpp
@@ -234,7 +234,7 @@ static wxString HelpTextBuiltIn( const wxString & Key )
" [[help:Main_Page|Audacity Manual]] - if not installed locally, [[https://manual.audacityteam.org/|view online]]")
<< wxT("</li><li>")
<< XO(
-" [[https://github.com/tenacitytenacity/tenacity/discussions|Discussions (on GitHub)]] - ask your question directly, online.")
+" [[https://github.com/tenacityteam/tenacity-legacy/discussions|Discussions (on GitHub)]] - ask your question directly, online.")
<< wxT("</li></ul></p><p>")
<< wxT("<b>")
<< XO("More:</b> Visit our [[https://codeberg.org/tenacityteam/tenacity/wiki|Wiki]] for tips, tricks, extra tutorials and effects plug-ins.")
--
2.37.3
From 14bea3df94b16ebc2b46bfb52a0a5eb09b676da1 Mon Sep 17 00:00:00 2001
From 8db32ca3afc9d07e85962839e204d49965fe2ecd Mon Sep 17 00:00:00 2001
From: David Karoly <karolyd577@gmail.com>
Date: Tue, 7 Feb 2023 19:56:39 +0100
Subject: OverlayPanel: call RefreshRect from DrawOverlays
@@ -224,3 +201,60 @@ index cfca34d..0fec289 100644
--
2.37.3
From 9ad759c3e9941b0c94d3819870608c0bbb8fcf52 Mon Sep 17 00:00:00 2001
From: David Karoly <karolyd577@gmail.com>
Date: Tue, 7 Feb 2023 18:40:17 +0100
Subject: HelpText: Remove broken link from welcome text
Signed-off-by: David Karoly <david.karoly@outlook.com>
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("</li><li>")
- << XO(
-" [[https://github.com/tenacitytenacity/tenacity/discussions|Discussions (on GitHub)]] - ask your question directly, online.")
<< wxT("</li></ul></p><p>")
<< wxT("<b>")
<< XO("More:</b> 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 <avery98@pm.me>
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 <avery98@pm.me>
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

View File

@@ -6,16 +6,16 @@ HOMEPAGE="https://www.tenacityaudio.org"
COPYRIGHT="2021-2023 by Tenacity Team"
LICENSE="GNU GPL v2"
REVISION="1"
srcGitRev="v1.3-beta"
srcGitDate="22 Jan 2023"
srcGitRev="v1.3-beta2"
srcGitDate="31 Jan 2023"
SOURCE_URI="https://codeberg.org/tenacityteam/tenacity/archive/${srcGitRev}.tar.gz"
CHECKSUM_SHA256="10577327867fc5463b72e19f94064feaf541b081ce6c882dbc0801311b80470d"
CHECKSUM_SHA256="65f0733e4e49d2a6ac02c9f646724043b84943cb3b148d2e37f3b69017fc71fc"
SOURCE_DIR="tenacity"
PATCHES="tenacity-$portVersion.patchset"
ADDITIONAL_FILES="tenacity.rdef.in"
ARCHITECTURES="?all !x86_gcc2"
SECONDARY_ARCHITECTURES="?x86"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
tenacity$secondaryArchSuffix = $portVersion