Browse Source

Update blop, now builds on windows

tags/v1.0
falkTX 3 years ago
parent
commit
87d1a93372
4 changed files with 34 additions and 34 deletions
  1. +0
    -26
      patches/blop-lv2/01_fix-wavedata-prototype.patch
  2. +26
    -0
      patches/blop-lv2/01_fix-win32-build.patch
  3. +0
    -8
      plugins-todo/blop-lv2.json
  4. +8
    -0
      plugins/blop.json

+ 0
- 26
patches/blop-lv2/01_fix-wavedata-prototype.patch View File

@@ -1,26 +0,0 @@
diff --git a/src/wavedata.c b/src/wavedata.c
index e574903..8ec3783 100644
--- a/src/wavedata.c
+++ b/src/wavedata.c
@@ -58,7 +58,7 @@ wavedata_load(Wavedata* w,
typedef int (*DescFunc)(Wavedata*, unsigned long);
DescFunc desc_func = (DescFunc)dlsym(handle, wdat_descriptor_name);
if (desc_func) {
- retval = desc_func(w, sample_rate);
+ retval = desc_func(w, (unsigned long)sample_rate);
w->data_handle = handle;
return retval;
}
diff --git a/src/wdatutil.c b/src/wdatutil.c
index b3bf84e..86b5fb0 100644
--- a/src/wdatutil.c
+++ b/src/wdatutil.c
@@ -249,7 +249,7 @@ wavedata_write_prototype(FILE* wdat_fp,
fprintf(wdat_fp, "int\n");
fprintf(
wdat_fp,
- "blop_get_%s (Wavedata * w, double sample_rate, const char* bundle_path, const LV2_Feature* const* features)",
+ "blop_get_%s (Wavedata * w, unsigned long sample_rate)",
data_name);
}

+ 26
- 0
patches/blop-lv2/01_fix-win32-build.patch View File

@@ -0,0 +1,26 @@
diff --git a/src/wavedata.c b/src/wavedata.c
index 910577f..a926596 100644
--- a/src/wavedata.c
+++ b/src/wavedata.c
@@ -28,7 +28,7 @@
# include <windows.h>
# define dlopen(path, flags) LoadLibrary(path)
# define dlclose(lib) FreeLibrary((HMODULE)lib)
-# define dlsym(lib, sym) GetProcAddress((HMODULE)lib, sym)
+# define dlfunc(lib, sym) GetProcAddress((HMODULE)lib, sym)
# define snprintf _snprintf
#else
# include <dlfcn.h>
@@ -55,10 +55,12 @@ wavedata_load(Wavedata* w,
free(lib_path);
if (handle) {
+#ifndef _WIN32
// Avoid pedantic warnings about fetching functions with dlsym
typedef void (*VoidFunc)(void);
typedef VoidFunc (*VoidFuncGetter)(void*, const char*);
VoidFuncGetter dlfunc = (VoidFuncGetter)dlsym;
+#endif
typedef int (*DescFunc)(Wavedata*, unsigned long);
DescFunc desc_func = (DescFunc)dlfunc(handle, wdat_descriptor_name);

+ 0
- 8
plugins-todo/blop-lv2.json View File

@@ -1,8 +0,0 @@
{
"name": "blop-lv2",
"lv2bundles": ["blop.lv2"],
"version": "1.0.0",
"dlbaseurl": "http://download.drobilla.net",
"dlext": "tar.bz2",
"buildtype": "waf"
}

+ 8
- 0
plugins/blop.json View File

@@ -0,0 +1,8 @@
{
"name": "blop-lv2",
"lv2bundles": ["blop.lv2"],
"version": "e76724d58c39a52e3f47dbff40c011c54d9a0fdb",
"dlbaseurl": "http://git.drobilla.net/blop.lv2.git",
"dlmethod": "git",
"buildtype": "waf"
}

Loading…
Cancel
Save