[debian-edu-commits] debian-edu/pkg-team/ 02/03: Fixed parallel build of VST plug-ins

[Javier Serrano Polo]

This is an automated email from the git hooks/post-receive script.

jasp00-guest pushed a commit to branch master
in repository lmms.

commit b9463568a26bdc217792bb3e91d3bfe434e89c7e
Author: Javier Serrano Polo <javier at jasp.net>
Date:   Fri May 13 00:36:39 2016 +0200

    Fixed parallel build of VST plug-ins
---
 debian/patches/find-vst_base.patch | 31 ++++++++++---------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/debian/patches/find-vst_base.patch b/debian/patches/find-vst_base.patch
index 641bc71..ac73b39 100644
--- a/debian/patches/find-vst_base.patch
+++ b/debian/patches/find-vst_base.patch
@@ -7,26 +7,11 @@ Bug-Debian: https://bugs.debian.org/763720
 Forwarded: https://github.com/LMMS/lmms/pull/2732
 Applied-Upstream: 1.1.91
 
-Index: lmms-1.1.3/plugins/CMakeLists.txt
-===================================================================
---- lmms-1.1.3.orig/plugins/CMakeLists.txt	2016-04-05 23:41:16.000000000 +0200
-+++ lmms-1.1.3/plugins/CMakeLists.txt	2016-04-05 23:52:36.000000000 +0200
-@@ -33,8 +33,9 @@
- ADD_SUBDIRECTORY(stereo_matrix)
- ADD_SUBDIRECTORY(stk)
- ADD_SUBDIRECTORY(triple_oscillator)
--ADD_SUBDIRECTORY(vestige)
-+# dependency is not detected
- ADD_SUBDIRECTORY(vst_base)
-+ADD_SUBDIRECTORY(vestige)
- ADD_SUBDIRECTORY(VstEffect)
- ADD_SUBDIRECTORY(watsyn)
- ADD_SUBDIRECTORY(waveshaper)
 Index: lmms-1.1.3/plugins/VstEffect/CMakeLists.txt
 ===================================================================
---- lmms-1.1.3.orig/plugins/VstEffect/CMakeLists.txt	2015-03-08 03:47:14.000000000 +0100
-+++ lmms-1.1.3/plugins/VstEffect/CMakeLists.txt	2016-04-05 23:27:04.000000000 +0200
-@@ -2,7 +2,8 @@
+--- lmms-1.1.3.orig/plugins/VstEffect/CMakeLists.txt	2016-05-13 00:25:55.000000000 +0200
++++ lmms-1.1.3/plugins/VstEffect/CMakeLists.txt	2016-05-13 00:33:32.000000000 +0200
+@@ -2,9 +2,11 @@
  INCLUDE(BuildPlugin)
  INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/../vst_base")
  LINK_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}/../vst_base")
@@ -35,12 +20,15 @@ Index: lmms-1.1.3/plugins/VstEffect/CMakeLists.txt
 +SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${PLUGIN_DIR}")
  BUILD_PLUGIN(vsteffect VstEffect.cpp VstEffectControls.cpp VstEffectControlDialog.cpp VstSubPluginFeatures.cpp VstEffect.h VstEffectControls.h VstEffectControlDialog.h VstSubPluginFeatures.h MOCFILES VstEffectControlDialog.h VstEffectControls.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
  SET_TARGET_PROPERTIES(vsteffect PROPERTIES COMPILE_FLAGS "-Wno-attributes")
++ADD_DEPENDENCIES(vsteffect vstbase)
+ 
+ ENDIF(LMMS_SUPPORT_VST)
  
 Index: lmms-1.1.3/plugins/vestige/CMakeLists.txt
 ===================================================================
---- lmms-1.1.3.orig/plugins/vestige/CMakeLists.txt	2015-03-08 03:47:14.000000000 +0100
-+++ lmms-1.1.3/plugins/vestige/CMakeLists.txt	2016-04-05 23:51:23.000000000 +0200
-@@ -2,7 +2,8 @@
+--- lmms-1.1.3.orig/plugins/vestige/CMakeLists.txt	2016-05-13 00:25:55.000000000 +0200
++++ lmms-1.1.3/plugins/vestige/CMakeLists.txt	2016-05-13 00:33:56.000000000 +0200
+@@ -2,7 +2,9 @@
     INCLUDE(BuildPlugin)
     INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/../vst_base")
     LINK_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}/../vst_base")
@@ -48,5 +36,6 @@ Index: lmms-1.1.3/plugins/vestige/CMakeLists.txt
 +   LINK_LIBRARIES(-lvstbase -Wl,--enable-new-dtags)
 +   SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${PLUGIN_DIR}")
     BUILD_PLUGIN(vestige vestige.cpp vestige.h MOCFILES vestige.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
++   ADD_DEPENDENCIES(vestige vstbase)
  ENDIF(LMMS_SUPPORT_VST)
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/lmms.git