-
-
Notifications
You must be signed in to change notification settings - Fork 3.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
5 changed files
with
190 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
diff --git a/src/modules/rtaudio/RtAudio.cpp b/src/modules/rtaudio/RtAudio.cpp | ||
index b13f04e..4178219 100644 | ||
--- a/src/modules/rtaudio/RtAudio.cpp | ||
+++ b/src/modules/rtaudio/RtAudio.cpp | ||
@@ -348,7 +348,7 @@ public: | ||
|
||
#if defined(__LINUX_OSS__) | ||
|
||
-#include <sys/soundcard.h> | ||
+#include <linux/soundcard.h> | ||
|
||
class RtApiOss: public RtApi | ||
{ |
34 changes: 34 additions & 0 deletions
34
x11-packages/mlt/0002-rtaudio-remove-pthread_testcancel.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
diff --git a/src/modules/rtaudio/RtAudio.cpp b/src/modules/rtaudio/RtAudio.cpp | ||
index 4178219..bd597ef 100644 | ||
--- a/src/modules/rtaudio/RtAudio.cpp | ||
+++ b/src/modules/rtaudio/RtAudio.cpp | ||
@@ -9087,7 +9087,9 @@ static void *alsaCallbackHandler( void *ptr ) | ||
#endif | ||
|
||
while ( *isRunning == true ) { | ||
+#ifndef __ANDROID__ | ||
pthread_testcancel(); | ||
+#endif | ||
object->callbackEvent(); | ||
} | ||
|
||
@@ -9363,7 +9365,9 @@ static void *pulseaudio_callback( void * user ) | ||
#endif | ||
|
||
while ( *isRunning ) { | ||
+#ifndef __ANDROID__ | ||
pthread_testcancel(); | ||
+#endif | ||
context->callbackEvent(); | ||
} | ||
|
||
@@ -10846,7 +10850,9 @@ static void *ossCallbackHandler( void *ptr ) | ||
#endif | ||
|
||
while ( *isRunning == true ) { | ||
+#ifndef __ANDROID__ | ||
pthread_testcancel(); | ||
+#endif | ||
object->callbackEvent(); | ||
} | ||
|
34 changes: 34 additions & 0 deletions
34
x11-packages/mlt/0003-rtaudio-remove-pthread_attr_setinheritsched.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
diff --git a/src/modules/rtaudio/RtAudio.cpp b/src/modules/rtaudio/RtAudio.cpp | ||
index bd597ef..dc64863 100644 | ||
--- a/src/modules/rtaudio/RtAudio.cpp | ||
+++ b/src/modules/rtaudio/RtAudio.cpp | ||
@@ -8636,7 +8636,9 @@ bool RtApiAlsa :: probeDeviceOpen( unsigned int deviceId, StreamMode mode, unsig | ||
pthread_attr_setschedpolicy(&attr, SCHED_RR); | ||
pthread_attr_setscope (&attr, PTHREAD_SCOPE_SYSTEM); | ||
// This is definitely required. Otherwise it fails. | ||
+#if !defined __ANDROID__ || __ANDROID_API__ >= 28 | ||
pthread_attr_setinheritsched(&attr, PTHREAD_EXPLICIT_SCHED); | ||
+#endif | ||
pthread_attr_setschedparam(&attr, ¶m); | ||
} | ||
else | ||
@@ -9602,7 +9604,9 @@ bool RtApiPulse::probeDeviceOpen( unsigned int deviceId, StreamMode mode, | ||
pthread_attr_setschedpolicy(&attr, SCHED_RR); | ||
pthread_attr_setscope (&attr, PTHREAD_SCOPE_SYSTEM); | ||
// This is definitely required. Otherwise it fails. | ||
+#if !defined __ANDROID__ || __ANDROID_API__ >= 28 | ||
pthread_attr_setinheritsched(&attr, PTHREAD_EXPLICIT_SCHED); | ||
+#endif | ||
pthread_attr_setschedparam(&attr, ¶m); | ||
} | ||
else | ||
@@ -10454,7 +10458,9 @@ bool RtApiOss :: probeDeviceOpen( unsigned int deviceId, StreamMode mode, unsign | ||
pthread_attr_setschedpolicy(&attr, SCHED_RR); | ||
pthread_attr_setscope (&attr, PTHREAD_SCOPE_SYSTEM); | ||
// This is definitely required. Otherwise it fails. | ||
+#if !defined __ANDROID__ || __ANDROID_API__ >= 28 | ||
pthread_attr_setinheritsched(&attr, PTHREAD_EXPLICIT_SCHED); | ||
+#endif | ||
pthread_attr_setschedparam(&attr, ¶m); | ||
} | ||
else |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,92 @@ | ||
diff --git a/Doxyfile b/Doxyfile | ||
index ae551d7e..62f63d08 100644 | ||
--- a/Doxyfile | ||
+++ b/Doxyfile | ||
@@ -1263,7 +1263,7 @@ EXTERNAL_GROUPS = YES | ||
# The PERL_PATH should be the absolute path and name of the perl script | ||
# interpreter (i.e. the result of `which perl'). | ||
|
||
-PERL_PATH = /usr/bin/perl | ||
+PERL_PATH = @TERMUX_PREFIX@/bin/perl | ||
|
||
#--------------------------------------------------------------------------- | ||
# Configuration options related to the dot tool | ||
diff --git a/cmake/FindMono.cmake b/cmake/FindMono.cmake | ||
index 0588a9c3..ea6ef046 100644 | ||
--- a/cmake/FindMono.cmake | ||
+++ b/cmake/FindMono.cmake | ||
@@ -110,10 +110,10 @@ else( UNIX ) | ||
set( chsarp_mono_names "mcs" "mcs.exe" "dmcs" "dmcs.exe" "smcs" "smcs.exe" "gmcs" "gmcs.exe" ) | ||
set( | ||
csharp_mono_paths | ||
- "/usr/bin/" | ||
- "/usr/local/bin/" | ||
- "/usr/lib/mono/2.0" | ||
- "/opt/novell/mono/bin" | ||
+ "@TERMUX_PREFIX@/bin/" | ||
+ "@TERMUX_PREFIX@/local/bin/" | ||
+ "@TERMUX_PREFIX@/lib/mono/2.0" | ||
+ "@TERMUX_PREFIX@/opt/novell/mono/bin" | ||
) | ||
find_program( | ||
csharp_mono_compiler # variable is added to the cache, we removed it below | ||
diff --git a/cmake/FindNode.cmake b/cmake/FindNode.cmake | ||
index 98b9de4f..f28d7234 100644 | ||
--- a/cmake/FindNode.cmake | ||
+++ b/cmake/FindNode.cmake | ||
@@ -1,8 +1,8 @@ | ||
# https://github.com/eclipse/upm/blob/master/cmake/modules/FindNode.cmake | ||
|
||
-# Macro to add directory to NODEJS_INCLUDE_DIRS if it exists and is not /usr/include | ||
+# Macro to add directory to NODEJS_INCLUDE_DIRS if it exists and is not @TERMUX_PREFIX@/include | ||
macro(add_include_dir dir) | ||
- if (IS_DIRECTORY ${dir} AND NOT ${dir} STREQUAL "/usr/include") | ||
+ if (IS_DIRECTORY ${dir} AND NOT ${dir} STREQUAL "@TERMUX_PREFIX@/include") | ||
set(NODEJS_INCLUDE_DIRS ${NODEJS_INCLUDE_DIRS} ${dir}) | ||
endif() | ||
endmacro() | ||
@@ -16,7 +16,7 @@ find_program (NODEJS_EXECUTABLE NAMES node nodejs | ||
include (FindPackageHandleStandardArgs) | ||
|
||
# If compat-libuv package exists, it must be at start of include path | ||
-find_path (UV_ROOT_DIR "uv.h" PATHS /usr/include/compat-libuv010 NO_DEFAULT_PATH) | ||
+find_path (UV_ROOT_DIR "uv.h" PATHS @TERMUX_PREFIX@/include/compat-libuv010 NO_DEFAULT_PATH) | ||
if (UV_ROOT_DIR) | ||
# set (NODEJS_INCLUDE_DIRS ${UV_ROOT_DIR}) | ||
add_include_dir(${UV_ROOT_DIR}) | ||
@@ -26,7 +26,7 @@ endif() | ||
find_path (NODE_ROOT_DIR | ||
NAMES node.h src/node.h | ||
PATH_SUFFIXES node node4 node5 node6 node7 node8 nodejs | ||
- PATHS /usr/include /usr/local/include) | ||
+ PATHS @TERMUX_PREFIX@/include @TERMUX_PREFIX@/local/include) | ||
|
||
if (NODE_ROOT_DIR) | ||
add_include_dir(${NODE_ROOT_DIR}) | ||
diff --git a/src/modules/frei0r/factory.c b/src/modules/frei0r/factory.c | ||
index 10b68ff2..06523ff5 100644 | ||
--- a/src/modules/frei0r/factory.c | ||
+++ b/src/modules/frei0r/factory.c | ||
@@ -45,8 +45,7 @@ | ||
#endif | ||
#else | ||
#define FREI0R_PLUGIN_PATH \ | ||
- "/usr/lib/frei0r-1:/usr/lib64/frei0r-1:/opt/local/lib/frei0r-1:/usr/local/lib/frei0r-1:$HOME/" \ | ||
- ".frei0r-1/lib" | ||
+ "@TERMUX_PREFIX@/lib/frei0r-1:$HOME/.frei0r-1/lib" | ||
#endif | ||
#endif | ||
|
||
diff --git a/src/modules/jackrack/plugin_mgr.c b/src/modules/jackrack/plugin_mgr.c | ||
index ab29f38a..3393394d 100644 | ||
--- a/src/modules/jackrack/plugin_mgr.c | ||
+++ b/src/modules/jackrack/plugin_mgr.c | ||
@@ -244,7 +244,7 @@ plugin_mgr_get_path_plugins (plugin_mgr_t * plugin_mgr) | ||
} | ||
#else | ||
if (!ladspa_path) | ||
- ladspa_path = g_strdup ("/usr/local/lib/ladspa:/usr/lib/ladspa:/usr/lib64/ladspa"); | ||
+ ladspa_path = g_strdup ("@TERMUX_PREFIX@/lib/ladspa"); | ||
#endif | ||
|
||
for (dir = strtok (ladspa_path, MLT_DIRLIST_DELIMITER); dir; dir = strtok (NULL, MLT_DIRLIST_DELIMITER)) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
TERMUX_PKG_HOMEPAGE=https://www.mltframework.org/ | ||
TERMUX_PKG_DESCRIPTION="Multimedia Framework. Author, manage, and run multitrack audio/video compositions." | ||
TERMUX_PKG_MAINTAINER="@termux" | ||
TERMUX_PKG_LICENSE="LGPL-2.1" | ||
TERMUX_PKG_VERSION=7.24.0 | ||
TERMUX_PKG_SRCURL=https://github.com/mltframework/mlt/releases/download/v${TERMUX_PKG_VERSION}/mlt-${TERMUX_PKG_VERSION}.tar.gz | ||
TERMUX_PKG_SHA256=8cde7c22a1a5395abe913976c2edafb498f81ed81a5f49dd0e6e2d86d68bcec0 | ||
TERMUX_PKG_DEPENDS="libebur128, swig" | ||
TERMUX_PKG_BUILD_DEPENDS="ffmpeg, fftw, fontconfig, frei0r-plugins, gdk-pixbuf, glib, jack, movit, ladspa-sdk, libepoxy, libexif, libglvnd, libsamplerate, libvidstab, libvorbis, libx11, libxml2, qt6-qtbase, qt6-qtsvg, pango, python, rubberband, sdl2, sdl-image, sox, zlib" | ||
TERMUX_PKG_SUGGESTS="$TERMUX_PKG_BUILD_DEPENDS" | ||
TERMUX_PKG_AUTO_UPDATE=true | ||
TERMUX_PKG_FORCE_CMAKE=true | ||
|
||
termux_step_pre_configure() { | ||
# Fix linker script error | ||
LDFLAGS+=" -Wl,--undefined-version" | ||
} |