haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-08 21:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity
Files
aecc875e4d4c46a2623e6a852d39b88d5d417d23
haikuports/media-sound/lmms/patches/lmms-1.2.2.patchset
hfsfox c9d590745c lmms: fix build zynaddsubfx plugin
2024-02-29 10:16:03 +10:00

291 lines
9.3 KiB
Plaintext
Raw Blame History

From 9156b190fa20b61ecb0ce1071a2aa39fc0f8e41b Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 14 Apr 2019 19:41:47 +1000
Subject: Disable TLS for Haiku
diff --git a/src/3rdparty/rpmalloc/CMakeLists.txt b/src/3rdparty/rpmalloc/CMakeLists.txt
index da6e722..c553c57 100644
--- a/src/3rdparty/rpmalloc/CMakeLists.txt
+++ b/src/3rdparty/rpmalloc/CMakeLists.txt
@@ -15,6 +15,12 @@ if (NOT LMMS_BUILD_WIN32)
)
endif()
+if (HAIKU)
+ target_compile_definitions(rpmalloc
+ PRIVATE -DENABLE_PRELOAD=1
+ )
+endif()
+
if (CMAKE_BUILD_TYPE STREQUAL "Debug")
# rpmalloc uses GCC builtin "__builtin_umull_overflow" with ENABLE_VALIDATE_ARGS,
# which is only available starting with GCC 5
--
2.43.2
From 5b83e94e6d12469358faa99351dd16531c3d9d13 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 14 Apr 2019 21:46:08 +1000
Subject: Fix settings dir
diff --git a/src/core/ConfigManager.cpp b/src/core/ConfigManager.cpp
index 2ed0f83..050347f 100644
--- a/src/core/ConfigManager.cpp
+++ b/src/core/ConfigManager.cpp
@@ -33,6 +33,10 @@
#endif
#include <QtCore/QTextStream>
+#ifdef __HAIKU__
+#include <FindDirectory.h>
+#endif
+
#include "ConfigManager.h"
#include "MainWindow.h"
#include "ProjectVersion.h"
@@ -73,7 +77,13 @@ ConfigManager::ConfigManager() :
if (! qgetenv("LMMS_DATA_DIR").isEmpty())
QDir::addSearchPath("data", QString::fromLocal8Bit(qgetenv("LMMS_DATA_DIR")));
-
+#ifdef __HAIKU__
+ m_workingDir = QDir::home().absolutePath() +"/config/settings/LMMS/";
+ m_lmmsRcFile = m_workingDir +"/lmmsrc.xml";
+ m_gigDir = m_workingDir + GIG_PATH;
+ m_vstDir = "/system/add-ons/media/vstplugins/";
+ m_sf2Dir = "/system/data/synth/";
+#endif
// If we're in development (lmms is not installed) let's get the source and
// binary directories by reading the CMake Cache
QDir appPath = qApp->applicationDirPath();
@@ -114,6 +124,8 @@ ConfigManager::ConfigManager() :
#ifdef LMMS_BUILD_WIN32
QDir::addSearchPath("data", qApp->applicationDirPath() + "/data/");
+#elif __HAIKU__
+ QDir::addSearchPath("data", qApp->applicationDirPath() + "/");
#else
QDir::addSearchPath("data", qApp->applicationDirPath().section('/', 0, -2) + "/share/lmms/");
#endif
@@ -524,6 +536,23 @@ void ConfigManager::loadConfigFile( const QString & configFile )
cfg_file.close();
}
+#ifdef __HAIKU__
+ char midiSettings[PATH_MAX] = "";
+ if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, midiSettings, sizeof(midiSettings)) == B_OK) {
+ strcat(midiSettings, "/Media/midi_settings");
+ if( access( midiSettings, F_OK ) != -1 ) {
+ FILE *inFile = fopen(midiSettings, "rt");
+ if (inFile) {
+ char sf2file[PATH_MAX];
+ if (fscanf(inFile, "# Midi\n\tsoundfont \"%[^\"]\"", sf2file)) {
+ setDefaultSoundfont( sf2file );
+ }
+ fclose(inFile);
+ }
+ }
+ }
+#endif
+
// Plugins are searched recursively, blacklist problematic locations
if( m_vstDir.isEmpty() || m_vstDir == QDir::separator() || m_vstDir == "/" ||
m_vstDir == ensureTrailingSlash( QDir::homePath() ) ||
@@ -580,9 +609,6 @@ void ConfigManager::loadConfigFile( const QString & configFile )
}
}
-
-
-
void ConfigManager::saveConfigFile()
{
setValue( "paths", "artwork", m_artworkDir );
--
2.43.2
From ac1a1c5316e9df2314a07c25af1ba357c52cc904 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 28 Sep 2019 10:50:26 +0200
Subject: rpmalloc: disable TLS for Haiku.
diff --git a/src/3rdparty/rpmalloc/rpmalloc/rpmalloc/rpmalloc.c b/src/3rdparty/rpmalloc/rpmalloc/rpmalloc/rpmalloc.c
index a5cf999..16c28b1 100644
--- a/src/3rdparty/rpmalloc/rpmalloc/rpmalloc/rpmalloc.c
+++ b/src/3rdparty/rpmalloc/rpmalloc/rpmalloc/rpmalloc.c
@@ -100,7 +100,7 @@
# endif
#else
# include <unistd.h>
-# if defined(__APPLE__) && ENABLE_PRELOAD
+# if (defined(__APPLE__) || defined(__HAIKU__)) && ENABLE_PRELOAD
# include <pthread.h>
# endif
# define ALIGNED_STRUCT(name, alignment) struct __attribute__((__aligned__(alignment))) name
@@ -459,10 +459,10 @@ static atomic32_t _unmapped_total;
#define MEMORY_UNUSED(x) (void)sizeof((x))
//! Current thread heap
-#if defined(__APPLE__) && ENABLE_PRELOAD
+#if (defined(__APPLE__) || defined(__HAIKU__)) && ENABLE_PRELOAD
static pthread_key_t _memory_thread_heap;
#else
-# ifdef _MSC_VER
+# if defined(_MSC_VER)
# define _Thread_local __declspec(thread)
# define TLS_MODEL
# else
@@ -477,7 +477,7 @@ static _Thread_local heap_t* _memory_thread_heap TLS_MODEL;
//! Get the current thread heap
static FORCEINLINE heap_t*
get_thread_heap(void) {
-#if defined(__APPLE__) && ENABLE_PRELOAD
+#if (defined(__APPLE__) || defined(__HAIKU__)) && ENABLE_PRELOAD
return pthread_getspecific(_memory_thread_heap);
#else
return _memory_thread_heap;
@@ -487,7 +487,7 @@ get_thread_heap(void) {
//! Set the current thread heap
static void
set_thread_heap(heap_t* heap) {
-#if defined(__APPLE__) && ENABLE_PRELOAD
+#if (defined(__APPLE__) || defined(__HAIKU__)) && ENABLE_PRELOAD
pthread_setspecific(_memory_thread_heap, heap);
#else
_memory_thread_heap = heap;
@@ -1593,7 +1593,7 @@ rpmalloc_initialize_config(const rpmalloc_config_t* config) {
if (_memory_config.span_map_count > 128)
_memory_config.span_map_count = 128;
-#if defined(__APPLE__) && ENABLE_PRELOAD
+#if (defined(__APPLE__) || defined(__HAIKU__)) && ENABLE_PRELOAD
if (pthread_key_create(&_memory_thread_heap, 0))
return -1;
#endif
@@ -1698,7 +1698,7 @@ rpmalloc_finalize(void) {
assert(!atomic_load32(&_reserved_spans));
#endif
-#if defined(__APPLE__) && ENABLE_PRELOAD
+#if (defined(__APPLE__) || defined(__HAIKU__)) && ENABLE_PRELOAD
pthread_key_delete(_memory_thread_heap);
#endif
}
--
2.43.2
From b7fb99800968e9bebfda6889d651f64e66e356bb Mon Sep 17 00:00:00 2001
From: hfsfox <darkkitsunezx128k2309@gmail.com>
Date: Thu, 29 Feb 2024 00:01:39 +0200
Subject: fix build zynaddsubfx plugin
diff --git a/plugins/zynaddsubfx/CMakeLists.txt b/plugins/zynaddsubfx/CMakeLists.txt
index 4c170a9..247d0d4 100644
--- a/plugins/zynaddsubfx/CMakeLists.txt
+++ b/plugins/zynaddsubfx/CMakeLists.txt
@@ -131,6 +131,10 @@ IF(QT5)
TARGET_LINK_LIBRARIES(ZynAddSubFxCore Qt5::Widgets Qt5::Xml)
ENDIF()
+IF(HAIKU)
+TARGET_LINK_LIBRARIES(ZynAddSubFxCore -lnetwork -lbsd)
+ENDIF()
+
IF(LMMS_BUILD_WIN32)
TARGET_LINK_LIBRARIES(ZynAddSubFxCore -lws2_32)
INSTALL(TARGETS ZynAddSubFxCore RUNTIME DESTINATION "${PLUGIN_DIR}")
@@ -187,6 +191,10 @@ IF(QT5)
TARGET_LINK_LIBRARIES(RemoteZynAddSubFx Qt5::Core)
ENDIF(QT5)
+IF(HAIKU)
+TARGET_LINK_LIBRARIES(RemoteZynAddSubFx -lnetwork -lbsd)
+ENDIF()
+
# link Qt libraries when on win32
IF(LMMS_BUILD_WIN32)
TARGET_LINK_LIBRARIES(RemoteZynAddSubFx ${QT_LIBRARIES})
diff --git a/plugins/zynaddsubfx/RemoteZynAddSubFx.cpp b/plugins/zynaddsubfx/RemoteZynAddSubFx.cpp
index 7cb6e63..3c282e7 100644
--- a/plugins/zynaddsubfx/RemoteZynAddSubFx.cpp
+++ b/plugins/zynaddsubfx/RemoteZynAddSubFx.cpp
@@ -27,6 +27,10 @@
#include <winsock2.h>
#endif
+#ifdef __HAIKU__
+#include <posix/unistd.h>
+#endif
+
#include <queue>
#define BUILD_REMOTE_PLUGIN_CLIENT
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/DSP/SVFilter.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/DSP/SVFilter.cpp
index e7836a8..9f9556d 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/DSP/SVFilter.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/DSP/SVFilter.cpp
@@ -146,7 +146,9 @@ void SVFilter::singlefilterout(float *smp, fstage &x, parameters &par)
break;
default:
#ifndef WIN32
+#ifndef __HAIKU__
errx(1, "Impossible SVFilter type encountered [%d]", type);
+#endif
#endif
break;
}
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Unison.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Unison.cpp
index 82880f1..2fa876a 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Unison.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Unison.cpp
@@ -113,8 +113,10 @@ void Unison::updateParameters(void)
//and thus are buggy
if(unison_amplitude_samples >= max_delay - 1) {
#ifndef WIN32
+#ifndef __HAIKU__
warnx("BUG: Unison amplitude samples too big");
warnx("Unision max_delay should be larger");
+#endif
#endif
unison_amplitude_samples = max_delay - 2;
}
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Util.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Util.cpp
index 8af97d4..c0ade4a 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Util.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Util.cpp
@@ -198,9 +198,11 @@ void clearTmpBuffers(void)
{
for(pool_itr_t itr = pool.begin(); itr != pool.end(); ++itr) {
#ifndef WIN32
+#ifndef __HAIKU__
if(!itr->free) //Warn about used buffers
warn("Temporary buffer (%p) about to be freed may be in use",
itr->dat);
+#endif
#endif
delete [] itr->dat;
}
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/UI/MasterUI.fl b/plugins/zynaddsubfx/zynaddsubfx/src/UI/MasterUI.fl
index 254e505..550c299 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/UI/MasterUI.fl
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/UI/MasterUI.fl
@@ -1696,7 +1696,7 @@ configui=new ConfigUI();
make_window();
\#ifdef OS_WINDOWS
-masterwindow->icon((char *)LoadIcon(GetModuleHandle(NULL), "zynaddsubfx_icon"));
+#masterwindow->icon((char *)LoadIcon(GetModuleHandle(NULL), "zynaddsubfx_icon"));
\#endif
presetsui=new PresetsUI();
--
2.43.2
Reference in New Issue View Git Blame Copy Permalink