[debian-edu-commits] debian-edu/pkg-team/ 01/01: Fixed most dh_shlibdeps warnings

[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 4b4ba5c8bd2c86ee33d5d1fd3a26fa15e952cefe
Author: Javier Serrano Polo <javier at jasp.net>
Date:   Sun Apr 24 02:15:06 2016 +0200

    Fixed most dh_shlibdeps warnings
---
 debian/patches/series                 |  2 ++
 debian/patches/useless-deps.patch     | 54 +++++++++++++++++++++++++++++++++++
 debian/patches/zynaddsubfx-libs.patch | 39 +++++++++++++++++++++++++
 3 files changed, 95 insertions(+)

diff --git a/debian/patches/series b/debian/patches/series
index 1b61ae5..f2b0edb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,5 @@ wine-runpath.patch
 sync-socket.patch
 wine-buildflags.patch
 gcc6.patch
+zynaddsubfx-libs.patch
+useless-deps.patch
diff --git a/debian/patches/useless-deps.patch b/debian/patches/useless-deps.patch
new file mode 100644
index 0000000..c7cd1cb
--- /dev/null
+++ b/debian/patches/useless-deps.patch
@@ -0,0 +1,54 @@
+Description: Removed useless dependencies
+ lmms depended on libX11 and libXext. vocoder-ladspa depended on libfftw3f.
+ lmms-vst-server still depends on libgcc_s; -static-libgcc could be used, but
+ this might break in the future.
+Author: Javier Serrano Polo <javier at jasp.net>
+
+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
+@@ -4,13 +4,16 @@
+                     ${FFTW3F_INCLUDE_DIRS}
+                     "${CMAKE_BINARY_DIR}")
+ LINK_DIRECTORIES(${FFTW3F_LIBRARY_DIRS})
+-LINK_LIBRARIES(-lfftw3f)
+ FILE(GLOB PLUGIN_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.c")
+ 
+ FOREACH(_item ${PLUGIN_SOURCES})
+ 	GET_FILENAME_COMPONENT(_plugin "${_item}" NAME_WE)
+ 
+ 	ADD_LIBRARY("${_plugin}" MODULE "${_item}")
++	# vocoder_1337 does not use fftw3f
++	IF(NOT ("${_plugin}" STREQUAL "vocoder_1337"))
++		TARGET_LINK_LIBRARIES("${_plugin}" -lfftw3f)
++	ENDIF()
+ 	INSTALL(TARGETS "${_plugin}" LIBRARY DESTINATION "${PLUGIN_DIR}/ladspa")
+ 	SET_TARGET_PROPERTIES("${_plugin}" PROPERTIES PREFIX "")
+ 	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 @@
+ 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 -L. -lZynAddSubFxCore ${FLTK_LIBRARIES} -lpthread )
++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 )
+ 
+ # link Qt libraries when on win32
+ IF(LMMS_BUILD_WIN32)
+ 	TARGET_LINK_LIBRARIES(RemoteZynAddSubFx ${QT_LIBRARIES})
+ ENDIF(LMMS_BUILD_WIN32)
+ 
+-# FLTK needs X
++# FLTK needs X (is -ldl not linked in libfltk?)
+ IF(LMMS_BUILD_LINUX)
+-	TARGET_LINK_LIBRARIES(RemoteZynAddSubFx -ldl)
++#	TARGET_LINK_LIBRARIES(RemoteZynAddSubFx -ldl)
+ ENDIF(LMMS_BUILD_LINUX)
+ 
+ 
diff --git a/debian/patches/zynaddsubfx-libs.patch b/debian/patches/zynaddsubfx-libs.patch
new file mode 100644
index 0000000..3120bd1
--- /dev/null
+++ b/debian/patches/zynaddsubfx-libs.patch
@@ -0,0 +1,39 @@
+Description: Fixed ZynAddSubFxCore library issues
+ This patch removes the SONAME from libZynAddSubFxCore.so, becoming a module
+ like the other plugins. RUNPATH information is set for depending objects.
+Author: Javier Serrano Polo <javier at jasp.net>
+
+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
+@@ -108,7 +108,7 @@
+     )
+ 
+ 
+-ADD_LIBRARY(ZynAddSubFxCore SHARED LocalZynAddSubFx.cpp ${zynaddsubfx_core_SRCS})
++ADD_LIBRARY(ZynAddSubFxCore MODULE LocalZynAddSubFx.cpp ${zynaddsubfx_core_SRCS})
+ 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 @@
+ 	INSTALL(TARGETS ZynAddSubFxCore LIBRARY DESTINATION "${PLUGIN_DIR}")
+ ENDIF(LMMS_BUILD_WIN32)
+ 
++LINK_LIBRARIES(-Wl,--enable-new-dtags)
++SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${PLUGIN_DIR}")
+ 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)
+ 
+ IF(WIN32)
+ 	SET(WINRC "${CMAKE_CURRENT_BINARY_DIR}/zynaddsubfxrc.obj")
+@@ -134,7 +136,7 @@
+ 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 )
+ 
+ # 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