lmms: fix build
tse tse it slipped in long time ago silently Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
@@ -0,0 +1,45 @@
|
||||
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
|
||||
Subject: [PATCH] Find native bin2res
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Inappropriate [embedded specific]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
cmake/modules/BuildPlugin.cmake | 2 +-
|
||||
src/CMakeLists.txt | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/cmake/modules/BuildPlugin.cmake b/cmake/modules/BuildPlugin.cmake
|
||||
index 7fa7c4c..fb0758f 100644
|
||||
--- a/cmake/modules/BuildPlugin.cmake
|
||||
+++ b/cmake/modules/BuildPlugin.cmake
|
||||
@@ -15,7 +15,7 @@ MACRO(BUILD_PLUGIN PLUGIN_NAME)
|
||||
IF(ER_LEN)
|
||||
SET(ER_H ${CMAKE_CURRENT_BINARY_DIR}/embedded_resources.h)
|
||||
ADD_CUSTOM_COMMAND(OUTPUT ${ER_H}
|
||||
- COMMAND ${BIN2RES}
|
||||
+ COMMAND bin2res
|
||||
ARGS ${PLUGIN_EMBEDDED_RESOURCES} > ${ER_H}
|
||||
DEPENDS bin2res)
|
||||
ENDIF(ER_LEN)
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 24cedbf..73901ef 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}")
|
||||
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)
|
||||
|
||||
# Paths relative to lmms executable
|
||||
FILE(RELATIVE_PATH LIB_DIR_RELATIVE "/${BIN_DIR}" "/${LIB_DIR}")
|
||||
--
|
||||
2.5.5
|
||||
|
||||
13
recipes-misc/recipes-multimedia/lmms/lmms-native.bb
Normal file
13
recipes-misc/recipes-multimedia/lmms/lmms-native.bb
Normal file
@@ -0,0 +1,13 @@
|
||||
require ${BPN}.inc
|
||||
|
||||
inherit native
|
||||
|
||||
do_compile() {
|
||||
cd ${S}/buildtools
|
||||
${CXX} ${CXXFLAGS} -o bin2res bin2res.cpp $(LDFLAGS)
|
||||
}
|
||||
|
||||
do_install() {
|
||||
install -d ${D}${bindir}
|
||||
install -m 755 ${S}/buildtools/bin2res ${D}${bindir}
|
||||
}
|
||||
25
recipes-misc/recipes-multimedia/lmms/lmms.bb
Normal file
25
recipes-misc/recipes-multimedia/lmms/lmms.bb
Normal file
@@ -0,0 +1,25 @@
|
||||
require ${BPN}.inc
|
||||
|
||||
inherit cmake_qt5 mime gtk-icon-cache
|
||||
|
||||
SRC_URI += "file://0001-Find-native-bin2res.patch"
|
||||
|
||||
DEPENDS += " \
|
||||
${BPN}-native \
|
||||
qtbase \
|
||||
jack \
|
||||
fftw \
|
||||
stk \
|
||||
fluidsynth \
|
||||
portaudio-v19 \
|
||||
libsdl \
|
||||
"
|
||||
|
||||
EXTRA_OECMAKE += " \
|
||||
-DWANT_QT5=ON \
|
||||
"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/mime \
|
||||
${datadir}/menu \
|
||||
"
|
||||
@@ -1,21 +1,9 @@
|
||||
SUMMARY = "Qt based sequencer"
|
||||
HOMEPAGE = "https://lmms.io"
|
||||
LICENSE = "GPLv2+"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2d5025d4aa3495befef8f17206a5b0a1"
|
||||
|
||||
inherit cmake_qt5
|
||||
|
||||
DEPENDS += " \
|
||||
qtbase \
|
||||
jack \
|
||||
fftw \
|
||||
"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=751419260aa954499f7abaabaa882bbe"
|
||||
|
||||
SRC_URI = "git://github.com/LMMS/${BPN}.git"
|
||||
SRCREV = "cfe5e98bf773abbe6003aa59209967c106965d3c"
|
||||
S = "${WORKDIR}/git"
|
||||
PV = "1.1.90+git${SRCPV}"
|
||||
|
||||
EXTRA_OECMAKE += " \
|
||||
-DWANT_QT5=ON \
|
||||
"
|
||||
Reference in New Issue
Block a user