falkTX
/
Carla
mirror of https://github.com/falkTX/Carla
1
0
Fork 0
Code Releases 42 Activity
Audio plugin host https://kx.studio/carla
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.
3871 Commits
16 Branches
14GB
Tree: a90b9f9a3e
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from 'a90b9f9a3e'
${ noResults }
Carla/source/modules/lilv/patches/lilv_mod-version-compare.patch

135 lines
4.4KB
Raw Blame History 

  1. diff --git a/src/lilv_internal.h b/src/lilv_internal.h

  2. index af8e31a..72be413 100644

  3. --- a/src/lilv_internal.h

  4. +++ b/src/lilv_internal.h

  5. @@ -185,6 +185,8 @@ struct LilvWorldImpl {

  6.  		SordNode* lv2_requiredFeature;

  7.  		SordNode* lv2_symbol;

  8.  		SordNode* lv2_prototype;

  9. +		SordNode* mod_builderVersion;

  10. +		SordNode* mod_releaseNumber;

  11.  		SordNode* owl_Ontology;

  12.  		SordNode* pset_value;

  13.  		SordNode* rdf_a;

  14. @@ -238,8 +240,10 @@ struct LilvUIImpl {

  15.  };

  16.  

  17.  typedef struct LilvVersion {

  18. +	int builder;

  19.  	int minor;

  20.  	int micro;

  21. +	int release;

  22.  } LilvVersion;

  23.  

  24.  /*

  25. @@ -335,6 +339,42 @@ lilv_version_cmp(const LilvVersion* a, const LilvVersion* b)

  26.  	}

  27.  }

  28.  

  29. +static inline int

  30. +lilv_version_cmp_mod(const LilvVersion* a, const LilvVersion* b)

  31. +{

  32. +	// same version

  33. +	if (a->builder == b->builder && a->minor == b->minor

  34. +	    && a->micro == b->micro && a->release == b->release)

  35. +		return 0;

  36. +

  37. +	// check builder

  38. +	if (a->builder < b->builder)

  39. +		return -1;

  40. +	if (a->builder > b->builder)

  41. +		return 1;

  42. +

  43. +	// check minor

  44. +	if (a->minor < b->minor)

  45. +		return -1;

  46. +	if (a->minor > b->minor)

  47. +		return 1;

  48. +

  49. +	// check micro

  50. +	if (a->micro < b->micro)

  51. +		return -1;

  52. +	if (a->micro > b->micro)

  53. +		return 1;

  54. +

  55. +	// check release

  56. +	if (a->release < b->release)

  57. +		return -1;

  58. +	if (a->release > b->release)

  59. +		return 1;

  60. +

  61. +	// huh!?

  62. +	return 0;

  63. +}

  64. +

  65.  struct LilvHeader*

  66.  lilv_collection_get_by_uri(const ZixTree* seq, const LilvNode* uri);

  67.  

  68. diff --git a/src/world.c b/src/world.c

  69. index 1e51a2d..d52edf4 100644

  70. --- a/src/world.c

  71. +++ b/src/world.c

  72. @@ -78,6 +78,8 @@ lilv_world_new(void)

  73.  	world->uris.lv2_requiredFeature = NEW_URI(LV2_CORE__requiredFeature);

  74.  	world->uris.lv2_symbol          = NEW_URI(LV2_CORE__symbol);

  75.  	world->uris.lv2_prototype       = NEW_URI(LV2_CORE__prototype);

  76. +	world->uris.mod_builderVersion  = NEW_URI("http://moddevices.com/ns/mod#builderVersion");

  77. +	world->uris.mod_releaseNumber   = NEW_URI("http://moddevices.com/ns/mod#releaseNumber");

  78.  	world->uris.owl_Ontology        = NEW_URI(NS_OWL "Ontology");

  79.  	world->uris.pset_value          = NEW_URI(LV2_PRESETS__value);

  80.  	world->uris.rdf_a               = NEW_URI(LILV_NS_RDF  "type");

  81. @@ -657,17 +659,27 @@ load_plugin_model(LilvWorld*      world,

  82.  static LilvVersion

  83.  get_version(LilvWorld* world, SordModel* model, const LilvNode* subject)

  84.  {

  85. +	const SordNode* builder_node = sord_get(

  86. +		model, subject->node, world->uris.mod_builderVersion, NULL, NULL);

  87.  	const SordNode* minor_node = sord_get(

  88.  		model, subject->node, world->uris.lv2_minorVersion, NULL, NULL);

  89.  	const SordNode* micro_node = sord_get(

  90.  		model, subject->node, world->uris.lv2_microVersion, NULL, NULL);

  91. +	const SordNode* release_node = sord_get(

  92. +		model, subject->node, world->uris.mod_releaseNumber, NULL, NULL);

  93.  

  94.  

  95. -	LilvVersion version = { 0, 0 };

  96. +	LilvVersion version = { 0, 0, 0, 0 };

  97. +	if (builder_node) {

  98. +		version.builder = atoi((const char*)sord_node_get_string(builder_node));

  99. +	}

  100.  	if (minor_node && micro_node) {

  101.  		version.minor = atoi((const char*)sord_node_get_string(minor_node));

  102.  		version.micro = atoi((const char*)sord_node_get_string(micro_node));

  103.  	}

  104. +	if (release_node) {

  105. +		version.release = atoi((const char*)sord_node_get_string(release_node));

  106. +	}

  107.  

  108.  	return version;

  109.  }

  110. @@ -720,17 +732,19 @@ lilv_world_load_bundle(LilvWorld* world, const LilvNode* bundle_uri)

  111.  		LilvVersion last_version = get_version(world, last_model, plugin_uri);

  112.  		sord_free(this_model);

  113.  		sord_free(last_model);

  114. -		const int cmp = lilv_version_cmp(&this_version, &last_version);

  115. +		const int cmp = lilv_version_cmp_mod(&this_version, &last_version);

  116.  		if (cmp > 0) {

  117.  			zix_tree_insert((ZixTree*)unload_uris,

  118.  			                lilv_node_duplicate(plugin_uri),

  119.  			                NULL);

  120. -			LILV_WARNF("Replacing version %d.%d of <%s> from <%s>\n",

  121. -			           last_version.minor, last_version.micro,

  122. +			LILV_WARNF("Replacing version %d:%d.%d-%d of <%s> from <%s>\n",

  123. +			           last_version.builder, last_version.minor,

  124. +			           last_version.micro, last_version.release,

  125.  			           sord_node_get_string(plug),

  126.  			           sord_node_get_string(last_bundle->node));

  127. -			LILV_NOTEF("New version %d.%d found in <%s>\n",

  128. -			           this_version.minor, this_version.micro,

  129. +			LILV_NOTEF("New version %d:%d.%d-%d found in <%s>\n",

  130. +			           this_version.builder, this_version.minor,

  131. +			           this_version.micro, this_version.release,

  132.  			           sord_node_get_string(bundle_node));

  133.  		} else if (cmp < 0) {

  134.  			LILV_WARNF("Ignoring bundle <%s>\n",