DISTRHO
/
PawPaw
mirror of https://github.com/DISTRHO/PawPaw
1
0
Fork 0
Code Issues 0 Releases 2 Wiki Activity
Browse Source

Update artyfx

tags/v1.0
falkTX 4 years ago
parent
6f956c049c
commit
987219c380
4 changed files with 264 additions and 113 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +0
    -112
      patches/artyfx/01_xplat-compat.patch
  2. +262
    -0
      patches/artyfx/win32/01_use-dll-in-ttl.patch
  3. +1
    -0
      patches/artyfx/win64
  4. +1
    -1
      plugins/artyfx.json

+ 0
- 112
patches/artyfx/01_xplat-compat.patch View File

@@ -1,112 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1c290ba..7c23e9e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,7 +24,10 @@ pkg_check_modules(SND sndfile REQUIRED)
include_directories( ${SND_INCLUDE_DIRS} )
#target_link_libraries( avtkDemo ${CAIRO_LIBRARIES} )
-SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fPIC -shared -L./src/avtk -Wl,--no-undefined")
+SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fPIC -shared -L./src/avtk")
+if(NOT APPLE)
+ SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
+endif()
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall -O1 -Wno-unused-variable")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -O1 -Wno-unused-variable -ftree-vectorize")
diff --git a/src/dsp/artyfx.cxx b/src/dsp/artyfx.cxx
index 49ace32..5258490 100644
--- a/src/dsp/artyfx.cxx
+++ b/src/dsp/artyfx.cxx
@@ -49,6 +49,7 @@ static const LV2_Descriptor descriptors[] = {
Bitta::cleanup,
Bitta::extension_data
},
+#ifndef _WIN32
{
CAPTA_URI,
Capta::instantiate,
@@ -59,6 +60,7 @@ static const LV2_Descriptor descriptors[] = {
Capta::cleanup,
Capta::extension_data
},
+#endif
{
DELLA_URI,
Della::instantiate,
diff --git a/src/dsp/capta.cxx b/src/dsp/capta.cxx
index 26cf298..c99a850 100644
--- a/src/dsp/capta.cxx
+++ b/src/dsp/capta.cxx
@@ -29,6 +29,8 @@
#include <sstream>
#include <sndfile.hh>
+#ifndef _WIN32
+
LV2_Handle Capta::instantiate(const LV2_Descriptor* descriptor,
double samplerate,
const char* bundle_path,
@@ -207,3 +209,4 @@ const void* Capta::extension_data(const char* uri)
return NULL;
}
+#endif
diff --git a/src/dsp/capta.hxx b/src/dsp/capta.hxx
index 39bbb11..083b21e 100644
--- a/src/dsp/capta.hxx
+++ b/src/dsp/capta.hxx
@@ -45,6 +45,8 @@ typedef enum {
#include "zix/sem.h"
#include "zix/thread.h"
+#ifndef _WIN32
+
class SndfileHandle;
class Capta
@@ -101,4 +103,6 @@ private:
}
};
+#endif
+
#endif // OPENAV_CAPTA
diff --git a/src/dsp/driva.hxx b/src/dsp/driva.hxx
index 7657c85..67399da 100644
--- a/src/dsp/driva.hxx
+++ b/src/dsp/driva.hxx
@@ -26,22 +26,22 @@
#define DRIVA_URI "http://www.openavproductions.com/artyfx#driva"
#define DRIVA_UI_URI "http://www.openavproductions.com/artyfx#driva/gui"
-typedef enum {
- // Audio
- INPUT = 0,
- OUTPUT,
-
- // Top signal
- DRIVA_TONE,
- DRIVA_AMOUNT,
-
-} DrivaPortIndex;
-
class StompBox;
class Driva
{
public:
+ typedef enum {
+ // Audio
+ INPUT = 0,
+ OUTPUT,
+
+ // Top signal
+ DRIVA_TONE,
+ DRIVA_AMOUNT,
+
+ } DrivaPortIndex;
+
Driva(int rate);
~Driva();
static LV2_Handle instantiate(const LV2_Descriptor* descriptor,

+ 262
- 0
patches/artyfx/win32/01_use-dll-in-ttl.patch View File

@@ -0,0 +1,262 @@
diff --git a/artyfx.lv2/bitta.ttl b/artyfx.lv2/bitta.ttl
index 8bb0109..e1f5ef4 100644
--- a/artyfx.lv2/bitta.ttl
+++ b/artyfx.lv2/bitta.ttl
@@ -28,7 +28,7 @@
<http://www.openavproductions.com/artyfx#bitta/gui>
a ui:X11UI;
- ui:binary <artyfx_ui.so>;
+ ui:binary <artyfx_ui.dll>;
lv2:optionalFeature ui:noUserResize ;
lv2:extensionData ui:idleInterface .
diff --git a/artyfx.lv2/capta.ttl b/artyfx.lv2/capta.ttl
index 891ce5d..681d716 100644
--- a/artyfx.lv2/capta.ttl
+++ b/artyfx.lv2/capta.ttl
@@ -27,7 +27,7 @@
<http://www.openavproductions.com/artyfx#capta/gui>
a ui:X11UI;
- ui:binary <artyfx_ui.so>;
+ ui:binary <artyfx_ui.dll>;
lv2:optionalFeature ui:noUserResize ;
lv2:extensionData ui:idleInterface .
diff --git a/artyfx.lv2/della.ttl b/artyfx.lv2/della.ttl
index 333d341..e4b6105 100644
--- a/artyfx.lv2/della.ttl
+++ b/artyfx.lv2/della.ttl
@@ -29,7 +29,7 @@
<http://www.openavproductions.com/artyfx#della/gui>
a ui:X11UI;
- ui:binary <artyfx_ui.so>;
+ ui:binary <artyfx_ui.dll>;
lv2:optionalFeature ui:noUserResize ;
lv2:extensionData ui:idleInterface ;
lv2:extensionData ui:idleInterface .
diff --git a/artyfx.lv2/driva.ttl b/artyfx.lv2/driva.ttl
index 9eaced1..111c792 100644
--- a/artyfx.lv2/driva.ttl
+++ b/artyfx.lv2/driva.ttl
@@ -30,7 +30,7 @@
<http://www.openavproductions.com/artyfx#driva/gui>
a ui:X11UI;
- ui:binary <artyfx_ui.so>;
+ ui:binary <artyfx_ui.dll>;
lv2:optionalFeature ui:noUserResize ;
lv2:extensionData ui:idleInterface .
diff --git a/artyfx.lv2/ducka.ttl b/artyfx.lv2/ducka.ttl
index bde2763..fdfe9cd 100644
--- a/artyfx.lv2/ducka.ttl
+++ b/artyfx.lv2/ducka.ttl
@@ -25,7 +25,7 @@
<http://www.openavproductions.com/artyfx#ducka/gui>
a ui:X11UI;
- ui:binary <artyfx_ui.so>;
+ ui:binary <artyfx_ui.dll>;
lv2:optionalFeature ui:noUserResize ;
lv2:extensionData ui:idleInterface .
diff --git a/artyfx.lv2/filta.ttl b/artyfx.lv2/filta.ttl
index 5acf869..327f4ff 100644
--- a/artyfx.lv2/filta.ttl
+++ b/artyfx.lv2/filta.ttl
@@ -25,7 +25,7 @@
<http://www.openavproductions.com/artyfx#filta/gui>
a ui:X11UI;
- ui:binary <artyfx_ui.so>;
+ ui:binary <artyfx_ui.dll>;
lv2:optionalFeature ui:noUserResize ;
lv2:extensionData ui:idleInterface .
diff --git a/artyfx.lv2/friza.ttl b/artyfx.lv2/friza.ttl
index 263e031..c4ff0e5 100644
--- a/artyfx.lv2/friza.ttl
+++ b/artyfx.lv2/friza.ttl
@@ -24,7 +24,7 @@
<http://www.openavproductions.com/artyfx#friza/gui>
a ui:X11UI;
- ui:binary <artyfx.so>;
+ ui:binary <artyfx.dll>;
lv2:optionalFeature ui:noUserResize ;
lv2:extensionData ui:idleInterface .
diff --git a/artyfx.lv2/kuiza.ttl b/artyfx.lv2/kuiza.ttl
index 99e5dab..d3439cd 100644
--- a/artyfx.lv2/kuiza.ttl
+++ b/artyfx.lv2/kuiza.ttl
@@ -24,7 +24,7 @@
<http://www.openavproductions.com/artyfx#kuiza/gui>
a ui:X11UI;
- ui:binary <artyfx_ui.so>;
+ ui:binary <artyfx_ui.dll>;
lv2:optionalFeature ui:noUserResize ;
lv2:extensionData ui:idleInterface .
diff --git a/artyfx.lv2/manifest.ttl b/artyfx.lv2/manifest.ttl
index 6a76ea1..0b3b8b1 100644
--- a/artyfx.lv2/manifest.ttl
+++ b/artyfx.lv2/manifest.ttl
@@ -5,61 +5,61 @@
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
<http://www.openavproductions.com/artyfx#bitta> a lv2:Plugin ;
- lv2:binary <artyfx.so> ;
+ lv2:binary <artyfx.dll> ;
rdfs:seeAlso <bitta.ttl> .
# Not tested to standard yet - do not package
#<http://www.openavproductions.com/artyfx#capta> a lv2:Plugin ;
-# lv2:binary <artyfx.so> ;
+# lv2:binary <artyfx.dll> ;
# rdfs:seeAlso <capta.ttl> .
<http://www.openavproductions.com/artyfx#della> a lv2:Plugin ;
- lv2:binary <artyfx.so> ;
+ lv2:binary <artyfx.dll> ;
rdfs:seeAlso <della.ttl> .
# Unfinished for this release - NOT ready for testing / usage.
#<http://www.openavproductions.com/artyfx#driva> a lv2:Plugin ;
-# lv2:binary <artyfx.so> ;
+# lv2:binary <artyfx.dll> ;
# rdfs:seeAlso <driva.ttl> .
<http://www.openavproductions.com/artyfx#ducka> a lv2:Plugin ;
- lv2:binary <artyfx.so> ;
+ lv2:binary <artyfx.dll> ;
rdfs:seeAlso <ducka.ttl> .
<http://www.openavproductions.com/artyfx#filta> a lv2:Plugin ;
- lv2:binary <artyfx.so> ;
+ lv2:binary <artyfx.dll> ;
rdfs:seeAlso <filta.ttl> .
# Unfinished for this release - NOT ready for testing / usage.
#<http://www.openavproductions.com/artyfx#friza> a lv2:Plugin ;
-# lv2:binary <artyfx.so> ;
+# lv2:binary <artyfx.dll> ;
# rdfs:seeAlso <friza.ttl> .
<http://www.openavproductions.com/artyfx#kuiza> a lv2:Plugin ;
- lv2:binary <artyfx.so> ;
+ lv2:binary <artyfx.dll> ;
rdfs:seeAlso <kuiza.ttl> .
<http://www.openavproductions.com/artyfx#masha> a lv2:Plugin ;
- lv2:binary <artyfx.so> ;
+ lv2:binary <artyfx.dll> ;
rdfs:seeAlso <masha.ttl> .
<http://www.openavproductions.com/artyfx#panda> a lv2:Plugin ;
- lv2:binary <artyfx.so> ;
+ lv2:binary <artyfx.dll> ;
rdfs:seeAlso <panda.ttl> .
<http://www.openavproductions.com/artyfx#roomy> a lv2:Plugin ;
- lv2:binary <artyfx.so> ;
+ lv2:binary <artyfx.dll> ;
rdfs:seeAlso <roomy.ttl> .
<http://www.openavproductions.com/artyfx#satma> a lv2:Plugin ;
- lv2:binary <artyfx.so> ;
+ lv2:binary <artyfx.dll> ;
rdfs:seeAlso <satma.ttl> .
<http://www.openavproductions.com/artyfx#vihda> a lv2:Plugin ;
- lv2:binary <artyfx.so> ;
+ lv2:binary <artyfx.dll> ;
rdfs:seeAlso <vihda.ttl> .
<http://www.openavproductions.com/artyfx#whaaa> a lv2:Plugin ;
- lv2:binary <artyfx.so> ;
+ lv2:binary <artyfx.dll> ;
rdfs:seeAlso <whaaa.ttl> .
diff --git a/artyfx.lv2/masha.ttl b/artyfx.lv2/masha.ttl
index 95fdb29..0d683c7 100644
--- a/artyfx.lv2/masha.ttl
+++ b/artyfx.lv2/masha.ttl
@@ -26,7 +26,7 @@
<http://www.openavproductions.com/artyfx#masha/gui>
a ui:X11UI;
- ui:binary <artyfx_ui.so>;
+ ui:binary <artyfx_ui.dll>;
lv2:optionalFeature ui:noUserResize ;
lv2:extensionData ui:idleInterface .
diff --git a/artyfx.lv2/panda.ttl b/artyfx.lv2/panda.ttl
index 4d76bcf..8b3b3ba 100644
--- a/artyfx.lv2/panda.ttl
+++ b/artyfx.lv2/panda.ttl
@@ -27,7 +27,7 @@
<http://www.openavproductions.com/artyfx#panda/gui>
a ui:X11UI;
- ui:binary <artyfx_ui.so>;
+ ui:binary <artyfx_ui.dll>;
lv2:optionalFeature ui:noUserResize ;
lv2:extensionData ui:idleInterface .
diff --git a/artyfx.lv2/roomy.ttl b/artyfx.lv2/roomy.ttl
index 155b484..9160a34 100644
--- a/artyfx.lv2/roomy.ttl
+++ b/artyfx.lv2/roomy.ttl
@@ -23,7 +23,7 @@
<http://www.openavproductions.com/artyfx#roomy/gui>
a ui:X11UI;
- ui:binary <artyfx_ui.so>;
+ ui:binary <artyfx_ui.dll>;
lv2:optionalFeature ui:noUserResize ;
lv2:extensionData ui:idleInterface .
diff --git a/artyfx.lv2/satma.ttl b/artyfx.lv2/satma.ttl
index c07cb79..01d8410 100644
--- a/artyfx.lv2/satma.ttl
+++ b/artyfx.lv2/satma.ttl
@@ -24,7 +24,7 @@
<http://www.openavproductions.com/artyfx#satma/gui>
a ui:X11UI;
- ui:binary <artyfx_ui.so>;
+ ui:binary <artyfx_ui.dll>;
lv2:optionalFeature ui:noUserResize ;
lv2:extensionData ui:idleInterface .
diff --git a/artyfx.lv2/vihda.ttl b/artyfx.lv2/vihda.ttl
index f162bdc..3fd3489 100644
--- a/artyfx.lv2/vihda.ttl
+++ b/artyfx.lv2/vihda.ttl
@@ -27,7 +27,7 @@
<http://www.openavproductions.com/artyfx#vihda/gui>
a ui:X11UI;
- ui:binary <artyfx_ui.so>;
+ ui:binary <artyfx_ui.dll>;
lv2:optionalFeature ui:noUserResize ;
lv2:extensionData ui:idleInterface .
diff --git a/artyfx.lv2/whaaa.ttl b/artyfx.lv2/whaaa.ttl
index 1251072..8981b0b 100644
--- a/artyfx.lv2/whaaa.ttl
+++ b/artyfx.lv2/whaaa.ttl
@@ -27,7 +27,7 @@
<http://www.openavproductions.com/artyfx#whaaa/gui>
a ui:X11UI;
- ui:binary <artyfx_ui.so>;
+ ui:binary <artyfx_ui.dll>;
lv2:optionalFeature ui:noUserResize ;
lv2:extensionData ui:idleInterface .

+ 1
- 0
patches/artyfx/win64 View File

@@ -0,0 +1 @@
win32

+ 1
- 1
plugins/artyfx.json View File

@@ -1,7 +1,7 @@
{
"name": "artyfx",
"lv2bundles": ["artyfx.lv2"],
"version": "6010d1a6034ea684cc2edb22021f034122ccf814",
"version": "f335f8059bddf5d33883600f39a263a8144b351e",
"dlbaseurl": "https://github.com/openAVproductions/openAV-ArtyFX.git",
"dlmethod": "git",
"buildtype": "cmake",


Write Preview
Loading…
Cancel
Save