diff --git a/recipes-misc/recipes-multimedia/lmms/files/0002-zynaddsubfx-link-agains-X11.patch b/recipes-misc/recipes-multimedia/lmms/files/0002-zynaddsubfx-link-agains-X11.patch new file mode 100644 index 00000000..0a485767 --- /dev/null +++ b/recipes-misc/recipes-multimedia/lmms/files/0002-zynaddsubfx-link-agains-X11.patch @@ -0,0 +1,31 @@ +From e379780b23d37b09cf33fdd50152958ba5ccb3cb Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Tue, 7 Mar 2017 19:36:47 +0100 +Subject: [PATCH] zynaddsubfx: link agains libraries necessary when linking with gold +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller +--- + plugins/zynaddsubfx/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plugins/zynaddsubfx/CMakeLists.txt b/plugins/zynaddsubfx/CMakeLists.txt +index 1fb8a61..2856737 100644 +--- a/plugins/zynaddsubfx/CMakeLists.txt ++++ b/plugins/zynaddsubfx/CMakeLists.txt +@@ -155,7 +155,7 @@ ADD_EXECUTABLE(RemoteZynAddSubFx RemoteZynAddSubFx.cpp "${WINRC}") + INSTALL(TARGETS RemoteZynAddSubFx RUNTIME DESTINATION "${PLUGIN_DIR}") + SET(FLTK_FILTERED_LIBRARIES ${FLTK_LIBRARIES}) + LIST(REMOVE_ITEM FLTK_FILTERED_LIBRARIES "${X11_X11_LIB}" "${X11_Xext_LIB}") +-TARGET_LINK_LIBRARIES(RemoteZynAddSubFx zynaddsubfx_gui ZynAddSubFxCore ${FLTK_FILTERED_LIBRARIES} -lpthread ) ++TARGET_LINK_LIBRARIES(RemoteZynAddSubFx zynaddsubfx_gui ZynAddSubFxCore ${FLTK_FILTERED_LIBRARIES} ${X11_LIBRARIES} -lXrender -lXft -lfontconfig -ldl -lpthread ) + + # link Qt libraries when on win32 + IF(LMMS_BUILD_WIN32) +-- +2.9.3 + diff --git a/recipes-misc/recipes-multimedia/lmms/lmms.bb b/recipes-misc/recipes-multimedia/lmms/lmms.bb index 4b604272..454be1c4 100644 --- a/recipes-misc/recipes-multimedia/lmms/lmms.bb +++ b/recipes-misc/recipes-multimedia/lmms/lmms.bb @@ -1,8 +1,11 @@ require ${BPN}.inc -inherit cmake_qt5 mime gtk-icon-cache +inherit cmake_qt5 mime gtk-icon-cache pkgconfig -SRC_URI += "file://0001-Find-native-bin2res.patch" +SRC_URI += " \ + file://0001-Find-native-bin2res.patch \ + file://0002-zynaddsubfx-link-agains-X11.patch \ +" DEPENDS += " \ ${BPN}-native \ @@ -14,6 +17,7 @@ DEPENDS += " \ fluidsynth \ portaudio-v19 \ libsdl \ + fltk fltk-native \ " EXTRA_OECMAKE += " \