Modify VST build systems to make debian integration work correctly

debian/control

@@ -45,7 +45,8 @@ Architecture: any
 Depends: lmms-common (>= ${source:Version}), ${shlibs:Depends}, ${misc:Depends},
  stk
 Recommends: tap-plugins, caps,
- lmms-vst-server:i386 (>= ${source:Version})
+ lmms-vst-server:i386 (>= ${source:Version}),
+ lmms-vst-server:amd64 (>= ${source:Version})
 Suggests: fil-plugins, mcp-plugins, omins, freepats, fluid-soundfont-gm,
  ladspa-plugin
 Replaces: lmms-common (<< 1.0.0-1)
@@ -99,9 +100,8 @@ Description: Linux Multimedia Studio - common files
  and some example projects.
 
 Package: lmms-vst-server
-Architecture: i386
-# Order matters to avoid wine64
-Depends: wine32, wine, ${shlibs:Depends}, ${misc:Depends}
+Architecture: amd64 i386
+Depends: wine64 [amd64] | wine64-development [amd64] | wine32 [i386] | wine32-development [i386], ${shlibs:Depends}, ${misc:Depends}
 Recommends: lmms-bin:any
 Description: Linux Multimedia Studio - VST server
  This package contains a helper application that loads VST plugins.

debian/lmms-vst-server.install

@@ -1 +1 @@
-usr/lib/*/lmms/RemoteVstPlugin*
+usr/lib/*/lmms/{32/,}RemoteVstPlugin*

debian/rules

@@ -6,6 +6,7 @@ DH_CMAKE_BUILD_DIR=obj	-${DEB_BUILD_GNU_TYPE}
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEB_HOST_ARCH_OS   ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+DEB_HOST_ARCH_BIT  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_BITS)
 
 CMAKE_OPTS= -DCONTRIBUTORS=$(CURDIR)/doc/CONTRIBUTORS -DFORCE_VERSION=internal \
 	-DWANT_QT5=1
@@ -13,13 +14,18 @@ ifneq ($(DEB_HOST_ARCH_OS),linux)
 CMAKE_OPTS+= -DWANT_ALSA=0
 endif
 
-ifeq ($(DEB_HOST_ARCH),i386)
+ifeq ($(DEB_HOST_ARCH),amd64)
 export PATH := $(PATH):/usr/lib/wine
 WINE_PATH := /usr/lib/$(DEB_HOST_MULTIARCH)/wine
-CMAKE_OPTS+= -DWINE_CXX_FLAGS=-Wl,--enable-new-dtags,-rpath=$(WINE_PATH)
+CMAKE_OPTS+= -DWANT_VST_32=OFF -DREMOTE_VST_PLUGIN_FILEPATH_32=../../i386-linux-gnu/lmms/32/RemoteVstPlugin32 \
+	-DWINE_CXX_FLAGS=-Wl,--enable-new-dtags,-rpath=$(WINE_PATH)
+else ifeq ($(DEB_HOST_ARCH),i386)
+export PATH := $(PATH):/usr/lib/wine
+WINE_PATH := /usr/lib/$(DEB_HOST_MULTIARCH)/wine
+CMAKE_OPTS+= -DWANT_VST_64=OFF -DREMOTE_VST_PLUGIN_FILEPATH_64=../../x86_64-linux-gnu/lmms/RemoteVstPlugin64 \
+	-DWINE_CXX_FLAGS=-Wl,--enable-new-dtags,-rpath=$(WINE_PATH)
 else
-CMAKE_OPTS+= -DWANT_VST_NOWINE=1 \
-	-DREMOTE_VST_PLUGIN_FILEPATH=../../i386-linux-gnu/lmms/RemoteVstPlugin
+CMAKE_OPTS+= -DWANT_VST=OFF
 endif
 
 # Define NDEBUG. This helps with reproducible builds.