zepto-forks/meta-qt5-extra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lmms: update to 1.2.0-rc4

Browse Source 
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2017-11-06 22:01:39 +01:00
parent 2e9013a5b2
commit 57e74e30f2
3 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
recipes-misc/recipes-multimedia/lmms/files/0001-Find-native-bin2res.patch
View File

@@ -1,6 +1,6 @@
From d224e6ccbd8c221172099e9c0162e03eeb1b6e18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Thu, 12 Jan 2017 23:30:23 +0100
Date: Mon, 6 Nov 2017 21:44:58 +0100
Subject: [PATCH] Find native bin2res
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
@@ -15,11 +15,11 @@ Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cmake/modules/BuildPlugin.cmake b/cmake/modules/BuildPlugin.cmake
index 7fa7c4c..fb0758f 100644
index a107ef5..1e182a4 100644
--- a/cmake/modules/BuildPlugin.cmake
+++ b/cmake/modules/BuildPlugin.cmake
@@ -15,7 +15,7 @@ MACRO(BUILD_PLUGIN PLUGIN_NAME)
IF(ER_LEN)
@@ -27,7 +27,7 @@ MACRO(BUILD_PLUGIN PLUGIN_NAME)
SET(ER_H ${CMAKE_CURRENT_BINARY_DIR}/embedded_resources.h)
ADD_CUSTOM_COMMAND(OUTPUT ${ER_H}
- COMMAND ${BIN2RES}
@@ -28,18 +28,18 @@ index 7fa7c4c..fb0758f 100644
DEPENDS bin2res)
ENDIF(ER_LEN)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 24cedbf..73901ef 100644
index 154ff4f..4ceddf6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -43,7 +43,7 @@ ENDIF()
SET(lmms_EMBEDDED_RESOURCES "${CMAKE_SOURCE_DIR}/doc/AUTHORS" "${CMAKE_SOURCE_DIR}/LICENSE.txt" "${CONTRIBUTORS}")
@@ -46,7 +46,7 @@ SET(lmms_EMBEDDED_RESOURCES
"${CMAKE_SOURCE_DIR}/LICENSE.txt"
"${CMAKE_SOURCE_DIR}/doc/CONTRIBUTORS")
SET(LMMS_ER_H "${CMAKE_CURRENT_BINARY_DIR}/embedded_resources.h")
-ADD_CUSTOM_COMMAND(OUTPUT "${LMMS_ER_H}" COMMAND "${BIN2RES}" ARGS ${lmms_EMBEDDED_RESOURCES} > "\"${LMMS_ER_H}\"" DEPENDS bin2res)
+ADD_CUSTOM_COMMAND(OUTPUT "${LMMS_ER_H}" COMMAND "bin2res" ARGS ${lmms_EMBEDDED_RESOURCES} > "\"${LMMS_ER_H}\"" DEPENDS bin2res)
-ADD_CUSTOM_COMMAND(OUTPUT "${LMMS_ER_H}" COMMAND "${BIN2RES}" ARGS ${lmms_EMBEDDED_RESOURCES} > "${LMMS_ER_H}" DEPENDS bin2res)
+ADD_CUSTOM_COMMAND(OUTPUT "${LMMS_ER_H}" COMMAND "bin2res" ARGS ${lmms_EMBEDDED_RESOURCES} > "${LMMS_ER_H}" DEPENDS bin2res)
# Paths relative to lmms executable
FILE(RELATIVE_PATH LIB_DIR_RELATIVE "/${BIN_DIR}" "/${LIB_DIR}")
--
2.5.5
2.9.5

22
recipes-misc/recipes-multimedia/lmms/files/0002-zynaddsubfx-link-agains-X11.patch
View File

@@ -1,6 +1,6 @@
From e379780b23d37b09cf33fdd50152958ba5ccb3cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Tue, 7 Mar 2017 19:36:47 +0100
Date: Mon, 6 Nov 2017 21:49:47 +0100
Subject: [PATCH] zynaddsubfx: link agains libraries necessary when linking with gold
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
@@ -14,18 +14,18 @@ Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plugins/zynaddsubfx/CMakeLists.txt b/plugins/zynaddsubfx/CMakeLists.txt
index 1fb8a61..2856737 100644
index 541b8cf..93f595b 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 )
@@ -175,7 +175,7 @@ IF(FLTK_CONFIG AND NOT (LMMS_BUILD_APPLE OR LMMS_BUILD_WIN32))
STRING(REPLACE " " ";" FLTK_FILTERED_LDFLAGS ${FLTK_FILTERED_LDFLAGS})
LIST(REMOVE_ITEM FLTK_FILTERED_LDFLAGS -lX11)
ENDIF()
-TARGET_LINK_LIBRARIES(RemoteZynAddSubFx zynaddsubfx_gui -lZynAddSubFxCore ${FLTK_FILTERED_LDFLAGS} -lpthread )
+TARGET_LINK_LIBRARIES(RemoteZynAddSubFx zynaddsubfx_gui -lZynAddSubFxCore ${FLTK_FILTERED_LDFLAGS} ${X11_LIBRARIES} -lXrender -lXft -lfontconfig -ldl -lpthread )
ADD_DEPENDENCIES(RemoteZynAddSubFx ZynAddSubFxCore)
# link Qt libraries when on win32
IF(LMMS_BUILD_WIN32)
# Support qt_version_tag in Qt 5.6
--
2.9.3
2.9.5

4
recipes-misc/recipes-multimedia/lmms/lmms.inc
View File

@@ -4,6 +4,6 @@ LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=751419260aa954499f7abaabaa882bbe"
SRC_URI = "git://github.com/LMMS/${BPN}.git"
SRCREV = "cfe5e98bf773abbe6003aa59209967c106965d3c"
SRCREV = "fb5a515f77ebae9b9bd861478a8d624ad3d59c80"
S = "${WORKDIR}/git"
PV = "1.1.90+git${SRCPV}"
PV = "1.2.0-rc4"