[debian-edu-commits] debian-edu/pkg-team/ 03/03: Fixed build of ZynAddSubFX

[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 3e4095d793475c98a144549a731c5644360ae3c5
Author: Javier Serrano Polo <javier at jasp.net>
Date:   Fri May 13 01:11:19 2016 +0200

    Fixed build of ZynAddSubFX
---
 debian/patches/useless-deps.patch     | 13 +++++++------
 debian/patches/zynaddsubfx-libs.patch | 10 ++++++----
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/debian/patches/useless-deps.patch b/debian/patches/useless-deps.patch
index 60bd805..bf56cd5 100644
--- a/debian/patches/useless-deps.patch
+++ b/debian/patches/useless-deps.patch
@@ -8,8 +8,8 @@ Applied-Upstream: 1.1.91
 
 Index: lmms-1.1.3/plugins/LadspaEffect/swh/CMakeLists.txt
 ===================================================================
---- lmms-1.1.3.orig/plugins/LadspaEffect/swh/CMakeLists.txt	2016-04-24 01:21:31.000000000 +0200
-+++ lmms-1.1.3/plugins/LadspaEffect/swh/CMakeLists.txt	2016-04-24 01:35:32.000000000 +0200
+--- lmms-1.1.3.orig/plugins/LadspaEffect/swh/CMakeLists.txt	2016-05-13 01:09:08.000000000 +0200
++++ lmms-1.1.3/plugins/LadspaEffect/swh/CMakeLists.txt	2016-05-13 01:09:14.000000000 +0200
 @@ -4,13 +4,16 @@
                      ${FFTW3F_INCLUDE_DIRS}
                      "${CMAKE_BINARY_DIR}")
@@ -30,9 +30,9 @@ Index: lmms-1.1.3/plugins/LadspaEffect/swh/CMakeLists.txt
  	SET_TARGET_PROPERTIES("${_plugin}" PROPERTIES COMPILE_FLAGS "-O3 -Wall -fomit-frame-pointer -fstrength-reduce -funroll-loops -ffast-math -c -fno-strict-aliasing")
 Index: lmms-1.1.3/plugins/zynaddsubfx/CMakeLists.txt
 ===================================================================
---- lmms-1.1.3.orig/plugins/zynaddsubfx/CMakeLists.txt	2016-04-24 01:26:39.000000000 +0200
-+++ lmms-1.1.3/plugins/zynaddsubfx/CMakeLists.txt	2016-04-24 01:35:32.000000000 +0200
-@@ -136,16 +136,18 @@
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/CMakeLists.txt	2016-05-13 01:09:08.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/CMakeLists.txt	2016-05-13 01:09:14.000000000 +0200
+@@ -137,7 +137,9 @@
  SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
  ADD_EXECUTABLE(RemoteZynAddSubFx RemoteZynAddSubFx.cpp "${WINRC}")
  INSTALL(TARGETS RemoteZynAddSubFx RUNTIME DESTINATION "${PLUGIN_DIR}")
@@ -40,9 +40,10 @@ Index: lmms-1.1.3/plugins/zynaddsubfx/CMakeLists.txt
 +SET(FLTK_FILTERED_LIBRARIES ${FLTK_LIBRARIES})
 +LIST(REMOVE_ITEM FLTK_FILTERED_LIBRARIES "${X11_X11_LIB}" "${X11_Xext_LIB}")
 +TARGET_LINK_LIBRARIES(RemoteZynAddSubFx zynaddsubfx_gui -L. -lZynAddSubFxCore ${FLTK_FILTERED_LIBRARIES} -lpthread )
+ ADD_DEPENDENCIES(RemoteZynAddSubFx ZynAddSubFxCore)
  
  # link Qt libraries when on win32
- IF(LMMS_BUILD_WIN32)
+@@ -145,9 +147,9 @@
  	TARGET_LINK_LIBRARIES(RemoteZynAddSubFx ${QT_LIBRARIES})
  ENDIF(LMMS_BUILD_WIN32)
  
diff --git a/debian/patches/zynaddsubfx-libs.patch b/debian/patches/zynaddsubfx-libs.patch
index 0bcb7d9..9f3d217 100644
--- a/debian/patches/zynaddsubfx-libs.patch
+++ b/debian/patches/zynaddsubfx-libs.patch
@@ -7,8 +7,8 @@ Applied-Upstream: 1.1.91
 
 Index: lmms-1.1.3/plugins/zynaddsubfx/CMakeLists.txt
 ===================================================================
---- lmms-1.1.3.orig/plugins/zynaddsubfx/CMakeLists.txt	2016-04-23 22:10:42.000000000 +0200
-+++ lmms-1.1.3/plugins/zynaddsubfx/CMakeLists.txt	2016-04-24 01:26:39.000000000 +0200
+--- lmms-1.1.3.orig/plugins/zynaddsubfx/CMakeLists.txt	2016-05-13 00:25:20.000000000 +0200
++++ lmms-1.1.3/plugins/zynaddsubfx/CMakeLists.txt	2016-05-13 01:05:21.000000000 +0200
 @@ -108,7 +108,7 @@
      )
  
@@ -18,7 +18,7 @@ Index: lmms-1.1.3/plugins/zynaddsubfx/CMakeLists.txt
  TARGET_LINK_LIBRARIES(ZynAddSubFxCore zynaddsubfx_nio ${FFTW3F_LIBRARIES} ${QT_LIBRARIES} -lz -lpthread)
  IF(LMMS_BUILD_WIN32)
  	TARGET_LINK_LIBRARIES(ZynAddSubFxCore -lws2_32)
-@@ -117,8 +117,10 @@
+@@ -117,8 +117,11 @@
  	INSTALL(TARGETS ZynAddSubFxCore LIBRARY DESTINATION "${PLUGIN_DIR}")
  ENDIF(LMMS_BUILD_WIN32)
  
@@ -27,15 +27,17 @@ Index: lmms-1.1.3/plugins/zynaddsubfx/CMakeLists.txt
  BUILD_PLUGIN(zynaddsubfx ZynAddSubFx.cpp ZynAddSubFx.h MOCFILES ZynAddSubFx.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
 -TARGET_LINK_LIBRARIES(zynaddsubfx ZynAddSubFxCore)
 +TARGET_LINK_LIBRARIES(zynaddsubfx -L. -lZynAddSubFxCore)
++ADD_DEPENDENCIES(zynaddsubfx ZynAddSubFxCore)
  
  IF(WIN32)
  	SET(WINRC "${CMAKE_CURRENT_BINARY_DIR}/zynaddsubfxrc.obj")
-@@ -134,7 +136,7 @@
+@@ -134,7 +137,8 @@
  SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
  ADD_EXECUTABLE(RemoteZynAddSubFx RemoteZynAddSubFx.cpp "${WINRC}")
  INSTALL(TARGETS RemoteZynAddSubFx RUNTIME DESTINATION "${PLUGIN_DIR}")
 -TARGET_LINK_LIBRARIES(RemoteZynAddSubFx zynaddsubfx_gui ZynAddSubFxCore ${FLTK_LIBRARIES} -lpthread )
 +TARGET_LINK_LIBRARIES(RemoteZynAddSubFx zynaddsubfx_gui -L. -lZynAddSubFxCore ${FLTK_LIBRARIES} -lpthread )
++ADD_DEPENDENCIES(RemoteZynAddSubFx ZynAddSubFxCore)
  
  # link Qt libraries when on win32
  IF(LMMS_BUILD_WIN32)

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