Skip to content

Commit

Permalink
Update jack2 for MOD
Browse files Browse the repository at this point in the history
Signed-off-by: falkTX <falktx@falktx.com>
  • Loading branch information
falkTX committed Oct 27, 2023
1 parent 272a381 commit 2e29f72
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 1 deletion.
2 changes: 1 addition & 1 deletion bootstrap-mod.sh
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ fi
# ---------------------------------------------------------------------------------------------------------------------
# jack2

JACK2_VERSION="250420381b1a6974798939ad7104ab1a4b9a9994"
JACK2_VERSION="73a759b0822163341718c5ac30f7927a824778d5"
JACK2_URL="https://github.com/jackaudio/jack2.git"

JACK2_EXTRAFLAGS=""
Expand Down
42 changes: 42 additions & 0 deletions patches/jack2/02_ignore-missing-internals.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
diff --git a/common/JackControlAPI.cpp b/common/JackControlAPI.cpp
index c13640a..0e00535 100644
--- a/common/JackControlAPI.cpp
+++ b/common/JackControlAPI.cpp
@@ -458,10 +458,7 @@ jackctl_internals_load(

descriptor_node_ptr = jack_internals_load(NULL);
if (descriptor_node_ptr == NULL)
- {
- jack_error("Could not find any internals in driver directory!");
return false;
- }

while (descriptor_node_ptr != NULL)
{
diff --git a/common/JackDriverLoader.cpp b/common/JackDriverLoader.cpp
index 7715043..9a1be51 100644
--- a/common/JackDriverLoader.cpp
+++ b/common/JackDriverLoader.cpp
@@ -670,10 +670,6 @@ JSList* jack_internals_load(JSList * internals)

} while (FindNextFileW(file, &filedata));

- if (!driver_list) {
- jack_error ("Could not find any internals in %s!", driver_dir);
- }
-
error:
if (driver_dir) {
free(driver_dir);
@@ -738,11 +734,6 @@ JSList* jack_internals_load(JSList * internals)
driver_dir, strerror (errno));
}

- if (!driver_list) {
- jack_error ("Could not find any internals in %s!", driver_dir);
- return NULL;
- }
-
return driver_list;
}

0 comments on commit 2e29f72

Please sign in to comment.