1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
|
--- vamp-plugin-sdk-2.7.1/Makefile.in.orig 2015-06-22 04:28:58 -0400
+++ vamp-plugin-sdk-2.7.1/Makefile.in 2016-06-11 07:41:04 -0400
@@ -54,8 +54,8 @@
# File extension for a dynamically loadable object
#
-PLUGIN_EXT = .so
-#PLUGIN_EXT = .dll
+#PLUGIN_EXT = .so
+PLUGIN_EXT = .dll
#PLUGIN_EXT = .dylib
# Libraries required for the host.
@@ -78,15 +78,13 @@
INSTALL_PLUGINS = $(INSTALL_PREFIX)/lib/vamp
INSTALL_BINARIES = $(INSTALL_PREFIX)/bin
-INSTALL_SDK_LIBNAME = libvamp-sdk.so.2.10.0
-INSTALL_SDK_LINK_ABI = libvamp-sdk.so.2
-INSTALL_SDK_LINK_DEV = libvamp-sdk.so
+INSTALL_SDK_LIBNAME = libvamp-sdk$(PLUGIN_EXT)
+INSTALL_SDK_LINK_ABI = libvamp-sdk.dll.a
INSTALL_SDK_STATIC = libvamp-sdk.a
INSTALL_SDK_LA = libvamp-sdk.la
-INSTALL_HOSTSDK_LIBNAME = libvamp-hostsdk.so.3.10.0
-INSTALL_HOSTSDK_LINK_ABI = libvamp-hostsdk.so.3
-INSTALL_HOSTSDK_LINK_DEV = libvamp-hostsdk.so
+INSTALL_HOSTSDK_LIBNAME = libvamp-hostsdk$(PLUGIN_EXT)
+INSTALL_HOSTSDK_LINK_ABI = libvamp-hostsdk.dll.a
INSTALL_HOSTSDK_STATIC = libvamp-hostsdk.a
INSTALL_HOSTSDK_LA = libvamp-hostsdk.la
@@ -95,8 +93,8 @@
# Flags required to tell the compiler to create a dynamically loadable object
#
DYNAMIC_LDFLAGS = -static-libgcc -shared -Wl,-Bsymbolic
-SDK_DYNAMIC_LDFLAGS = $(DYNAMIC_LDFLAGS) -Wl,-soname=$(INSTALL_SDK_LINK_ABI)
-HOSTSDK_DYNAMIC_LDFLAGS = $(DYNAMIC_LDFLAGS) -Wl,-soname=$(INSTALL_HOSTSDK_LINK_ABI)
+SDK_DYNAMIC_LDFLAGS = $(DYNAMIC_LDFLAGS) -Wl,--out-implib,$(INSTALL_SDK_LINK_ABI)
+HOSTSDK_DYNAMIC_LDFLAGS = $(DYNAMIC_LDFLAGS) -Wl,--out-implib,$(INSTALL_HOSTSDK_LINK_ABI)
# Additional flags for making a plugin. This version script tells the
# GNU linker to make all symbols in the library hidden except for the
@@ -282,16 +280,10 @@
cp $(HOSTSDK_HEADERS) $(DESTDIR)$(INSTALL_HOSTSDK_HEADERS)
cp $(SDK_STATIC) $(DESTDIR)$(INSTALL_SDK_LIBS)
cp $(HOSTSDK_STATIC) $(DESTDIR)$(INSTALL_SDK_LIBS)
- cp $(SDK_DYNAMIC) $(DESTDIR)$(INSTALL_SDK_LIBS)/$(INSTALL_SDK_LIBNAME)
- cp $(HOSTSDK_DYNAMIC) $(DESTDIR)$(INSTALL_SDK_LIBS)/$(INSTALL_HOSTSDK_LIBNAME)
- rm -f $(DESTDIR)$(INSTALL_SDK_LIBS)/$(INSTALL_SDK_LINK_ABI)
- ln -s $(INSTALL_SDK_LIBNAME) $(DESTDIR)$(INSTALL_SDK_LIBS)/$(INSTALL_SDK_LINK_ABI)
- rm -f $(DESTDIR)$(INSTALL_SDK_LIBS)/$(INSTALL_HOSTSDK_LINK_ABI)
- ln -s $(INSTALL_HOSTSDK_LIBNAME) $(DESTDIR)$(INSTALL_SDK_LIBS)/$(INSTALL_HOSTSDK_LINK_ABI)
- rm -f $(DESTDIR)$(INSTALL_SDK_LIBS)/$(INSTALL_SDK_LINK_DEV)
- ln -s $(INSTALL_SDK_LIBNAME) $(DESTDIR)$(INSTALL_SDK_LIBS)/$(INSTALL_SDK_LINK_DEV)
- rm -f $(DESTDIR)$(INSTALL_SDK_LIBS)/$(INSTALL_HOSTSDK_LINK_DEV)
- ln -s $(INSTALL_HOSTSDK_LIBNAME) $(DESTDIR)$(INSTALL_SDK_LIBS)/$(INSTALL_HOSTSDK_LINK_DEV)
+ cp $(SDK_DYNAMIC) $(DESTDIR)$(INSTALL_BINARIES)
+ cp $(HOSTSDK_DYNAMIC) $(DESTDIR)$(INSTALL_BINARIES)
+ cp $(INSTALL_SDK_LINK_ABI) $(DESTDIR)$(INSTALL_SDK_LIBS)
+ cp $(INSTALL_HOSTSDK_LINK_ABI) $(DESTDIR)$(INSTALL_SDK_LIBS)
sed "s,%PREFIX%,$(INSTALL_PREFIX)," $(PCDIR)/vamp.pc.in \
> $(DESTDIR)$(INSTALL_PKGCONFIG)/vamp.pc
sed "s,%PREFIX%,$(INSTALL_PREFIX)," $(PCDIR)/vamp-sdk.pc.in \
@@ -300,13 +292,11 @@
> $(DESTDIR)$(INSTALL_PKGCONFIG)/vamp-hostsdk.pc
sed -e "s,%LIBNAME%,$(INSTALL_SDK_LIBNAME),g" \
-e "s,%LINK_ABI%,$(INSTALL_SDK_LINK_ABI),g" \
- -e "s,%LINK_DEV%,$(INSTALL_SDK_LINK_DEV),g" \
-e "s,%STATIC%,$(INSTALL_SDK_STATIC),g" \
-e "s,%LIBS%,$(INSTALL_SDK_LIBS),g" $(SDK_LA).in \
> $(DESTDIR)$(INSTALL_SDK_LIBS)/$(INSTALL_SDK_LA)
sed -e "s,%LIBNAME%,$(INSTALL_HOSTSDK_LIBNAME),g" \
-e "s,%LINK_ABI%,$(INSTALL_HOSTSDK_LINK_ABI),g" \
- -e "s,%LINK_DEV%,$(INSTALL_HOSTSDK_LINK_DEV),g" \
-e "s,%STATIC%,$(INSTALL_HOSTSDK_STATIC),g" \
-e "s,%LIBS%,$(INSTALL_SDK_LIBS),g" $(HOSTSDK_LA).in \
> $(DESTDIR)$(INSTALL_SDK_LIBS)/$(INSTALL_HOSTSDK_LA)
--- vamp-plugin-sdk-2.6/pkgconfig/vamp-hostsdk.pc.in.orig 2015-06-22 04:28:58 -0400
+++ vamp-plugin-sdk-2.6/pkgconfig/vamp-hostsdk.pc.in 2016-06-11 07:51:53 -0400
@@ -6,5 +6,5 @@
Name: vamp-hostsdk
Version: 2.6
Description: Development library for Vamp audio analysis plugin hosts
-Libs: -L${libdir} -lvamp-hostsdk -ldl
+Libs: -L${libdir} -lvamp-hostsdk
Cflags: -I${includedir}
|