haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-09 05:10:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

audacity: update to 3.3.1 (#8573)

Browse Source
This commit is contained in:
davidkaroly
2023-05-03 13:31:05 +02:00
committed by GitHub
parent 9750b94bae
commit 51c0bd12b2
2 changed files with 86 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media-sound/audacity/audacity-3.2.5.recipe → media-sound/audacity/audacity-3.3.1.recipe
View File

@@ -6,9 +6,9 @@ tracks and more."
HOMEPAGE="https://www.audacityteam.org"
COPYRIGHT="1999-2023 by Audacity Team"
LICENSE="GNU GPL v2"
REVISION="2"
REVISION="1"
SOURCE_URI="https://github.com/audacity/audacity/archive/refs/tags/Audacity-$portVersion.tar.gz"
CHECKSUM_SHA256="7ee4f6f3ea985114b8fda578c67faf163e1d2cc8b2f0bad1b259a9367d2ccb1b"
CHECKSUM_SHA256="5c22735a9ed7b0a0143a1817cc5f7e61ae3a855d911fbca8758962e5273710e4"
SOURCE_DIR="audacity-Audacity-$portVersion"
PATCHES="audacity-$portVersion.patchset"
ADDITIONAL_FILES="audacity.rdef.in"

123
media-sound/audacity/patches/audacity-3.2.5.patchset → media-sound/audacity/patches/audacity-3.3.1.patchset
View File

@@ -1,4 +1,4 @@
From 96eb16309eed86d5db6f6e7dfcdfaa3fa292ea8d Mon Sep 17 00:00:00 2001
From b31a6262a4ecad15fdd5730bb3986c324148ad2b Mon Sep 17 00:00:00 2001
From: David Karoly <david.karoly@outlook.com>
Date: Mon, 7 Nov 2022 14:27:23 +0100
Subject: nyquist: fix build on Haiku
@@ -34,7 +34,7 @@ index 3134849..8fd29ea 100644
2.37.3
From ecb2791d4cc1c29af8c85e2394a24d9954dcf9f9 Mon Sep 17 00:00:00 2001
From f3cd87c3cb743973c93fdc5fc3f7124cd469e6df Mon Sep 17 00:00:00 2001
From: David Karoly <david.karoly@outlook.com>
Date: Mon, 7 Nov 2022 14:17:48 +0100
Subject: portmixer: fix build on Haiku
@@ -93,7 +93,7 @@ index 978f27b..eb44dce 100644
2.37.3
From 91cd8ecd507b087d19799ad3c8dac608847407e9 Mon Sep 17 00:00:00 2001
From 8192a1db2463995de46393e9eef2503a5602d7b4 Mon Sep 17 00:00:00 2001
From: David Karoly <david.karoly@outlook.com>
Date: Mon, 7 Nov 2022 15:09:44 +0100
Subject: MIDIPlay: fix build on Haiku
@@ -116,17 +116,17 @@ index 620bb85..e1ee067 100644
2.37.3
From 599e51581eba796e3c6c0795f227e50d5bded308 Mon Sep 17 00:00:00 2001
From 504245ef18918b857e8c224cbaf6132cca772292 Mon Sep 17 00:00:00 2001
From: David Karoly <david.karoly@outlook.com>
Date: Mon, 7 Nov 2022 15:06:14 +0100
Subject: fix GTK include paths and libs
diff --git a/cmake-proxies/cmake-modules/dependencies/wxwidgets.cmake b/cmake-proxies/cmake-modules/dependencies/wxwidgets.cmake
index 4b35e89..e5a909c 100644
index df79c6a..dffd951 100644
--- a/cmake-proxies/cmake-modules/dependencies/wxwidgets.cmake
+++ b/cmake-proxies/cmake-modules/dependencies/wxwidgets.cmake
@@ -106,5 +106,9 @@ if( NOT CMAKE_SYSTEM_NAME MATCHES "Windows|Darwin" )
@@ -159,5 +159,9 @@ if( NOT CMAKE_SYSTEM_NAME MATCHES "Windows|Darwin" )
pkg_check_modules( GTK REQUIRED IMPORTED_TARGET GLOBAL ${gtk} )
pkg_check_modules( GLIB REQUIRED IMPORTED_TARGET GLOBAL ${glib} )
@@ -140,17 +140,17 @@ index 4b35e89..e5a909c 100644
2.37.3
From 7e99e0da1c25707bf73c44d37836af654a145861 Mon Sep 17 00:00:00 2001
From 44731a66c04c4ab8e06024288160c5963affcb6a Mon Sep 17 00:00:00 2001
From: David Karoly <david.karoly@outlook.com>
Date: Mon, 7 Nov 2022 14:33:10 +0100
Subject: Adjust install rules for Haiku
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a71cacd..129c33e 100644
index 08f3717..792f925 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1449,6 +1449,8 @@ elseif( CMAKE_SYSTEM_NAME MATCHES "Darwin" )
@@ -1352,6 +1352,8 @@ elseif( CMAKE_SYSTEM_NAME MATCHES "Darwin" )
POST_BUILD
)
endif()
@@ -159,9 +159,9 @@ index a71cacd..129c33e 100644
else()
set_target_properties(
${TARGET}
@@ -1652,8 +1654,10 @@ else()
install( CODE "set( _LIBDIR \"${_LIBDIR}\")" )
install( SCRIPT "${CMAKE_SOURCE_DIR}/scripts/build/linux/fix_rpath.cmake" )
@@ -1562,8 +1564,10 @@ else()
USE_SOURCE_PERMISSIONS
FILES_MATCHING PATTERN "*.so*" )
- install( FILES "${_INTDIR}/audacity.desktop"
- DESTINATION "${_DATADIR}/applications" )
@@ -169,14 +169,14 @@ index a71cacd..129c33e 100644
+ install( FILES "${_INTDIR}/audacity.desktop"
+ DESTINATION "${_DATADIR}/applications" )
+ endif()
install( FILES "${topdir}/LICENSE.txt" "${topdir}/README.txt"
install( FILES "${topdir}/LICENSE.txt" "${topdir}/README.md"
DESTINATION "${_DATADIR}/doc/${AUDACITY_NAME}" )
install( FILES "${_SRCDIR}/audacity.xml"
--
2.37.3
From e58525b35e7960cbc9fe6abac5d2a02a7130207c Mon Sep 17 00:00:00 2001
From 3a3dc550928a746c746dc9357273a2c8a2462008 Mon Sep 17 00:00:00 2001
From: David Karoly <david.karoly@outlook.com>
Date: Thu, 17 Nov 2022 20:54:07 +0100
Subject: Use POSIX shared memory
@@ -184,10 +184,10 @@ Subject: Use POSIX shared memory
Patch inspired by Tenacity, original author: Avery King <avery98@pm.me>
diff --git a/src/AudacityApp.cpp b/src/AudacityApp.cpp
index 4472ca0..c2133f8 100644
index edce76f..ca44936 100644
--- a/src/AudacityApp.cpp
+++ b/src/AudacityApp.cpp
@@ -64,6 +64,7 @@ It handles initialization and termination by subclassing wxApp.
@@ -60,6 +60,7 @@ It handles initialization and termination by subclassing wxApp.
#include <sys/file.h>
#include <sys/stat.h>
#include <stdio.h>
@@ -195,7 +195,7 @@ index 4472ca0..c2133f8 100644
#endif
#if defined(__WXMSW__)
@@ -1172,6 +1173,7 @@ bool AudacityApp::OSXIsGUIApplication()
@@ -1243,6 +1244,7 @@ bool AudacityApp::OSXIsGUIApplication()
AudacityApp::~AudacityApp()
{
@@ -203,7 +203,7 @@ index 4472ca0..c2133f8 100644
}
// Some of the many initialization steps
@@ -1939,7 +1941,6 @@ bool AudacityApp::CreateSingleInstanceChecker(const wxString &dir)
@@ -2018,7 +2020,6 @@ bool AudacityApp::CreateSingleInstanceChecker(const wxString &dir)
#include <sys/ipc.h>
#include <sys/sem.h>
@@ -211,7 +211,7 @@ index 4472ca0..c2133f8 100644
// Return true if there are no other instances of Audacity running,
// false otherwise.
@@ -1962,8 +1963,8 @@ bool AudacityApp::CreateSingleInstanceChecker(const wxString &dir)
@@ -2041,8 +2042,8 @@ bool AudacityApp::CreateSingleInstanceChecker(const wxString &dir)
// Create and map the shared memory segment where the port number
// will be stored.
@@ -222,7 +222,7 @@ index 4472ca0..c2133f8 100644
{
AudacityMessageBox(
XO("Unable to create shared memory segment.\n\n"
@@ -1974,7 +1975,28 @@ bool AudacityApp::CreateSingleInstanceChecker(const wxString &dir)
@@ -2053,7 +2054,28 @@ bool AudacityApp::CreateSingleInstanceChecker(const wxString &dir)
return false;
}
@@ -252,7 +252,7 @@ index 4472ca0..c2133f8 100644
// Create (or return) the SERVER semaphore ID
int servid = semget(servkey, 1, IPC_CREAT | S_IRUSR | S_IWUSR);
@@ -2117,6 +2139,8 @@ bool AudacityApp::CreateSingleInstanceChecker(const wxString &dir)
@@ -2196,6 +2218,8 @@ bool AudacityApp::CreateSingleInstanceChecker(const wxString &dir)
return false;
}
@@ -261,7 +261,7 @@ index 4472ca0..c2133f8 100644
// We've successfully created the socket server and the app
// should continue to initialize.
return true;
@@ -2214,6 +2238,8 @@ bool AudacityApp::CreateSingleInstanceChecker(const wxString &dir)
@@ -2293,6 +2317,8 @@ bool AudacityApp::CreateSingleInstanceChecker(const wxString &dir)
// Send an empty string to force existing Audacity to front
sock->WriteMsg(wxEmptyString, sizeof(wxChar));
@@ -274,17 +274,17 @@ index 4472ca0..c2133f8 100644
2.37.3
From c1ba7fc10deefd8ac290a94dbcbf59f9b1c9e4f8 Mon Sep 17 00:00:00 2001
From 082285212f8511b147833ef72ba8f8359ddb34e1 Mon Sep 17 00:00:00 2001
From: David Karoly <david.karoly@outlook.com>
Date: Fri, 9 Dec 2022 16:36:39 +0100
Subject: Haiku: initialize XDG vars
diff --git a/src/AudacityApp.cpp b/src/AudacityApp.cpp
index c2133f8..77eff52 100644
index ca44936..9256072 100644
--- a/src/AudacityApp.cpp
+++ b/src/AudacityApp.cpp
@@ -58,6 +58,12 @@ It handles initialization and termination by subclassing wxApp.
@@ -54,6 +54,12 @@ It handles initialization and termination by subclassing wxApp.
#endif
#endif
@@ -297,9 +297,9 @@ index c2133f8..77eff52 100644
// chmod, lstat, geteuid
#ifdef __UNIX__
#include <sys/types.h>
@@ -833,6 +839,30 @@ int main(int argc, char *argv[])
IMPLEMENT_APP_NO_MAIN(AudacityApp)
IMPLEMENT_WX_THEME_SUPPORT
@@ -842,6 +848,30 @@ public:
};
};
+#ifdef __HAIKU__
+void initialize_xdg_paths(void)
@@ -325,12 +325,12 @@ index c2133f8..77eff52 100644
+}
+#endif
+
int main(int argc, char *argv[])
{
wxDISABLE_DEBUG_SUPPORT();
@@ -845,6 +875,10 @@ int main(int argc, char *argv[])
stdout = freopen("/dev/null", "w", stdout);
stderr = freopen("/dev/null", "w", stderr);
#if defined(__WXMAC__)
IMPLEMENT_APP_NO_MAIN(AudacityApp)
@@ -893,6 +923,10 @@ int main(int argc, char *argv[])
freopen("/dev/null", "w", stdout);
freopen("/dev/null", "w", stderr);
+#ifdef __HAIKU__
+ initialize_xdg_paths();
@@ -339,11 +339,22 @@ index c2133f8..77eff52 100644
return wxEntry(argc, argv);
}
@@ -908,6 +942,10 @@ int main(int argc, char *argv[])
wxDISABLE_DEBUG_SUPPORT();
+#ifdef __HAIKU__
+ initialize_xdg_paths();
+#endif
+
return wxEntry(argc, argv);
}
wxIMPLEMENT_APP_NO_MAIN(AudacityApp);
--
2.37.3
From 4e510ab731c0fa2575668d8f664b377fd39a9462 Mon Sep 17 00:00:00 2001
From d12f70cb8abea40088d635c780a744b6a093dec2 Mon Sep 17 00:00:00 2001
From: David Karoly <david.karoly@outlook.com>
Date: Sat, 17 Dec 2022 23:26:49 +0100
Subject: adjust paths for Haiku
@@ -408,7 +419,7 @@ index 6cd5775..9078693 100644
2.37.3
From c4b3ce7f97ab1422c99c32ee626c50bbbb5a485a Mon Sep 17 00:00:00 2001
From 80808ac4f1af4a720380a9ced73e2538dab6dbfb Mon Sep 17 00:00:00 2001
From: David Karoly <david.karoly@outlook.com>
Date: Sun, 18 Dec 2022 22:39:34 +0100
Subject: shutdown hook for locales. fix crash on exit
@@ -445,10 +456,10 @@ index c6707ee..f545484 100644
STRINGS_API
wxString GetLang();
diff --git a/src/AudacityApp.cpp b/src/AudacityApp.cpp
index 77eff52..fdd1988 100644
index 9256072..ade1668 100644
--- a/src/AudacityApp.cpp
+++ b/src/AudacityApp.cpp
@@ -879,7 +879,9 @@ int main(int argc, char *argv[])
@@ -927,7 +927,9 @@ int main(int argc, char *argv[])
initialize_xdg_paths();
#endif
@@ -458,7 +469,41 @@ index 77eff52..fdd1988 100644
+ return res;
}
#else
#elif defined(__WXGTK__)
@@ -946,7 +948,9 @@ int main(int argc, char *argv[])
initialize_xdg_paths();
#endif
- return wxEntry(argc, argv);
+ int res = wxEntry(argc, argv);
+ Languages::UnsetLocale();
+ return res;
}
wxIMPLEMENT_APP_NO_MAIN(AudacityApp);
--
2.37.3
From 75c0f654e8d820058e2d5864326e66ff8131b5fc Mon Sep 17 00:00:00 2001
From: David Karoly <david.karoly@outlook.com>
Date: Tue, 2 May 2023 19:53:40 +0200
Subject: Haiku: Build GTK FileDialog
diff --git a/libraries/lib-wx-wrappers/CMakeLists.txt b/libraries/lib-wx-wrappers/CMakeLists.txt
index 3399210..2762940 100644
--- a/libraries/lib-wx-wrappers/CMakeLists.txt
+++ b/libraries/lib-wx-wrappers/CMakeLists.txt
@@ -21,7 +21,7 @@ set( SOURCES
FileDialog/mac/FileDialogPrivate.mm
FileDialog/mac/FileDialogPrivate.h
>
- $<$<PLATFORM_ID:Linux,FreeBSD,CYGWIN>:
+ $<$<PLATFORM_ID:Linux,FreeBSD,CYGWIN,Haiku>:
FileDialog/gtk/FileDialogPrivate.cpp
FileDialog/gtk/FileDialogPrivate.h
>
--
2.37.3