falkTX
/
Carla
mirror of https://github.com/falkTX/Carla
1
0
Fork 0
Code Releases 42 Activity
Browse Source

Update lilv patch files

tags/1.9.7
falkTX 9 years ago
parent
52e46c6fbe
commit
3173b7cfbe
4 changed files with 77 additions and 62 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +0
    -26
      source/modules/lilv/custom-patches2.diff
  2. +43
    -36
      source/modules/lilv/patches/lilv_custom-changes.patch
  3. +17
    -0
      source/modules/lilv/patches/sratom_lv2-includes.patch
  4. +17
    -0
      source/modules/lilv/patches/sratom_lv2-includes2.patch

+ 0
- 26
source/modules/lilv/custom-patches2.diff View File

@@ -1,26 +0,0 @@
diff --git a/source/modules/lilv/lilv-0.21.3/lilv/lilvmm.hpp b/source/modules/lilv/lilv-0.21.3/lilv/lilvmm.hpp
index c3aa822..1f67e81 100644
--- a/source/modules/lilv/lilv-0.21.3/lilv/lilvmm.hpp
+++ b/source/modules/lilv/lilv-0.21.3/lilv/lilvmm.hpp
@@ -29,11 +29,6 @@
namespace Lilv {
-static inline const char*
-uri_to_path(const char* uri) {
- return lilv_uri_to_path(uri);
-}
-
#define LILV_WRAP0(RT, prefix, name) \
inline RT name() { return lilv_ ## prefix ## _ ## name (me); }
@@ -329,6 +324,9 @@ struct World {
inline LilvNode* new_uri(const char* uri) const {
return lilv_new_uri(me, uri);
}
+ inline LilvNode* new_file_uri(const char* host, const char* path) const {
+ return lilv_new_file_uri(me, host, path);
+ }
inline LilvNode* new_string(const char* str) const {
return lilv_new_string(me, str);
}

source/modules/lilv/custom-patches.diff → source/modules/lilv/patches/lilv_custom-changes.patch View File

@@ -1,5 +1,5 @@
diff --git a/source/modules/lilv/lilv-0.22.1/lilv/lilv.h b/source/modules/lilv/lilv-0.22.1/lilv/lilv.h
index e907789..84223c5 100644
index 27ed6d0..83fe233 100644
--- a/source/modules/lilv/lilv-0.22.1/lilv/lilv.h
+++ b/source/modules/lilv/lilv-0.22.1/lilv/lilv.h
@@ -26,8 +26,9 @@
@@ -14,7 +14,7 @@ index e907789..84223c5 100644
#ifdef LILV_SHARED
# ifdef _WIN32
@@ -552,7 +553,7 @@ lilv_world_free(LilvWorld* world);
@@ -562,7 +563,7 @@ lilv_world_free(LilvWorld* world);
with special plugin bundles which are installed to a known location).
*/
LILV_API void
@@ -23,7 +23,7 @@ index e907789..84223c5 100644
/**
Load a specific bundle.
@@ -1199,9 +1200,9 @@ lilv_port_get_scale_points(const LilvPlugin* plugin,
@@ -1209,9 +1210,9 @@ lilv_port_get_scale_points(const LilvPlugin* plugin,
@return A new LilvState which must be freed with lilv_state_free(), or NULL.
*/
LILV_API LilvState*
@@ -36,7 +36,7 @@ index e907789..84223c5 100644
/**
Load a state snapshot from a file.
@@ -1219,18 +1220,18 @@ lilv_state_new_from_world(LilvWorld* world,
@@ -1229,18 +1230,18 @@ lilv_state_new_from_world(LilvWorld* world,
new memory consumed once this function returns.
*/
LILV_API LilvState*
@@ -62,7 +62,7 @@ index e907789..84223c5 100644
/**
Function to get a port value.
@@ -1425,7 +1426,8 @@ lilv_state_emit_port_values(const LilvState* state,
@@ -1435,7 +1436,8 @@ lilv_state_emit_port_values(const LilvState* state,
*/
LILV_API void
lilv_state_restore(const LilvState* state,
@@ -72,7 +72,7 @@ index e907789..84223c5 100644
LilvSetPortValueFunc set_value,
void* user_data,
uint32_t flags,
@@ -1786,6 +1788,42 @@ LILV_API const LilvNode*
@@ -1796,6 +1798,42 @@ LILV_API const LilvNode*
lilv_ui_get_binary_uri(const LilvUI* ui);
/**
@@ -116,7 +116,7 @@ index e907789..84223c5 100644
@}
*/
diff --git a/source/modules/lilv/lilv-0.22.1/lilv/lilvmm.hpp b/source/modules/lilv/lilv-0.22.1/lilv/lilvmm.hpp
index b9b3a69..367b8d8 100644
index b9b3a69..1f67e81 100644
--- a/source/modules/lilv/lilv-0.22.1/lilv/lilvmm.hpp
+++ b/source/modules/lilv/lilv-0.22.1/lilv/lilvmm.hpp
@@ -17,6 +17,8 @@
@@ -128,7 +128,15 @@ index b9b3a69..367b8d8 100644
#include "lilv/lilv.h"
#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
@@ -35,6 +37,9 @@ uri_to_path(const char* uri) {
@@ -27,14 +29,12 @@
namespace Lilv {
-static inline const char*
-uri_to_path(const char* uri) {
- return lilv_uri_to_path(uri);
-}
-
#define LILV_WRAP0(RT, prefix, name) \
inline RT name() { return lilv_ ## prefix ## _ ## name (me); }
@@ -138,7 +146,7 @@ index b9b3a69..367b8d8 100644
#define LILV_WRAP0_VOID(prefix, name) \
inline void name() { lilv_ ## prefix ## _ ## name(me); }
@@ -65,6 +70,7 @@ uri_to_path(const char* uri) {
@@ -65,6 +65,7 @@ uri_to_path(const char* uri) {
#endif
struct Node {
@@ -146,7 +154,7 @@ index b9b3a69..367b8d8 100644
inline Node(const LilvNode* node) : me(lilv_node_duplicate(node)) {}
inline Node(const Node& copy) : me(lilv_node_duplicate(copy.me)) {}
@@ -78,20 +84,26 @@ struct Node {
@@ -78,20 +79,26 @@ struct Node {
LILV_WRAP_CONVERSION(LilvNode);
@@ -187,7 +195,7 @@ index b9b3a69..367b8d8 100644
LilvNode* me;
};
@@ -126,7 +138,7 @@ struct PluginClass {
@@ -126,7 +133,7 @@ struct PluginClass {
LILV_WRAP0(LilvIter*, prefix, begin); \
LILV_WRAP1(LilvIter*, prefix, next, LilvIter*, i); \
LILV_WRAP1(bool, prefix, is_end, LilvIter*, i); \
@@ -196,7 +204,7 @@ index b9b3a69..367b8d8 100644
struct PluginClasses {
LILV_WRAP_COLL(PluginClasses, PluginClass, plugin_classes);
@@ -141,22 +153,24 @@ struct ScalePoints {
@@ -141,22 +148,24 @@ struct ScalePoints {
struct Nodes {
LILV_WRAP_COLL(Nodes, Node, nodes);
LILV_WRAP1(bool, nodes, contains, const Node, node);
@@ -231,7 +239,7 @@ index b9b3a69..367b8d8 100644
const LilvUI* me;
};
@@ -220,6 +234,13 @@ struct Plugin {
@@ -220,6 +229,13 @@ struct Plugin {
LILV_WRAP0(Nodes, plugin, get_extension_data);
LILV_WRAP0(UIs, plugin, get_uis);
LILV_WRAP1(Nodes, plugin, get_related, Node, type);
@@ -245,31 +253,27 @@ index b9b3a69..367b8d8 100644
inline Port get_port_by_index(unsigned index) {
return Port(me, lilv_plugin_get_port_by_index(me, index));
@@ -258,16 +279,14 @@ struct Plugins {
struct Instance {
@@ -259,15 +275,13 @@ struct Instance {
inline Instance(LilvInstance* instance) : me(instance) {}
- LILV_DEPRECATED
LILV_DEPRECATED
- inline Instance(Plugin plugin, double sample_rate) {
- me = lilv_plugin_instantiate(plugin, sample_rate, NULL);
- }
+ LILV_DEPRECATED
+ inline Instance(Plugin plugin, double sample_rate)
+ : me(lilv_plugin_instantiate(plugin, sample_rate, NULL)) {}
- LILV_DEPRECATED inline Instance(Plugin plugin,
- double sample_rate,
LILV_DEPRECATED inline Instance(Plugin plugin,
double sample_rate,
- LV2_Feature* const* features) {
- me = lilv_plugin_instantiate(plugin, sample_rate, features);
- }
+ LILV_DEPRECATED inline Instance(Plugin plugin,
+ double sample_rate,
+ LV2_Feature* const* features)
+ : me(lilv_plugin_instantiate(plugin, sample_rate, features)) {}
static inline Instance* create(Plugin plugin,
double sample_rate,
@@ -304,22 +323,22 @@ struct Instance {
@@ -304,22 +318,25 @@ struct Instance {
};
struct World {
@@ -283,6 +287,9 @@ index b9b3a69..367b8d8 100644
return lilv_new_uri(me, uri);
}
- inline LilvNode* new_string(const char* str) {
+ inline LilvNode* new_file_uri(const char* host, const char* path) const {
+ return lilv_new_file_uri(me, host, path);
+ }
+ inline LilvNode* new_string(const char* str) const {
return lilv_new_string(me, str);
}
@@ -299,7 +306,7 @@ index b9b3a69..367b8d8 100644
return lilv_new_bool(me, val);
}
inline Nodes find_nodes(const LilvNode* subject,
@@ -329,7 +348,7 @@ struct World {
@@ -329,7 +346,7 @@ struct World {
}
LILV_WRAP2_VOID(world, set_option, const char*, uri, LilvNode*, value);
@@ -308,7 +315,7 @@ index b9b3a69..367b8d8 100644
LILV_WRAP1_VOID(world, load_bundle, LilvNode*, bundle_uri);
LILV_WRAP0(const LilvPluginClass*, world, get_plugin_class);
LILV_WRAP0(const LilvPluginClasses*, world, get_plugin_classes);
@@ -337,6 +356,8 @@ struct World {
@@ -337,6 +354,8 @@ struct World {
LILV_WRAP1(int, world, load_resource, const LilvNode*, resource);
LilvWorld* me;
@@ -318,10 +325,10 @@ index b9b3a69..367b8d8 100644
} /* namespace Lilv */
diff --git a/source/modules/lilv/lilv-0.22.1/src/lilv_internal.h b/source/modules/lilv/lilv-0.22.1/src/lilv_internal.h
index e2444d3..4d0a8e5 100644
index 15b00dc..ee906fd 100644
--- a/source/modules/lilv/lilv-0.22.1/src/lilv_internal.h
+++ b/source/modules/lilv/lilv-0.22.1/src/lilv_internal.h
@@ -53,7 +53,7 @@ static inline char* dlerror(void) { return "Unknown error"; }
@@ -58,7 +58,7 @@ static inline char* dlerror(void) { return "Unknown error"; }
#include "lilv/lilv.h"
#ifdef LILV_DYN_MANIFEST
@@ -331,7 +338,7 @@ index e2444d3..4d0a8e5 100644
/*
diff --git a/source/modules/lilv/lilv-0.22.1/src/plugin.c b/source/modules/lilv/lilv-0.22.1/src/plugin.c
index bf0843b..c711990 100644
index bf0843b..d825192 100644
--- a/source/modules/lilv/lilv-0.22.1/src/plugin.c
+++ b/source/modules/lilv/lilv-0.22.1/src/plugin.c
@@ -27,10 +27,11 @@
@@ -495,7 +502,7 @@ index 6bf8fc7..0a50891 100644
#include "lilv_internal.h"
diff --git a/source/modules/lilv/lilv-0.22.1/src/state.c b/source/modules/lilv/lilv-0.22.1/src/state.c
index 79199e4..119dcee 100644
index ccc1b22..dc2a55c 100644
--- a/source/modules/lilv/lilv-0.22.1/src/state.c
+++ b/source/modules/lilv/lilv-0.22.1/src/state.c
@@ -18,10 +18,10 @@
@@ -513,7 +520,7 @@ index 79199e4..119dcee 100644
#include "lilv_config.h"
#include "lilv_internal.h"
@@ -411,35 +411,18 @@ lilv_state_emit_port_values(const LilvState* state,
@@ -415,35 +415,18 @@ lilv_state_emit_port_values(const LilvState* state,
LILV_API void
lilv_state_restore(const LilvState* state,
@@ -553,7 +560,7 @@ index 79199e4..119dcee 100644
if (set_value) {
lilv_state_emit_port_values(state, set_value, user_data);
}
@@ -586,9 +569,9 @@ new_state_from_model(LilvWorld* world,
@@ -590,9 +573,9 @@ new_state_from_model(LilvWorld* world,
}
LILV_API LilvState*
@@ -566,7 +573,7 @@ index 79199e4..119dcee 100644
{
if (!lilv_node_is_uri(node) && !lilv_node_is_blank(node)) {
LILV_ERRORF("Subject `%s' is not a URI or blank node.\n",
@@ -600,10 +583,10 @@ lilv_state_new_from_world(LilvWorld* world,
@@ -604,10 +587,10 @@ lilv_state_new_from_world(LilvWorld* world,
}
LILV_API LilvState*
@@ -581,7 +588,7 @@ index 79199e4..119dcee 100644
{
if (subject && !lilv_node_is_uri(subject)
&& !lilv_node_is_blank(subject)) {
@@ -653,9 +636,9 @@ set_prefixes(SerdEnv* env)
@@ -657,9 +640,9 @@ set_prefixes(SerdEnv* env)
}
LILV_API LilvState*
@@ -595,7 +602,7 @@ index 79199e4..119dcee 100644
if (!str) {
return NULL;
diff --git a/source/modules/lilv/lilv-0.22.1/src/ui.c b/source/modules/lilv/lilv-0.22.1/src/ui.c
index 0f4f2f6..a0dd567 100644
index 0f4f2f6..a3e17da 100644
--- a/source/modules/lilv/lilv-0.22.1/src/ui.c
+++ b/source/modules/lilv/lilv-0.22.1/src/ui.c
@@ -109,3 +109,54 @@ lilv_ui_get_binary_uri(const LilvUI* ui)
@@ -654,10 +661,10 @@ index 0f4f2f6..a0dd567 100644
+ return lilv_ui_get_value_internal(ui, ui->world->uris.lv2_extensionData);
+}
diff --git a/source/modules/lilv/lilv-0.22.1/src/util.c b/source/modules/lilv/lilv-0.22.1/src/util.c
index 31c9238..5bcdb7e 100644
index d999942..5393d7c 100644
--- a/source/modules/lilv/lilv-0.22.1/src/util.c
+++ b/source/modules/lilv/lilv-0.22.1/src/util.c
@@ -30,7 +30,6 @@
@@ -29,7 +29,6 @@
#include <string.h>
#ifdef _WIN32
@@ -665,7 +672,7 @@ index 31c9238..5bcdb7e 100644
# include <windows.h>
# include <direct.h>
# include <io.h>
@@ -446,10 +445,7 @@ lilv_symlink(const char* oldpath, const char* newpath)
@@ -459,10 +458,7 @@ lilv_symlink(const char* oldpath, const char* newpath)
int ret = 0;
if (strcmp(oldpath, newpath)) {
#ifdef _WIN32

+ 17
- 0
source/modules/lilv/patches/sratom_lv2-includes.patch View File

@@ -0,0 +1,17 @@
diff --git a/source/modules/lilv/sratom-0.4.7/src/sratom.c b/source/modules/lilv/sratom-0.4.7/src/sratom.c
index e0996c4..b6ea4b1 100644
--- a/source/modules/lilv/sratom-0.4.7/src/sratom.c
+++ b/source/modules/lilv/sratom-0.4.7/src/sratom.c
@@ -20,9 +20,9 @@
#include <stdlib.h>
#include <string.h>
-#include "lv2/lv2plug.in/ns/ext/atom/forge.h"
-#include "lv2/lv2plug.in/ns/ext/atom/util.h"
-#include "lv2/lv2plug.in/ns/ext/midi/midi.h"
+#include "lv2/atom-forge.h"
+#include "lv2/atom-util.h"
+#include "lv2/midi.h"
#include "sratom/sratom.h"

+ 17
- 0
source/modules/lilv/patches/sratom_lv2-includes2.patch View File

@@ -0,0 +1,17 @@
diff --git a/source/modules/lilv/sratom-0.4.7/sratom/sratom.h b/source/modules/lilv/sratom-0.4.7/sratom/sratom.h
index a86f67e..cf33396 100644
--- a/source/modules/lilv/sratom-0.4.7/sratom/sratom.h
+++ b/source/modules/lilv/sratom-0.4.7/sratom/sratom.h
@@ -23,9 +23,9 @@
#include <stdint.h>
-#include "lv2/lv2plug.in/ns/ext/urid/urid.h"
-#include "lv2/lv2plug.in/ns/ext/atom/atom.h"
-#include "lv2/lv2plug.in/ns/ext/atom/forge.h"
+#include "lv2/urid.h"
+#include "lv2/atom.h"
+#include "lv2/atom-forge.h"
#include "serd/serd.h"
#include "sord/sord.h"

Write Preview
Loading…
Cancel
Save