KXStudio
/
Repository
mirror of https://github.com/KXStudio/Repository
1
0
Fork 0
Code Releases 2 Activity
External, Non-PPA KXStudio Repository
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
178 Commits
1 Branch
2.4MB
Tree: ae3feb5537
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from 'ae3feb5537'
${ noResults }
Repository/sources/apps/carla/debian/patches/01-hotfix-2.5-git-changes.p...

126 lines
5.9KB
Raw Blame History 

  1. diff --git a/source/frontend/carla_database.py b/source/frontend/carla_database.py

  2. index 98b97bada..7654851e2 100755

  3. --- a/source/frontend/carla_database.py

  4. +++ b/source/frontend/carla_database.py

  5. @@ -239,12 +239,12 @@ def runCarlaDiscovery(itype, stype, filename, tool, wineSettings=None):

  6.          else:

  7.              break

  8.  

  9. -        if line == "carla-discovery::init::-----------":

  10. +        if line.startswith("carla-discovery::init::"):

  11.              pinfo = deepcopy(PyPluginInfo)

  12.              pinfo['type']     = itype

  13.              pinfo['filename'] = filename if filename != ":all" else ""

  14.  

  15. -        elif line == "carla-discovery::end::------------":

  16. +        elif line.startswith("carla-discovery::end::"):

  17.              if pinfo is not None:

  18.                  plugins.append(pinfo)

  19.                  del pinfo

  20. diff --git a/source/plugin/Makefile b/source/plugin/Makefile

  21. index 24a4d4c28..19d9f973a 100644

  22. --- a/source/plugin/Makefile

  23. +++ b/source/plugin/Makefile

  24. @@ -134,9 +134,17 @@ SYMBOLS_NATIVE += -Wl,-exported_symbol,_carla_get_native_patchbay16_plugin

  25.  SYMBOLS_NATIVE += -Wl,-exported_symbol,_carla_get_native_patchbay32_plugin

  26.  SYMBOLS_NATIVE += -Wl,-exported_symbol,_carla_get_native_patchbay64_plugin

  27.  SYMBOLS_NATIVE += -Wl,-exported_symbol,_carla_get_native_patchbay_cv_plugin

  28. +SYMBOLS_NATIVE += -Wl,-exported_symbol,_carla_get_native_patchbay_cv8_plugin

  29. +SYMBOLS_NATIVE += -Wl,-exported_symbol,_carla_get_native_patchbay_cv32_plugin

  30. +SYMBOLS_NATIVE += -Wl,-exported_symbol,_carla_get_native_patchbay_obs_plugin

  31.  SYMBOLS_NATIVE += -Wl,-exported_symbol,_carla_create_native_plugin_host_handle

  32.  SYMBOLS_NATIVE += -Wl,-exported_symbol,_carla_host_handle_free

  33.  SYMBOLS_NATIVE += -Wl,-exported_symbol,_carla_get_native_plugin_engine

  34. +SYMBOLS_NATIVE += -Wl,-exported_symbol,_carla_get_complete_license_text

  35. +SYMBOLS_NATIVE += -Wl,-exported_symbol,_carla_get_juce_version

  36. +SYMBOLS_NATIVE += -Wl,-exported_symbol,_carla_get_supported_file_extensions

  37. +SYMBOLS_NATIVE += -Wl,-exported_symbol,_carla_get_supported_features

  38. +SYMBOLS_NATIVE += -Wl,-exported_symbol,_carla_get_library_filename

  39.  SYMBOLS_NATIVE += -Wl,-exported_symbol,_carla_get_library_folder

  40.  SYMBOLS_LV2     = -Wl,-exported_symbol,_lv2_descriptor

  41.  ifeq ($(HAVE_PYQT),true)

  42. @@ -152,9 +160,18 @@ SYMBOLS_NATIVE += 'carla_get_native_patchbay16_plugin',

  43.  SYMBOLS_NATIVE += 'carla_get_native_patchbay32_plugin',

  44.  SYMBOLS_NATIVE += 'carla_get_native_patchbay64_plugin',

  45.  SYMBOLS_NATIVE += 'carla_get_native_patchbay_cv_plugin',

  46. +SYMBOLS_NATIVE += 'carla_get_native_patchbay_cv8_plugin',

  47. +SYMBOLS_NATIVE += 'carla_get_native_patchbay_cv32_plugin',

  48. +SYMBOLS_NATIVE += 'carla_get_native_patchbay_obs_plugin',

  49.  SYMBOLS_NATIVE += 'carla_create_native_plugin_host_handle',

  50.  SYMBOLS_NATIVE += 'carla_host_handle_free',

  51. -SYMBOLS_NATIVE += 'carla_get_native_plugin_engine'

  52. +SYMBOLS_NATIVE += 'carla_get_native_plugin_engine',

  53. +SYMBOLS_NATIVE += 'carla_get_complete_license_text',

  54. +SYMBOLS_NATIVE += 'carla_get_juce_version',

  55. +SYMBOLS_NATIVE += 'carla_get_supported_file_extensions',

  56. +SYMBOLS_NATIVE += 'carla_get_supported_features',

  57. +SYMBOLS_NATIVE += 'carla_get_library_filename',

  58. +SYMBOLS_NATIVE += 'carla_get_library_folder'

  59.  SYMBOLS_NATIVE += ]"

  60.  ifeq ($(HAVE_PYQT),true)

  61.  SYMBOLS_LV2     = -sSIDE_MODULE=2 -sEXPORTED_FUNCTIONS="['lv2_descriptor','lv2ui_descriptor']"

  62. diff --git a/source/plugin/carla-host-plugin.cpp b/source/plugin/carla-host-plugin.cpp

  63. index 5bc748582..247efbf34 100644

  64. --- a/source/plugin/carla-host-plugin.cpp

  65. +++ b/source/plugin/carla-host-plugin.cpp

  66. @@ -18,6 +18,7 @@

  67.  #include "CarlaNativePlugin.h"

  68.  

  69.  #define CARLA_PLUGIN_BUILD

  70. +#define CARLA_HOST_PLUGIN_BUILD

  71.  

  72.  #include "carla-native-plugin.cpp"

  73.  

  74. diff --git a/source/plugin/carla-native-plugin.cpp b/source/plugin/carla-native-plugin.cpp

  75. index 0ea582d22..ce97b45a4 100644

  76. --- a/source/plugin/carla-native-plugin.cpp

  77. +++ b/source/plugin/carla-native-plugin.cpp

  78. @@ -26,7 +26,7 @@

  79.  // --------------------------------------------------------------------------------------------------------------------

  80.  // Expose info functions as needed

  81.  

  82. -#ifndef CARLA_PLUGIN_BUILD

  83. +#ifndef CARLA_HOST_PLUGIN_BUILD

  84.  # include "utils/Information.cpp"

  85.  #endif

  86.  

  87. diff --git a/source/plugin/symbols/carla-native-plugin.def b/source/plugin/symbols/carla-native-plugin.def

  88. index 0e5445452..e222e9c2a 100644

  89. --- a/source/plugin/symbols/carla-native-plugin.def

  90. +++ b/source/plugin/symbols/carla-native-plugin.def

  91. @@ -16,3 +16,6 @@ EXPORTS

  92.      carla_get_supported_features @13

  93.      carla_get_library_filename @14

  94.      carla_get_library_folder @15

  95. +    carla_get_native_patchbay_cv8_plugin @16

  96. +    carla_get_native_patchbay_cv32_plugin @17

  97. +    carla_get_native_patchbay_obs_plugin @18

  98. diff --git a/source/plugin/symbols/carla-native-plugin.txt b/source/plugin/symbols/carla-native-plugin.txt

  99. index 896cfa6fc..060bb5528 100644

  100. --- a/source/plugin/symbols/carla-native-plugin.txt

  101. +++ b/source/plugin/symbols/carla-native-plugin.txt

  102. @@ -4,6 +4,9 @@ carla_get_native_patchbay16_plugin

  103.  carla_get_native_patchbay32_plugin

  104.  carla_get_native_patchbay64_plugin

  105.  carla_get_native_patchbay_cv_plugin

  106. +carla_get_native_patchbay_cv8_plugin

  107. +carla_get_native_patchbay_cv32_plugin

  108. +carla_get_native_patchbay_obs_plugin

  109.  carla_create_native_plugin_host_handle

  110.  carla_host_handle_free

  111.  carla_get_native_plugin_engine

  112. diff --git a/source/plugin/symbols/carla-native-plugin.version b/source/plugin/symbols/carla-native-plugin.version

  113. index f6285765b..855b98410 100644

  114. --- a/source/plugin/symbols/carla-native-plugin.version

  115. +++ b/source/plugin/symbols/carla-native-plugin.version

  116. @@ -5,6 +5,9 @@

  117.              carla_get_native_patchbay32_plugin;

  118.              carla_get_native_patchbay64_plugin;

  119.              carla_get_native_patchbay_cv_plugin;

  120. +            carla_get_native_patchbay_cv8_plugin;

  121. +            carla_get_native_patchbay_cv32_plugin;

  122. +            carla_get_native_patchbay_obs_plugin;

  123.              carla_create_native_plugin_host_handle;

  124.              carla_host_handle_free;

  125.              carla_get_native_plugin_engine;