remove all recipes moved to meta-musiscians
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
@@ -1,53 +0,0 @@
|
||||
# Helper class to handle ontarget-postinst creation of lv2 turtle files
|
||||
|
||||
# File created during compile usually. To create this file makefiles have to be
|
||||
# aligned - see do_configure_prepend at zynaddsubfx or distrho-ports. The file
|
||||
# is expected with the following format
|
||||
# lv2-ttl-generator <path>/plugin.so
|
||||
LV2-TURTLE-BUILD-DATA = "${WORKDIR}/lv2-ttl-generator-data"
|
||||
|
||||
# E.g zynaddsubfx needs to create dummy lv2 turtle files to keep install sane.
|
||||
# To delete them automatically (see below) the contain a dummy string:
|
||||
LV2-DUMMY-TURTLE-STR = "lv2-dummy-turtle-string"
|
||||
|
||||
# To make ontarget postinst/prerm happen, the names of all plugins with their
|
||||
# paths as installed on target a stored in a file called lv2-postinst-manifest
|
||||
LV2-POSTINST-MANIFEST = "${datadir}/${BPN}/lv2-postinst-manifest"
|
||||
|
||||
do_install_append() {
|
||||
# remove dummy lv2-turtles again
|
||||
cd ${D}/${libdir}/lv2
|
||||
for tfile in `grep -rl ${LV2-DUMMY-TURTLE-STR}`; do
|
||||
rm $tfile
|
||||
done
|
||||
|
||||
# create postinst manifest
|
||||
install -d ${D}`dirname ${LV2-POSTINST-MANIFEST}`
|
||||
for sofile in `cat ${LV2-TURTLE-BUILD-DATA} | awk '{ print $2 }'`; do
|
||||
sofile=`basename $sofile`
|
||||
installed=`find ${D}${libdir}/lv2 -name $sofile | sed 's|${D}||g'`
|
||||
echo $installed >> ${D}${LV2-POSTINST-MANIFEST}
|
||||
done
|
||||
}
|
||||
|
||||
|
||||
pkg_postinst_ontarget_${PN}-lv2() {
|
||||
oldpath=`pwd`
|
||||
for sofile in `cat ${LV2-POSTINST-MANIFEST}`; do
|
||||
cd `dirname "$sofile"`
|
||||
lv2-ttl-generator "$sofile"
|
||||
done
|
||||
cd $oldpath
|
||||
}
|
||||
|
||||
pkg_prerm_${PN}-lv2() {
|
||||
for sofile in `cat ${LV2-POSTINST-MANIFEST}`; do
|
||||
path=`dirname "$sofile"`
|
||||
for turtle in `find $path -name '*.ttl'`; do
|
||||
rm $turtle
|
||||
done
|
||||
done
|
||||
}
|
||||
|
||||
FILES_${PN}-lv2 += "${LV2-POSTINST-MANIFEST}"
|
||||
RDEPENDS_${PN}-lv2 += "lv2-ttl-generator"
|
||||
@@ -1,8 +0,0 @@
|
||||
# Auto package audio plugins
|
||||
|
||||
PACKAGES =+ "${PN}-dssi ${PN}-ladspa ${PN}-lv2 ${PN}-vst"
|
||||
|
||||
FILES_${PN}-dssi += "${libdir}/dssi"
|
||||
FILES_${PN}-ladspa += "${libdir}/ladspa"
|
||||
FILES_${PN}-lv2 += "${libdir}/lv2"
|
||||
FILES_${PN}-vst += "${libdir}/vst"
|
||||
@@ -1,37 +0,0 @@
|
||||
# avoids build breaks when using no-static-libs.inc
|
||||
DISABLE_STATIC = ""
|
||||
|
||||
EXTRA_OECONF_append = " ${PACKAGECONFIG_CONFARGS}"
|
||||
|
||||
python waf_preconfigure() {
|
||||
import subprocess
|
||||
from distutils.version import StrictVersion
|
||||
subsrcdir = d.getVar('S')
|
||||
wafbin = os.path.join(subsrcdir, 'waf')
|
||||
try:
|
||||
result = subprocess.check_output([wafbin, '--version'], cwd=subsrcdir, stderr=subprocess.STDOUT)
|
||||
version = result.decode('utf-8').split()[1]
|
||||
if StrictVersion(version) >= StrictVersion("1.8.7"):
|
||||
d.setVar("WAF_EXTRA_CONF", "--bindir=${bindir} --libdir=${libdir}")
|
||||
except subprocess.CalledProcessError as e:
|
||||
bb.warn("Unable to execute waf --version, exit code %d. Assuming waf version without bindir/libdir support." % e.returncode)
|
||||
except FileNotFoundError:
|
||||
bb.fatal("waf does not exist in %s" % subsrcdir)
|
||||
}
|
||||
|
||||
do_configure[prefuncs] += "waf_preconfigure"
|
||||
|
||||
wafold_do_configure() {
|
||||
${S}/waf configure --prefix=${prefix} ${WAF_EXTRA_CONF} ${EXTRA_OECONF}
|
||||
}
|
||||
|
||||
do_compile[progress] = "outof:^\[\s*(\d+)/\s*(\d+)\]\s+"
|
||||
wafold_do_compile() {
|
||||
${S}/waf build ${@oe.utils.parallel_make_argument(d, '-j%d', limit=64)}
|
||||
}
|
||||
|
||||
wafold_do_install() {
|
||||
${S}/waf install --destdir=${D}
|
||||
}
|
||||
|
||||
EXPORT_FUNCTIONS do_configure do_compile do_install
|
||||
@@ -1,31 +0,0 @@
|
||||
From f583921012ed1f4e853f41d4fd3d95d1a819ac03 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Sat, 4 Aug 2018 02:48:14 +0200
|
||||
Subject: [PATCH] Make sure to find python3 sip code generator
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
configure.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.py b/configure.py
|
||||
index a263efb..daefc0e 100644
|
||||
--- a/configure.py
|
||||
+++ b/configure.py
|
||||
@@ -522,7 +522,7 @@ class TargetConfiguration:
|
||||
self.qtconf_prefix = ''
|
||||
self.qt_shared = False
|
||||
self.qt_version = 0
|
||||
- self.sip = self._find_exe('sip5', 'sip')
|
||||
+ self.sip = self._find_exe('sip3')
|
||||
self.sip_h_version = None
|
||||
self.sip_inc_dir = self.py_venv_inc_dir
|
||||
self.static = False
|
||||
--
|
||||
2.14.4
|
||||
|
||||
@@ -1,76 +0,0 @@
|
||||
SUMMARY = "Python Qt5 Bindings"
|
||||
AUTHOR = "Phil Thomson @ riverbank.co.uk"
|
||||
HOMEPAGE = "http://riverbankcomputing.co.uk"
|
||||
SECTION = "devel/python"
|
||||
LICENSE = "GPLv3"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504"
|
||||
|
||||
SRC_URI = "\
|
||||
https://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-${PV}/PyQt5_gpl-${PV}.tar.gz \
|
||||
file://0001-Make-sure-to-find-python3-sip-code-generator.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "33d6d2ab8183da17ac18b8132a4b278e"
|
||||
SRC_URI[sha256sum] = "c190dac598c97b0113ca5e7a37c71c623f02d1d713088addfacac4acfa4b8394"
|
||||
|
||||
PE = "1"
|
||||
|
||||
inherit qmake5 python3native
|
||||
|
||||
DEPENDS += "sip3-native sip3 qtbase python3"
|
||||
DEPENDS_append_class-target = "qtsvg"
|
||||
|
||||
S = "${WORKDIR}/PyQt5_gpl-${PV}"
|
||||
B = "${S}"
|
||||
|
||||
DISABLED_FEATURES = "PyQt_Desktop_OpenGL"
|
||||
|
||||
DISABLED_FEATURES_append_arm = " PyQt_qreal_double"
|
||||
|
||||
PYQT_MODULES = "QtCore QtGui QtNetwork QtWidgets QtSvg"
|
||||
PYQT_MODULES_class-native = "QtCore"
|
||||
PYQT_MODULES_aarch64 = "QtCore QtGui QtNetwork QtWidgets QtSvg"
|
||||
|
||||
# full paths
|
||||
SYSROOTDIR = "${STAGING_DIR_HOST}"
|
||||
SYSROOTDIR_class-native = "${STAGING_DIR_NATIVE}"
|
||||
INCLUDEDIR = "${STAGING_INCDIR}"
|
||||
INCLUDEDIR_class-native = "${STAGING_INCDIR_NATIVE}"
|
||||
LIBDIR = "${STAGING_LIBDIR}"
|
||||
LIBDIR_class-native = "${STAGING_LIBDIR_NATIVE}"
|
||||
PYTHONEXEC="${bindir}/${PYTHON_PN}"
|
||||
PYTHONEXEC_class-native="${PYTHON}"
|
||||
|
||||
do_configure() {
|
||||
echo "py_platform = linux" > pyqt.cfg
|
||||
echo "py_inc_dir = ${INCLUDEDIR}/python${PYTHON_BASEVERSION}${PYTHON_ABI}" >> pyqt.cfg
|
||||
echo "py_pylib_dir = ${LIBDIR}/python${PYTHON_BASEVERSION}" >> pyqt.cfg
|
||||
echo "py_pylib_lib = python${PYTHON_BASEVERSION}${PYTHON_ABI}" >> pyqt.cfg
|
||||
echo "pyqt_module_dir = ${D}/${PYTHON_SITEPACKAGES_DIR}" >> pyqt.cfg
|
||||
echo "pyqt_bin_dir = ${D}/${bindir}" >> pyqt.cfg
|
||||
echo "pyqt_sip_dir = ${D}/${datadir}/sip/PyQt5" >> pyqt.cfg
|
||||
echo "pyuic_interpreter = ${PYTHONEXEC}" >> pyqt.cfg
|
||||
echo "pyqt_disabled_features = ${DISABLED_FEATURES}" >> pyqt.cfg
|
||||
echo "qt_shared = True" >> pyqt.cfg
|
||||
QT_VERSION=`${OE_QMAKE_QMAKE} -query QT_VERSION`
|
||||
echo "[Qt $QT_VERSION]" >> pyqt.cfg
|
||||
echo "pyqt_modules = ${PYQT_MODULES}" >> pyqt.cfg
|
||||
echo yes | python3 configure.py --verbose --qmake ${OE_QMAKE_QMAKE} --configuration pyqt.cfg --sysroot ${SYSROOTDIR}
|
||||
}
|
||||
|
||||
do_install() {
|
||||
oe_runmake install
|
||||
}
|
||||
|
||||
do_install_class-native() {
|
||||
oe_runmake install
|
||||
}
|
||||
|
||||
RDEPENDS_${PN}_append_class-target = " python3-core python3-sip"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${libdir}/${PYTHON_DIR}/site-packages \
|
||||
${datadir}/sip/PyQt5 \
|
||||
"
|
||||
|
||||
BBCLASSEXTEND += "native nativesdk"
|
||||
|
||||
@@ -1,44 +0,0 @@
|
||||
SUMMARY = "SIP is a C++/Python Wrapper Generator"
|
||||
HOMEPAGE = "http://www.riverbankcomputing.co.uk/sip"
|
||||
SECTION = "devel"
|
||||
LICENSE = "GPLv2+"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE-GPL2;md5=e91355d8a6f8bd8f7c699d62863c7303"
|
||||
|
||||
inherit python3-dir
|
||||
|
||||
DEPENDS = "python3"
|
||||
|
||||
SRC_URI = "${SOURCEFORGE_MIRROR}/project/pyqt/sip/sip-${PV}/sip-${PV}.tar.gz"
|
||||
SRC_URI[md5sum] = "0625fb20347d4ff1b5da551539be0727"
|
||||
SRC_URI[sha256sum] = "7eaf7a2ea7d4d38a56dd6d2506574464bddf7cf284c960801679942377c297bc"
|
||||
BPN = "sip"
|
||||
|
||||
BBCLASSEXTEND = "native"
|
||||
|
||||
PACKAGES += "python3-sip"
|
||||
|
||||
do_configure_prepend_class-target() {
|
||||
echo "py_platform = linux" > sip.cfg
|
||||
echo "py_inc_dir = %(sysroot)/${includedir}/python${PYTHON_BASEVERSION}${PYTHON_ABI}" >> sip.cfg
|
||||
echo "sip_bin_dir = ${D}/${bindir}" >> sip.cfg
|
||||
echo "sip_inc_dir = ${D}/${includedir}" >> sip.cfg
|
||||
echo "sip_module_dir = ${D}/${libdir}/python${PYTHON_BASEVERSION}/site-packages" >> sip.cfg
|
||||
echo "sip_sip_dir = ${D}/${datadir}/sip" >> sip.cfg
|
||||
python3 configure.py --configuration sip.cfg --sysroot ${STAGING_DIR_HOST} CC="${CC}" CXX="${CXX}" LINK="${CXX}" STRIP="" LINK_SHLIB="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LFLAGS="${LDFLAGS}"
|
||||
}
|
||||
do_configure_prepend_class-native() {
|
||||
echo "py_platform = linux" > sip.cfg
|
||||
echo "py_inc_dir = ${includedir}/python${PYTHON_BASEVERSION}${PYTHON_ABI}" >> sip.cfg
|
||||
echo "sip_bin_dir = ${D}/${bindir}" >> sip.cfg
|
||||
echo "sip_inc_dir = ${D}/${includedir}" >> sip.cfg
|
||||
echo "sip_module_dir = ${D}/${libdir}/python${PYTHON_BASEVERSION}/site-packages" >> sip.cfg
|
||||
echo "sip_sip_dir = ${D}/${datadir}/sip" >> sip.cfg
|
||||
python3 configure.py --configuration sip.cfg --sysroot ${STAGING_DIR_NATIVE}
|
||||
}
|
||||
do_install() {
|
||||
oe_runmake install
|
||||
# avoid conflicts with sip for python2
|
||||
mv ${D}/${bindir}/sip ${D}/${bindir}/sip3
|
||||
}
|
||||
|
||||
FILES_python3-sip = "${libdir}/${PYTHON_DIR}/site-packages/"
|
||||
@@ -1,81 +0,0 @@
|
||||
From 281158892d69815f4f8c40467c9900d105fb7f9b Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Fri, 30 Jun 2017 22:40:22 +0200
|
||||
Subject: [PATCH] wscript: check compile- instead of tun-check datatype sizes
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
When cross compiling run checks are a challenge if not impossible
|
||||
|
||||
Upstream-Status: Submitted [1]
|
||||
|
||||
[1] https://github.com/original-male/ntk/pull/9
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
wscript | 42 +++++++++++++++++++++---------------------
|
||||
1 file changed, 21 insertions(+), 21 deletions(-)
|
||||
|
||||
diff --git a/wscript b/wscript
|
||||
index 2b4e27d..3188af9 100644
|
||||
--- a/wscript
|
||||
+++ b/wscript
|
||||
@@ -72,6 +72,21 @@ def options(opt):
|
||||
opt.add_option('--enable-test', action='store_true', default=False, dest='ENABLE_TEST',
|
||||
help='Build test programs')
|
||||
|
||||
+# inspired by: http://www.gnu.org/software/autoconf-archive/ax_compile_check_sizeof.html
|
||||
+def check_ctype_size(conf, datatype, define_name):
|
||||
+ for bytesize in [1, 2, 4, 8, 16]:
|
||||
+ code="#include <sys/types.h>\nint main (int argc,char **argv) { switch (0) case 0: case (sizeof (%s) == %i):; }" % (datatype, bytesize)
|
||||
+ try:
|
||||
+ conf.check(
|
||||
+ fragment=code,
|
||||
+ execute = False,
|
||||
+ msg='Checking for %s has size %i' % (datatype, bytesize),
|
||||
+ mandatory=True)
|
||||
+ conf.define(define_name, bytesize)
|
||||
+ break
|
||||
+ except:
|
||||
+ pass
|
||||
+
|
||||
def configure(conf):
|
||||
conf.load('compiler_c')
|
||||
conf.load('compiler_cxx')
|
||||
@@ -170,27 +186,11 @@ def configure(conf):
|
||||
|
||||
# print conf.env
|
||||
|
||||
- conf.check( fragment='#include <stdio.h>\n int main ( int argc, char **argv ) { printf("%u", (unsigned)sizeof(short)); return 0; }',
|
||||
- execute=True,
|
||||
- define_ret=True,
|
||||
- quote=False,
|
||||
- define_name='SIZEOF_SHORT',
|
||||
- msg='Checking sizeof short',
|
||||
- mandatory=True);
|
||||
-
|
||||
- conf.check( fragment='#include <stdio.h>\n int main ( int argc, char **argv ) { printf("%u", (unsigned)sizeof(int)); return 0; }',
|
||||
- execute=True,
|
||||
- quote=False,
|
||||
- define_ret=True,
|
||||
- msg='Checking sizeof int',
|
||||
- define_name='SIZEOF_INT', mandatory=True );
|
||||
-
|
||||
- conf.check( fragment='#include <stdio.h>\n int main ( int argc, char **argv ) { printf("%u", (unsigned)sizeof(long)); return 0; }',
|
||||
- quote=False,
|
||||
- execute=True,
|
||||
- define_ret=True,
|
||||
- msg='Checking sizeof long',
|
||||
- define_name='SIZEOF_LONG', mandatory=True );
|
||||
+ check_ctype_size(conf, 'short', 'SIZEOF_SHORT')
|
||||
+
|
||||
+ check_ctype_size(conf, 'int', 'SIZEOF_INT')
|
||||
+
|
||||
+ check_ctype_size(conf, 'long', 'SIZEOF_LONG')
|
||||
|
||||
if int(conf.get_define('SIZEOF_SHORT')) == 2:
|
||||
conf.define( 'U16', 'unsigned short', quote=False )
|
||||
--
|
||||
2.9.4
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
SUMMARY = "NTK is a fork of FLTK"
|
||||
SECTION = "libs"
|
||||
LICENSE = "LGPLv2 & FLTK"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=f6b26344a24a941a01a5b0826e80b5ca"
|
||||
|
||||
SRC_URI = " \
|
||||
git://github.com/original-male/${BPN}.git \
|
||||
file://0001-wscript-check-compile-instead-of-tun-check-datatype-.patch \
|
||||
"
|
||||
SRCREV = "1e3f5106d404562902bed2983403301db24a3f78"
|
||||
S = "${WORKDIR}/git"
|
||||
PV_LAST_RELEASE = "1.3.1000"
|
||||
PV = "${PV_LAST_RELEASE}"
|
||||
|
||||
inherit waf pkgconfig
|
||||
|
||||
DEPENDS = " \
|
||||
cairo \
|
||||
libpng \
|
||||
jpeg \
|
||||
zlib \
|
||||
libxft \
|
||||
"
|
||||
|
||||
WAF_EXTRA_CONF = " \
|
||||
--libdir=${libdir} \
|
||||
"
|
||||
|
||||
do_install_append() {
|
||||
rm ${D}${libdir}/libntk.a
|
||||
rm ${D}${libdir}/libntk.a.1
|
||||
mv ${D}${libdir}/libntk.a.${PV_LAST_RELEASE} ${D}${libdir}/libntk.a
|
||||
|
||||
rm ${D}${libdir}/libntk_images.a
|
||||
rm ${D}${libdir}/libntk_images.a.1
|
||||
mv ${D}${libdir}/libntk_images.a.${PV_LAST_RELEASE} ${D}${libdir}/libntk_images.a
|
||||
}
|
||||
|
||||
BBCLASSEXTEND = "native"
|
||||
@@ -1,43 +0,0 @@
|
||||
From b8673fb304f0eed41a1bcaa953a63bedb27b05e6 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Mon, 19 Sep 2016 01:11:47 +0200
|
||||
Subject: [PATCH] do not check for known machine types
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
build/mixxx.py | 14 --------------
|
||||
1 file changed, 14 deletions(-)
|
||||
|
||||
diff --git a/build/mixxx.py b/build/mixxx.py
|
||||
index aeed9e8..631bbfa 100644
|
||||
--- a/build/mixxx.py
|
||||
+++ b/build/mixxx.py
|
||||
@@ -45,20 +45,6 @@ class MixxxBuild(object):
|
||||
if target not in ['windows', 'osx', 'linux', 'bsd']:
|
||||
raise Exception("invalid target platform")
|
||||
|
||||
- if machine.lower() not in ['x86_64', 'x86', 'i686', 'i586',
|
||||
- 'alpha', 'hppa', 'mips', 'mipsel', 's390',
|
||||
- 'sparc', 'ia64', 'armel', 'armhf', 'hurd-i386',
|
||||
- 'armv5tel', 'armv5tejl', 'armv6l', 'armv6hl',
|
||||
- 'armv7l', 'armv7hl', 'armv7hnl',
|
||||
- 'sh3', 'sh4',
|
||||
- 'kfreebsd-amd64', 'kfreebsd-i386',
|
||||
- 'i486', 'i386', 'ppc', 'ppc64', 'powerpc',
|
||||
- 'powerpc64', 'powerpcspe', 's390x',
|
||||
- 'amd64', 'em64t', 'intel64', 'arm64',
|
||||
- 'ppc64el', 'ppc64le', 'm68k', 'mips64',
|
||||
- 'mips64el', 'mipsn32', 'mipsn32el',
|
||||
- 'aarch64']:
|
||||
- raise Exception("invalid machine type")
|
||||
|
||||
if toolchain not in ['gnu', 'msvs']:
|
||||
raise Exception('invalid toolchain type')
|
||||
--
|
||||
2.9.4
|
||||
|
||||
@@ -1,41 +0,0 @@
|
||||
From bf659102f80fa2c104c2725e71943453ed8b9caf Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Mon, 19 Sep 2016 23:46:11 +0200
|
||||
Subject: [PATCH] force using system soundtouch
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
For unknown reasons soundtouch is not properly found - maybe
|
||||
PKG_CONFIG_PATH gets lost in some scons depth - no idea.
|
||||
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
build/depends.py | 9 +++------
|
||||
1 file changed, 3 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/build/depends.py b/build/depends.py
|
||||
index a053970..3edb64e 100644
|
||||
--- a/build/depends.py
|
||||
+++ b/build/depends.py
|
||||
@@ -490,12 +490,9 @@ class SoundTouch(Dependence):
|
||||
env = build.env
|
||||
|
||||
if build.platform_is_linux:
|
||||
- # Try using system lib
|
||||
- if conf.CheckForPKG('soundtouch', '2.0.0'):
|
||||
- # System Lib found
|
||||
- build.env.ParseConfig('pkg-config soundtouch --silence-errors \
|
||||
- --cflags --libs')
|
||||
- self.INTERNAL_LINK = False
|
||||
+ build.env.ParseConfig('pkg-config soundtouch --silence-errors \
|
||||
+ --cflags --libs')
|
||||
+ self.INTERNAL_LINK = False
|
||||
|
||||
if self.INTERNAL_LINK:
|
||||
env.Append(CPPPATH=[self.SOUNDTOUCH_INTERNAL_PATH])
|
||||
--
|
||||
2.5.5
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
From 5c81f8bf6b60dbc289ec0ad7657362bec169a35b Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Wed, 7 Dec 2016 18:33:04 +0100
|
||||
Subject: [PATCH] align path of qt build tools to our needs
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
build/qt5.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/build/qt5.py b/build/qt5.py
|
||||
index aa70a42..da96996 100644
|
||||
--- a/build/qt5.py
|
||||
+++ b/build/qt5.py
|
||||
@@ -704,7 +704,7 @@ def generate(env):
|
||||
def locateQt5Command(env, command, qtdir) :
|
||||
triedPaths = []
|
||||
for suffix in suffixes :
|
||||
- fullpath = os.path.join(qtdir,'bin',command + suffix)
|
||||
+ fullpath = os.path.join(qtdir,command + suffix)
|
||||
if os.access(fullpath, os.X_OK) :
|
||||
return fullpath
|
||||
triedPaths.append(fullpath)
|
||||
--
|
||||
2.7.4
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,34 +0,0 @@
|
||||
From a16c3cf78bdfc954560812478e0022957acaca8d Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Sun, 18 Nov 2018 23:16:19 +0100
|
||||
Subject: [PATCH] Do not add QT libdir - it injectst /usr/lib these days
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
build/depends.py | 5 -----
|
||||
1 file changed, 5 deletions(-)
|
||||
|
||||
diff --git a/build/depends.py b/build/depends.py
|
||||
index e6c4a4d250..637ebd0bb9 100644
|
||||
--- a/build/depends.py
|
||||
+++ b/build/depends.py
|
||||
@@ -484,11 +484,6 @@ class Qt(Dependence):
|
||||
if build.platform_is_osx:
|
||||
compiling_on_104 = (
|
||||
os.popen('sw_vers').readlines()[1].find('10.4') >= 0)
|
||||
- if not build.platform_is_windows and not (using_104_sdk or compiling_on_104):
|
||||
- qtdir = build.env['QTDIR']
|
||||
- framework_path = Qt.find_framework_libdir(qtdir, qt5)
|
||||
- if os.path.isdir(framework_path):
|
||||
- build.env.Append(LINKFLAGS="-L" + framework_path)
|
||||
|
||||
# Mixxx requires C++11 support. Windows enables C++11 features by
|
||||
# default but Clang/GCC require a flag.
|
||||
--
|
||||
2.14.4
|
||||
|
||||
@@ -1,81 +0,0 @@
|
||||
SUMMARY = "Qt based DJ software"
|
||||
HOMEPAGE = "http://mixxx.org/"
|
||||
LICENSE = "GPLv2+"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=e029b0dfdd8cfff5e40a3741234b1ca7"
|
||||
|
||||
inherit scons qmake5_paths pkgconfig
|
||||
|
||||
DEPENDS += " \
|
||||
qtbase \
|
||||
qtscript \
|
||||
qtsvg \
|
||||
qtxmlpatterns \
|
||||
qttools-native \
|
||||
libusb1 \
|
||||
hidapi \
|
||||
upower \
|
||||
sqlite \
|
||||
libid3tag \
|
||||
taglib \
|
||||
libmad \
|
||||
faad2 \
|
||||
libmp4v2 \
|
||||
libogg \
|
||||
libvorbis \
|
||||
protobuf protobuf-native \
|
||||
fftw \
|
||||
portaudio-v19 \
|
||||
portmidi \
|
||||
chromaprint \
|
||||
rubberband \
|
||||
soundtouch \
|
||||
libglu \
|
||||
"
|
||||
# causes segfault trying to find debug libs
|
||||
# gperftools
|
||||
|
||||
SRC_URI = " \
|
||||
git://github.com/mixxxdj/${BPN}.git;branch=2.1 \
|
||||
file://0001-do-not-check-for-known-machine-types.patch \
|
||||
file://0002-force-using-system-soundtouch.patch \
|
||||
file://0003-align-path-of-qt-build-tools-to-our-needs.patch \
|
||||
file://0004-add-vamp-float-math-build-option-to-force-vamp-calcu.patch \
|
||||
file://0005-Do-not-add-QT-libdir-it-injectst-usr-lib-these-days.patch \
|
||||
"
|
||||
SRCREV = "b4e0fd7c215c7d9afa6fcef70a7f197200b5a5d1"
|
||||
S = "${WORKDIR}/git"
|
||||
PV = "2.1.5"
|
||||
|
||||
EXTRA_OESCONS_MATH ??= " \
|
||||
vampfloatmath=1 \
|
||||
"
|
||||
|
||||
# qtbase is expected to be build for desktop GL. If there is qtbase with gles
|
||||
# add opengles=1 to EXTRA_OESCONS but that currently disables code paths and
|
||||
# wave displays remain empty
|
||||
EXTRA_OESCONS += " \
|
||||
build=release \
|
||||
target=linux \
|
||||
machine=${TARGET_ARCH} \
|
||||
qt5=1 \
|
||||
qtdir=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS} \
|
||||
shoutcast=0 \
|
||||
localecompare=0 \
|
||||
faad=1 \
|
||||
${EXTRA_OESCONS_MATH} \
|
||||
"
|
||||
# perftools=1
|
||||
|
||||
# If we export in do_install only, mixxx is compiled twice
|
||||
export LIBDIR="${libdir}"
|
||||
|
||||
do_install_prepend() {
|
||||
install -d ${D}${prefix}
|
||||
sed -i 's:/etc/udev:${D}/etc/udev:g' ${S}/src/SConscript
|
||||
}
|
||||
|
||||
FILES_${PN} += "${datadir}/appdata"
|
||||
|
||||
# was: 'probably-redundant RPATH /usr/lib' - not exactly a bad breaker. Looked
|
||||
# into but could't find why this is thrown - so ignore for now.
|
||||
INSANE_SKIP_${PN} = "useless-rpaths"
|
||||
@@ -1,27 +0,0 @@
|
||||
From 6ceffc2725ed4146510436938ffda7dc0acc6c5d Mon Sep 17 00:00:00 2001
|
||||
From: "Luis Gustavo S. Barreto" <gustavo@ossystems.com.br>
|
||||
Date: Tue, 3 May 2016 18:36:14 +0000
|
||||
Subject: [PATCH] Remove freebsd compilation support
|
||||
|
||||
Signed-off-by: Luis Gustavo S. Barreto <gustavo@ossystems.com.br>
|
||||
---
|
||||
CMakeLists.txt | 4 ----
|
||||
1 file changed, 4 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 5976e69..0711b11 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1,9 +1,5 @@
|
||||
cmake_minimum_required(VERSION 2.8.11 FATAL_ERROR)
|
||||
|
||||
-#freebsd support
|
||||
-include_directories(SYSTEM /usr/local/include)
|
||||
-SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} /usr/local/include)
|
||||
-
|
||||
#macports support
|
||||
IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
||||
SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} /opt/local/include)
|
||||
--
|
||||
2.1.4
|
||||
|
||||
@@ -1,34 +0,0 @@
|
||||
From d0591ebca09921ed7bfd67f224015ced4bc7a9f8 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Sat, 14 Apr 2018 19:12:49 +0200
|
||||
Subject: [PATCH] Hardcode projectM configuration file location
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
A bit of a hack but other attempts failed
|
||||
|
||||
Upstream-Status: Inappropriate [workaround]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
src/plugins/Visual/projectm/projectmwidget.cpp | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
|
||||
index 7f7fcc4..12d2595 100644
|
||||
--- a/src/plugins/Visual/projectm/projectmwidget.cpp
|
||||
+++ b/src/plugins/Visual/projectm/projectmwidget.cpp
|
||||
@@ -33,9 +33,7 @@
|
||||
#include "projectmwrapper.h"
|
||||
#include "projectmwidget.h"
|
||||
|
||||
-#ifndef PROJECTM_CONFIG
|
||||
#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
|
||||
-#endif
|
||||
|
||||
ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
|
||||
: QOpenGLWidget(parent)
|
||||
--
|
||||
2.14.3
|
||||
|
||||
@@ -1,45 +0,0 @@
|
||||
SUMMARY = "Qt5 based audio-player"
|
||||
LICENSE = "GPLv2"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
|
||||
|
||||
# Note: to support projectm, qtbase must be configured with desktop gl / gles
|
||||
# won't work
|
||||
|
||||
DEPENDS += " \
|
||||
qttools-native \
|
||||
qtbase \
|
||||
qtmultimedia \
|
||||
ffmpeg \
|
||||
libsamplerate0 \
|
||||
curl \
|
||||
qtx11extras \
|
||||
taglib \
|
||||
libcdio \
|
||||
libcdio-paranoia \
|
||||
libcddb \
|
||||
libmad \
|
||||
faad2 \
|
||||
wavpack \
|
||||
libmms \
|
||||
libmodplug \
|
||||
libvorbis \
|
||||
projectm \
|
||||
enca \
|
||||
jack \
|
||||
soxr \
|
||||
"
|
||||
|
||||
SRC_URI = " \
|
||||
http://qmmp.ylsoftware.com/files/${BPN}-${PV}.tar.bz2 \
|
||||
file://0001-Remove-freebsd-compilation-support.patch \
|
||||
file://0002-Hardcode-projectM-configuration-file-location.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "827963a73facb802c8f684a3762c6b8b"
|
||||
SRC_URI[sha256sum] = "1cd2dd430a12e987720d30832e9ead8220ce9fcc9b871d45bed0e4bbe25fbeb6"
|
||||
|
||||
inherit cmake_qt5
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir} \
|
||||
${libdir}/qmmp-1.3 \
|
||||
"
|
||||
@@ -1,52 +0,0 @@
|
||||
From e6a9d88cb4c1cd9b5ce09990acc4045acdfb00c9 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Thu, 15 Nov 2018 19:51:30 +0100
|
||||
Subject: [PATCH] Fix path to m4 macro dir
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstrem-Status: Pending
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
Makefile.am | 4 ++--
|
||||
configure.ac | 2 +-
|
||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 1394ce6..b3d148e 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -40,7 +40,7 @@ m4data_DATA=soundtouch.m4
|
||||
# NOTE: wouldn't have to list the .TXT file if it were named without the .TXT
|
||||
EXTRA_DIST= \
|
||||
soundtouch.m4 \
|
||||
- config/m4 \
|
||||
+ config \
|
||||
bootstrap \
|
||||
make-win.bat \
|
||||
COPYING.TXT \
|
||||
@@ -61,5 +61,5 @@ dist-hook:
|
||||
|
||||
|
||||
# flag to aclocal where to find m4 macros for tests
|
||||
-ACLOCAL_AMFLAGS = -I config/m4
|
||||
+ACLOCAL_AMFLAGS = -I config
|
||||
AUTOMAKE_OPTIONS = foreign
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index bd8023c..c17de73 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -21,7 +21,7 @@ LIB_SONAME=1
|
||||
AC_SUBST(LIB_SONAME)
|
||||
|
||||
AC_CONFIG_AUX_DIR(config)
|
||||
-AC_CONFIG_MACRO_DIR([config/m4])
|
||||
+AC_CONFIG_MACRO_DIR([config])
|
||||
AM_CONFIG_HEADER([config.h include/soundtouch_config.h])
|
||||
AM_INIT_AUTOMAKE
|
||||
AM_SILENT_RULES([yes])
|
||||
--
|
||||
2.14.5
|
||||
|
||||
@@ -1,14 +0,0 @@
|
||||
SUMMARY = "SoundTouch audio tempo/pitch control library"
|
||||
HOMEPAGE = "http://www.surina.net/soundtouch/index.html"
|
||||
LICENSE = "LGPLv2.1"
|
||||
LIC_FILES_CHKSUM = "file://COPYING.TXT;md5=4d2892adf339c4489918ab705d44f66c"
|
||||
|
||||
inherit autotools-brokensep pkgconfig gettext
|
||||
|
||||
SRC_URI = " \
|
||||
git://gitlab.com/${BPN}/${BPN}.git \
|
||||
file://0001-Fix-path-to-m4-macro-dir.patch \
|
||||
"
|
||||
SRCREV = "b9659b64c692aab50a91da44cc0ea6ba41309949"
|
||||
PV = "2.1.1"
|
||||
S = "${WORKDIR}/git"
|
||||
@@ -1,51 +0,0 @@
|
||||
SUMMARY = "Software synth with a classic subtractive synthesizer topology"
|
||||
HOMEPAGE = "http://amsynth.github.io/"
|
||||
LICENSE = "GPLv2"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=67b604758dd265c185ce36fcf76a889d"
|
||||
|
||||
inherit autotools pkgconfig gtk-icon-cache gettext pack_audio_plugins
|
||||
|
||||
DEPENDS += " \
|
||||
gtk+ \
|
||||
intltool-native \
|
||||
"
|
||||
|
||||
SRC_URI = "git://github.com/amsynth/amsynth.git;branch=develop"
|
||||
SRCREV = "3ddbd8c44ea9ddec558c1da0d27b26f553898d4f"
|
||||
PV = "1.8.0+git${SRCPV}"
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
|
||||
PACKAGECONFIG ??= "alsa jack sndfile lv2"
|
||||
|
||||
PACKAGECONFIG[oss] = "--with-oss,--without-oss"
|
||||
PACKAGECONFIG[alsa] = "--with-alsa,--without-alsa,alsa-lib"
|
||||
PACKAGECONFIG[dssi] = "--with-dssi,--without-dssi,dssi liblo"
|
||||
PACKAGECONFIG[jack] = "--with-jack,--without-jack,jack"
|
||||
PACKAGECONFIG[sndfile] = "--with-sndfile,--without-sndfile,libsndfile1"
|
||||
PACKAGECONFIG[lv2] = "--with-lv2,--without-lv2,lv2"
|
||||
|
||||
PACKAGES =+ "${PN}-standalone"
|
||||
FILES_${PN}-standalone += " \
|
||||
${datadir}/appdata/amsynth.appdata.xml \
|
||||
${datadir}/applications \
|
||||
${datadir}/icons \
|
||||
${bindir} \
|
||||
"
|
||||
|
||||
FILES_${PN}-dssi += " \
|
||||
${datadir}/appdata/dssi-amsynth-plugin.metainfo.xml \
|
||||
"
|
||||
|
||||
FILES_${PN}-lv2 += " \
|
||||
${datadir}/appdata/lv2-amsynth-plugin.metainfo.xml \
|
||||
"
|
||||
|
||||
FILES_${PN}-vst += " \
|
||||
${datadir}/appdata/vst-amsynth-plugin.metainfo.xml \
|
||||
"
|
||||
|
||||
RDEPENDS_${PN}-standalone += "${PN}"
|
||||
RDEPENDS_${PN}-dssi += "${PN}"
|
||||
RDEPENDS_${PN}-lv2 += "${PN}"
|
||||
RDEPENDS_${PN}-vst += "${PN}"
|
||||
@@ -1,101 +0,0 @@
|
||||
SUMMARY = "Ardour is a multi-channel digital audio workstation"
|
||||
HOMEPAGE = "http://ardour.org/"
|
||||
LICENSE = "GPLv2"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=4641e94ec96f98fabc56ff9cc48be14b"
|
||||
|
||||
DEPENDS += " \
|
||||
gettext-native \
|
||||
gtk+ \
|
||||
gtkmm \
|
||||
cppunit \
|
||||
jack \
|
||||
alsa-lib \
|
||||
fftw \
|
||||
vamp-plugin-sdk \
|
||||
aubio \
|
||||
taglib \
|
||||
boost \
|
||||
virtual/libx11 \
|
||||
dssi \
|
||||
zlib \
|
||||
lrdf \
|
||||
rubberband \
|
||||
suil \
|
||||
lilv \
|
||||
libarchive \
|
||||
libltc \
|
||||
qm-dsp \
|
||||
fluidsynth \
|
||||
"
|
||||
|
||||
inherit wafold distro_features_check gtk-icon-cache pkgconfig
|
||||
|
||||
REQUIRED_DISTRO_FEATURE = "x11"
|
||||
|
||||
SRC_URI = " \
|
||||
git://github.com/Ardour/ardour.git \
|
||||
file://0001-remove-all-build-flags-that-cause-trouble-for-cross-.patch \
|
||||
file://0002-Use-ARM-NEON-intrinsics-if-available-for-mixing-func.patch \
|
||||
file://0003-Prevent-excessive-meter-redraws-for-inactive-meters-.patch \
|
||||
file://0004-Prevent-excessive-meter-redraws-for-inactive-meters-.patch \
|
||||
file://0005-Follow-fluidsynth-s-API-changes-introduced-with-2.0..patch \
|
||||
file://ardour5.desktop \
|
||||
"
|
||||
SRCREV = "ae0dcdc0c5d13483271065c360e378202d20170a"
|
||||
PV = "5.12"
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
|
||||
# arch specific override - default (tested) is ARM -> no fpu-optimizations
|
||||
# can be something like i686 / x86_64 see file 'wscript' in sourcepath for more details
|
||||
BUILD_DIST_TARGET ??= "none"
|
||||
|
||||
EXTRA_OECONF = " \
|
||||
--configdir=${sysconfdir} \
|
||||
--libdir=${libdir} \
|
||||
--optimize \
|
||||
--cxx11 \
|
||||
--no-phone-home \
|
||||
--use-external-libs \
|
||||
--qm-dsp-include=${STAGING_INCDIR}/qm-dsp \
|
||||
\
|
||||
--with-backends="jack,alsa" \
|
||||
--dist-target=${BUILD_DIST_TARGET} \
|
||||
"
|
||||
|
||||
do_install_append() {
|
||||
# install icons to freedesktop locations
|
||||
for s in 16 22 32 48 256 512; do
|
||||
install -d ${D}${datadir}/icons/hicolor/${s}x${s}/apps
|
||||
ln -s ../../../../${BPN}/resources/Ardour-icon_${s}px.png \
|
||||
${D}${datadir}/icons/hicolor/${s}x${s}/apps/${BPN}.png
|
||||
done
|
||||
|
||||
# install .desktop
|
||||
install -d ${D}${datadir}/applications
|
||||
install -m 0644 ${WORKDIR}/ardour5.desktop ${D}${datadir}/applications
|
||||
}
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/${BPN} \
|
||||
${libdir}/${BPN} \
|
||||
"
|
||||
|
||||
FILES_${PN}-dev += " \
|
||||
${libdir}/${BPN}/libardour.so \
|
||||
${libdir}/${BPN}/libardouralsautil.so \
|
||||
${libdir}/${BPN}/libaudiographer.so \
|
||||
${libdir}/${BPN}/libcanvas.so \
|
||||
${libdir}/${BPN}/libevoral.so \
|
||||
${libdir}/${BPN}/libgtkmm2ext.so \
|
||||
${libdir}/${BPN}/libmidipp.so \
|
||||
${libdir}/${BPN}/libpbd.so \
|
||||
${libdir}/${BPN}/libptformat.so \
|
||||
${libdir}/${BPN}/libwaveview.so \
|
||||
${libdir}/${BPN}/libwidgets.so \
|
||||
${libdir}/${BPN}/vamp/*.so \
|
||||
"
|
||||
|
||||
FILES_${PN}-staticdev += " \
|
||||
${libdir}/${BPN}/*.a \
|
||||
"
|
||||
@@ -1,75 +0,0 @@
|
||||
From 24b6038dc7c235780038d3fce2d9c83fada6ac8b Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Mon, 6 Feb 2017 23:33:45 +0100
|
||||
Subject: [PATCH] remove all build flags that cause trouble for cross
|
||||
configure/build
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Inappropriate [cross specific]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
tools/autowaf.py | 1 +
|
||||
wscript | 26 -
|
||||
|
||||
diff --git a/tools/autowaf.py b/tools/autowaf.py
|
||||
index f82b80a..626e951 100644
|
||||
--- a/tools/autowaf.py
|
||||
+++ b/tools/autowaf.py
|
||||
@@ -93,6 +93,7 @@ def copyfile (task):
|
||||
|
||||
def check_header(conf, lang, name, define='', mandatory=True):
|
||||
"Check for a header"
|
||||
+ return True
|
||||
includes = '' # search default system include paths
|
||||
if sys.platform == "darwin":
|
||||
includes = '/opt/local/include'
|
||||
diff --git a/wscript b/wscript
|
||||
index a7dd5e2..35acc51 100644
|
||||
--- a/wscript
|
||||
+++ b/wscript
|
||||
@@ -440,31 +440,6 @@ int main() { return 0; }''',
|
||||
|
||||
compiler_flags.append ("-DARCH_X86")
|
||||
|
||||
- if platform == 'linux' :
|
||||
-
|
||||
- #
|
||||
- # determine processor flags via /proc/cpuinfo
|
||||
- #
|
||||
-
|
||||
- if conf.env['build_target'] != 'i386':
|
||||
-
|
||||
- flag_line = os.popen ("cat /proc/cpuinfo | grep '^flags'").read()[:-1]
|
||||
- x86_flags = flag_line.split (": ")[1:][0].split ()
|
||||
-
|
||||
- if "mmx" in x86_flags:
|
||||
- compiler_flags.append ("-mmmx")
|
||||
- if "sse" in x86_flags:
|
||||
- build_host_supports_sse = True
|
||||
- if "3dnow" in x86_flags:
|
||||
- compiler_flags.append ("-m3dnow")
|
||||
-
|
||||
- if cpu == "i586":
|
||||
- compiler_flags.append ("-march=i586")
|
||||
- elif cpu == "i686":
|
||||
- compiler_flags.append ("-march=i686")
|
||||
-
|
||||
- if not is_clang and ((conf.env['build_target'] == 'i686') or (conf.env['build_target'] == 'x86_64')) and build_host_supports_sse:
|
||||
- compiler_flags.extend ([ flags_dict['sse'], flags_dict['fpmath-sse'], flags_dict['xmmintrinsics'] ])
|
||||
|
||||
if (conf.env['build_target'] == 'mingw'):
|
||||
if (re.search ("(x86_64|AMD64)", cpu) != None):
|
||||
@@ -965,7 +940,6 @@ def configure(conf):
|
||||
else:
|
||||
conf.check_cc(function_name='dlopen', header_name='dlfcn.h', lib='dl', uselib_store='DL')
|
||||
conf.check_cxx(fragment = "#include <boost/version.hpp>\nint main(void) { return (BOOST_VERSION >= 103900 ? 0 : 1); }\n",
|
||||
- execute = "1",
|
||||
mandatory = True,
|
||||
msg = 'Checking for boost library >= 1.39',
|
||||
okmsg = 'ok',
|
||||
--
|
||||
2.9.3
|
||||
|
||||
@@ -1,229 +0,0 @@
|
||||
From 610ce4e19b0b39d0e8391057b22163d4fdc7bdb4 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Mon, 3 Jul 2017 23:24:55 +0200
|
||||
Subject: [PATCH 2/2] Use ARM NEON intrinsics if available for mixing functions
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
libs/ardour/ardour/mix.h | 10 +++
|
||||
libs/ardour/globals.cc | 13 ++++
|
||||
libs/ardour/mix.cc | 157 +++++++++++++++++++++++++++++++++++++++++++++++
|
||||
3 files changed, 180 insertions(+)
|
||||
|
||||
diff --git a/libs/ardour/ardour/mix.h b/libs/ardour/ardour/mix.h
|
||||
index 4676c01..55919f0 100644
|
||||
--- a/libs/ardour/ardour/mix.h
|
||||
+++ b/libs/ardour/ardour/mix.h
|
||||
@@ -65,6 +65,16 @@ LIBARDOUR_API void veclib_mix_buffers_no_gain (ARDOUR::Sample * dst, cons
|
||||
|
||||
#endif
|
||||
|
||||
+#if defined (__ARM_NEON__)
|
||||
+
|
||||
+LIBARDOUR_API float neon_compute_peak (const ARDOUR::Sample * buf, ARDOUR::pframes_t nsamples, float current);
|
||||
+LIBARDOUR_API void neon_find_peaks (const ARDOUR::Sample * buf, ARDOUR::pframes_t nsamples, float *min, float *max);
|
||||
+LIBARDOUR_API void neon_apply_gain_to_buffer (ARDOUR::Sample * buf, ARDOUR::pframes_t nframes, float gain);
|
||||
+LIBARDOUR_API void neon_mix_buffers_with_gain (ARDOUR::Sample * dst, const ARDOUR::Sample * src, ARDOUR::pframes_t nframes, float gain);
|
||||
+LIBARDOUR_API void neon_mix_buffers_no_gain (ARDOUR::Sample * dst, const ARDOUR::Sample * src, ARDOUR::pframes_t nframes);
|
||||
+
|
||||
+#endif
|
||||
+
|
||||
/* non-optimized functions */
|
||||
|
||||
LIBARDOUR_API float default_compute_peak (const ARDOUR::Sample * buf, ARDOUR::pframes_t nsamples, float current);
|
||||
diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc
|
||||
index 28eb818..d562b35 100644
|
||||
--- a/libs/ardour/globals.cc
|
||||
+++ b/libs/ardour/globals.cc
|
||||
@@ -222,6 +222,19 @@ setup_hardware_optimization (bool try_optimization)
|
||||
|
||||
info << "Apple VecLib H/W specific optimizations in use" << endmsg;
|
||||
}
|
||||
+#elif defined (__ARM_NEON__)
|
||||
+ // No runtime detection
|
||||
+ compute_peak = neon_compute_peak;
|
||||
+ find_peaks = neon_find_peaks;
|
||||
+ apply_gain_to_buffer = neon_apply_gain_to_buffer;
|
||||
+ mix_buffers_with_gain = neon_mix_buffers_with_gain;
|
||||
+ mix_buffers_no_gain = neon_mix_buffers_no_gain;
|
||||
+ copy_vector = default_copy_vector;
|
||||
+
|
||||
+ generic_mix_functions = false;
|
||||
+
|
||||
+ info << "ARM NEON optimizations in use" << endmsg;
|
||||
+
|
||||
#endif
|
||||
|
||||
/* consider FPU denormal handling to be "h/w optimization" */
|
||||
diff --git a/libs/ardour/mix.cc b/libs/ardour/mix.cc
|
||||
index 96ae624..d1a46a2 100644
|
||||
--- a/libs/ardour/mix.cc
|
||||
+++ b/libs/ardour/mix.cc
|
||||
@@ -182,4 +182,161 @@ veclib_mix_buffers_no_gain (ARDOUR::Sample * dst, const ARDOUR::Sample * src, pf
|
||||
|
||||
#endif
|
||||
|
||||
+#if defined (__ARM_NEON__)
|
||||
+#include <arm_neon.h>
|
||||
+
|
||||
+float
|
||||
+neon_compute_peak (const ARDOUR::Sample * buf, ARDOUR::pframes_t nsamples, float current)
|
||||
+{
|
||||
+ float32x4_t v4current = vdupq_n_f32(current);
|
||||
+ float32x4_t v4work;
|
||||
+ float32x2_t v2current;
|
||||
+
|
||||
+ // unaligned lead (spread single float to vector)
|
||||
+ while (((intptr_t)buf) % 16 != 0 && nsamples > 0) {
|
||||
+ v4work = vdupq_n_f32(*buf);
|
||||
+ v4current = vmaxq_f32(v4current, vabsq_f32(v4work));
|
||||
+
|
||||
+ buf++;
|
||||
+ nsamples--;
|
||||
+ }
|
||||
+ // aligned
|
||||
+ while (nsamples >= 4) {
|
||||
+ v4work = vld1q_f32(buf);
|
||||
+ v4current = vmaxq_f32(v4current, vabsq_f32(v4work));
|
||||
+
|
||||
+ buf+=4;
|
||||
+ nsamples-=4;
|
||||
+ }
|
||||
+ // rest < 4 (spread single float to vector)
|
||||
+ while (nsamples > 0) {
|
||||
+ v4work = vdupq_n_f32(*buf);
|
||||
+ v4current = vmaxq_f32(v4current, vabsq_f32(v4work));
|
||||
+
|
||||
+ buf++;
|
||||
+ nsamples--;
|
||||
+ }
|
||||
+
|
||||
+ // calc max in vector by pairwise max done twice
|
||||
+ v2current = vpmax_f32(vget_low_f32(v4current), vget_high_f32(v4current));
|
||||
+ v2current = vpmax_f32(v2current, v2current);
|
||||
+ return vget_lane_f32(v2current, 0);
|
||||
+}
|
||||
+
|
||||
+void
|
||||
+neon_find_peaks (const ARDOUR::Sample * buf, ARDOUR::pframes_t nsamples, float *min, float *max)
|
||||
+{
|
||||
+ float32x4_t v4min = vdupq_n_f32(*min);
|
||||
+ float32x4_t v4max = vdupq_n_f32(*max);
|
||||
+ float32x4_t v4work;
|
||||
+ float32x2_t v2min, v2max;
|
||||
+
|
||||
+ // vector
|
||||
+ while (nsamples >= 4) {
|
||||
+ v4work = vld1q_f32(buf);
|
||||
+ v4min = vminq_f32(v4min, v4work);
|
||||
+ v4max = vmaxq_f32(v4max, v4work);
|
||||
+
|
||||
+ buf+=4;
|
||||
+ nsamples-=4;
|
||||
+ }
|
||||
+ // rest < 4 (spread single float to vector)
|
||||
+ while (nsamples > 0) {
|
||||
+ v4work = vdupq_n_f32(*buf);
|
||||
+ v4min = vminq_f32(v4min, v4work);
|
||||
+ v4max = vmaxq_f32(v4max, v4work);
|
||||
+
|
||||
+ buf++;
|
||||
+ nsamples--;
|
||||
+ }
|
||||
+
|
||||
+ // calc min in vector by pairwise max done twice
|
||||
+ v2min = vpmin_f32(vget_low_f32(v4min), vget_high_f32(v4min));
|
||||
+ v2min = vpmax_f32(v2min, v2min);
|
||||
+ *min = vget_lane_f32(v2min, 0);
|
||||
+ // calc max in vector by pairwise max done twice
|
||||
+ v2max = vpmax_f32(vget_low_f32(v4max), vget_high_f32(v4max));
|
||||
+ v2max = vpmax_f32(v2max, v2max);
|
||||
+ *max = vget_lane_f32(v2max, 0);
|
||||
+}
|
||||
+
|
||||
+void
|
||||
+neon_apply_gain_to_buffer (ARDOUR::Sample * buf, ARDOUR::pframes_t nframes, float gain)
|
||||
+{
|
||||
+ float32x4_t v4gain = vdupq_n_f32(gain);
|
||||
+ float32x4_t v4work;
|
||||
+
|
||||
+ // vector
|
||||
+ while (nframes >= 4) {
|
||||
+ v4work = vld1q_f32(buf);
|
||||
+ v4work = vmulq_f32(v4work, v4gain);
|
||||
+ vst1q_f32(buf, v4work);
|
||||
+
|
||||
+ buf+=4;
|
||||
+ nframes-=4;
|
||||
+ }
|
||||
+ // rest < 4
|
||||
+ while (nframes > 0) {
|
||||
+ *buf *= gain;
|
||||
+
|
||||
+ buf++;
|
||||
+ nframes--;
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+void
|
||||
+neon_mix_buffers_with_gain (ARDOUR::Sample * dst, const ARDOUR::Sample * src, ARDOUR::pframes_t nframes, float gain)
|
||||
+{
|
||||
+ float32x4_t v4gain = vdupq_n_f32(gain);
|
||||
+ float32x4_t v4src, v4dst;
|
||||
+
|
||||
+ // vector
|
||||
+ while (nframes >= 4) {
|
||||
+ v4src = vld1q_f32(src);
|
||||
+ v4dst = vld1q_f32(dst);
|
||||
+ // v4dst = v4dst + v4src * v4gain
|
||||
+ v4dst = vmlaq_f32(v4dst, v4src, v4gain);
|
||||
+ vst1q_f32(dst, v4dst);
|
||||
+
|
||||
+ src+=4;
|
||||
+ dst+=4;
|
||||
+ nframes-=4;
|
||||
+ }
|
||||
+ // rest < 4
|
||||
+ while (nframes > 0) {
|
||||
+ *dst += *src * gain;
|
||||
+
|
||||
+ src++;
|
||||
+ dst++;
|
||||
+ nframes--;
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+void
|
||||
+neon_mix_buffers_no_gain (ARDOUR::Sample * dst, const ARDOUR::Sample * src, ARDOUR::pframes_t nframes)
|
||||
+{
|
||||
+ float32x4_t v4src, v4dst;
|
||||
+
|
||||
+ // vector
|
||||
+ while (nframes >= 4) {
|
||||
+ v4src = vld1q_f32(src);
|
||||
+ v4dst = vld1q_f32(dst);
|
||||
+ v4dst = vaddq_f32(v4dst, v4src);
|
||||
+ vst1q_f32(dst, v4dst);
|
||||
+
|
||||
+ src+=4;
|
||||
+ dst+=4;
|
||||
+ nframes-=4;
|
||||
+ }
|
||||
+ // rest < 4
|
||||
+ while (nframes > 0) {
|
||||
+ *dst += *src;
|
||||
+
|
||||
+ src++;
|
||||
+ dst++;
|
||||
+ nframes--;
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+#endif
|
||||
|
||||
--
|
||||
2.9.4
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
From be826f363522dbca96c8263d404c57c4fe9ff0e2 Mon Sep 17 00:00:00 2001
|
||||
From: Robin Gareus <robin@gareus.org>
|
||||
Date: Wed, 3 Oct 2018 20:54:14 +0200
|
||||
Subject: [PATCH] Prevent excessive meter redraws for inactive meters at zero
|
||||
|
||||
Upstream-Status: Backport [1]
|
||||
|
||||
[1] https://github.com/Ardour/ardour/commit/be826f363522dbca96c8263d404c57c4fe9ff0e2
|
||||
|
||||
---
|
||||
libs/widgets/fastmeter.cc | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libs/widgets/fastmeter.cc b/libs/widgets/fastmeter.cc
|
||||
index cf1d9dd07..a9ecf5dad 100644
|
||||
--- a/libs/widgets/fastmeter.cc
|
||||
+++ b/libs/widgets/fastmeter.cc
|
||||
@@ -703,7 +703,7 @@ FastMeter::set (float lvl, float peak)
|
||||
if (pixwidth <= 0 || pixheight <=0) return;
|
||||
|
||||
if (peak == -1) {
|
||||
- if (lvl >= current_peak) {
|
||||
+ if (lvl >= current_peak && lvl > 0) {
|
||||
current_peak = lvl;
|
||||
hold_state = hold_cnt;
|
||||
}
|
||||
--
|
||||
2.14.4
|
||||
|
||||
@@ -1,34 +0,0 @@
|
||||
From 8d5e7e9f4e4372debb9ce285336ccc1ecc0383f6 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Wed, 17 Oct 2018 22:10:41 +0200
|
||||
Subject: [PATCH] Prevent excessive meter redraws for inactive meters at zero
|
||||
II
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Same as be826f363522dbca96c8263d404c57c4fe9ff0e2
|
||||
|
||||
Upstream-Status: Applied
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
libs/canvas/meter.cc | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libs/canvas/meter.cc b/libs/canvas/meter.cc
|
||||
index b539a1b4a..76e31bf58 100644
|
||||
--- a/libs/canvas/meter.cc
|
||||
+++ b/libs/canvas/meter.cc
|
||||
@@ -702,7 +702,7 @@ Meter::set (float lvl, float peak)
|
||||
if (pixwidth <= 0 || pixheight <=0) return;
|
||||
|
||||
if (peak == -1) {
|
||||
- if (lvl >= current_peak) {
|
||||
+ if (lvl >= current_peak && lvl > 0) {
|
||||
current_peak = lvl;
|
||||
hold_state = hold_cnt;
|
||||
}
|
||||
--
|
||||
2.14.4
|
||||
|
||||
@@ -1,117 +0,0 @@
|
||||
From ae281f2135607e55675d7cc18a9fe1a5b88464ec Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Fri, 12 Oct 2018 00:56:59 +0200
|
||||
Subject: [PATCH] Follow fluidsynth's API changes introduced with 2.0.0
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Submitted [1]
|
||||
|
||||
[1] https://github.com/Ardour/ardour/pull/431
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
libs/ardour/fluid_synth.cc | 14 ++++++++++++++
|
||||
libs/plugins/a-fluidsynth.lv2/a-fluidsynth.cc | 27 ++++++++++++++++++++++++++-
|
||||
2 files changed, 40 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libs/ardour/fluid_synth.cc b/libs/ardour/fluid_synth.cc
|
||||
index 45653a9e7..c9b7b526e 100644
|
||||
--- a/libs/ardour/fluid_synth.cc
|
||||
+++ b/libs/ardour/fluid_synth.cc
|
||||
@@ -71,6 +71,7 @@ FluidSynth::load_sf2 (const std::string& fn)
|
||||
}
|
||||
|
||||
size_t count;
|
||||
+#if FLUIDSYNTH_VERSION_MAJOR < 2
|
||||
fluid_preset_t preset;
|
||||
|
||||
sfont->iteration_start (sfont);
|
||||
@@ -83,7 +84,20 @@ FluidSynth::load_sf2 (const std::string& fn)
|
||||
preset.get_banknum (&preset),
|
||||
preset.get_num (&preset)));
|
||||
}
|
||||
+#else
|
||||
+ fluid_preset_t* preset;
|
||||
|
||||
+ fluid_sfont_iteration_start (sfont);
|
||||
+ for (count = 0; (preset = fluid_sfont_iteration_next (sfont)) != 0; ++count) {
|
||||
+ if (count < 16) {
|
||||
+ fluid_synth_program_select (_synth, count, _synth_id, fluid_preset_get_banknum (preset), fluid_preset_get_num (preset));
|
||||
+ }
|
||||
+ _presets.push_back (BankProgram (
|
||||
+ fluid_preset_get_name (preset),
|
||||
+ fluid_preset_get_banknum (preset),
|
||||
+ fluid_preset_get_num (preset)));
|
||||
+ }
|
||||
+#endif
|
||||
if (count == 0) {
|
||||
return false;
|
||||
}
|
||||
diff --git a/libs/plugins/a-fluidsynth.lv2/a-fluidsynth.cc b/libs/plugins/a-fluidsynth.lv2/a-fluidsynth.cc
|
||||
index e6cf1e29d..6d168d5fe 100644
|
||||
--- a/libs/plugins/a-fluidsynth.lv2/a-fluidsynth.cc
|
||||
+++ b/libs/plugins/a-fluidsynth.lv2/a-fluidsynth.cc
|
||||
@@ -184,6 +184,7 @@ load_sf2 (AFluidSynth* self, const char* fn)
|
||||
}
|
||||
|
||||
int chn;
|
||||
+#if FLUIDSYNTH_VERSION_MAJOR < 2
|
||||
fluid_preset_t preset;
|
||||
sfont->iteration_start (sfont);
|
||||
pthread_mutex_lock (&self->bp_lock);
|
||||
@@ -192,15 +193,33 @@ load_sf2 (AFluidSynth* self, const char* fn)
|
||||
fluid_synth_program_select (self->synth, chn, synth_id,
|
||||
preset.get_banknum (&preset), preset.get_num (&preset));
|
||||
}
|
||||
+#else
|
||||
+ fluid_preset_t *preset;
|
||||
+ fluid_sfont_iteration_start (sfont);
|
||||
+ pthread_mutex_lock (&self->bp_lock);
|
||||
+ for (chn = 0; (preset = fluid_sfont_iteration_next (sfont)); ++chn) {
|
||||
+ if (chn < 16) {
|
||||
+ fluid_synth_program_select (self->synth, chn, synth_id,
|
||||
+ fluid_preset_get_banknum (preset), fluid_preset_get_num (preset));
|
||||
+ }
|
||||
+#endif // FLUIDSYNTH_VERSION_MAJOR < 2
|
||||
#ifndef LV2_EXTENDED
|
||||
else { break ; }
|
||||
#else
|
||||
+#if FLUIDSYNTH_VERSION_MAJOR < 2
|
||||
self->presets[preset.get_banknum (&preset)].push_back (
|
||||
BankProgram (
|
||||
preset.get_name (&preset),
|
||||
preset.get_banknum (&preset),
|
||||
preset.get_num (&preset)));
|
||||
-#endif
|
||||
+#else
|
||||
+ self->presets[fluid_preset_get_banknum (preset)].push_back (
|
||||
+ BankProgram (
|
||||
+ fluid_preset_get_name (preset),
|
||||
+ fluid_preset_get_banknum (preset),
|
||||
+ fluid_preset_get_num (preset)));
|
||||
+#endif // FLUIDSYNTH_VERSION_MAJOR < 2
|
||||
+#endif // LV2_EXTENDED
|
||||
}
|
||||
pthread_mutex_unlock (&self->bp_lock);
|
||||
|
||||
@@ -681,9 +700,15 @@ work_response (LV2_Handle instance,
|
||||
}
|
||||
|
||||
for (int chn = 0; chn < 16; ++chn) {
|
||||
+#if FLUIDSYNTH_VERSION_MAJOR < 2
|
||||
unsigned int sfid = 0;
|
||||
unsigned int bank = 0;
|
||||
unsigned int program = -1;
|
||||
+#else
|
||||
+ int sfid = 0;
|
||||
+ int bank = 0;
|
||||
+ int program = -1;
|
||||
+#endif
|
||||
if (FLUID_OK == fluid_synth_get_program (self->synth, chn, &sfid, &bank, &program)) {
|
||||
self->program_state[chn].bank = bank;
|
||||
self->program_state[chn].program = program;
|
||||
--
|
||||
2.14.4
|
||||
|
||||
@@ -1,10 +0,0 @@
|
||||
[Desktop Entry]
|
||||
Name=Ardour
|
||||
Comment=Record, mix and master audio
|
||||
Exec=ardour5
|
||||
Icon=ardour5
|
||||
Terminal=false
|
||||
MimeType=application/x-ardour;
|
||||
Type=Application
|
||||
Categories=AudioVideo;Audio;X-Recorders;X-Multitrack;X-Jack;X-AudioEditing;
|
||||
GenericName=Digital Audio Workstation
|
||||
@@ -1,27 +0,0 @@
|
||||
SUMMARY = "aubio is designed for the extraction of annotations from audio signals"
|
||||
HOMEPAGE = "https://aubio.org/"
|
||||
LICENSE = "GPLv3"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
|
||||
|
||||
inherit waf pkgconfig
|
||||
|
||||
DEPENDS += " \
|
||||
jack \
|
||||
ffmpeg \
|
||||
libsndfile1 \
|
||||
libsamplerate0 \
|
||||
python3-numpy \
|
||||
"
|
||||
|
||||
SRC_URI = " \
|
||||
https://aubio.org/pub/${BPN}-${PV}.tar.bz2 \
|
||||
file://0001-do-not-build-tests.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "1e8deb14b0e45ffadc91dcf7cfaee0c8"
|
||||
SRC_URI[sha256sum] = "cbed4afec5ab3a1a6300c7e3af0a1369379aa94259f5e701a8ca905cdd9fa041"
|
||||
|
||||
EXTRA_OECONF = " \
|
||||
--prefix=${prefix} \
|
||||
--sysconfdir=${sysconfdir} \
|
||||
--libdir=${libdir} \
|
||||
"
|
||||
@@ -1,28 +0,0 @@
|
||||
From e597c5c8636a269dbe5e664c706e66887479f161 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Tue, 25 Sep 2018 00:44:12 +0200
|
||||
Subject: [PATCH] do not build tests
|
||||
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
wscript | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/wscript b/wscript
|
||||
index c08298c..1443ae2 100644
|
||||
--- a/wscript
|
||||
+++ b/wscript
|
||||
@@ -494,8 +494,6 @@ def build(bld):
|
||||
bld.options.testcmd = 'node %s'
|
||||
if bld.options.enable_examples:
|
||||
bld.recurse('examples')
|
||||
- if bld.options.enable_tests:
|
||||
- bld.recurse('tests')
|
||||
|
||||
# pkg-config template
|
||||
bld( source = 'aubio.pc.in' )
|
||||
--
|
||||
2.14.4
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
DESCRIPTION = "Audio latency tweaks"
|
||||
LICENSE = "MIT"
|
||||
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
|
||||
|
||||
SRC_URI += "file://95-audio-tweaks.conf"
|
||||
|
||||
do_install() {
|
||||
install -d ${D}${sysconfdir}/security/limits.d
|
||||
install -m 0644 ${WORKDIR}/95-audio-tweaks.conf ${D}${sysconfdir}/security/limits.d/
|
||||
|
||||
}
|
||||
|
||||
RDEPENDS_${PN} = "pam-plugin-limits"
|
||||
@@ -1,5 +0,0 @@
|
||||
# Default limits for audio users
|
||||
|
||||
@audio - rtprio 90
|
||||
@audio - memlock unlimited
|
||||
@audio - nice -18
|
||||
@@ -1,38 +0,0 @@
|
||||
SUMMARY = "Emulator for vintage synthesisers, electric pianos and organs"
|
||||
HOMEPAGE = "https://sourceforge.net/projects/bristol/"
|
||||
LICENSE = "GPLv3"
|
||||
LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=d32239bcb673463ab874e80d47fae504"
|
||||
|
||||
inherit autotools pkgconfig distro_features_check
|
||||
|
||||
REQUIRED_DISTRO_FEATURES = "x11"
|
||||
|
||||
DEPENDS += " \
|
||||
virtual/libx11 \
|
||||
alsa-lib \
|
||||
jack \
|
||||
"
|
||||
|
||||
SRC_URI = " \
|
||||
${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/0.60/${BPN}-${PV}.tar.gz \
|
||||
file://0001-Do-not-force-sse.patch \
|
||||
file://0002-Do-not-include-alsa-iatomic.h.patch \
|
||||
file://0003-bristoljackstats-do-not-overwrite-LDFLAGS.patch \
|
||||
file://0004-Avoid-crosscompile-warnings.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "9ea4dacdac0dba3048156e2f6a5ee4d6"
|
||||
SRC_URI[sha256sum] = "7d1f0bbd0d7d303fc77c6b9549b61708d7a83b4dc007818011b1f55d1fa922ba"
|
||||
|
||||
EXTRA_OECONF = " \
|
||||
--disable-version-check \
|
||||
--disable-oss \
|
||||
--enable-jack-default-audio \
|
||||
"
|
||||
|
||||
do_install_append() {
|
||||
# the tar magic makes files owned by build user
|
||||
chown -R root:root ${D}${datadir}
|
||||
# align data paths
|
||||
mv ${D}${datadir}/bristol/bristol-${PV}/* ${D}${datadir}/bristol/
|
||||
rmdir ${D}${datadir}/bristol/bristol-${PV}
|
||||
}
|
||||
@@ -1,30 +0,0 @@
|
||||
From f006426aac72fba8529bc85068d98e664e860584 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Thu, 5 Jul 2018 23:33:36 +0200
|
||||
Subject: [PATCH 1/2] Do not force sse
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
bristol/Makefile.am | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/bristol/Makefile.am b/bristol/Makefile.am
|
||||
index bbc90c9..5d12413 100755
|
||||
--- a/bristol/Makefile.am
|
||||
+++ b/bristol/Makefile.am
|
||||
@@ -1,6 +1,6 @@
|
||||
AUTOMAKE_OPTIONS = foreign
|
||||
|
||||
-AM_CFLAGS = -pthread -Wall -g -I$(srcdir)/../include/slab -I$(srcdir)/../include/bristol -I. -DBRISTOL_VOICECOUNT=@_BRISTOL_VOICES@ @BRISTOL_JACK_DEFAULT_MIDI@ @BRISTOL_JACK_DEFAULT@ @BRISTOL_JACK_MULTI_CLOSE@ @BRISTOL_SEMAPHORE@ @BRISTOL_SEM_OPEN@ @BRISTOL_BARRIER@ @BRISTOL_HAS_PA@ -DBRISTOL_RAMP_RATE=@BRR@ @BRISTOL_LIN_ATTACK@ @BRISTOL_HAS_DRAIN@ @BRISTOL_HAS_JACK@ @BRISTOL_HAS_JACK_MIDI@ @BRISTOL_HAS_JACK_SESSION@ -DBRISTOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ @JACK_CFLAGS@ @ALSA_CFLAGS@ -msse -mfpmath=sse -ffast-math -fomit-frame-pointer -O2
|
||||
+AM_CFLAGS = -pthread -Wall -g -I$(srcdir)/../include/slab -I$(srcdir)/../include/bristol -I. -DBRISTOL_VOICECOUNT=@_BRISTOL_VOICES@ @BRISTOL_JACK_DEFAULT_MIDI@ @BRISTOL_JACK_DEFAULT@ @BRISTOL_JACK_MULTI_CLOSE@ @BRISTOL_SEMAPHORE@ @BRISTOL_SEM_OPEN@ @BRISTOL_BARRIER@ @BRISTOL_HAS_PA@ -DBRISTOL_RAMP_RATE=@BRR@ @BRISTOL_LIN_ATTACK@ @BRISTOL_HAS_DRAIN@ @BRISTOL_HAS_JACK@ @BRISTOL_HAS_JACK_MIDI@ @BRISTOL_HAS_JACK_SESSION@ -DBRISTOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ @JACK_CFLAGS@ @ALSA_CFLAGS@ -ffast-math -fomit-frame-pointer -O2
|
||||
|
||||
bin_PROGRAMS = bristol
|
||||
#bristol_LDFLAGS = -Bdynamic -L../libbristolmidi/.libs -L../libbristolaudio/.libs -L../libbristol -L../libbristolic
|
||||
--
|
||||
2.14.3
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
From d7b57162ff8c279fb9ac309fce0cdd98696c327a Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Thu, 5 Jul 2018 23:34:17 +0200
|
||||
Subject: [PATCH 2/2] Do not include alsa/iatomic.h
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
libbristolaudio/audioEngineJack.c | 3 ---
|
||||
1 file changed, 3 deletions(-)
|
||||
|
||||
diff --git a/libbristolaudio/audioEngineJack.c b/libbristolaudio/audioEngineJack.c
|
||||
index 2b8900b..94c083e 100644
|
||||
--- a/libbristolaudio/audioEngineJack.c
|
||||
+++ b/libbristolaudio/audioEngineJack.c
|
||||
@@ -38,9 +38,6 @@
|
||||
#include <string.h>
|
||||
|
||||
#ifdef _BRISTOL_JACK
|
||||
-#if (BRISTOL_HAS_ALSA == 1)
|
||||
-#include <alsa/iatomic.h>
|
||||
-#endif
|
||||
|
||||
/*
|
||||
* Drop this atomic stuff, it comes from the ALSA library and it not present on
|
||||
--
|
||||
2.14.3
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
From 4269cada0a225e89c3edd3e85c21debd3f5ab958 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Sat, 4 Aug 2018 22:33:08 +0200
|
||||
Subject: [PATCH] bristoljackstats: do not overwrite LDFLAGS
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
bin/Makefile.am | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/bin/Makefile.am b/bin/Makefile.am
|
||||
index fed0c6b..d9957b1 100755
|
||||
--- a/bin/Makefile.am
|
||||
+++ b/bin/Makefile.am
|
||||
@@ -1,6 +1,5 @@
|
||||
AUTOMAKE_OPTIONS = foreign
|
||||
|
||||
-LDFLAGS = -Bdynamic -lm -lpthread `pkg-config --silence-errors --libs jack`
|
||||
AM_CFLAGS = -pthread -Wall -g -I. -I$(srcdir)/../include/bristol @BRISTOL_HAS_JACK@ @BRISTOL_HAS_JACK_MIDI@ @JACK_CFLAGS@
|
||||
|
||||
#bin_PROGRAMS = bristoljackstats bristolnotegen bristolNRPgen
|
||||
--
|
||||
2.14.4
|
||||
|
||||
@@ -1,33 +0,0 @@
|
||||
From f767f062beeedc014584e0d9d0aa70090b774941 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Tue, 30 Oct 2018 11:24:13 +0100
|
||||
Subject: [PATCH] Avoid crosscompile warnings
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
| ld: warning: library search path "/usr/X11R6/lib" is unsafe for cross-compilation
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
brighton/Makefile.am | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/brighton/Makefile.am b/brighton/Makefile.am
|
||||
index 274adc2..e900c62 100755
|
||||
--- a/brighton/Makefile.am
|
||||
+++ b/brighton/Makefile.am
|
||||
@@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign
|
||||
AM_CFLAGS = -pthread -Wall -g -I$(srcdir)/../include/brighton -I$(srcdir)/../include/bristol -DBRISTOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ @BRIGHTON_HAS_X11@ -DBRISTOL_VOICECOUNT=@_BRISTOL_VOICES@
|
||||
|
||||
bin_PROGRAMS = brighton
|
||||
-brighton_LDFLAGS = -Bdynamic -L../libbrighton/ -L../libbristolmidi/.libs @BRIGHTON_LIBXLIBS@ -L/usr/X11R6/lib -L../libbvg
|
||||
+brighton_LDFLAGS = -Bdynamic -L../libbrighton/ -L../libbristolmidi/.libs @BRIGHTON_LIBXLIBS@ -L../libbvg
|
||||
brighton_LDADD = -lbrighton -lbvg @BRIGHTON_LIBB11@ @BRIGHTON_LIBX11@ @BRIGHTON_LIBXEXT@ -lbristolmidi @ALSA_LIBS@ -lm -lpthread
|
||||
|
||||
brighton_SOURCES = brightonArp2600.c brightonAxxe.c brighton.c brightonControllers.c brightonDX.c brightonExplorer.c brightonHammondB3.c brightonHammond.c brightonJuno.c brightonMemoryMoog.c brightonMini.c brightonMixer.c brightonMixerMemory.c brightonMixerMenu.c brightonMS20.c brightonOBXa.c brightonOBX.c brightonOdyssey.c brightonPoly6.c brightonPoly.c brightonProphet10.c brightonProphet52.c brightonProphet.c brightonRhodesBass.c brightonRhodes.c brightonRoutines.c brightonSAks.c brightonVox.c brightonKeyboards.h brightonKeys.h brightonMini.h brightonMixer.h brightonMixerMemory.h brightonhelp.h brightonSolina.c brightonRoadRunner.c brightonGranular.c brightonRealistic.c brightonVoxM2.c brightonJupiter.c brightonBitOne.c brightonMaster.c brightonCS80.c brightonProOne.c brightonVoyager.c brightonSonic6.c brightonTrilogy.c brightonStratus.c brightonPoly800.c brightonBME700.c brightonBassMaker.c brightonSID.c brightonSID2.c brightonSID2.h brightonreadme.h brightonCLI.c brightonVImages.h
|
||||
--
|
||||
2.14.5
|
||||
|
||||
@@ -1,55 +0,0 @@
|
||||
From 29a3bcf1a134d9bf51afa36bf39a903cd9328a5b Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Tue, 14 Nov 2017 16:44:37 +0100
|
||||
Subject: [PATCH] Do store calfmakerdf-commandline for later use in qemu /
|
||||
install calfmakerdf
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
gui/Makefile.am | 2 +-
|
||||
src/Makefile.am | 4 ++--
|
||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/gui/Makefile.am b/gui/Makefile.am
|
||||
index 11eb4c3..9b53a0a 100644
|
||||
--- a/gui/Makefile.am
|
||||
+++ b/gui/Makefile.am
|
||||
@@ -4,7 +4,7 @@ STYLES = $(wildcard $(srcdir)/styles/*)
|
||||
EXTRA_DIST = $(wildcard $(srcdir)/styles) $(wildcard $(srcdir)/strips) $(wildcard $(srcdir)/gui)
|
||||
|
||||
install-data-hook:
|
||||
- $(top_builddir)/src/calfmakerdf -m gui -p $(DESTDIR)$(pkgdatadir)
|
||||
+ echo "-m gui -p $(DESTDIR)$(pkgdatadir)" >> %QEMUCOMMAND%
|
||||
install -d -m 755 $(DESTDIR)$(pkgdatadir)/styles/
|
||||
for f in ${STYLES}; do \
|
||||
sn=`basename $${f}` ; \
|
||||
diff --git a/src/Makefile.am b/src/Makefile.am
|
||||
index 794e668..2b66870 100644
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -30,7 +30,7 @@ endif
|
||||
endif
|
||||
|
||||
AM_CXXFLAGS += $(GLIB_DEPS_CFLAGS)
|
||||
-noinst_PROGRAMS += calfmakerdf
|
||||
+bin_PROGRAMS += calfmakerdf
|
||||
calfmakerdf_SOURCES = makerdf.cpp
|
||||
calfmakerdf_LDADD = calf.la
|
||||
|
||||
@@ -82,7 +82,7 @@ if USE_LV2_GUI
|
||||
install -c -m 755 $(top_builddir)/src/.libs/calflv2gui.so $(DESTDIR)$(lv2dir)/calflv2gui.so
|
||||
endif
|
||||
rm -f $(DESTDIR)$(lv2dir)/*.ttl
|
||||
- $(top_builddir)/src/calfmakerdf -m ttl -p $(DESTDIR)$(lv2dir)/ -d $(DESTDIR)$(pkgdatadir)/
|
||||
+ echo "-m ttl -p $(DESTDIR)$(lv2dir)/ -d $(DESTDIR)$(pkgdatadir)/" >> %QEMUCOMMAND%
|
||||
if USE_SORDI
|
||||
for f in $(DESTDIR)$(lv2dir)/*.ttl; do sout=`sordi -o turtle "$$f"`; if test $$? != 0; then echo "RDF file $$f is corrupted:"; echo $$sout"<<<"; fi; done
|
||||
endif
|
||||
--
|
||||
2.9.5
|
||||
|
||||
@@ -1,33 +0,0 @@
|
||||
From 579ce205281dc47c94b0e6392decac9763397a9d Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Sun, 13 Jan 2019 12:14:52 +0100
|
||||
Subject: [PATCH] fluidsynth: Activate synth.dynamic-sample-loading for
|
||||
fluidsynth >=2
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
This reduces soundfont load time and memory consumption significantly
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
src/fluidsynth.cpp | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/src/fluidsynth.cpp b/src/fluidsynth.cpp
|
||||
index 54023dc8..14c018e3 100644
|
||||
--- a/src/fluidsynth.cpp
|
||||
+++ b/src/fluidsynth.cpp
|
||||
@@ -59,6 +59,9 @@ fluid_synth_t *fluidsynth_audio_module::create_synth(int &new_sfid)
|
||||
std::fill(set_presets, set_presets + 16, -1);
|
||||
fluid_settings_t *new_settings = new_fluid_settings();
|
||||
fluid_settings_setnum(new_settings, "synth.sample-rate", srate);
|
||||
+#if FLUIDSYNTH_VERSION_MAJOR >= 2
|
||||
+ fluid_settings_setint(new_settings, "synth.dynamic-sample-loading", 1);
|
||||
+#endif
|
||||
fluid_synth_t *s = new_fluid_synth(new_settings);
|
||||
if (!soundfont.empty())
|
||||
{
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
From 021850be25992b8a090182a05ad62660414c964f Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Sat, 19 Jan 2019 21:48:29 +0100
|
||||
Subject: [PATCH 1/2] Fix detection of LV2 for latest git
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
LV2 removed lv2-core.pc in [1]. So find lv2 and set required version to 1.1.4
|
||||
which was released in September 2016 and should be avalaible on most
|
||||
environments. This should be compatible to LV2 1.1.14 because from pkg-config
|
||||
point of view lv2-core.pc and lv2.pc look similar.
|
||||
|
||||
Upstream-Status: Submitted [2]
|
||||
|
||||
[1] https://github.com/drobilla/lv2/commit/4db67120efca2d4c200d2e1ba5cf3d7b97cab97e
|
||||
[2] https://github.com/calf-studio-gear/calf/pull/213
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
configure.ac | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index b9c3d500..a0368773 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -79,7 +79,7 @@ if test "$JACK_FOUND" = "yes"; then
|
||||
PKG_CHECK_MODULES(JACK_RENAME_PORT, jack >= 1.9.11, JACK_HAS_RENAME="yes", JACK_HAS_RENAME_DUMMY="no")
|
||||
fi
|
||||
|
||||
-PKG_CHECK_MODULES(LV2_DEPS, lv2core >= 6, LV2_FOUND="yes", LV2_FOUND="no")
|
||||
+PKG_CHECK_MODULES(LV2_DEPS, lv2 >= 1.1.14, LV2_FOUND="yes", LV2_FOUND="no")
|
||||
|
||||
PKG_CHECK_MODULES(LASH_DEPS, lash-1.0 >= 0.6.0,
|
||||
AC_CHECK_LIB([lash], [lash_client_is_being_restored], LASH_0_6_FOUND="yes", LASH_0_6_FOUND="no"),
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -1,75 +0,0 @@
|
||||
From 855cf20b9bb9fec30b72fa05a9b4cd28a1b4d35d Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Sat, 19 Jan 2019 23:00:49 +0100
|
||||
Subject: [PATCH 2/2] Find headers for all versions of LV2
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Submitted [1]
|
||||
|
||||
[1] https://github.com/calf-studio-gear/calf/pull/213
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
src/calf/lv2_options.h | 2 +-
|
||||
src/calf/lv2_ui.h | 2 +-
|
||||
src/calf/lv2wrap.h | 2 +-
|
||||
src/makerdf.cpp | 2 +-
|
||||
4 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/calf/lv2_options.h b/src/calf/lv2_options.h
|
||||
index 29568b8d..d66153da 100644
|
||||
--- a/src/calf/lv2_options.h
|
||||
+++ b/src/calf/lv2_options.h
|
||||
@@ -20,7 +20,7 @@
|
||||
#include <stdint.h>
|
||||
|
||||
#include "lv2_urid.h"
|
||||
-#include "lv2.h"
|
||||
+#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
|
||||
|
||||
#define LV2_OPTIONS_URI "http://lv2plug.in/ns/ext/options"
|
||||
#define LV2_OPTIONS_PREFIX LV2_OPTIONS_URI "#"
|
||||
diff --git a/src/calf/lv2_ui.h b/src/calf/lv2_ui.h
|
||||
index b802ec59..c3e60822 100644
|
||||
--- a/src/calf/lv2_ui.h
|
||||
+++ b/src/calf/lv2_ui.h
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
-#include "lv2.h"
|
||||
+#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
|
||||
|
||||
#define LV2_UI_URI "http://lv2plug.in/ns/extensions/ui"
|
||||
#define LV2_UI_PREFIX LV2_UI_URI "#"
|
||||
diff --git a/src/calf/lv2wrap.h b/src/calf/lv2wrap.h
|
||||
index 8d6b13c4..d19eae7b 100644
|
||||
--- a/src/calf/lv2wrap.h
|
||||
+++ b/src/calf/lv2wrap.h
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
-#include <lv2.h>
|
||||
+#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
|
||||
#include <calf/giface.h>
|
||||
#include <calf/lv2_atom.h>
|
||||
#include <calf/lv2_atom_util.h>
|
||||
diff --git a/src/makerdf.cpp b/src/makerdf.cpp
|
||||
index 0b6cec5c..9f782534 100644
|
||||
--- a/src/makerdf.cpp
|
||||
+++ b/src/makerdf.cpp
|
||||
@@ -22,7 +22,7 @@
|
||||
#include <calf/preset.h>
|
||||
#include <calf/utils.h>
|
||||
#if USE_LV2
|
||||
-#include <lv2.h>
|
||||
+#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
|
||||
#include <calf/lv2_atom.h>
|
||||
#include <calf/lv2_options.h>
|
||||
#include <calf/lv2_state.h>
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -1,64 +0,0 @@
|
||||
SUMMARY = "High quality open source audio plugins for musicians"
|
||||
HOMEPAGE = "http://calf-studio-gear.org/"
|
||||
LICENSE = "GPLv2 & LGPLv2.1"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://COPYING;md5=dcf3c825659e82539645da41a7908589 \
|
||||
file://COPYING.GPL;md5=94d55d512a9ba36caa9b7df079bae19f \
|
||||
"
|
||||
|
||||
SRC_URI = " \
|
||||
git://github.com/calf-studio-gear/calf.git \
|
||||
file://0001-Do-store-calfmakerdf-commandline-for-later-use-in-qe.patch \
|
||||
file://0002-fluidsynth-Activate-synth.dynamic-sample-loading-for.patch \
|
||||
file://0003-Fix-detection-of-LV2-for-latest-git.patch \
|
||||
file://0004-Find-headers-for-all-versions-of-LV2.patch \
|
||||
"
|
||||
SRCREV = "e5c08dc2483c444d18d24a37c395274002320f5c"
|
||||
S = "${WORKDIR}/git"
|
||||
PV = "0.90.1"
|
||||
|
||||
inherit autotools-brokensep pkgconfig gtk-icon-cache bash-completion qemu-ext
|
||||
|
||||
DEPENDS += " \
|
||||
gtk+ \
|
||||
jack \
|
||||
fluidsynth \
|
||||
liblo \
|
||||
ladspa-sdk \
|
||||
lv2 \
|
||||
"
|
||||
|
||||
EXTRA_OECONF += " \
|
||||
--with-lv2-dir=${libdir}/lv2 \
|
||||
--enable-experimental \
|
||||
"
|
||||
|
||||
do_configure_prepend() {
|
||||
sed -i 's:%QEMUCOMMAND%:${WORKDIR}/QemuCommands:g' `find ${S} -name Makefile.am`
|
||||
}
|
||||
|
||||
QEMU_EXTRA_LIBDIR = "${D}${libdir}/calf"
|
||||
|
||||
do_install_prepend() {
|
||||
# These are installed by calfmakerdf but that's moved to end of installation
|
||||
install -d ${D}${libdir}/lv2
|
||||
install -d ${D}${datadir}/calf
|
||||
}
|
||||
|
||||
do_install_append() {
|
||||
# build ttl-files must be done in quemu (lv2-ttl-generator-data loads
|
||||
# so-files and calls functions to create ttl-files)
|
||||
cat ${WORKDIR}/QemuCommands | while read calfmakerdf_param; do
|
||||
${@qemu_run_binary_local(d, '${STAGING_DIR_TARGET}', '${D}${bindir}/calfmakerdf')} ${calfmakerdf_param}
|
||||
done
|
||||
|
||||
chown -R root:root ${D}${libdir}/lv2
|
||||
chown root:root ${D}${datadir}/calf/*.xml
|
||||
|
||||
# job is done - not needed on target
|
||||
rm ${D}${bindir}/calfmakerdf
|
||||
|
||||
}
|
||||
|
||||
FILES_${PN} += "${libdir}/lv2"
|
||||
INSANE_SKIP_${PN} = "dev-so"
|
||||
@@ -1,31 +0,0 @@
|
||||
From 88c61efce068b4cfe6d4c175bd9d1b85def23708 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Sat, 15 Jul 2017 00:03:36 +0200
|
||||
Subject: [PATCH] do not try to cross-run carla-lv2-export
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Inappropriate [cross specific]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
source/plugin/Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/source/plugin/Makefile b/source/plugin/Makefile
|
||||
index 59b5c5d..3bcb368 100644
|
||||
--- a/source/plugin/Makefile
|
||||
+++ b/source/plugin/Makefile
|
||||
@@ -206,7 +206,7 @@ $(BINDIR)/carla.lv2/manifest.ttl: $(OBJDIR)/carla-lv2-export.cpp.o $(LIBS)
|
||||
ifeq ($(BUILDING_FOR_WINDOWS),true)
|
||||
@cd $(BINDIR) && wine ./carla-lv2-export$(APP_EXT)
|
||||
else
|
||||
- @cd $(BINDIR) && ./carla-lv2-export$(APP_EXT)
|
||||
+ @cd $(BINDIR)
|
||||
endif
|
||||
@cd $(BINDIR)/carla.lv2 && ln -sf ../*bridge-* ../carla-discovery-* .
|
||||
|
||||
--
|
||||
2.9.4
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
From 079d1a1b34394b76d23ce7d92254cb785333d3e7 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Thu, 20 Sep 2018 22:44:48 +0200
|
||||
Subject: [PATCH] Do not try to find Qt5 host bins - it won't work
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Inappropriate [cross specific]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
source/Makefile.mk | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/source/Makefile.mk b/source/Makefile.mk
|
||||
index 688dca20..07afc7a2 100644
|
||||
--- a/source/Makefile.mk
|
||||
+++ b/source/Makefile.mk
|
||||
@@ -253,7 +253,6 @@ endif
|
||||
endif
|
||||
|
||||
ifeq ($(HAVE_QT5),true)
|
||||
-QT5_HOSTBINS = $(shell pkg-config --variable=host_bins Qt5Core)
|
||||
MOC_QT5 ?= $(QT5_HOSTBINS)/moc
|
||||
RCC_QT5 ?= $(QT5_HOSTBINS)/rcc
|
||||
UIC_QT5 ?= $(QT5_HOSTBINS)/uic
|
||||
--
|
||||
2.14.4
|
||||
|
||||
@@ -1,245 +0,0 @@
|
||||
From d55575c62bd911e1edf126e1efed8219c97bb25a Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Wed, 10 Oct 2018 23:48:22 +0200
|
||||
Subject: [PATCH 1/3] Fluidsynths: Ensure fluidsynth's defaults are set once
|
||||
and in one place
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
This makes transition fluidsynth 1.x -> 2.x a lot easier.
|
||||
|
||||
Upstream-Status: Submitted [1]
|
||||
|
||||
[1] https://github.com/falkTX/Carla/pull/766
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
source/backend/plugin/CarlaPluginFluidSynth.cpp | 67 ++++++++++++++++++-------
|
||||
1 file changed, 48 insertions(+), 19 deletions(-)
|
||||
|
||||
diff --git a/source/backend/plugin/CarlaPluginFluidSynth.cpp b/source/backend/plugin/CarlaPluginFluidSynth.cpp
|
||||
index be9e720a..7f6d919c 100644
|
||||
--- a/source/backend/plugin/CarlaPluginFluidSynth.cpp
|
||||
+++ b/source/backend/plugin/CarlaPluginFluidSynth.cpp
|
||||
@@ -73,20 +73,22 @@ public:
|
||||
fSynth = new_fluid_synth(fSettings);
|
||||
CARLA_SAFE_ASSERT_RETURN(fSynth != nullptr,);
|
||||
|
||||
+ initializeFluidDefaultsIfNeeded();
|
||||
+
|
||||
fluid_synth_set_sample_rate(fSynth, (float)pData->engine->getSampleRate());
|
||||
|
||||
// set default values
|
||||
fluid_synth_set_reverb_on(fSynth, 1);
|
||||
- fluid_synth_set_reverb(fSynth, FLUID_REVERB_DEFAULT_ROOMSIZE, FLUID_REVERB_DEFAULT_DAMP, FLUID_REVERB_DEFAULT_WIDTH, FLUID_REVERB_DEFAULT_LEVEL);
|
||||
+ fluid_synth_set_reverb(fSynth, sFluidDefaults[FluidSynthReverbRoomSize], sFluidDefaults[FluidSynthReverbDamp], sFluidDefaults[FluidSynthReverbWidth], sFluidDefaults[FluidSynthReverbLevel]);
|
||||
|
||||
fluid_synth_set_chorus_on(fSynth, 1);
|
||||
- fluid_synth_set_chorus(fSynth, FLUID_CHORUS_DEFAULT_N, FLUID_CHORUS_DEFAULT_LEVEL, FLUID_CHORUS_DEFAULT_SPEED, FLUID_CHORUS_DEFAULT_DEPTH, FLUID_CHORUS_DEFAULT_TYPE);
|
||||
+ fluid_synth_set_chorus(fSynth, sFluidDefaults[FluidSynthChorusNr], sFluidDefaults[FluidSynthChorusLevel], sFluidDefaults[FluidSynthChorusSpeedHz], sFluidDefaults[FluidSynthChorusDepthMs], sFluidDefaults[FluidSynthChorusType]);
|
||||
|
||||
fluid_synth_set_polyphony(fSynth, FLUID_DEFAULT_POLYPHONY);
|
||||
fluid_synth_set_gain(fSynth, 1.0f);
|
||||
|
||||
for (int i=0; i < MAX_MIDI_CHANNELS; ++i)
|
||||
- fluid_synth_set_interp_method(fSynth, i, FLUID_INTERP_DEFAULT);
|
||||
+ fluid_synth_set_interp_method(fSynth, i, sFluidDefaults[FluidSynthInterpolation]);
|
||||
}
|
||||
|
||||
~CarlaPluginFluidSynth() override
|
||||
@@ -195,7 +197,7 @@ public:
|
||||
case 1:
|
||||
return FLUID_CHORUS_MOD_TRIANGLE;
|
||||
default:
|
||||
- return FLUID_CHORUS_DEFAULT_TYPE;
|
||||
+ return sFluidDefaults[FluidSynthChorusType];
|
||||
}
|
||||
case FluidSynthInterpolation:
|
||||
switch (scalePointId)
|
||||
@@ -209,7 +211,7 @@ public:
|
||||
case 3:
|
||||
return FLUID_INTERP_7THORDER;
|
||||
default:
|
||||
- return FLUID_INTERP_DEFAULT;
|
||||
+ return sFluidDefaults[FluidSynthInterpolation];
|
||||
}
|
||||
default:
|
||||
return 0.0f;
|
||||
@@ -721,7 +723,7 @@ public:
|
||||
pData->param.data[j].rindex = j;
|
||||
pData->param.ranges[j].min = 0.0f;
|
||||
pData->param.ranges[j].max = 1.0f;
|
||||
- pData->param.ranges[j].def = 1.0f;
|
||||
+ pData->param.ranges[j].def = sFluidDefaults[j];
|
||||
pData->param.ranges[j].step = 1.0f;
|
||||
pData->param.ranges[j].stepSmall = 1.0f;
|
||||
pData->param.ranges[j].stepLarge = 1.0f;
|
||||
@@ -734,7 +736,7 @@ public:
|
||||
pData->param.data[j].rindex = j;
|
||||
pData->param.ranges[j].min = 0.0f;
|
||||
pData->param.ranges[j].max = 1.2f;
|
||||
- pData->param.ranges[j].def = FLUID_REVERB_DEFAULT_ROOMSIZE;
|
||||
+ pData->param.ranges[j].def = sFluidDefaults[j];
|
||||
pData->param.ranges[j].step = 0.01f;
|
||||
pData->param.ranges[j].stepSmall = 0.0001f;
|
||||
pData->param.ranges[j].stepLarge = 0.1f;
|
||||
@@ -747,7 +749,7 @@ public:
|
||||
pData->param.data[j].rindex = j;
|
||||
pData->param.ranges[j].min = 0.0f;
|
||||
pData->param.ranges[j].max = 1.0f;
|
||||
- pData->param.ranges[j].def = FLUID_REVERB_DEFAULT_DAMP;
|
||||
+ pData->param.ranges[j].def = sFluidDefaults[j];
|
||||
pData->param.ranges[j].step = 0.01f;
|
||||
pData->param.ranges[j].stepSmall = 0.0001f;
|
||||
pData->param.ranges[j].stepLarge = 0.1f;
|
||||
@@ -761,7 +763,7 @@ public:
|
||||
pData->param.data[j].midiCC = MIDI_CONTROL_REVERB_SEND_LEVEL;
|
||||
pData->param.ranges[j].min = 0.0f;
|
||||
pData->param.ranges[j].max = 1.0f;
|
||||
- pData->param.ranges[j].def = FLUID_REVERB_DEFAULT_LEVEL;
|
||||
+ pData->param.ranges[j].def = sFluidDefaults[j];
|
||||
pData->param.ranges[j].step = 0.01f;
|
||||
pData->param.ranges[j].stepSmall = 0.0001f;
|
||||
pData->param.ranges[j].stepLarge = 0.1f;
|
||||
@@ -774,7 +776,7 @@ public:
|
||||
pData->param.data[j].rindex = j;
|
||||
pData->param.ranges[j].min = 0.0f;
|
||||
pData->param.ranges[j].max = 10.0f; // should be 100, but that sounds too much
|
||||
- pData->param.ranges[j].def = FLUID_REVERB_DEFAULT_WIDTH;
|
||||
+ pData->param.ranges[j].def = sFluidDefaults[j];
|
||||
pData->param.ranges[j].step = 0.01f;
|
||||
pData->param.ranges[j].stepSmall = 0.0001f;
|
||||
pData->param.ranges[j].stepLarge = 0.1f;
|
||||
@@ -787,7 +789,7 @@ public:
|
||||
pData->param.data[j].rindex = j;
|
||||
pData->param.ranges[j].min = 0.0f;
|
||||
pData->param.ranges[j].max = 1.0f;
|
||||
- pData->param.ranges[j].def = 1.0f;
|
||||
+ pData->param.ranges[j].def = sFluidDefaults[j];
|
||||
pData->param.ranges[j].step = 1.0f;
|
||||
pData->param.ranges[j].stepSmall = 1.0f;
|
||||
pData->param.ranges[j].stepLarge = 1.0f;
|
||||
@@ -800,7 +802,7 @@ public:
|
||||
pData->param.data[j].rindex = j;
|
||||
pData->param.ranges[j].min = 0.0f;
|
||||
pData->param.ranges[j].max = 99.0f;
|
||||
- pData->param.ranges[j].def = FLUID_CHORUS_DEFAULT_N;
|
||||
+ pData->param.ranges[j].def = sFluidDefaults[j];
|
||||
pData->param.ranges[j].step = 1.0f;
|
||||
pData->param.ranges[j].stepSmall = 1.0f;
|
||||
pData->param.ranges[j].stepLarge = 10.0f;
|
||||
@@ -813,7 +815,7 @@ public:
|
||||
pData->param.data[j].rindex = j;
|
||||
pData->param.ranges[j].min = 0.0f;
|
||||
pData->param.ranges[j].max = 10.0f;
|
||||
- pData->param.ranges[j].def = FLUID_CHORUS_DEFAULT_LEVEL;
|
||||
+ pData->param.ranges[j].def = sFluidDefaults[j];
|
||||
pData->param.ranges[j].step = 0.01f;
|
||||
pData->param.ranges[j].stepSmall = 0.0001f;
|
||||
pData->param.ranges[j].stepLarge = 0.1f;
|
||||
@@ -826,7 +828,7 @@ public:
|
||||
pData->param.data[j].rindex = j;
|
||||
pData->param.ranges[j].min = 0.29f;
|
||||
pData->param.ranges[j].max = 5.0f;
|
||||
- pData->param.ranges[j].def = FLUID_CHORUS_DEFAULT_SPEED;
|
||||
+ pData->param.ranges[j].def = sFluidDefaults[j];
|
||||
pData->param.ranges[j].step = 0.01f;
|
||||
pData->param.ranges[j].stepSmall = 0.0001f;
|
||||
pData->param.ranges[j].stepLarge = 0.1f;
|
||||
@@ -839,7 +841,7 @@ public:
|
||||
pData->param.data[j].rindex = j;
|
||||
pData->param.ranges[j].min = 0.0f;
|
||||
pData->param.ranges[j].max = float(2048.0 * 1000.0 / pData->engine->getSampleRate()); // FIXME?
|
||||
- pData->param.ranges[j].def = FLUID_CHORUS_DEFAULT_DEPTH;
|
||||
+ pData->param.ranges[j].def = sFluidDefaults[j];
|
||||
pData->param.ranges[j].step = 0.01f;
|
||||
pData->param.ranges[j].stepSmall = 0.0001f;
|
||||
pData->param.ranges[j].stepLarge = 0.1f;
|
||||
@@ -852,7 +854,7 @@ public:
|
||||
pData->param.data[j].rindex = j;
|
||||
pData->param.ranges[j].min = FLUID_CHORUS_MOD_SINE;
|
||||
pData->param.ranges[j].max = FLUID_CHORUS_MOD_TRIANGLE;
|
||||
- pData->param.ranges[j].def = FLUID_CHORUS_DEFAULT_TYPE;
|
||||
+ pData->param.ranges[j].def = sFluidDefaults[j];
|
||||
pData->param.ranges[j].step = 1.0f;
|
||||
pData->param.ranges[j].stepSmall = 1.0f;
|
||||
pData->param.ranges[j].stepLarge = 1.0f;
|
||||
@@ -865,7 +867,7 @@ public:
|
||||
pData->param.data[j].rindex = j;
|
||||
pData->param.ranges[j].min = 1.0f;
|
||||
pData->param.ranges[j].max = 512.0f; // max theoric is 65535
|
||||
- pData->param.ranges[j].def = (float)fluid_synth_get_polyphony(fSynth);
|
||||
+ pData->param.ranges[j].def = sFluidDefaults[j];
|
||||
pData->param.ranges[j].step = 1.0f;
|
||||
pData->param.ranges[j].stepSmall = 1.0f;
|
||||
pData->param.ranges[j].stepLarge = 10.0f;
|
||||
@@ -878,7 +880,7 @@ public:
|
||||
pData->param.data[j].rindex = j;
|
||||
pData->param.ranges[j].min = FLUID_INTERP_NONE;
|
||||
pData->param.ranges[j].max = FLUID_INTERP_HIGHEST;
|
||||
- pData->param.ranges[j].def = FLUID_INTERP_DEFAULT;
|
||||
+ pData->param.ranges[j].def = sFluidDefaults[j];
|
||||
pData->param.ranges[j].step = 1.0f;
|
||||
pData->param.ranges[j].stepSmall = 1.0f;
|
||||
pData->param.ranges[j].stepLarge = 1.0f;
|
||||
@@ -891,7 +893,7 @@ public:
|
||||
pData->param.data[j].rindex = j;
|
||||
pData->param.ranges[j].min = 0.0f;
|
||||
pData->param.ranges[j].max = 65535.0f;
|
||||
- pData->param.ranges[j].def = 0.0f;
|
||||
+ pData->param.ranges[j].def = sFluidDefaults[j];
|
||||
pData->param.ranges[j].step = 1.0f;
|
||||
pData->param.ranges[j].stepSmall = 1.0f;
|
||||
pData->param.ranges[j].stepLarge = 1.0f;
|
||||
@@ -1656,6 +1658,27 @@ public:
|
||||
}
|
||||
|
||||
private:
|
||||
+ void initializeFluidDefaultsIfNeeded()
|
||||
+ {
|
||||
+ if (sFluidDefaultsStored)
|
||||
+ return;
|
||||
+ sFluidDefaultsStored = true;
|
||||
+ sFluidDefaults[FluidSynthReverbOnOff] = 1.0f;
|
||||
+ sFluidDefaults[FluidSynthReverbRoomSize] = FLUID_REVERB_DEFAULT_ROOMSIZE;
|
||||
+ sFluidDefaults[FluidSynthReverbDamp] = FLUID_REVERB_DEFAULT_DAMP;
|
||||
+ sFluidDefaults[FluidSynthReverbLevel] = FLUID_REVERB_DEFAULT_LEVEL;
|
||||
+ sFluidDefaults[FluidSynthReverbWidth] = FLUID_REVERB_DEFAULT_WIDTH;
|
||||
+ sFluidDefaults[FluidSynthChorusOnOff] = 1.0f;
|
||||
+ sFluidDefaults[FluidSynthChorusNr] = FLUID_CHORUS_DEFAULT_N;
|
||||
+ sFluidDefaults[FluidSynthChorusLevel] = FLUID_CHORUS_DEFAULT_LEVEL;
|
||||
+ sFluidDefaults[FluidSynthChorusSpeedHz] = FLUID_CHORUS_DEFAULT_SPEED;
|
||||
+ sFluidDefaults[FluidSynthChorusDepthMs] = FLUID_CHORUS_DEFAULT_DEPTH;
|
||||
+ sFluidDefaults[FluidSynthChorusType] = FLUID_CHORUS_DEFAULT_TYPE;
|
||||
+ sFluidDefaults[FluidSynthPolyphony] = (float)fluid_synth_get_polyphony(fSynth);
|
||||
+ sFluidDefaults[FluidSynthInterpolation] = FLUID_INTERP_DEFAULT;
|
||||
+ sFluidDefaults[FluidSynthVoiceCount] = 0.0f;
|
||||
+ }
|
||||
+
|
||||
enum FluidSynthParameters {
|
||||
FluidSynthReverbOnOff = 0,
|
||||
FluidSynthReverbRoomSize = 1,
|
||||
@@ -1683,6 +1706,9 @@ private:
|
||||
float** fAudio16Buffers;
|
||||
float fParamBuffers[FluidSynthParametersMax];
|
||||
|
||||
+ static bool sFluidDefaultsStored;
|
||||
+ static float sFluidDefaults[FluidSynthParametersMax];
|
||||
+
|
||||
int32_t fCurMidiProgs[MAX_MIDI_CHANNELS];
|
||||
|
||||
const char* fLabel;
|
||||
@@ -1690,6 +1716,9 @@ private:
|
||||
CARLA_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(CarlaPluginFluidSynth)
|
||||
};
|
||||
|
||||
+bool CarlaPluginFluidSynth::sFluidDefaultsStored = false;
|
||||
+float CarlaPluginFluidSynth::sFluidDefaults[FluidSynthParametersMax];
|
||||
+
|
||||
CARLA_BACKEND_END_NAMESPACE
|
||||
|
||||
#endif // HAVE_FLUIDSYNTH
|
||||
--
|
||||
2.14.4
|
||||
|
||||
@@ -1,143 +0,0 @@
|
||||
From 94c96ee0d04e324122ee1a73344a44f1b21837ef Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Sat, 13 Oct 2018 15:16:20 +0200
|
||||
Subject: [PATCH 2/3] Fixes for fluidsynth >= 2.0.0
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
* preset iteration and getters have changed
|
||||
* constants for most defaults are no more available in public headers -
|
||||
fluidsynth wants to be asked
|
||||
|
||||
Upstream-Status: Submitted [1]
|
||||
|
||||
[1] https://github.com/falkTX/Carla/pull/766
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
source/backend/plugin/CarlaPluginFluidSynth.cpp | 62 +++++++++++++++++++++++++
|
||||
source/discovery/carla-discovery.cpp | 5 ++
|
||||
2 files changed, 67 insertions(+)
|
||||
|
||||
diff --git a/source/backend/plugin/CarlaPluginFluidSynth.cpp b/source/backend/plugin/CarlaPluginFluidSynth.cpp
|
||||
index 7f6d919c..5645fe3c 100644
|
||||
--- a/source/backend/plugin/CarlaPluginFluidSynth.cpp
|
||||
+++ b/source/backend/plugin/CarlaPluginFluidSynth.cpp
|
||||
@@ -943,6 +943,7 @@ public:
|
||||
|
||||
if (fluid_sfont_t* const f_sfont = fluid_synth_get_sfont_by_id(fSynth, fSynthId))
|
||||
{
|
||||
+#if FLUIDSYNTH_VERSION_MAJOR < 2
|
||||
fluid_preset_t f_preset;
|
||||
|
||||
// initial check to know how many midi-programs we have
|
||||
@@ -971,6 +972,36 @@ public:
|
||||
pData->midiprog.data[i].program = (tmp >= 0) ? static_cast<uint32_t>(tmp) : 0;
|
||||
|
||||
pData->midiprog.data[i].name = carla_strdup(f_preset.get_name(&f_preset));
|
||||
+#else
|
||||
+ fluid_preset_t* f_preset;
|
||||
+
|
||||
+ // initial check to know how many midi-programs we have
|
||||
+ fluid_sfont_iteration_start(f_sfont);
|
||||
+ for (; fluid_sfont_iteration_next(f_sfont);)
|
||||
+ ++count;
|
||||
+
|
||||
+ // sound kits must always have at least 1 midi-program
|
||||
+ CARLA_SAFE_ASSERT_RETURN(count > 0,);
|
||||
+
|
||||
+ pData->midiprog.createNew(count);
|
||||
+
|
||||
+ // Update data
|
||||
+ int tmp;
|
||||
+ uint32_t i = 0;
|
||||
+ fluid_sfont_iteration_start(f_sfont);
|
||||
+
|
||||
+ for (; (f_preset = fluid_sfont_iteration_next(f_sfont));)
|
||||
+ {
|
||||
+ CARLA_SAFE_ASSERT_BREAK(i < count);
|
||||
+
|
||||
+ tmp = fluid_preset_get_banknum(f_preset);
|
||||
+ pData->midiprog.data[i].bank = (tmp >= 0) ? static_cast<uint32_t>(tmp) : 0;
|
||||
+
|
||||
+ tmp = fluid_preset_get_num(f_preset);
|
||||
+ pData->midiprog.data[i].program = (tmp >= 0) ? static_cast<uint32_t>(tmp) : 0;
|
||||
+
|
||||
+ pData->midiprog.data[i].name = carla_strdup(fluid_preset_get_name(f_preset));
|
||||
+#endif
|
||||
|
||||
if (pData->midiprog.data[i].bank == 128 && ! hasDrums)
|
||||
{
|
||||
@@ -1663,17 +1694,48 @@ private:
|
||||
if (sFluidDefaultsStored)
|
||||
return;
|
||||
sFluidDefaultsStored = true;
|
||||
+ // reverb defaults
|
||||
sFluidDefaults[FluidSynthReverbOnOff] = 1.0f;
|
||||
+#if FLUIDSYNTH_VERSION_MAJOR < 2
|
||||
sFluidDefaults[FluidSynthReverbRoomSize] = FLUID_REVERB_DEFAULT_ROOMSIZE;
|
||||
sFluidDefaults[FluidSynthReverbDamp] = FLUID_REVERB_DEFAULT_DAMP;
|
||||
sFluidDefaults[FluidSynthReverbLevel] = FLUID_REVERB_DEFAULT_LEVEL;
|
||||
sFluidDefaults[FluidSynthReverbWidth] = FLUID_REVERB_DEFAULT_WIDTH;
|
||||
+#else
|
||||
+ double reverbVal;
|
||||
+ fluid_settings_getnum_default(fSettings, "synth.reverb.room-size", &reverbVal);
|
||||
+ sFluidDefaults[FluidSynthReverbRoomSize] = reverbVal;
|
||||
+ fluid_settings_getnum_default(fSettings, "synth.reverb.damp", &reverbVal);
|
||||
+ sFluidDefaults[FluidSynthReverbDamp] = reverbVal;
|
||||
+ fluid_settings_getnum_default(fSettings, "synth.reverb.level", &reverbVal);
|
||||
+ sFluidDefaults[FluidSynthReverbLevel] = reverbVal;
|
||||
+ fluid_settings_getnum_default(fSettings, "synth.reverb.width", &reverbVal);
|
||||
+ sFluidDefaults[FluidSynthReverbWidth] = reverbVal;
|
||||
+#endif
|
||||
+
|
||||
+ // chorus defaults
|
||||
sFluidDefaults[FluidSynthChorusOnOff] = 1.0f;
|
||||
+#if FLUIDSYNTH_VERSION_MAJOR < 2
|
||||
sFluidDefaults[FluidSynthChorusNr] = FLUID_CHORUS_DEFAULT_N;
|
||||
sFluidDefaults[FluidSynthChorusLevel] = FLUID_CHORUS_DEFAULT_LEVEL;
|
||||
sFluidDefaults[FluidSynthChorusSpeedHz] = FLUID_CHORUS_DEFAULT_SPEED;
|
||||
sFluidDefaults[FluidSynthChorusDepthMs] = FLUID_CHORUS_DEFAULT_DEPTH;
|
||||
sFluidDefaults[FluidSynthChorusType] = FLUID_CHORUS_DEFAULT_TYPE;
|
||||
+#else
|
||||
+ double chorusVal;
|
||||
+ fluid_settings_getnum_default(fSettings, "synth.chorus.nr", &chorusVal);
|
||||
+ sFluidDefaults[FluidSynthChorusNr] = chorusVal;
|
||||
+ fluid_settings_getnum_default(fSettings, "synth.chorus.level", &chorusVal);
|
||||
+ sFluidDefaults[FluidSynthChorusLevel] = chorusVal;
|
||||
+ fluid_settings_getnum_default(fSettings, "synth.chorus.speed", &chorusVal);
|
||||
+ sFluidDefaults[FluidSynthChorusSpeedHz] = chorusVal;
|
||||
+ fluid_settings_getnum_default(fSettings, "synth.chorus.depth", &chorusVal);
|
||||
+ sFluidDefaults[FluidSynthChorusDepthMs] = chorusVal;
|
||||
+ // There is no settings for chorus default type
|
||||
+ sFluidDefaults[FluidSynthChorusType] = (float)fluid_synth_get_chorus_type(fSynth);
|
||||
+#endif
|
||||
+
|
||||
+ // misc. defaults
|
||||
sFluidDefaults[FluidSynthPolyphony] = (float)fluid_synth_get_polyphony(fSynth);
|
||||
sFluidDefaults[FluidSynthInterpolation] = FLUID_INTERP_DEFAULT;
|
||||
sFluidDefaults[FluidSynthVoiceCount] = 0.0f;
|
||||
diff --git a/source/discovery/carla-discovery.cpp b/source/discovery/carla-discovery.cpp
|
||||
index a0745e23..d2cd2931 100644
|
||||
--- a/source/discovery/carla-discovery.cpp
|
||||
+++ b/source/discovery/carla-discovery.cpp
|
||||
@@ -1323,10 +1323,15 @@ static void do_fluidsynth_check(const char* const filename, const bool doInit)
|
||||
|
||||
if (fluid_sfont_t* const f_sfont = fluid_synth_get_sfont_by_id(f_synth, static_cast<uint>(f_id)))
|
||||
{
|
||||
+#if FLUIDSYNTH_VERSION_MAJOR < 2
|
||||
fluid_preset_t f_preset;
|
||||
|
||||
f_sfont->iteration_start(f_sfont);
|
||||
for (; f_sfont->iteration_next(f_sfont, &f_preset);)
|
||||
+#else
|
||||
+ fluid_sfont_iteration_start(f_sfont);
|
||||
+ for (; fluid_sfont_iteration_next(f_sfont);)
|
||||
+#endif
|
||||
++programs;
|
||||
}
|
||||
|
||||
--
|
||||
2.14.4
|
||||
|
||||
@@ -1,71 +0,0 @@
|
||||
SUMMARY = "Audio plugin host"
|
||||
HOMEPAGE = "http://kxstudio.linuxaudio.org/Applications:Carla"
|
||||
LICENSE = "GPLv2 & LGPLv3"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://doc/GPL.txt;md5=4641e94ec96f98fabc56ff9cc48be14b \
|
||||
file://doc/LGPL.txt;md5=e6a600fd5e1d9cbde2d983680233ad02 \
|
||||
"
|
||||
|
||||
SRC_URI = " \
|
||||
git://github.com/falkTX/Carla.git \
|
||||
file://0001-do-not-try-to-cross-run-carla-lv2-export.patch \
|
||||
file://0002-Do-not-try-to-find-Qt5-host-bins-it-won-t-work.patch \
|
||||
file://0003-Fluidsynths-Ensure-fluidsynth-s-defaults-are-set-onc.patch \
|
||||
file://0004-Fixes-for-fluidsynth-2.0.0.patch \
|
||||
"
|
||||
SRCREV = "d73c0788ccc5fb9019d224046ef1b652aa5a9bbe"
|
||||
S = "${WORKDIR}/git"
|
||||
PV = "1.9.11+git${SRCPV}"
|
||||
|
||||
REQUIRED_DISTRO_FEATURES = "x11"
|
||||
|
||||
inherit qmake5_base pkgconfig qemu-ext distro_features_check mime gtk-icon-cache
|
||||
|
||||
B = "${S}"
|
||||
|
||||
DEPENDS += " \
|
||||
python3-pyqt5-native \
|
||||
qtbase-native \
|
||||
qtbase \
|
||||
gtk+ \
|
||||
gtk+3 \
|
||||
liblo \
|
||||
pulseaudio \
|
||||
fluidsynth \
|
||||
libsndfile1 \
|
||||
"
|
||||
|
||||
EXTRA_OEMAKE += " \
|
||||
DEFAULT_QT=5 \
|
||||
NOOPT=true \
|
||||
HAVE_PYQT=true \
|
||||
HAVE_PYQT4=false \
|
||||
HAVE_PYQT5=true \
|
||||
SKIP_STRIPPING=true \
|
||||
"
|
||||
|
||||
export QT5_HOSTBINS="${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}"
|
||||
|
||||
do_configure() {
|
||||
oe_runmake features
|
||||
}
|
||||
|
||||
do_compile_append() {
|
||||
cd ${S}/bin
|
||||
${@qemu_run_binary_local(d, '${STAGING_DIR_TARGET}', 'carla-lv2-export')}
|
||||
}
|
||||
|
||||
do_install() {
|
||||
oe_runmake DESTDIR=${D} PREFIX=${prefix} LIBDIR=${libdir} install
|
||||
}
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/icons \
|
||||
${datadir}/mime \
|
||||
${libdir}/lv2 \
|
||||
${libdir}/vst \
|
||||
"
|
||||
|
||||
INSANE_SKIP_${PN} = "dev-so"
|
||||
|
||||
RDEPENDS_${PN} += "python3-pyqt5 bash"
|
||||
@@ -1,22 +0,0 @@
|
||||
SUMMARY = "Chromaprint is library that extracts fingerprints from audio sources"
|
||||
HOMEPAGE = "https://acoustid.org/chromaprint"
|
||||
LICENSE = "MIT & LGPLv2.1"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE.md;md5=5d50f7a9fde1110fa1756b0f5faa26f2"
|
||||
|
||||
inherit cmake
|
||||
|
||||
DEPENDS += " \
|
||||
fftw \
|
||||
ffmpeg \
|
||||
"
|
||||
|
||||
|
||||
SRC_URI = "git://github.com/acoustid/chromaprint.git"
|
||||
SRCREV = "ecd2edd73315530d4f9c1b1186aee24c63a7b6c2"
|
||||
PV = "1.4.3"
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
EXTRA_OECMAKE += " \
|
||||
${@bb.utils.contains('TUNE_FEATURES', 'neon', '-DFFT_LIB=fftw3f', '', d)} \
|
||||
-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \
|
||||
"
|
||||
@@ -1,63 +0,0 @@
|
||||
SUMMARY = "A sound and music computing system"
|
||||
LICENSE = "LGPLv2.1"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
|
||||
|
||||
inherit cmake gettext python-dir
|
||||
|
||||
# TBD: fltk is not propely detected
|
||||
DEPENDS += " \
|
||||
flex-native \
|
||||
bison-native \
|
||||
swig-native \
|
||||
python \
|
||||
alsa-lib \
|
||||
libsndfile1 \
|
||||
portaudio-v19 \
|
||||
portmidi \
|
||||
fluidsynth \
|
||||
curl \
|
||||
fltk \
|
||||
liblo \
|
||||
stk \
|
||||
libvorbis \
|
||||
libeigen \
|
||||
libwebsockets \
|
||||
"
|
||||
|
||||
SRC_URI = " \
|
||||
git://github.com/csound/csound.git \
|
||||
file://0001-Do-not-set-include-path-to-usr-local-include.patch \
|
||||
file://0002-Do-not-use-try_run-for-portaudio.patch \
|
||||
file://0003-strict-aliasing-errors.patch \
|
||||
file://0004-Engine-csound_orc_semantics.c-Fix-build-with-gcc8.patch \
|
||||
file://0005-InOut-pmidi.c-Fix-build-with-gcc8.patch \
|
||||
file://0006-fixed-unsafe-use-of-strncpy.patch \
|
||||
file://0007-util1-csd_util-cs.c-Fix-build-with-gcc8.patch \
|
||||
file://0008-Fix-build-with-fluidsynth-version-2.0.0.patch \
|
||||
"
|
||||
SRCREV = "2905724262b516983e779ed8c589602da4bf3f7d"
|
||||
S = "${WORKDIR}/git"
|
||||
PV = "6.11.0"
|
||||
|
||||
# Where to get lua-version from?
|
||||
LUA_VERSION = "5.3"
|
||||
|
||||
EXTRA_OECMAKE += " \
|
||||
-DUSE_DOUBLE=OFF \
|
||||
-DPYTHON_MODULE_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} \
|
||||
-DUSE_LIB64=${@bb.utils.contains("baselib", "lib64", "ON", "OFF",d)} \
|
||||
"
|
||||
|
||||
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)}"
|
||||
PACKAGECONFIG[pulseaudio] = "-DUSE_PULSEAUDIO=ON,-DUSE_PULSEAUDIO=OFF,pulseaudio,pulseaudio-server"
|
||||
PACKAGECONFIG[luajit] = "-DLUA_MODULE_INSTALL_DIR=${libdir}/lua/${LUA_VERSION},,luajit"
|
||||
|
||||
PACKAGES =+ " \
|
||||
${PN}-python2 \
|
||||
${PN}-luajit \
|
||||
"
|
||||
|
||||
FILES_${PN}-python2 = "${PYTHON_SITEPACKAGES_DIR}"
|
||||
RDEPENDS_${PN}-python2 += "python"
|
||||
|
||||
FILES_${PN}-luajit = "${libdir}/lua"
|
||||
@@ -1,31 +0,0 @@
|
||||
From 1ae6204460552d524398765ca3931f73c7647472 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Sun, 20 May 2018 20:22:21 +0200
|
||||
Subject: [PATCH] Do not set include path to /usr/local/include
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
InOut/CMakeLists.txt | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/InOut/CMakeLists.txt b/InOut/CMakeLists.txt
|
||||
index 9422575e3..535528c83 100644
|
||||
--- a/InOut/CMakeLists.txt
|
||||
+++ b/InOut/CMakeLists.txt
|
||||
@@ -16,8 +16,6 @@ option(USE_FLTK "Use FLTK for graphs and widget opcodes" ON)
|
||||
option(BUILD_VIRTUAL_KEYBOARD "Build Virtual MIDI keyboard" ON)
|
||||
option(NEED_PORTTIME "porttime library separate from portmidi" ON)
|
||||
|
||||
-set(CMAKE_REQUIRED_INCLUDES /usr/local/include)
|
||||
-
|
||||
# FIND LIBRARIES AND HEADERS
|
||||
|
||||
if(USE_ALSA)
|
||||
--
|
||||
2.14.3
|
||||
|
||||
@@ -1,51 +0,0 @@
|
||||
From 70b48196f3f2eb7a8cd2b21a3c39986bdb24bff2 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Sun, 20 May 2018 20:59:59 +0200
|
||||
Subject: [PATCH] Do not use try_run for portaudio
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Inappropriate [OE specific]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
InOut/CMakeLists.txt | 13 -------------
|
||||
1 file changed, 13 deletions(-)
|
||||
|
||||
diff --git a/InOut/CMakeLists.txt b/InOut/CMakeLists.txt
|
||||
index 9422575e3..7590a8c01 100644
|
||||
--- a/InOut/CMakeLists.txt
|
||||
+++ b/InOut/CMakeLists.txt
|
||||
@@ -27,19 +27,6 @@ endif()
|
||||
if(USE_PORTAUDIO)
|
||||
find_path(PORTAUDIO_INCLUDE_PATH portaudio.h)
|
||||
find_library(PORTAUDIO_LIBRARY NAMES portaudio portaudio_x64)
|
||||
-
|
||||
- if(PORTAUDIO_INCLUDE_PATH AND PORTAUDIO_LIBRARY)
|
||||
- try_run(PORTAUDIO_V19 PORTAUDIO_TEST_COMPILED
|
||||
- ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/portaudio_test.c
|
||||
- CMAKE_FLAGS -DLINK_LIBRARIES:STRING=${PORTAUDIO_LIBRARY}
|
||||
- COMPILE_DEFINITIONS "-I${PORTAUDIO_INCLUDE_PATH}"
|
||||
- COMPILE_OUTPUT_VARIABLE OUTPUT)
|
||||
- if(NOT PORTAUDIO_TEST_COMPILED AND NOT WIN32)
|
||||
- set(PORTAUDIO_V19 false)
|
||||
- endif()
|
||||
- else()
|
||||
- set(PORTAUDIO_V19 false)
|
||||
- endif()
|
||||
endif()
|
||||
if(USE_PORTMIDI)
|
||||
find_path(PORTMIDI_INCLUDE_PATH portmidi.h)
|
||||
@@ -117,7 +117,7 @@ endif()
|
||||
if(WIN32)
|
||||
check_deps(USE_PORTAUDIO PORTAUDIO_INCLUDE_PATH PORTAUDIO_LIBRARY)
|
||||
else()
|
||||
- check_deps(USE_PORTAUDIO PORTAUDIO_INCLUDE_PATH PORTAUDIO_LIBRARY PORTAUDIO_TEST_COMPILED)
|
||||
+ check_deps(USE_PORTAUDIO PORTAUDIO_INCLUDE_PATH PORTAUDIO_LIBRARY)
|
||||
endif()
|
||||
if(USE_PORTAUDIO AND PORTAUDIO_V19 MATCHES 1)
|
||||
message(STATUS "Building rtpa module.")
|
||||
--
|
||||
2.14.3
|
||||
|
||||
@@ -1,117 +0,0 @@
|
||||
From 7e2f3f49670166804529c6b9ff1398f38999d921 Mon Sep 17 00:00:00 2001
|
||||
From: veplaini <victor.lazzarini@nuim.ie>
|
||||
Date: Fri, 11 May 2018 14:05:49 +0100
|
||||
Subject: [PATCH] strict aliasing errors
|
||||
|
||||
---
|
||||
Engine/musmon.c | 2 +-
|
||||
Engine/rdscor.c | 8 +++++---
|
||||
OOps/schedule.c | 19 ++++++++++++++-----
|
||||
3 files changed, 20 insertions(+), 9 deletions(-)
|
||||
|
||||
Upstream-Status: Backport
|
||||
|
||||
diff --git a/Engine/musmon.c b/Engine/musmon.c
|
||||
index 440642489..8f4cc22cf 100644
|
||||
--- a/Engine/musmon.c
|
||||
+++ b/Engine/musmon.c
|
||||
@@ -1033,7 +1033,7 @@ int sensevents(CSOUND *csound)
|
||||
if (!(rdscor(csound, e))){
|
||||
/* or rd nxt evt from scstr */
|
||||
e->opcod = 'e';
|
||||
- }
|
||||
+ }
|
||||
csound->currevent = e;
|
||||
|
||||
switch (e->opcod) {
|
||||
diff --git a/Engine/rdscor.c b/Engine/rdscor.c
|
||||
index f39393725..fe6488cb2 100644
|
||||
--- a/Engine/rdscor.c
|
||||
+++ b/Engine/rdscor.c
|
||||
@@ -142,7 +142,7 @@ int rdscor(CSOUND *csound, EVTBLK *e) /* read next score-line from scorefile */
|
||||
{ /* presumes good format if warped */
|
||||
MYFLT *pp, *plim;
|
||||
int c;
|
||||
-
|
||||
+
|
||||
e->pinstance = NULL;
|
||||
if (csound->scstr == NULL ||
|
||||
csound->scstr->body[0] == '\0') { /* if no concurrent scorefile */
|
||||
@@ -151,12 +151,14 @@ int rdscor(CSOUND *csound, EVTBLK *e) /* read next score-line from scorefile */
|
||||
e->p[2] = FL(INF);
|
||||
e->p2orig = FL(INF);
|
||||
e->pcnt = 2;
|
||||
+
|
||||
return(1);
|
||||
}
|
||||
+
|
||||
/* else read the real score */
|
||||
while ((c = corfile_getc(csound->scstr)) != '\0') {
|
||||
csound->scnt = 0;
|
||||
- switch (c) {
|
||||
+ switch (c) {
|
||||
case ' ':
|
||||
case '\t':
|
||||
case '\n':
|
||||
@@ -193,7 +195,7 @@ int rdscor(CSOUND *csound, EVTBLK *e) /* read next score-line from scorefile */
|
||||
goto setp;
|
||||
case 'e':
|
||||
e->opcod = c;
|
||||
- e->pcnt = 0;
|
||||
+ e->pcnt = 0;
|
||||
return(1);
|
||||
case EOF: /* necessary for cscoreGetEvent */
|
||||
return(0);
|
||||
diff --git a/OOps/schedule.c b/OOps/schedule.c
|
||||
index b87897ec9..6dd60e94f 100644
|
||||
--- a/OOps/schedule.c
|
||||
+++ b/OOps/schedule.c
|
||||
@@ -79,7 +79,7 @@ int32_t schedule_N(CSOUND *csound, SCHED *p)
|
||||
{
|
||||
int32_t i;
|
||||
int32_t argno = p->INOCOUNT+1;
|
||||
- char s[16384];
|
||||
+ char s[16384], sf[64];
|
||||
sprintf(s, "i %f %f %f", *p->which, *p->when, *p->dur);
|
||||
for (i=4; i < argno ; i++) {
|
||||
MYFLT *arg = p->argums[i-4];
|
||||
@@ -87,8 +87,12 @@ int32_t schedule_N(CSOUND *csound, SCHED *p)
|
||||
add_string_arg(s, ((STRINGDAT *)arg)->data);
|
||||
//sprintf(s, "%s \"%s\" ", s, ((STRINGDAT *)arg)->data);
|
||||
}
|
||||
- else sprintf(s, "%s %f", s, *arg);
|
||||
-
|
||||
+ else {
|
||||
+ sprintf(sf, " %f", *arg);
|
||||
+ if(strlen(s) < 16384)
|
||||
+ strncat(s, sf, 16384-strlen(s));
|
||||
+ //sprintf(s, "%s %f", s, *arg);
|
||||
+ }
|
||||
}
|
||||
|
||||
csoundInputMessageInternal(csound, s);
|
||||
@@ -99,14 +103,19 @@ int32_t schedule_SN(CSOUND *csound, SCHED *p)
|
||||
{
|
||||
int32_t i;
|
||||
int32_t argno = p->INOCOUNT+1;
|
||||
- char s[16384];
|
||||
+ char s[16384], sf[64];
|
||||
sprintf(s, "i \"%s\" %f %f", ((STRINGDAT *)p->which)->data, *p->when, *p->dur);
|
||||
for (i=4; i < argno ; i++) {
|
||||
MYFLT *arg = p->argums[i-4];
|
||||
if (csoundGetTypeForArg(arg) == &CS_VAR_TYPE_S)
|
||||
//sprintf(s, "%s \"%s\" ", s, ((STRINGDAT *)arg)->data);
|
||||
add_string_arg(s, ((STRINGDAT *)arg)->data);
|
||||
- else sprintf(s, "%s %f", s, *arg);
|
||||
+ else {
|
||||
+ sprintf(sf, " %f", *arg);
|
||||
+ if(strlen(s) < 16384)
|
||||
+ strncat(s, sf, 16384-strlen(s));
|
||||
+ //sprintf(s, "%s %f", s, *arg);
|
||||
+ }
|
||||
}
|
||||
//printf("%s\n", s);
|
||||
csoundInputMessageInternal(csound, s);
|
||||
--
|
||||
2.14.4
|
||||
|
||||
@@ -1,84 +0,0 @@
|
||||
From 9d4fef967e622faec90bbed00fb00383e85e328c Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Mon, 2 Jul 2018 00:22:14 +0200
|
||||
Subject: [PATCH] Engine/csound_orc_semantics.c: Fix build with gcc8
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-angstrom-linux-gnueabi/csound/6.11.0-r0/git/Engine/csound_orc_semantics.c:73:7: error: 'strncpy' output truncated before terminating nul copying as many bytes from a string as its length [-Werror=stringop-truncation]
|
||||
strncpy(retVal, str, len);
|
||||
^~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-angstrom-linux-gnueabi/csound/6.11.0-r0/git/Engine/csound_orc_semantics.c:69:11: note: length computed here
|
||||
len = strlen(str);
|
||||
^~~~~~~~~~~
|
||||
/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-angstrom-linux-gnueabi/csound/6.11.0-r0/git/Engine/csound_orc_semantics.c: In function 'get_arg_type2':
|
||||
/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-angstrom-linux-gnueabi/csound/6.11.0-r0/git/Engine/csound_orc_semantics.c:450:7: error: 'strncpy' output truncated before terminating nul copying as many bytes from a string as its length [-Werror=stringop-truncation]
|
||||
strncpy(inArgTypes, argTypeLeft, len1);
|
||||
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-angstrom-linux-gnueabi/csound/6.11.0-r0/git/Engine/csound_orc_semantics.c:446:14: note: length computed here
|
||||
len1 = strlen(argTypeLeft);
|
||||
^~~~~~~~~~~~~~~~~~~
|
||||
/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-angstrom-linux-gnueabi/csound/6.11.0-r0/git/Engine/csound_orc_semantics.c:451:7: error: 'strncpy' output truncated before terminating nul copying as many bytes from a string as its length [-Werror=stringop-truncation]
|
||||
strncpy(inArgTypes + len1, argTypeRight, len2);
|
||||
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-angstrom-linux-gnueabi/csound/6.11.0-r0/git/Engine/csound_orc_semantics.c:447:14: note: length computed here
|
||||
len2 = strlen(argTypeRight);
|
||||
^~~~~~~~~~~~~~~~~~~~
|
||||
/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-angstrom-linux-gnueabi/csound/6.11.0-r0/git/Engine/csound_orc_semantics.c:392:9: error: 'strncpy' output truncated before terminating nul copying as many bytes from a string as its length [-Werror=stringop-truncation]
|
||||
strncpy(inArgTypes, argTypeLeft, len1);
|
||||
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-angstrom-linux-gnueabi/csound/6.11.0-r0/git/Engine/csound_orc_semantics.c:388:16: note: length computed here
|
||||
len1 = strlen(argTypeLeft);
|
||||
^~~~~~~~~~~~~~~~~~~
|
||||
/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-angstrom-linux-gnueabi/csound/6.11.0-r0/git/Engine/csound_orc_semantics.c:393:9: error: 'strncpy' output truncated before terminating nul copying as many bytes from a string as its length [-Werror=stringop-truncation]
|
||||
strncpy(inArgTypes + len1, argTypeRight, len2);
|
||||
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-angstrom-linux-gnueabi/csound/6.11.0-r0/git/Engine/csound_orc_semantics.c:389:16: note: length computed here
|
||||
len2 = strlen(argTypeRight);
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
Engine/csound_orc_semantics.c | 10 +++++-----
|
||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/Engine/csound_orc_semantics.c b/Engine/csound_orc_semantics.c
|
||||
index 6b6255d9c..5985b2435 100644
|
||||
--- a/Engine/csound_orc_semantics.c
|
||||
+++ b/Engine/csound_orc_semantics.c
|
||||
@@ -70,7 +70,7 @@ char* cs_strdup(CSOUND* csound, char* str) {
|
||||
retVal = csound->Malloc(csound, len + 1);
|
||||
|
||||
if (len > 0) {
|
||||
- strncpy(retVal, str, len);
|
||||
+ strncpy(retVal, str, len+1);
|
||||
}
|
||||
retVal[len] = '\0';
|
||||
|
||||
@@ -389,8 +389,8 @@ char* get_arg_type2(CSOUND* csound, TREE* tree, TYPE_TABLE* typeTable)
|
||||
len2 = strlen(argTypeRight);
|
||||
inArgTypes = csound->Malloc(csound, len1 + len2 + 1);
|
||||
|
||||
- strncpy(inArgTypes, argTypeLeft, len1);
|
||||
- strncpy(inArgTypes + len1, argTypeRight, len2);
|
||||
+ strncpy(inArgTypes, argTypeLeft, len1+1);
|
||||
+ strncpy(inArgTypes + len1, argTypeRight, len2+1);
|
||||
|
||||
inArgTypes[len1 + len2] = '\0';
|
||||
|
||||
@@ -447,8 +447,8 @@ char* get_arg_type2(CSOUND* csound, TREE* tree, TYPE_TABLE* typeTable)
|
||||
len2 = strlen(argTypeRight);
|
||||
inArgTypes = csound->Malloc(csound, len1 + len2 + 1);
|
||||
|
||||
- strncpy(inArgTypes, argTypeLeft, len1);
|
||||
- strncpy(inArgTypes + len1, argTypeRight, len2);
|
||||
+ strncpy(inArgTypes, argTypeLeft, len1+1);
|
||||
+ strncpy(inArgTypes + len1, argTypeRight, len2+1);
|
||||
|
||||
inArgTypes[len1 + len2] = '\0';
|
||||
|
||||
--
|
||||
2.14.4
|
||||
|
||||
@@ -1,41 +0,0 @@
|
||||
From 599e78547a32ec3cd01ce9e007531b765f4168ee Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Mon, 2 Jul 2018 00:39:01 +0200
|
||||
Subject: [PATCH] InOut/pmidi.c: Fix build with gcc8
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
InOut/pmidi.c | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/InOut/pmidi.c b/InOut/pmidi.c
|
||||
index 8dfe0e71d..f6de618cf 100644
|
||||
--- a/InOut/pmidi.c
|
||||
+++ b/InOut/pmidi.c
|
||||
@@ -188,14 +188,14 @@ static int listDevices(CSOUND *csound, CS_MIDIDEVICE *list, int isOutput){
|
||||
for (i = 0; i < cnt; i++) {
|
||||
info = portMidi_getDeviceInfo(i, isOutput);
|
||||
if (info->name != NULL)
|
||||
- strncpy(list[i].device_name, info->name, 63);
|
||||
+ strncpy(list[i].device_name, info->name, 64);
|
||||
snprintf(tmp, 64, "%d", i);
|
||||
- strncpy(list[i].device_id, tmp, 63);
|
||||
+ strncpy(list[i].device_id, tmp, 64);
|
||||
list[i].isOutput = isOutput;
|
||||
if (info->interf != NULL)
|
||||
- strncpy(list[i].interface_name, info->interf, 63);
|
||||
+ strncpy(list[i].interface_name, info->interf, 64);
|
||||
else strcpy(list[i].interface_name, "");
|
||||
- strncpy(list[i].midi_module, drv, 63);
|
||||
+ strncpy(list[i].midi_module, drv, 64);
|
||||
}
|
||||
return cnt;
|
||||
}
|
||||
--
|
||||
2.14.4
|
||||
|
||||
@@ -1,27 +0,0 @@
|
||||
From 3d5e27ea49f67b38a39ad831d18e8abd17b3a9bc Mon Sep 17 00:00:00 2001
|
||||
From: vlazzarini <vlazzarini@mu.ie>
|
||||
Date: Sun, 27 May 2018 11:18:08 +0100
|
||||
Subject: [PATCH] fixed unsafe use of strncpy
|
||||
|
||||
Upstream-Status: Backport
|
||||
|
||||
---
|
||||
util1/scot/scot.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/util1/scot/scot.c b/util1/scot/scot.c
|
||||
index 857bb08ce..5b9a0eb96 100644
|
||||
--- a/util1/scot/scot.c
|
||||
+++ b/util1/scot/scot.c
|
||||
@@ -684,7 +684,7 @@ void addparam(int n, /* number of param to change */
|
||||
|
||||
ps = findparam(n, ptop);
|
||||
if (strcmp(s, "."))
|
||||
- strncpy(ps, s, 1+strlen(s));
|
||||
+ strncpy(ps, s, 31);
|
||||
}
|
||||
|
||||
static /* returns pointer to */
|
||||
--
|
||||
2.14.4
|
||||
|
||||
@@ -1,46 +0,0 @@
|
||||
From a070eaef29510f9138055896975917211d4fe61f Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Mon, 2 Jul 2018 00:55:16 +0200
|
||||
Subject: [PATCH] util1/csd_util/cs.c: Fix build with gcc8
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
util1/csd_util/cs.c | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/util1/csd_util/cs.c b/util1/csd_util/cs.c
|
||||
index a05ee3b43..768843fff 100644
|
||||
--- a/util1/csd_util/cs.c
|
||||
+++ b/util1/csd_util/cs.c
|
||||
@@ -385,7 +385,7 @@ int main(int argc, char **argv)
|
||||
while (--j) {
|
||||
i++;
|
||||
if (argv[i][0] != '-' && i < 3 && tmp[0] == '\0') {
|
||||
- strncpy(tmp, argv[i],256);
|
||||
+ strncpy(tmp, argv[i],255);
|
||||
/* strip extension */
|
||||
if (is_orc(tmp) || is_sco(tmp) || is_mid(tmp) || is_csd(tmp))
|
||||
tmp[strlen(tmp) - 4] = '\0';
|
||||
@@ -428,12 +428,12 @@ int main(int argc, char **argv)
|
||||
/* (the last option has the highest precedence) */
|
||||
s = getenv("CSOUND");
|
||||
if (s != NULL) /* get default setting from CSOUND, if available */
|
||||
- strncpy(tmp, s, 256);
|
||||
+ strncpy(tmp, s, 255);
|
||||
for (i = (int) strlen(optlst); --i >= 0; ) {
|
||||
sprintf(tmp2, "CSOUND_%c", optlst[i]);
|
||||
s = getenv(tmp2);
|
||||
if (s != NULL) {
|
||||
- strncpy(tmp, s, 256);
|
||||
+ strncpy(tmp, s, 255);
|
||||
if (tmp[0] != '\0') break;
|
||||
}
|
||||
}
|
||||
--
|
||||
2.14.4
|
||||
|
||||
@@ -1,53 +0,0 @@
|
||||
From 281beca9614fa8b5c09527809a6810525faf2177 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Wed, 10 Oct 2018 20:47:04 +0200
|
||||
Subject: [PATCH] Fix build with fluidsynth version >= 2.0.0
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Please not that the second change set at
|
||||
|
||||
Upstream-Status: Backport [1]
|
||||
|
||||
[1] https://github.com/csound/csound/pull/1046
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
Opcodes/fluidOpcodes/fluidOpcodes.cpp | 27 +++++++++++++++++++++++++++
|
||||
1 file changed, 27 insertions(+)
|
||||
|
||||
diff --git a/Opcodes/fluidOpcodes/fluidOpcodes.cpp b/Opcodes/fluidOpcodes/fluidOpcodes.cpp
|
||||
index d6f4da0fd..aa2b9d4b2 100644
|
||||
--- a/Opcodes/fluidOpcodes/fluidOpcodes.cpp
|
||||
+++ b/Opcodes/fluidOpcodes/fluidOpcodes.cpp
|
||||
@@ -208,6 +208,7 @@ public:
|
||||
} else if (listPresets) {
|
||||
fluid_sfont_t *fluidSoundfont =
|
||||
fluid_synth_get_sfont_by_id(fluidSynth, soundFontId);
|
||||
+#if FLUIDSYNTH_VERSION_MAJOR < 2
|
||||
fluid_preset_t fluidPreset;
|
||||
fluidSoundfont->iteration_start(fluidSoundfont);
|
||||
OPARMS oparms;
|
||||
@@ -218,6 +219,18 @@ public:
|
||||
soundFontId, fluidPreset.get_banknum(&fluidPreset),
|
||||
fluidPreset.get_num(&fluidPreset),
|
||||
fluidPreset.get_name(&fluidPreset));
|
||||
+#else
|
||||
+ fluid_preset_t *fluidPreset;
|
||||
+ fluid_sfont_iteration_start(fluidSoundfont);
|
||||
+ OPARMS oparms;
|
||||
+ csound->GetOParms(csound, &oparms);
|
||||
+ if (oparms.msglevel & 0x7)
|
||||
+ while ((fluidPreset = fluid_sfont_iteration_next(fluidSoundfont))) {
|
||||
+ log(csound, "SoundFont: %3d Bank: %3d Preset: %3d %s\n",
|
||||
+ soundFontId, fluid_preset_get_banknum(fluidPreset),
|
||||
+ fluid_preset_get_num(fluidPreset),
|
||||
+ fluid_preset_get_name(fluidPreset));
|
||||
+#endif
|
||||
}
|
||||
}
|
||||
return result;
|
||||
--
|
||||
2.14.4
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
[Desktop Entry]
|
||||
Name=lpd8-editor
|
||||
GenericName=AKAI LPD8 editor
|
||||
GenericName[fr]=Utilitaire de contrôle pour les AKAI LPD8
|
||||
Comment=Control AKAI LPD8
|
||||
Comment[fr]=Utilitaire de contrôle pour les AKAI LPD8
|
||||
Icon=lpd8-editor
|
||||
Type=Application
|
||||
Categories=AudioVideo;Audio;
|
||||
Exec=lpd8-editor
|
||||
Terminal=false
|
||||
|
||||
@@ -1,24 +0,0 @@
|
||||
SUMMARY = "A linux editor for the Akai LPD8"
|
||||
LICENSE = "MIT"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE.md;md5=6dc9df5fa3108f437a4580b0aebca196"
|
||||
|
||||
inherit pkgconfig qmake5 gtk-icon-cache
|
||||
|
||||
DEPENDS += " \
|
||||
qtbase \
|
||||
qtsvg \
|
||||
alsa-lib \
|
||||
"
|
||||
|
||||
SRC_URI = " \
|
||||
git://github.com/charlesfleche/lpd8editor.git \
|
||||
file://lpd8-editor.desktop \
|
||||
"
|
||||
SRCREV = "5ca6f2b90889893e0633b23ffe0e4a014096656a"
|
||||
PV = "0.0.12"
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
do_install_append() {
|
||||
install -Dm 644 ${WORKDIR}/lpd8-editor.desktop ${D}/${datadir}/applications/lpd8-editor.desktop
|
||||
install -Dm 644 ${S}/lpd8editor.svg ${D}/${datadir}/icons/hicolor/scalable/apps/lpd8-editor.svg
|
||||
}
|
||||
@@ -1,69 +0,0 @@
|
||||
SUMMARY = "Collection of synthesizers and plugins"
|
||||
HOMEPAGE = "http://distrho.sourceforge.net/ports"
|
||||
LICENSE = "GPLv2 & MIT"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://ports/argotlunar/README.md;md5=81abc323be6ba481ab72864b53b3daca \
|
||||
file://ports/protoplug/license.txt;md5=56b9d913eb7c3ef00ca375ab614bf02f \
|
||||
"
|
||||
|
||||
SRC_URI = " \
|
||||
git://github.com/DISTRHO/DISTRHO-Ports-Extra.git \
|
||||
"
|
||||
# TODO:
|
||||
# argolunar: no sound (presets?)
|
||||
# pdpulp: segfault
|
||||
# protoplug asks for files
|
||||
|
||||
SRCREV = "b6f25f1feb4de49136844f20d88bec6439cdfbc5"
|
||||
S = "${WORKDIR}/git"
|
||||
PV = "0.0.0+git${SRCPV}"
|
||||
|
||||
REQUIRED_DISTRO_FEATURES = "x11 opengl"
|
||||
|
||||
inherit lv2-postinst-helper distro_features_check pack_audio_plugins
|
||||
|
||||
# distro-ports dependency for special hack script / libs
|
||||
DEPENDS += " \
|
||||
premake3-native \
|
||||
virtual/libgl \
|
||||
libx11 \
|
||||
libxext \
|
||||
libxcursor \
|
||||
freetype \
|
||||
csound \
|
||||
distrho-ports \
|
||||
"
|
||||
|
||||
do_configure() {
|
||||
# reconfigure?
|
||||
if [ ! -f ${LV2-TURTLE-BUILD-DATA} ] ; then
|
||||
# Seems this collection is not ready for public - copy 'shared' from distrho-ports
|
||||
rm -rf ${S}/scripts
|
||||
rm -rf ${S}/libs
|
||||
cp -rf ${STAGING_LIBDIR}/distrho-ports-build/* ${S}/
|
||||
# manipulate scripts to keep lv2_ttl_generator-calls in script for lv2-postinst-helper
|
||||
sed -i 's|$GEN ./$FILE|echo "lv2-ttl-generator `pwd`/$FILE" >> ${LV2-TURTLE-BUILD-DATA}|g' `find ${S}/scripts -name *.sh`
|
||||
else
|
||||
rm -f ${LV2-TURTLE-BUILD-DATA}
|
||||
fi
|
||||
|
||||
cd ${S}
|
||||
# platforms supporting sse2 can override NOOPTIMIZATIONS
|
||||
NOOPTIMIZATIONS=1 ${S}/scripts/premake-update.sh linux
|
||||
}
|
||||
|
||||
do_install() {
|
||||
install -d ${D}${libdir}
|
||||
cp -r ${S}/bin/* ${D}${libdir}
|
||||
}
|
||||
|
||||
FILES_${PN} += " \
|
||||
${libdir}/cabbage* \
|
||||
"
|
||||
|
||||
# for common (?) cabbage files
|
||||
RDEPENDS_${PN}-lv2 += "${PN}"
|
||||
RDEPENDS_${PN}-vst += "${PN}"
|
||||
|
||||
# Have not found what causes stripping - debugging of plugins is unlikely
|
||||
INSANE_SKIP_${PN} = "already-stripped"
|
||||
@@ -1,96 +0,0 @@
|
||||
SUMMARY = "Collection of synthesizers and plugins"
|
||||
HOMEPAGE = "http://distrho.sourceforge.net/ports"
|
||||
LICENSE = "GPLv2 & LGPLv3"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://doc/GPL.txt;md5=4641e94ec96f98fabc56ff9cc48be14b \
|
||||
file://doc/LGPL.txt;md5=e6a600fd5e1d9cbde2d983680233ad02 \
|
||||
"
|
||||
|
||||
SRC_URI = " \
|
||||
git://github.com/DISTRHO/DISTRHO-Ports.git \
|
||||
file://0001-disable-pitchedDelay-it-uses-double-precision-SSE2-b.patch \
|
||||
file://0002-Refine-Plugin-do-not-include-xmmintrin.h.patch \
|
||||
\
|
||||
http://linuxsynths.com/ObxdPatchesDemos/ObxdPatchesBrian-01.tar.gz;name=linuxsynths-obxd-patches1;subdir=linuxsynths-obxd-patches \
|
||||
\
|
||||
http://linuxsynths.com/VexPatchesDemos/VexPatches01.tar.gz;name=linuxsynths-vex-patches1;subdir=linuxsynths-vex-patches \
|
||||
http://linuxsynths.com/VexPatchesDemos/VexPatches02.tar.gz;name=linuxsynths-vex-patches2;subdir=linuxsynths-vex-patches \
|
||||
"
|
||||
|
||||
SRCREV = "a82fff059baafc03f7c0e8b9a99f383af7bfbd79"
|
||||
S = "${WORKDIR}/git"
|
||||
PV = "2018-04-16"
|
||||
|
||||
SRC_URI[linuxsynths-obxd-patches1.md5sum] = "32244f847a54a71ee3c25079df5c8b84"
|
||||
SRC_URI[linuxsynths-obxd-patches1.sha256sum] = "246fccadd71bb9f0606a95bf7b0aee7807fd3a14f754367425423a51c31e160e"
|
||||
|
||||
SRC_URI[linuxsynths-vex-patches1.md5sum] = "c03f8ac9eaf3fabb3c98af5cb27a5edb"
|
||||
SRC_URI[linuxsynths-vex-patches1.sha256sum] = "1a32ba4ba52d0efcd2214e52ecf9ea71885d110261c2b26e23ccdbd0960b6f60"
|
||||
SRC_URI[linuxsynths-vex-patches2.md5sum] = "a3d00bf9eb7e2381ffc56f3e79e067ec"
|
||||
SRC_URI[linuxsynths-vex-patches2.sha256sum] = "378cff261dab333c5f29246b6f3f557e0461e8bc230519da3a1a9049cbd437d5"
|
||||
|
||||
REQUIRED_DISTRO_FEATURES = "x11 opengl"
|
||||
|
||||
inherit lv2-postinst-helper distro_features_check pack_audio_plugins
|
||||
|
||||
DEPENDS += " \
|
||||
premake3-native \
|
||||
virtual/libgl \
|
||||
alsa-lib \
|
||||
libx11 \
|
||||
libxext \
|
||||
libxcursor \
|
||||
freetype \
|
||||
ladspa-sdk \
|
||||
"
|
||||
|
||||
do_configure() {
|
||||
# reconfigure?
|
||||
if [ ! -f ${LV2-TURTLE-BUILD-DATA} ] ; then
|
||||
# keep unmodified scripts
|
||||
cp -r ${S}/scripts ${WORKDIR}
|
||||
# manipulate scripts to keep lv2_ttl_generator-calls in script for lv2-postinst-helper
|
||||
sed -i 's|$GEN ./$FILE|echo "lv2-ttl-generator `pwd`/$FILE" >> ${LV2-TURTLE-BUILD-DATA}|g' `find ${S}/scripts -name *.sh`
|
||||
else
|
||||
rm -f ${LV2-TURTLE-BUILD-DATA}
|
||||
fi
|
||||
|
||||
# platforms supporting sse2 can override this (NOOPTIMIZATIONS)
|
||||
NOOPTIMIZATIONS=1 ${S}/scripts/premake-update.sh linux
|
||||
}
|
||||
|
||||
do_install() {
|
||||
install -d ${D}${libdir}
|
||||
cp -r ${S}/bin/* ${D}${libdir}
|
||||
|
||||
# presets
|
||||
install -d ${D}${libdir}/lv2
|
||||
# obxd
|
||||
for file in `find ${WORKDIR}/linuxsynths-obxd-patches -mindepth 1 -maxdepth 1` ; do
|
||||
cp -rf $file ${D}${libdir}/lv2/
|
||||
done
|
||||
# vex
|
||||
for file in `find ${WORKDIR}/linuxsynths-vex-patches -mindepth 1 -maxdepth 1` ; do
|
||||
cp -rf $file ${D}${libdir}/lv2/
|
||||
done
|
||||
|
||||
# install scripts for distro-ports-extra (and abuse libdir to ensure is is found in sysroot)
|
||||
install -d ${D}/${libdir}/distrho-ports-build
|
||||
cp -rf ${WORKDIR}/scripts ${D}${libdir}/distrho-ports-build/
|
||||
cp -rf ${S}/libs ${D}${libdir}/distrho-ports-build/
|
||||
rm -f ${D}${libdir}/distrho-ports-build/libs/lv2_ttl_generator
|
||||
}
|
||||
|
||||
PACKAGES =+ "${PN}-presets"
|
||||
RDEPENDS_${PN}-presets = "${PN}-lv2"
|
||||
|
||||
FILES_${PN}-presets = "${libdir}/lv2/*.preset.lv2"
|
||||
|
||||
# dummy pack scripts for distrho-ports-extra
|
||||
FILES_${PN}-staticdev += " \
|
||||
${libdir}/distrho-ports-build \
|
||||
"
|
||||
RDEPENDS_${PN}-staticdev = "bash perl"
|
||||
|
||||
# Have not found what causes stripping - debugging of plugins is unlikely
|
||||
INSANE_SKIP_${PN} = "already-stripped"
|
||||
@@ -1,57 +0,0 @@
|
||||
From b1b48a24ed4eda34e4dc4d649a1ef030c37694ec Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Mon, 26 Jun 2017 23:12:22 +0200
|
||||
Subject: [PATCH] disable pitchedDelay - it uses double precision SSE2 by
|
||||
default
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Our build system should setz proper flags.
|
||||
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
ports/Makefile | 4 ----
|
||||
1 file changed, 4 deletions(-)
|
||||
|
||||
diff --git a/ports/Makefile b/ports/Makefile
|
||||
index d87da4af..521d9e1e 100644
|
||||
--- a/ports/Makefile
|
||||
+++ b/ports/Makefile
|
||||
@@ -59,7 +59,6 @@ else
|
||||
$(MAKE) -C LUFSMeter/LV2-Multi
|
||||
$(MAKE) -C luftikus/LV2
|
||||
$(MAKE) -C obxd/LV2
|
||||
- $(MAKE) -C pitchedDelay/LV2
|
||||
$(MAKE) -C refine/LV2
|
||||
$(MAKE) -C stereosourceseparation/LV2
|
||||
$(MAKE) -C tal-dub-3/LV2
|
||||
@@ -98,7 +97,6 @@ vst: libs
|
||||
$(MAKE) -C LUFSMeter/VST-Multi
|
||||
$(MAKE) -C luftikus/VST
|
||||
$(MAKE) -C obxd/VST
|
||||
- $(MAKE) -C pitchedDelay/VST
|
||||
$(MAKE) -C refine/VST
|
||||
$(MAKE) -C stereosourceseparation/VST
|
||||
$(MAKE) -C tal-dub-3/VST
|
||||
@@ -136,7 +134,6 @@ clean:
|
||||
$(MAKE) clean -C LUFSMeter/LV2-Multi
|
||||
$(MAKE) clean -C luftikus/LV2
|
||||
$(MAKE) clean -C obxd/LV2
|
||||
- $(MAKE) clean -C pitchedDelay/LV2
|
||||
$(MAKE) clean -C refine/LV2
|
||||
$(MAKE) clean -C stereosourceseparation/LV2
|
||||
$(MAKE) clean -C tal-dub-3/LV2
|
||||
@@ -170,7 +167,6 @@ clean:
|
||||
$(MAKE) clean -C LUFSMeter/VST-Multi
|
||||
$(MAKE) clean -C luftikus/VST
|
||||
$(MAKE) clean -C obxd/VST
|
||||
- $(MAKE) clean -C pitchedDelay/VST
|
||||
$(MAKE) clean -C refine/VST
|
||||
$(MAKE) clean -C stereosourceseparation/VST
|
||||
$(MAKE) clean -C tal-dub-3/VST
|
||||
--
|
||||
2.14.3
|
||||
|
||||
@@ -1,27 +0,0 @@
|
||||
From 8681831fa6fc5e58a7eebfc46bb0a467c8f19dcc Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Fri, 29 Dec 2017 23:36:46 +0100
|
||||
Subject: [PATCH] Refine-Plugin: do not include "xmmintrin.h"
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
ports/refine/source/PluginProcessor.cpp | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/ports/refine/source/PluginProcessor.cpp b/ports/refine/source/PluginProcessor.cpp
|
||||
index 6c9e6182..ab50a6ad 100644
|
||||
--- a/ports/refine/source/PluginProcessor.cpp
|
||||
+++ b/ports/refine/source/PluginProcessor.cpp
|
||||
@@ -1,6 +1,5 @@
|
||||
#include "PluginProcessor.h"
|
||||
#include "PluginEditor.h"
|
||||
-#include "xmmintrin.h"
|
||||
|
||||
ReFinedAudioProcessor::ReFinedAudioProcessor()
|
||||
{
|
||||
--
|
||||
2.14.3
|
||||
|
||||
@@ -1,65 +0,0 @@
|
||||
SUMMARY = "Collection of DPF-based plugins"
|
||||
LICENSE = "ISC & GPLv2 & GPLv3 & LGPLv3 & MIT"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://LICENSE;md5=ec024abddfab2ee463c8c1ad98883d12 \
|
||||
"
|
||||
|
||||
SRC_URI = " \
|
||||
git://github.com/DISTRHO/DPF-Plugins.git \
|
||||
"
|
||||
|
||||
SRCREV = "3adff289617ed32f9d0cb679b05e430531cbf0dd"
|
||||
S = "${WORKDIR}/git"
|
||||
PV = "v1.1+git${SRCPV}"
|
||||
|
||||
REQUIRED_DISTRO_FEATURES = "x11 opengl"
|
||||
|
||||
inherit qemu-ext distro_features_check pkgconfig pack_audio_plugins
|
||||
|
||||
# TODO standalones: DEPEND jack / install / *.desktop
|
||||
DEPENDS += " \
|
||||
virtual/libgl \
|
||||
ladspa-sdk \
|
||||
lv2 \
|
||||
projectm \
|
||||
"
|
||||
|
||||
do_compile_prepend() {
|
||||
export NOOPT=true
|
||||
rm -f ${WORKDIR}/lv2_ttl_generator-data
|
||||
# manipulate scripts to keep lv2_ttl_generator-calls in script for qemu
|
||||
sed -i 's|"$GEN" "./$FILE"|echo `pwd`/$FILE >> ${WORKDIR}/lv2_ttl_generator-data|g' ${S}/dpf/utils/generate-ttl.sh
|
||||
}
|
||||
|
||||
do_compile_append() {
|
||||
# build ttl-files must be done in quemu
|
||||
for sofile in `cat ${WORKDIR}/lv2_ttl_generator-data`; do
|
||||
cd `dirname ${sofile}`
|
||||
echo "QEMU lv2_ttl_generator for ${sofile}..."
|
||||
${@qemu_run_binary_local(d, '${STAGING_DIR_TARGET}', '${S}/dpf/utils/lv2_ttl_generator')} ${sofile} || echo "ERROR: for QEMU lv2_ttl_generator for ${sofile}!"
|
||||
done
|
||||
}
|
||||
|
||||
do_install() {
|
||||
install -d ${D}${libdir}/ladspa
|
||||
for plugin in `find ${S}/bin/ -name *ladspa.so`; do
|
||||
install -m 644 $plugin ${D}${libdir}/ladspa/
|
||||
done
|
||||
|
||||
install -d ${D}${libdir}/lv2
|
||||
for plugindir in `find ${S}/bin/ -maxdepth 1 -name *.lv2`; do
|
||||
lv2dir=${D}${libdir}/lv2/`basename $plugindir`
|
||||
install -d $lv2dir
|
||||
for plugin in `find $plugindir -type f`; do
|
||||
install -m 644 $plugin $lv2dir/
|
||||
done
|
||||
done
|
||||
|
||||
install -d ${D}${libdir}/vst
|
||||
for plugin in `find ${S}/bin/ -name *vst.so`; do
|
||||
install -m 644 $plugin ${D}${libdir}/vst/
|
||||
done
|
||||
}
|
||||
|
||||
# Have not found what causes stripping - debugging of plugins is unlikely
|
||||
INSANE_SKIP_${PN} = "already-stripped"
|
||||
@@ -1,22 +0,0 @@
|
||||
SUMMARY = "lv2-ttl-generator-native"
|
||||
LICENSE = "ISC"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://LICENSE;md5=7b4d7947003bd60e5475fc61c6d014da \
|
||||
"
|
||||
|
||||
SRC_URI = "git://github.com/DISTRHO/DPF.git"
|
||||
SRCREV = "70cec6a9d0222b32abdcaec02cd7b01378c4d78b"
|
||||
S = "${WORKDIR}/git"
|
||||
PV = "0.0.0+git${SRCPV}"
|
||||
|
||||
BBCLASSEXTEND = "native"
|
||||
|
||||
do_compile() {
|
||||
cd ${S}/utils/lv2-ttl-generator
|
||||
oe_runmake
|
||||
}
|
||||
|
||||
do_install() {
|
||||
install -d ${D}${bindir}
|
||||
install -m 0755 ${S}/utils/lv2_ttl_generator ${D}${bindir}/lv2-ttl-generator
|
||||
}
|
||||
@@ -1,36 +0,0 @@
|
||||
From bc0b880e8f6c352d3ad6f6af02beb4e4c9d82bcb Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Fri, 18 Jan 2019 19:15:57 +0100
|
||||
Subject: [PATCH] CMake: Keep build system flags
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
This fixes builds for cross/sysrooted build systems which set lots of flags to
|
||||
tailor build.
|
||||
|
||||
Upstream-Status: Submitted [1]
|
||||
|
||||
[1] https://github.com/nicklan/drmr/pull/22
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 7380842..1d0e174 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 2.6)
|
||||
project (DrMr)
|
||||
|
||||
set(LV2_INSTALL_DIR lib/lv2 CACHE PATH "Specifies where the LV2 libraries should be installed")
|
||||
-set(CMAKE_C_FLAGS "-Wall")
|
||||
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
|
||||
|
||||
# Availble options
|
||||
option(USE_NKNOB "Use custom NKnob widgets for gain/pan instead of Gtk sliders" ON)
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
SUMMARY = "An LV2 sampler plugin that plays hydrogen drum kits "
|
||||
HOMEPAGE = "https://github.com/nicklan/drmr"
|
||||
LICENSE = "GPLv3"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
|
||||
|
||||
DEPENDS += " \
|
||||
libsndfile1 \
|
||||
libsamplerate0 \
|
||||
lv2 \
|
||||
expat \
|
||||
gtk+ \
|
||||
"
|
||||
|
||||
inherit cmake pkgconfig
|
||||
|
||||
SRC_URI = " \
|
||||
git://github.com/nicklan/drmr.git;branch=lv2unstable \
|
||||
file://0001-CMake-Keep-build-system-flags.patch \
|
||||
"
|
||||
SRCREV = "f244f3b09bb290dd6a4b9c14d4abaf69e9861f9d"
|
||||
S = "${WORKDIR}/git"
|
||||
PV = "0.0.0+git${SRCPV}"
|
||||
|
||||
|
||||
EXTRA_OECMAKE = " \
|
||||
-DLV2_INSTALL_DIR:PATH=${baselib}/lv2 \
|
||||
"
|
||||
|
||||
FILES_${PN} += "${libdir}/lv2"
|
||||
@@ -1,31 +0,0 @@
|
||||
From 36b834661ac4169db20c682bddfdcdf96df5a2f7 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Sat, 19 Jan 2019 00:44:13 +0100
|
||||
Subject: [PATCH] Do not inject /usr/local/include to include paths
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
waflib/extras/autowaf.py | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/waflib/extras/autowaf.py b/waflib/extras/autowaf.py
|
||||
index feaae3c6..119c95b5 100644
|
||||
--- a/waflib/extras/autowaf.py
|
||||
+++ b/waflib/extras/autowaf.py
|
||||
@@ -189,8 +189,6 @@ def check_pkg(conf, name, **args):
|
||||
if 'COMPILER_CXX' in conf.env:
|
||||
conf.env.append_value('CXXFLAGS', ['-isystem', path])
|
||||
|
||||
- conf.env.append_value('CXXFLAGS', ['-isystem', '/usr/local/include'])
|
||||
-
|
||||
def normpath(path):
|
||||
if sys.platform == 'win32':
|
||||
return os.path.normpath(path).replace('\\', '/')
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -1,21 +0,0 @@
|
||||
SUMMARY = "Ganv is a Gtk widget for interactive graph-like environments"
|
||||
DESCRIPTION = "Ganv is a Gtk widget for interactive graph-like environments, such as modular synthesizers or finite state machines"
|
||||
HOMEPAGE = "http://drobilla.net/software/ganv"
|
||||
LICENSE = "GPLv3"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
|
||||
|
||||
inherit waf
|
||||
|
||||
DEPENDS += " \
|
||||
glib-2.0-native \
|
||||
gtk+ \
|
||||
gtkmm \
|
||||
"
|
||||
|
||||
SRC_URI = " \
|
||||
git://git.drobilla.net/ganv.git;protocol=http \
|
||||
file://0001-Do-not-inject-usr-local-include-to-include-paths.patch \
|
||||
"
|
||||
SRCREV = "ccc9b971ab206fa3dc32a432a3e76db976192f58"
|
||||
S = "${WORKDIR}/git"
|
||||
PV = "1.4.2+git${SRCPV}"
|
||||
@@ -1,57 +0,0 @@
|
||||
SUMMARY = "Ingen is a modular audio processing system for Jack and LV2 based systems"
|
||||
HOMEPAGE = "http://drobilla.net/software/ingen"
|
||||
LICENSE = "AGPLv3"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788"
|
||||
|
||||
inherit waf pkgconfig gtk-icon-cache pack_audio_plugins pythonnative
|
||||
|
||||
DEPENDS += " \
|
||||
boost \
|
||||
gtkmm \
|
||||
lilv \
|
||||
suil \
|
||||
raul \
|
||||
ganv \
|
||||
portaudio-v19 \
|
||||
"
|
||||
|
||||
SRC_URI = " \
|
||||
git://github.com/drobilla/ingen.git \
|
||||
file://0001-Do-not-inject-usr-local-include-to-include-paths.patch \
|
||||
"
|
||||
SRCREV = "cc3d7ef610e5f93086eb46406cc600ee81a23e98"
|
||||
S = "${WORKDIR}/git"
|
||||
PV = "0.5.1+git${SRCPV}"
|
||||
|
||||
DOCDEPENDS = " \
|
||||
lv2-native \
|
||||
doxygen-native \
|
||||
graphviz-native \
|
||||
gdk-pixbuf-native \
|
||||
libpng-native \
|
||||
python-rdflib-native \
|
||||
python-isodate-native \
|
||||
python-six-native \
|
||||
"
|
||||
PACKAGECONFIG[doc] = "--docs,,${DOCDEPENDS}"
|
||||
|
||||
PACKAGES =+ "${PN}-standalone ${PN}-python"
|
||||
|
||||
FILES_SOLIBSDEV = "${libdir}/libingen${SOLIBSDEV}"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${libdir}/libingen_*.so \
|
||||
"
|
||||
|
||||
FILES_${PN}-standalone = " \
|
||||
${datadir}/applications \
|
||||
${datadir}/icons \
|
||||
${bindir}/ingen \
|
||||
"
|
||||
|
||||
# pyton tools are not expected to work: we do not have rdflib yet
|
||||
FILES_${PN}-python = " \
|
||||
${bindir}/ingenams \
|
||||
${bindir}/ingenish \
|
||||
${PYTHON_SITEPACKAGES_DIR} \
|
||||
"
|
||||
@@ -1,32 +0,0 @@
|
||||
SUMMARY = "Jalv is a simple but fully featured LV2 host for Jack"
|
||||
HOMEPAGE = "http://drobilla.net/software/jalv"
|
||||
LICENSE = "ISC"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=eb60cfffc455677d4f11cf7f36c12093"
|
||||
|
||||
inherit waf pkgconfig gtk-icon-cache
|
||||
|
||||
DEPENDS += " \
|
||||
qtbase-native \
|
||||
lv2 \
|
||||
lilv \
|
||||
serd \
|
||||
sord \
|
||||
sratom \
|
||||
suil \
|
||||
jack \
|
||||
gtkmm \
|
||||
gtk+3 \
|
||||
qtbase \
|
||||
"
|
||||
|
||||
SRC_URI = " \
|
||||
git://github.com/drobilla/jalv.git \
|
||||
file://0001-Do-not-inject-usr-local-include-to-include-paths.patch \
|
||||
"
|
||||
SRCREV = "8311df91cc212adf3220acfcb50ab63414fe9dd6"
|
||||
S = "${WORKDIR}/git"
|
||||
PV = "1.6.0+git${SRCPV}"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${libdir}/jack \
|
||||
"
|
||||
@@ -1,14 +0,0 @@
|
||||
SUMMARY = "C library providing simple use of LV2 plugins"
|
||||
HOMEPAGE = "http://drobilla.net/software/lilv"
|
||||
LICENSE = "MIT"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=7aceb3a3edc99517b08f5cdd557e11fb"
|
||||
|
||||
inherit waf bash-completion pkgconfig
|
||||
|
||||
DEPENDS += "lv2 serd sord sratom"
|
||||
|
||||
SRC_URI = "http://download.drobilla.net/${BPN}-${PV}.tar.bz2"
|
||||
SRC_URI[md5sum] = "fb340958a6df5a683bf25e291493dc4d"
|
||||
SRC_URI[sha256sum] = "c33b84b7a6e8e8fffb412fbcd6f69e59ca297ef3e29d829249b4ccc94f634438"
|
||||
|
||||
EXTRA_OECONF = "--configdir=${sysconfdir} --dyn-manifest"
|
||||
@@ -1,5 +0,0 @@
|
||||
require ${BPN}.inc
|
||||
|
||||
inherit native
|
||||
|
||||
|
||||
@@ -1,9 +0,0 @@
|
||||
require ${BPN}.inc
|
||||
|
||||
DEPENDS = "gtk+ libsndfile1"
|
||||
|
||||
EXTRA_OECONF = "--libdir=${libdir}"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir} \
|
||||
"
|
||||
@@ -1,13 +0,0 @@
|
||||
SUMMARY = "LV2 is an open standard for audio plugins"
|
||||
LICENSE = "ISC"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=0383f162366b0c5a316292759a55d292"
|
||||
|
||||
SRC_URI = " \
|
||||
git://github.com/drobilla/lv2.git \
|
||||
file://0001-Output-more-details-on-import-error-to-catch-missing.patch \
|
||||
"
|
||||
S = "${WORKDIR}/git"
|
||||
SRCREV = "96a6283a5fe023c59113242631f337da5f0eb278"
|
||||
PV = "1.14.0+git${SRCPV}"
|
||||
|
||||
inherit waf pkgconfig
|
||||
@@ -1,56 +0,0 @@
|
||||
From bc96caf97d32168abefde038e9353685a14fa64d Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Mon, 21 Jan 2019 22:38:05 +0100
|
||||
Subject: [PATCH] Output more details on import error to catch missing
|
||||
dependencies
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Updream-Status: Pending
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
lv2specgen/lv2docgen.py | 3 ++-
|
||||
lv2specgen/lv2specgen.py | 6 ++++--
|
||||
2 files changed, 6 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/lv2specgen/lv2docgen.py b/lv2specgen/lv2docgen.py
|
||||
index 23a239d..685f32e 100755
|
||||
--- a/lv2specgen/lv2docgen.py
|
||||
+++ b/lv2specgen/lv2docgen.py
|
||||
@@ -28,7 +28,8 @@ __contact__ = 'devel@lists.lv2plug.in'
|
||||
|
||||
try:
|
||||
import rdflib
|
||||
-except ImportError:
|
||||
+except ImportError as imperror:
|
||||
+ print(imperror)
|
||||
sys.exit('Error importing rdflib')
|
||||
|
||||
doap = rdflib.Namespace('http://usefulinc.com/ns/doap#')
|
||||
diff --git a/lv2specgen/lv2specgen.py b/lv2specgen/lv2specgen.py
|
||||
index ddd0ba5..c86157e 100755
|
||||
--- a/lv2specgen/lv2specgen.py
|
||||
+++ b/lv2specgen/lv2specgen.py
|
||||
@@ -63,13 +63,15 @@ try:
|
||||
from pygments.lexer import RegexLexer, include, bygroups
|
||||
from pygments.token import Text, Comment, Operator, Keyword, Name, String, Literal, Punctuation
|
||||
have_pygments = True
|
||||
-except ImportError:
|
||||
+except ImportError as imperror:
|
||||
+ print(imperror)
|
||||
print("Error importing pygments, syntax highlighting disabled")
|
||||
have_pygments = False
|
||||
|
||||
try:
|
||||
import rdflib
|
||||
-except ImportError:
|
||||
+except ImportError as imperror:
|
||||
+ print(imperror)
|
||||
sys.exit("Error importing rdflib")
|
||||
|
||||
# Global Variables
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -1,21 +0,0 @@
|
||||
SUMMARY = "MDA-LV2 is an LV2 port of the MDA plugins by Paul Kellett"
|
||||
HOMEPAGE = "https://drobilla.net/software/mda-lv2"
|
||||
LICENSE = "GPLv3"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
|
||||
|
||||
inherit waf distro_features_check pkgconfig
|
||||
|
||||
REQUIRED_DISTRO_FEATURES = "x11"
|
||||
|
||||
DEPENDS = "lv2"
|
||||
|
||||
SRC_URI = "http://download.drobilla.net/${BPN}-${PV}.tar.bz2"
|
||||
SRC_URI[md5sum] = "1962f48c54eafe52a3d2471cd3072aa8"
|
||||
SRC_URI[sha256sum] = "a476c31ed9f8b009ebacc32a02d06ba9584c0d0d03f03dd62b1354d10a030442"
|
||||
|
||||
EXTRA_OECONF = " \
|
||||
--lv2dir=${libdir}/lv2 \
|
||||
"
|
||||
|
||||
FILES_${PN} += "${libdir}/lv2"
|
||||
|
||||
@@ -1,21 +0,0 @@
|
||||
SUMMARY = "Patchage is a modular patch bay for audio and MIDI systems"
|
||||
DESCRIPTION = "Patchage is a modular patch bay for audio and MIDI systems based on Jack and Alsa"
|
||||
HOMEPAGE = "http://drobilla.net/software/patchage"
|
||||
LICENSE = "GPLv3"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
|
||||
|
||||
inherit waf gtk-icon-cache pkgconfig
|
||||
|
||||
DEPENDS += " \
|
||||
boost \
|
||||
jack \
|
||||
ganv \
|
||||
"
|
||||
|
||||
SRC_URI = " \
|
||||
git://git.drobilla.net/patchage.git;protocol=http \
|
||||
file://0001-Do-not-inject-usr-local-include-to-include-paths.patch \
|
||||
"
|
||||
SRCREV = "b69a38d171758c6e979d74541fc21d12b7e6abda"
|
||||
PV = "1.0.0+git${SRCPV}"
|
||||
S = "${WORKDIR}/git"
|
||||
@@ -1,12 +0,0 @@
|
||||
SUMMARY = "Raul is a utility library primarily aimed at audio/musical applications"
|
||||
DESCRIPTION = "Raul (Realtime Audio Utility Library) is a C++ utility library primarily aimed at audio/musical applications"
|
||||
HOMEPAGE = "https://drobilla.net/software/raul"
|
||||
LICENSE = "GPLv3"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
|
||||
|
||||
inherit waf
|
||||
|
||||
SRC_URI = "git://github.com/drobilla/raul.git"
|
||||
SRCREV = "5eb7a555de2291f4df8c75ce261c555552725beb"
|
||||
S = "${WORKDIR}/git"
|
||||
PV = "0.8.10+git${SRCPV}"
|
||||
@@ -1,10 +0,0 @@
|
||||
SUMMARY = "C library for RDF syntax which supports accessing Turtle and NTriples"
|
||||
HOMEPAGE = "http://drobilla.net/software/serd"
|
||||
LICENSE = "MIT"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=7aceb3a3edc99517b08f5cdd557e11fb"
|
||||
|
||||
inherit waf
|
||||
|
||||
SRC_URI = "http://download.drobilla.net/${BPN}-${PV}.tar.bz2"
|
||||
SRC_URI[md5sum] = "82243362b8b5a47dd46dac7ae893f562"
|
||||
SRC_URI[sha256sum] = "6efb0efa5c2155e6bbac941cddeeabb7ed26d70a57d24178894ff169d8f6cefb"
|
||||
@@ -1,12 +0,0 @@
|
||||
SUMMARY = "C library for storing RDF data in memory"
|
||||
HOMEPAGE = "http://drobilla.net/software/sord"
|
||||
LICENSE = "MIT"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=6b8d060e6d32fbd53684f9dc0443b6a3"
|
||||
|
||||
inherit waf pkgconfig
|
||||
|
||||
DEPENDS += "libpcre serd"
|
||||
|
||||
SRC_URI = "http://download.drobilla.net/${BPN}-${PV}.tar.bz2"
|
||||
SRC_URI[md5sum] = "eb1d1c62ffb5153d5e1f5d12a3b7279b"
|
||||
SRC_URI[sha256sum] = "09f51174dd8f3efbd95f44f0bb0b165f08e066e052d40095de59de787987da8d"
|
||||
@@ -1,12 +0,0 @@
|
||||
SUMMARY = "Sratom is a library for serialising LV2 atoms to and from RDF"
|
||||
HOMEPAGE = "http://drobilla.net/software/sratom"
|
||||
LICENSE = "MIT"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=ebc7934238811c788037421c6c548ddf"
|
||||
|
||||
inherit waf pkgconfig
|
||||
|
||||
DEPENDS += "lv2 serd sord"
|
||||
|
||||
SRC_URI = "http://download.drobilla.net/${BPN}-${PV}.tar.bz2"
|
||||
SRC_URI[md5sum] = "aa3c540032da43cf6cf68f684983d7f5"
|
||||
SRC_URI[sha256sum] = "0a514a55d6b6cb7b5d6f32d1dcb78a1e6e54537fa22fce533e4ef6adf240e853"
|
||||
@@ -1,41 +0,0 @@
|
||||
From e557abec62aa4c9c90ae50db3fe938a97e910288 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Wed, 26 Dec 2018 22:39:08 +0100
|
||||
Subject: [PATCH] Do not try to build macOS cocoa
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Seems the headers are installed for unknown reason - so make sure support is
|
||||
remains disabled.
|
||||
|
||||
Fixes:
|
||||
| arm-mortsgna-linux-gnueabi-g++: error: ../suil-0.10.2/src/cocoa_in_qt5.mm: Objective-C++ compiler not installed on this system
|
||||
|
||||
Upstream-Status: Pending [1]
|
||||
|
||||
[1] https://github.com/drobilla/suil/issues/6
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
wscript | 4 ----
|
||||
1 file changed, 4 deletions(-)
|
||||
|
||||
diff --git a/wscript b/wscript
|
||||
index 89ab039..352e569 100644
|
||||
--- a/wscript
|
||||
+++ b/wscript
|
||||
@@ -91,10 +91,6 @@ def configure(conf):
|
||||
if not conf.options.no_qt5:
|
||||
autowaf.check_pkg(conf, 'Qt5Widgets', uselib_store='QT5',
|
||||
atleast_version='5.1.0', mandatory=False)
|
||||
- if conf.check_cxx(header_name = 'QMacCocoaViewContainer',
|
||||
- uselib = 'QT5',
|
||||
- mandatory = False):
|
||||
- autowaf.define(conf, 'SUIL_WITH_COCOA_IN_QT5', 1)
|
||||
|
||||
conf.check_cc(define_name = 'HAVE_LIBDL',
|
||||
lib = 'dl',
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -1,19 +0,0 @@
|
||||
SUMMARY = "Suil is a lightweight C library for loading and wrapping LV2 plugin UIs"
|
||||
HOMEPAGE = "https://drobilla.net/software/suil"
|
||||
LICENSE = "MIT"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=83836dc85960985c534b2a881cca21c0"
|
||||
|
||||
inherit waf distro_features_check pkgconfig
|
||||
|
||||
REQUIRED_DISTRO_FEATURES = "x11"
|
||||
|
||||
DEPENDS = "gtk+ gtk+3 qtbase lv2"
|
||||
|
||||
SRC_URI = " \
|
||||
http://download.drobilla.net/${BPN}-${PV}.tar.bz2 \
|
||||
file://0001-Do-not-try-to-build-macOS-cocoa.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "e92d656b5faf999226642cdbe595976d"
|
||||
SRC_URI[sha256sum] = "9f445910627fb30f4c182b9ee00d1030324910d8a9ce7c9654c34465411da401"
|
||||
|
||||
FILES_${PN} += "${libdir}/suil-0"
|
||||
@@ -1,12 +0,0 @@
|
||||
require ${BPN}.inc
|
||||
|
||||
inherit native
|
||||
|
||||
do_compile() {
|
||||
${CXX} ${CXXFLAGS} -o ${S}/drumgizmo-rcgen ${S}/plugingui/rcgen.cc $(LDFLAGS)
|
||||
}
|
||||
|
||||
do_install() {
|
||||
install -d ${D}${bindir}
|
||||
install -m 755 ${S}/drumgizmo-rcgen ${D}${bindir}
|
||||
}
|
||||
@@ -1,40 +0,0 @@
|
||||
require ${BPN}.inc
|
||||
|
||||
inherit autotools-brokensep pkgconfig distro_features_check gtk-icon-cache
|
||||
|
||||
REQUIRED_DISTRO_FEATURE = "x11"
|
||||
|
||||
DEPENDS += " \
|
||||
${BPN}-native \
|
||||
libx11 \
|
||||
libxext \
|
||||
lv2 \
|
||||
libsmf \
|
||||
alsa-lib \
|
||||
libsndfile1 \
|
||||
zita-resampler \
|
||||
jack \
|
||||
"
|
||||
|
||||
SRC_URI += " \
|
||||
file://0001-automake-enable-subdir-objects.patch \
|
||||
file://0002-Use-native-rcgen.patch \
|
||||
file://drumgizmo.desktop \
|
||||
"
|
||||
|
||||
# --disable-editor: sigh - editor requires Qt4
|
||||
EXTRA_OECONF = " \
|
||||
--enable-lv2 \
|
||||
--without-debug \
|
||||
--disable-sse \
|
||||
"
|
||||
|
||||
do_install_append() {
|
||||
install -d ${D}${datadir}/pixmaps
|
||||
install -m 0644 ${S}/plugingui/resources/logo.png ${D}${datadir}/pixmaps/drumgizmo-logo.png
|
||||
|
||||
install -d ${D}${datadir}/applications
|
||||
install -m 0644 ${WORKDIR}/${BPN}.desktop ${D}${datadir}/applications/
|
||||
}
|
||||
|
||||
FILES_${PN} += "${libdir}/lv2"
|
||||
@@ -1,11 +0,0 @@
|
||||
SUMMARY = "DrumGizmo is drum plugin and stand-alone application"
|
||||
HOMEPAGE = "https://www.drumgizmo.org"
|
||||
LICENSE = "LGPLv3"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02"
|
||||
|
||||
SRC_URI = " \
|
||||
http://www.drumgizmo.org/releases/${BPN}-${PV}/${BPN}-${PV}.tar.gz \
|
||||
"
|
||||
SRC_URI[md5sum] = "86e4239f1eb59e8b77c7d13edc24f93b"
|
||||
SRC_URI[sha256sum] = "8f76b58785186ac02337b9248003ec1a459a801d3003619fd32fde976c307947"
|
||||
PV = "0.9.16"
|
||||
@@ -1,31 +0,0 @@
|
||||
From c9eec598b2f8b1435a2229dd5c49a9e15c6bc2ac Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Thu, 22 Feb 2018 00:13:04 +0100
|
||||
Subject: [PATCH] automake: enable subdir-objects
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
configure.ac | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 0562059..13a7ffc 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3,7 +3,7 @@
|
||||
AC_INIT([drumgizmo], m4_esyscmd([cat version.h | cut -d'"' -f2 | xargs echo -n]))dnl"
|
||||
|
||||
AC_CONFIG_SRCDIR([src/drumgizmo.cc])
|
||||
-AM_INIT_AUTOMAKE
|
||||
+AM_INIT_AUTOMAKE(subdir-objects)
|
||||
|
||||
AC_PROG_CXX
|
||||
AC_PROG_OBJC
|
||||
--
|
||||
2.14.3
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
From 766c8c4aa6f6e8743234b93a760a89480bddd7fd Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Mon, 28 May 2018 23:08:07 +0200
|
||||
Subject: [PATCH] Use native rcgen
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Inappropriate [cross specific]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
plugingui/Makefile.am | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/plugingui/Makefile.am b/plugingui/Makefile.am
|
||||
index dd36783..ca30e84 100644
|
||||
--- a/plugingui/Makefile.am
|
||||
+++ b/plugingui/Makefile.am
|
||||
@@ -28,7 +28,7 @@ RES = \
|
||||
../COPYING
|
||||
|
||||
resource_data.cc : rcgen $(RES)
|
||||
- ./rcgen $(RES) > resource_data.cc
|
||||
+ drumgizmo-rcgen $(RES) > resource_data.cc
|
||||
|
||||
libdggui_la_CPPFLAGS = \
|
||||
$(GUI_CPPFLAGS) \
|
||||
--
|
||||
2.14.3
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
[Desktop Entry]
|
||||
Name=DrumGizmo
|
||||
Comment=DrumGizmo standalone application
|
||||
Exec=drumgizmo
|
||||
Icon=drumgizmo-logo.png
|
||||
Terminal=false
|
||||
Type=Application
|
||||
Categories=Application;Audio;Midi;Music
|
||||
@@ -1,41 +0,0 @@
|
||||
SUMMARY = "DSSI plugin wrapper for VST plugins"
|
||||
HOMEPAGE = "http://breakfastquay.com/dssi-vst/"
|
||||
LICENSE = "LGPLv2"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=3523f03012c30f3347df42d632e5762c"
|
||||
|
||||
inherit pkgconfig
|
||||
|
||||
DEPENDS += " \
|
||||
dssi \
|
||||
ladspa-sdk \
|
||||
alsa-lib \
|
||||
jack \
|
||||
liblo \
|
||||
zlib \
|
||||
"
|
||||
|
||||
SRC_URI = "git://github.com/falkTX/dssi-vst.git"
|
||||
SRCREV = "9462b34563af84b452795d4924d4f18af9072529"
|
||||
S = "${WORKDIR}/git"
|
||||
PV = "0.9.2+git${SRCPV}"
|
||||
|
||||
EXTRA_OEMAKE = 'BUILD_FLAGS="-ffast-math -fPIC -Ivestige ${CXX_FLAGS}" TARGETS="dssi-vst.so dssi-vst_gui vsthost"'
|
||||
|
||||
do_install() {
|
||||
# Makefile wants to install wine binaries - so install manually
|
||||
install -d ${D}${bindir}
|
||||
install -d ${D}${libdir}/dssi/dssi-vst
|
||||
install -d ${D}${libdir}/ladspa
|
||||
install -m 755 vsthost ${D}${bindir}
|
||||
install -m 755 ${S}/dssi-vst.so ${D}${libdir}/dssi
|
||||
# install once only
|
||||
ln -s ../dssi/dssi-vst.so ${D}${libdir}/ladspa
|
||||
install -m 755 ${S}/dssi-vst_gui ${D}${libdir}/dssi/dssi-vst
|
||||
}
|
||||
|
||||
INSANE_SKIP_${PN} = "dev-so"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${libdir}/ladspa \
|
||||
${libdir}/dssi \
|
||||
"
|
||||
@@ -1,27 +0,0 @@
|
||||
SUMMARY = "DSSI is an audio plugin API for soft synths and effects"
|
||||
HOMEPAGE = "http://dssi.sourceforge.net"
|
||||
LICENSE = "LGPLv2.1"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=9f46aa1ea6e91bb339e8fa2f11d17e4d"
|
||||
|
||||
inherit autotools pkgconfig
|
||||
|
||||
DEPENDS += " \
|
||||
jack \
|
||||
libsndfile1 \
|
||||
libsamplerate0 \
|
||||
liblo \
|
||||
ladspa-sdk \
|
||||
"
|
||||
|
||||
SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz"
|
||||
SRC_URI[md5sum] = "619ab73c883b02dc37ddb37001591f8b"
|
||||
SRC_URI[sha256sum] = "f2c82b073a947c8255284249097667f9b14e660bf86186f3fcd3b3b3e087814e"
|
||||
|
||||
PACKAGES =+ "${PN}-examples"
|
||||
FILES_${PN}-examples = " \
|
||||
${bindir}/dssi_* \
|
||||
${bindir}/karplong \
|
||||
${bindir}/*trivial* \
|
||||
\
|
||||
${libdir}/dssi/*.so \
|
||||
"
|
||||
@@ -1,9 +0,0 @@
|
||||
[Desktop Entry]
|
||||
Name=GMidiMonitor Alsa
|
||||
Comment=Shows Alsa MIDI events
|
||||
Exec=gmidimonitor --alsa
|
||||
Icon=gmidimonitor
|
||||
Terminal=false
|
||||
Type=Application
|
||||
Encoding=UTF-8
|
||||
Categories=Application;AudioVideo;Audio;Multimedia;
|
||||
@@ -1,9 +0,0 @@
|
||||
[Desktop Entry]
|
||||
Name=GMidiMonitor Jack
|
||||
Comment=Shows Jack MIDI events
|
||||
Exec=gmidimonitor --jack
|
||||
Icon=gmidimonitor
|
||||
Terminal=false
|
||||
Type=Application
|
||||
Encoding=UTF-8
|
||||
Categories=Application;AudioVideo;Audio;Multimedia;
|
||||
@@ -1,32 +0,0 @@
|
||||
SUMMARY = "GTK+ application that shows MIDI events"
|
||||
HOMEPAGE = "http://home.gna.org/gmidimonitor"
|
||||
LICENSE = "GPLv2"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=f1e8b3e96c0abf4e3abb3b0f8e8eaf7f"
|
||||
|
||||
inherit waf gtk-icon-cache
|
||||
|
||||
DEPENDS += " \
|
||||
gtk+ \
|
||||
jack \
|
||||
"
|
||||
|
||||
SRC_URI = " \
|
||||
git://repo.or.cz/gmidimonitor.git \
|
||||
http://upload.wikimedia.org/wikipedia/commons/d/d5/RB_keyboard_icon.svg;name=icon \
|
||||
file://gmidimonitor-alsa.desktop \
|
||||
file://gmidimonitor-jack.desktop \
|
||||
"
|
||||
SRCREV = "a50612655903f1a56748604a5d0d27a5044a78b3"
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
SRC_URI[icon.md5sum] = "e6e764ea13f2b15a297d8cd62540edf2"
|
||||
SRC_URI[icon.sha256sum] = "16d3e31b4e9ef6e9c7ba3ab79876726f52da21631870cea95076a98913a0bd2c"
|
||||
|
||||
do_install_append() {
|
||||
install -d "${D}/${datadir}/applications"
|
||||
install ${WORKDIR}/gmidimonitor-alsa.desktop ${D}/${datadir}/applications/
|
||||
install ${WORKDIR}/gmidimonitor-jack.desktop ${D}/${datadir}/applications/
|
||||
|
||||
install -d "${D}/${datadir}/pixmaps"
|
||||
install ${WORKDIR}/RB_keyboard_icon.svg ${D}/${datadir}/pixmaps/${BPN}.svg
|
||||
}
|
||||
@@ -1,33 +0,0 @@
|
||||
From c2fca3345cfbcb0fc129ea23e8438057202604f2 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Fri, 4 Aug 2017 22:01:03 +0200
|
||||
Subject: [PATCH] do not perform link test durin cross build
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Inappropriate [cross specific]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
src/ladspa/wscript | 4 ----
|
||||
1 file changed, 4 deletions(-)
|
||||
|
||||
diff --git a/src/ladspa/wscript b/src/ladspa/wscript
|
||||
index be5f31d..2c43e2d 100644
|
||||
--- a/src/ladspa/wscript
|
||||
+++ b/src/ladspa/wscript
|
||||
@@ -10,10 +10,6 @@ def configure(conf):
|
||||
def test_loadable(self):
|
||||
def link_and_test(lib=self.link_task.outputs[0].bldpath(self.env), link=self.link_task.run):
|
||||
link()
|
||||
- try:
|
||||
- ctypes.cdll.LoadLibrary(lib)
|
||||
- except Exception as e:
|
||||
- raise RuntimeError("LADSPA load test failed: %s" % e)
|
||||
self.link_task.run = link_and_test
|
||||
|
||||
def build(bld):
|
||||
--
|
||||
2.9.4
|
||||
|
||||
@@ -1,38 +0,0 @@
|
||||
From d4e6aa415af0b3a836cbfb882a31e960e5e60246 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Fri, 15 Mar 2019 21:14:10 +0100
|
||||
Subject: [PATCH] Fix build with boost >= 1.69.0
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
| In file included from ../src/headers/engine.h:73,
|
||||
| from ../src/gx_head/engine/ladspaplugin.cpp:22:
|
||||
| ../src/headers/gx_system.h:353:40: error: expected class-name before '{' token
|
||||
| class BasicOptions: boost::noncopyable {
|
||||
| ^
|
||||
|
||||
and more
|
||||
|
||||
Upstream-Status: Backport
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
src/headers/engine.h | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/headers/engine.h b/src/headers/engine.h
|
||||
index 95f4497..2b6155e 100644
|
||||
--- a/src/headers/engine.h
|
||||
+++ b/src/headers/engine.h
|
||||
@@ -39,6 +39,7 @@
|
||||
#include <sys/stat.h>
|
||||
#include <boost/format.hpp>
|
||||
#include <boost/thread/mutex.hpp>
|
||||
+#include <boost/core/noncopyable.hpp>
|
||||
#include <glibmm/i18n.h> // NOLINT
|
||||
#include <glibmm/optioncontext.h> // NOLINT
|
||||
#include <glibmm/dispatcher.h>
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -1,57 +0,0 @@
|
||||
SUMMARY = "A virtual guitar amplifier"
|
||||
HOMEPAGE = "http://guitarix.org/"
|
||||
LICENSE = "GPLv2"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=384f45fb7968a0fe30622ce6160d3b69"
|
||||
|
||||
SRC_URI = " \
|
||||
${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BPN}2-${PV}.tar.xz \
|
||||
file://0001-do-not-perform-link-test-durin-cross-build.patch \
|
||||
file://0002-Fix-build-with-boost-1.69.0.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "78ebc879e5cd7a6e4bd43ff8aec562e1"
|
||||
SRC_URI[sha256sum] = "4ca93bd4226cd175456f37612acd28b46e13133db61c0f235917dbcc3347d5f1"
|
||||
|
||||
inherit wafold fontcache gettext
|
||||
|
||||
DEPENDS += " \
|
||||
gperf-native \
|
||||
intltool-native \
|
||||
boost \
|
||||
libeigen \
|
||||
avahi \
|
||||
bluez5 \
|
||||
gtkmm \
|
||||
jack \
|
||||
lilv \
|
||||
ladspa-sdk \
|
||||
libsndfile1 \
|
||||
lrdf \
|
||||
zita-resampler \
|
||||
zita-convolver \
|
||||
"
|
||||
|
||||
EXTRA_OECONF = " \
|
||||
--disable-sse \
|
||||
--ldflags="${LDFLAGS}" \
|
||||
--no-ldconfig \
|
||||
--no-desktop-update \
|
||||
--shared-lib \
|
||||
--lib-dev \
|
||||
--install-roboto-font \
|
||||
"
|
||||
|
||||
do_install_append() {
|
||||
# some corrections [dev-elf] - inspired by https://src.fedoraproject.org/rpms/guitarix/blob/master/f/guitarix.spec
|
||||
chmod 755 ${D}${libdir}/libgxw*.so.0.1
|
||||
rm -rf ${D}${libdir}/libgxw*.so
|
||||
ln -sf libgxwmm.so.0.1 ${D}${libdir}/libgxwmm.so
|
||||
ln -sf libgxw.so.0.1 ${D}${libdir}/libgxw.so
|
||||
}
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/fonts \
|
||||
${datadir}/gx_head \
|
||||
${datadir}/ladspa \
|
||||
${libdir}/ladspa \
|
||||
${libdir}/lv2 \
|
||||
"
|
||||
@@ -1,826 +0,0 @@
|
||||
From 50092b8f2c5c2c6de3de90d97f75b6fd475b8b5d Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Sun, 27 Jan 2019 00:37:05 +0100
|
||||
Subject: [PATCH] Adjust Makefiles for cross-compiling
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
GxAxisFace.lv2/Makefile | 36 +++---------------
|
||||
GxBoobTube.lv2/Makefile | 34 ++---------------
|
||||
GxBottleRocket.lv2/Makefile | 38 +++----------------
|
||||
.../gui/gx_bottlerocket_x11ui.c | 2 +-
|
||||
GxCreamMachine.lv2/Makefile | 34 ++---------------
|
||||
GxDOP250.lv2/Makefile | 36 +++---------------
|
||||
GxFz1b.lv2/Makefile | 38 +++----------------
|
||||
GxFz1s.lv2/Makefile | 38 +++----------------
|
||||
GxGuvnor.lv2/Makefile | 32 ++--------------
|
||||
GxHeathkit.lv2/Makefile | 36 +++---------------
|
||||
GxHotBox.lv2/Makefile | 37 +++---------------
|
||||
GxHotBox.lv2/gui/gx_hotbox_x11ui.c | 2 +-
|
||||
GxHyperion.lv2/Makefile | 32 ++--------------
|
||||
GxHyperion.lv2/gui/gx_hyperion_x11ui.c | 2 +-
|
||||
GxKnightFuzz.lv2/Makefile | 36 +++---------------
|
||||
GxLiquidDrive.lv2/Makefile | 36 +++---------------
|
||||
GxMicroAmp.lv2/Makefile | 36 +++---------------
|
||||
GxQuack.lv2/Makefile | 38 +++----------------
|
||||
GxSD1.lv2/Makefile | 38 +++----------------
|
||||
GxSD2Lead.lv2/Makefile | 36 +++---------------
|
||||
GxSVT.lv2/Makefile | 36 +++---------------
|
||||
GxSaturator.lv2/Makefile | 32 ++--------------
|
||||
GxSlowGear.lv2/Makefile | 32 ++--------------
|
||||
GxSunFace.lv2/Makefile | 36 +++---------------
|
||||
GxSuperFuzz.lv2/Makefile | 32 ++--------------
|
||||
GxSuppaToneBender.lv2/Makefile | 32 ++--------------
|
||||
GxSuppaToneBender.lv2/gui/gx_vstb_x11ui.c | 2 +-
|
||||
GxToneMachine.lv2/Makefile | 32 ++--------------
|
||||
GxTubeDistortion.lv2/Makefile | 36 +++---------------
|
||||
GxUVox720k.lv2/Makefile | 32 ++--------------
|
||||
GxVBassPreAmp.lv2/Makefile | 38 +++----------------
|
||||
GxVBassPreAmp.lv2/gui/gx_voxbass_x11ui.c | 2 +-
|
||||
GxValveCaster.lv2/Makefile | 36 +++---------------
|
||||
GxVintageFuzzMaster.lv2/Makefile | 32 ++--------------
|
||||
GxVmk2.lv2/Makefile | 34 ++---------------
|
||||
GxVoodoFuzz.lv2/Makefile | 32 ++--------------
|
||||
GxVoodoFuzz.lv2/gui/gx_voodoo_x11ui.c | 2 +-
|
||||
37 files changed, 145 insertions(+), 950 deletions(-)
|
||||
|
||||
diff --git a/GxAxisFace.lv2/Makefile b/GxAxisFace.lv2/Makefile
|
||||
index 1193800..ea27187 100644
|
||||
--- a/GxAxisFace.lv2/Makefile
|
||||
+++ b/GxAxisFace.lv2/Makefile
|
||||
@@ -38,7 +12,7 @@
|
||||
-funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
|
||||
-fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
|
||||
LDFLAGS += -I. -shared -lm
|
||||
- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
+ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
# invoke build files
|
||||
OBJECTS = plugin/$(NAME).cpp
|
||||
GUI_OBJECTS = gui/$(NAME)_x11ui.c
|
||||
@@ -75,9 +49,9 @@ endif
|
||||
#@build resource object files
|
||||
$(RES_OBJECTS) : gui/pedal.png gui/pswitch_on.png gui/pswitch_off.png
|
||||
@echo $(LGREEN)"generate resource files,"$(NONE)
|
||||
- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o
|
||||
- -@cd ./gui && ld -r -b binary pswitch_on.png -o pswitch_on.o
|
||||
- -@cd ./gui && ld -r -b binary pswitch_off.png -o pswitch_off.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pswitch_on.png -o pswitch_on.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pswitch_off.png -o pswitch_off.o
|
||||
|
||||
clean :
|
||||
@rm -f $(NAME).so
|
||||
diff --git a/GxBoobTube.lv2/Makefile b/GxBoobTube.lv2/Makefile
|
||||
index 66cf7eb..1f81fcd 100644
|
||||
--- a/GxBoobTube.lv2/Makefile
|
||||
+++ b/GxBoobTube.lv2/Makefile
|
||||
@@ -38,7 +12,7 @@
|
||||
-fPIC -DPIC -O2 -Wall -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
|
||||
-fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
|
||||
LDFLAGS += -I. -shared -lm
|
||||
- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
+ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
# invoke build files
|
||||
OBJECTS = plugin/$(NAME).cpp
|
||||
GUI_OBJECTS = gui/$(NAME)_x11ui.c
|
||||
@@ -84,8 +58,8 @@ endif
|
||||
#@build resource object files
|
||||
$(RES_OBJECTS) : gui/pedal.png gui/pswitch.png
|
||||
@$(ECHO) $(LGREEN)"generate resource files,"$(NONE)
|
||||
- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o
|
||||
- -@cd ./gui && ld -r -b binary pswitch.png -o pswitch.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pswitch.png -o pswitch.o
|
||||
|
||||
clean :
|
||||
@rm -f $(NAME).so
|
||||
diff --git a/GxBottleRocket.lv2/Makefile b/GxBottleRocket.lv2/Makefile
|
||||
index e7efdcc..b01970f 100644
|
||||
--- a/GxBottleRocket.lv2/Makefile
|
||||
+++ b/GxBottleRocket.lv2/Makefile
|
||||
@@ -38,7 +12,7 @@
|
||||
-funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
|
||||
-fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
|
||||
LDFLAGS += -I. -shared -lm
|
||||
- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
+ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
# invoke build files
|
||||
OBJECTS = plugin/$(NAME).cpp
|
||||
GUI_OBJECTS = gui/$(NAME)_x11ui.c
|
||||
@@ -75,10 +49,10 @@ endif
|
||||
#@build resource object files
|
||||
$(RES_OBJECTS) : gui/pedal.png gui/pswitch_on.png gui/pswitch_off.png gui/frame.png
|
||||
@echo $(LGREEN)"generate resource files,"$(NONE)
|
||||
- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o
|
||||
- -@cd ./gui && ld -r -b binary pswitch_on.png -o pswitch_on.o
|
||||
- -@cd ./gui && ld -r -b binary pswitch_off.png -o pswitch_off.o
|
||||
- -@cd ./gui && ld -r -b binary frame.png -o frame.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pswitch_on.png -o pswitch_on.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pswitch_off.png -o pswitch_off.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary frame.png -o frame.o
|
||||
|
||||
clean :
|
||||
@rm -f $(NAME).so
|
||||
diff --git a/GxCreamMachine.lv2/Makefile b/GxCreamMachine.lv2/Makefile
|
||||
index 53c1dc6..a8b3604 100644
|
||||
--- a/GxCreamMachine.lv2/Makefile
|
||||
+++ b/GxCreamMachine.lv2/Makefile
|
||||
@@ -36,7 +10,7 @@
|
||||
# set compile flags
|
||||
CXXFLAGS += -I. -I./dsp -I./plugin -I./dsp/zita-resampler-1.1.0 -I./dsp/zita-resampler-1.1.0/zita-resampler -fPIC -DPIC -O2 -Wall -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
|
||||
LDFLAGS += -I. -shared -lm
|
||||
- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
+ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
# invoke build files
|
||||
OBJECTS = plugin/$(NAME).cpp
|
||||
GUI_OBJECTS = gui/$(NAME)_x11ui.c
|
||||
@@ -73,8 +47,8 @@ endif
|
||||
#@build resource object files
|
||||
$(RES_OBJECTS) : gui/pedal.png gui/pswitch.png
|
||||
@echo $(LGREEN)"generate resource files,"$(NONE)
|
||||
- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o
|
||||
- -@cd ./gui && ld -r -b binary pswitch.png -o pswitch.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pswitch.png -o pswitch.o
|
||||
|
||||
clean :
|
||||
@rm -f $(NAME).so
|
||||
diff --git a/GxDOP250.lv2/Makefile b/GxDOP250.lv2/Makefile
|
||||
index ba27784..a797bb4 100644
|
||||
--- a/GxDOP250.lv2/Makefile
|
||||
+++ b/GxDOP250.lv2/Makefile
|
||||
@@ -38,7 +12,7 @@
|
||||
-funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
|
||||
-fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
|
||||
LDFLAGS += -I. -shared -lm
|
||||
- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
+ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
# invoke build files
|
||||
OBJECTS = plugin/$(NAME).cpp
|
||||
GUI_OBJECTS = gui/$(NAME)_x11ui.c
|
||||
@@ -75,9 +49,9 @@ endif
|
||||
#@build resource object files
|
||||
$(RES_OBJECTS) : gui/pedal.png gui/pswitch_on.png gui/pswitch_off.png
|
||||
@echo $(LGREEN)"generate resource files,"$(NONE)
|
||||
- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o
|
||||
- -@cd ./gui && ld -r -b binary pswitch_on.png -o pswitch_on.o
|
||||
- -@cd ./gui && ld -r -b binary pswitch_off.png -o pswitch_off.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pswitch_on.png -o pswitch_on.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pswitch_off.png -o pswitch_off.o
|
||||
|
||||
clean :
|
||||
@rm -f $(NAME).so
|
||||
diff --git a/GxFz1b.lv2/Makefile b/GxFz1b.lv2/Makefile
|
||||
index 72df63a..6311726 100644
|
||||
--- a/GxFz1b.lv2/Makefile
|
||||
+++ b/GxFz1b.lv2/Makefile
|
||||
@@ -38,7 +12,7 @@
|
||||
-fPIC -DPIC -O2 -Wall -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
|
||||
-fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
|
||||
LDFLAGS += -I. -shared -lm
|
||||
- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
+ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
# invoke build files
|
||||
OBJECTS = plugin/$(NAME).cpp
|
||||
GUI_OBJECTS = gui/$(NAME)_x11ui.c
|
||||
@@ -75,10 +49,10 @@ endif
|
||||
#@build resource object files
|
||||
$(RES_OBJECTS) : gui/pedal.png gui/pswitch_on.png gui/pswitch_off.png gui/frame.png
|
||||
@echo $(LGREEN)"generate resource files,"$(NONE)
|
||||
- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o
|
||||
- -@cd ./gui && ld -r -b binary pswitch_on.png -o pswitch_on.o
|
||||
- -@cd ./gui && ld -r -b binary pswitch_off.png -o pswitch_off.o
|
||||
- -@cd ./gui && ld -r -b binary frame.png -o frame.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pswitch_on.png -o pswitch_on.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pswitch_off.png -o pswitch_off.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary frame.png -o frame.o
|
||||
|
||||
clean :
|
||||
@rm -f $(NAME).so
|
||||
diff --git a/GxFz1s.lv2/Makefile b/GxFz1s.lv2/Makefile
|
||||
index fd5af20..1de0565 100644
|
||||
--- a/GxFz1s.lv2/Makefile
|
||||
+++ b/GxFz1s.lv2/Makefile
|
||||
@@ -38,7 +12,7 @@
|
||||
-funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
|
||||
-fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
|
||||
LDFLAGS += -I. -shared -lm
|
||||
- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
+ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
# invoke build files
|
||||
OBJECTS = plugin/$(NAME).cpp
|
||||
GUI_OBJECTS = gui/$(NAME)_x11ui.c
|
||||
@@ -75,10 +49,10 @@ endif
|
||||
#@build resource object files
|
||||
$(RES_OBJECTS) : gui/pedal.png gui/pswitch_on.png gui/pswitch_off.png gui/frame.png
|
||||
@echo $(LGREEN)"generate resource files,"$(NONE)
|
||||
- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o
|
||||
- -@cd ./gui && ld -r -b binary pswitch_on.png -o pswitch_on.o
|
||||
- -@cd ./gui && ld -r -b binary pswitch_off.png -o pswitch_off.o
|
||||
- -@cd ./gui && ld -r -b binary frame.png -o frame.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pswitch_on.png -o pswitch_on.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pswitch_off.png -o pswitch_off.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary frame.png -o frame.o
|
||||
|
||||
clean :
|
||||
@rm -f $(NAME).so
|
||||
diff --git a/GxGuvnor.lv2/Makefile b/GxGuvnor.lv2/Makefile
|
||||
index 065acf1..5dc4406 100644
|
||||
--- a/GxGuvnor.lv2/Makefile
|
||||
+++ b/GxGuvnor.lv2/Makefile
|
||||
@@ -38,7 +12,7 @@
|
||||
-funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
|
||||
-fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
|
||||
LDFLAGS += -I. -shared -lm
|
||||
- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
+ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
# invoke build files
|
||||
OBJECTS = plugin/$(NAME).cpp
|
||||
GUI_OBJECTS = gui/$(NAME)_x11ui.c
|
||||
@@ -75,7 +49,7 @@ endif
|
||||
#@build resource object files
|
||||
$(RES_OBJECTS) : gui/pedal.png
|
||||
@echo $(LGREEN)"generate resource files,"$(NONE)
|
||||
- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
|
||||
|
||||
clean :
|
||||
@rm -f $(NAME).so
|
||||
diff --git a/GxHeathkit.lv2/Makefile b/GxHeathkit.lv2/Makefile
|
||||
index 1669295..ae5ba5d 100644
|
||||
--- a/GxHeathkit.lv2/Makefile
|
||||
+++ b/GxHeathkit.lv2/Makefile
|
||||
@@ -38,7 +12,7 @@
|
||||
-funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
|
||||
-fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
|
||||
LDFLAGS += -I. -shared -lm
|
||||
- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
+ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
# invoke build files
|
||||
OBJECTS = plugin/$(NAME).cpp
|
||||
GUI_OBJECTS = gui/$(NAME)_x11ui.c
|
||||
@@ -75,9 +49,9 @@ endif
|
||||
#@build resource object files
|
||||
$(RES_OBJECTS) : gui/pedal.png gui/pswitch_on.png gui/pswitch_off.png
|
||||
@echo $(LGREEN)"generate resource files,"$(NONE)
|
||||
- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o
|
||||
- -@cd ./gui && ld -r -b binary pswitch_on.png -o pswitch_on.o
|
||||
- -@cd ./gui && ld -r -b binary pswitch_off.png -o pswitch_off.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pswitch_on.png -o pswitch_on.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pswitch_off.png -o pswitch_off.o
|
||||
|
||||
clean :
|
||||
@rm -f $(NAME).so
|
||||
diff --git a/GxHotBox.lv2/Makefile b/GxHotBox.lv2/Makefile
|
||||
index 8df2752..16d805f 100644
|
||||
--- a/GxHotBox.lv2/Makefile
|
||||
+++ b/GxHotBox.lv2/Makefile
|
||||
@@ -38,7 +13,7 @@
|
||||
-funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
|
||||
-fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
|
||||
LDFLAGS += -I. -shared -lm
|
||||
- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
+ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
# invoke build files
|
||||
OBJECTS = plugin/$(NAME).cpp
|
||||
GUI_OBJECTS = gui/$(NAME)_x11ui.c
|
||||
@@ -75,10 +50,10 @@ endif
|
||||
#@build resource object files
|
||||
$(RES_OBJECTS) : gui/pedal.png gui/pswitch_on.png gui/pswitch_off.png gui/frame.png
|
||||
@echo $(LGREEN)"generate resource files,"$(NONE)
|
||||
- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o
|
||||
- -@cd ./gui && ld -r -b binary pswitch_on.png -o pswitch_on.o
|
||||
- -@cd ./gui && ld -r -b binary pswitch_off.png -o pswitch_off.o
|
||||
- -@cd ./gui && ld -r -b binary frame.png -o frame.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pswitch_on.png -o pswitch_on.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pswitch_off.png -o pswitch_off.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary frame.png -o frame.o
|
||||
|
||||
clean :
|
||||
@rm -f $(NAME).so
|
||||
diff --git a/GxHyperion.lv2/Makefile b/GxHyperion.lv2/Makefile
|
||||
index 86f8b88..2bc01e0 100644
|
||||
--- a/GxHyperion.lv2/Makefile
|
||||
+++ b/GxHyperion.lv2/Makefile
|
||||
@@ -38,7 +12,7 @@
|
||||
-funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
|
||||
-fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
|
||||
LDFLAGS += -I. -shared -lm
|
||||
- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
+ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
# invoke build files
|
||||
OBJECTS = plugin/$(NAME).cpp
|
||||
GUI_OBJECTS = gui/$(NAME)_x11ui.c
|
||||
@@ -75,7 +49,7 @@ endif
|
||||
#@build resource object files
|
||||
$(RES_OBJECTS) : gui/pedal.png
|
||||
@echo $(LGREEN)"generate resource files,"$(NONE)
|
||||
- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
|
||||
|
||||
clean :
|
||||
@rm -f $(NAME).so
|
||||
diff --git a/GxKnightFuzz.lv2/Makefile b/GxKnightFuzz.lv2/Makefile
|
||||
index 16d13b8..02a9713 100644
|
||||
--- a/GxKnightFuzz.lv2/Makefile
|
||||
+++ b/GxKnightFuzz.lv2/Makefile
|
||||
@@ -38,7 +12,7 @@
|
||||
-funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
|
||||
-fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
|
||||
LDFLAGS += -I. -shared -lm
|
||||
- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
+ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
# invoke build files
|
||||
OBJECTS = plugin/$(NAME).cpp
|
||||
GUI_OBJECTS = gui/$(NAME)_x11ui.c
|
||||
@@ -75,9 +49,9 @@ endif
|
||||
#@build resource object files
|
||||
$(RES_OBJECTS) : gui/pedal.png gui/pswitch_on.png gui/pswitch_off.png
|
||||
@echo $(LGREEN)"generate resource files,"$(NONE)
|
||||
- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o
|
||||
- -@cd ./gui && ld -r -b binary pswitch_on.png -o pswitch_on.o
|
||||
- -@cd ./gui && ld -r -b binary pswitch_off.png -o pswitch_off.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pswitch_on.png -o pswitch_on.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pswitch_off.png -o pswitch_off.o
|
||||
|
||||
clean :
|
||||
@rm -f $(NAME).so
|
||||
diff --git a/GxLiquidDrive.lv2/Makefile b/GxLiquidDrive.lv2/Makefile
|
||||
index 92796e6..537923d 100644
|
||||
--- a/GxLiquidDrive.lv2/Makefile
|
||||
+++ b/GxLiquidDrive.lv2/Makefile
|
||||
@@ -38,7 +12,7 @@
|
||||
-funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
|
||||
-fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
|
||||
LDFLAGS += -I. -shared -lm
|
||||
- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
+ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
# invoke build files
|
||||
OBJECTS = plugin/$(NAME).cpp
|
||||
GUI_OBJECTS = gui/$(NAME)_x11ui.c
|
||||
@@ -75,9 +49,9 @@ endif
|
||||
#@build resource object files
|
||||
$(RES_OBJECTS) : gui/pedal.png gui/pswitch_on.png gui/pswitch_off.png
|
||||
@echo $(LGREEN)"generate resource files,"$(NONE)
|
||||
- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o
|
||||
- -@cd ./gui && ld -r -b binary pswitch_on.png -o pswitch_on.o
|
||||
- -@cd ./gui && ld -r -b binary pswitch_off.png -o pswitch_off.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pswitch_on.png -o pswitch_on.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pswitch_off.png -o pswitch_off.o
|
||||
|
||||
clean :
|
||||
@rm -f $(NAME).so
|
||||
diff --git a/GxMicroAmp.lv2/Makefile b/GxMicroAmp.lv2/Makefile
|
||||
index 60818f0..556ade0 100644
|
||||
--- a/GxMicroAmp.lv2/Makefile
|
||||
+++ b/GxMicroAmp.lv2/Makefile
|
||||
@@ -38,7 +12,7 @@
|
||||
-funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
|
||||
-fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
|
||||
LDFLAGS += -I. -shared -lm
|
||||
- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
+ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
# invoke build files
|
||||
OBJECTS = plugin/$(NAME).cpp
|
||||
GUI_OBJECTS = gui/$(NAME)_x11ui.c
|
||||
@@ -75,9 +49,9 @@ endif
|
||||
#@build resource object files
|
||||
$(RES_OBJECTS) : gui/pedal.png gui/pswitch_on.png gui/pswitch_off.png
|
||||
@echo $(LGREEN)"generate resource files,"$(NONE)
|
||||
- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o
|
||||
- -@cd ./gui && ld -r -b binary pswitch_on.png -o pswitch_on.o
|
||||
- -@cd ./gui && ld -r -b binary pswitch_off.png -o pswitch_off.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pswitch_on.png -o pswitch_on.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pswitch_off.png -o pswitch_off.o
|
||||
|
||||
clean :
|
||||
@rm -f $(NAME).so
|
||||
diff --git a/GxQuack.lv2/Makefile b/GxQuack.lv2/Makefile
|
||||
index 2aed99f..a39c911 100644
|
||||
--- a/GxQuack.lv2/Makefile
|
||||
+++ b/GxQuack.lv2/Makefile
|
||||
@@ -38,7 +12,7 @@
|
||||
-funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
|
||||
-fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
|
||||
LDFLAGS += -I. -shared -lm
|
||||
- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
+ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
# invoke build files
|
||||
OBJECTS = plugin/$(NAME).cpp
|
||||
GUI_OBJECTS = gui/$(NAME)_x11ui.c
|
||||
@@ -70,10 +44,10 @@ endif
|
||||
#@build resource object files
|
||||
$(RES_OBJECTS) : gui/pedal.png gui/pswitch_on.png gui/pswitch_off.png gui/frame.png
|
||||
@echo $(LGREEN)"generate resource files,"$(NONE)
|
||||
- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o
|
||||
- -@cd ./gui && ld -r -b binary pswitch_on.png -o pswitch_on.o
|
||||
- -@cd ./gui && ld -r -b binary pswitch_off.png -o pswitch_off.o
|
||||
- -@cd ./gui && ld -r -b binary frame.png -o frame.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pswitch_on.png -o pswitch_on.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pswitch_off.png -o pswitch_off.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary frame.png -o frame.o
|
||||
|
||||
clean :
|
||||
@rm -f $(NAME).so
|
||||
diff --git a/GxSD1.lv2/Makefile b/GxSD1.lv2/Makefile
|
||||
index 3b98ee0..4cbfc6a 100644
|
||||
--- a/GxSD1.lv2/Makefile
|
||||
+++ b/GxSD1.lv2/Makefile
|
||||
@@ -38,7 +12,7 @@
|
||||
-funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
|
||||
-fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
|
||||
LDFLAGS += -I. -shared -lm
|
||||
- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
+ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
# invoke build files
|
||||
OBJECTS = plugin/$(NAME).cpp
|
||||
GUI_OBJECTS = gui/$(NAME)_x11ui.c
|
||||
@@ -75,10 +49,10 @@ endif
|
||||
#@build resource object files
|
||||
$(RES_OBJECTS) : gui/pedal.png gui/pswitch_on.png gui/pswitch_off.png gui/frame.png
|
||||
@echo $(LGREEN)"generate resource files,"$(NONE)
|
||||
- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o
|
||||
- -@cd ./gui && ld -r -b binary pswitch_on.png -o pswitch_on.o
|
||||
- -@cd ./gui && ld -r -b binary pswitch_off.png -o pswitch_off.o
|
||||
- -@cd ./gui && ld -r -b binary frame.png -o frame.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pswitch_on.png -o pswitch_on.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pswitch_off.png -o pswitch_off.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary frame.png -o frame.o
|
||||
|
||||
clean :
|
||||
@rm -f $(NAME).so
|
||||
diff --git a/GxSD2Lead.lv2/Makefile b/GxSD2Lead.lv2/Makefile
|
||||
index 7759f91..0f7bb91 100644
|
||||
--- a/GxSD2Lead.lv2/Makefile
|
||||
+++ b/GxSD2Lead.lv2/Makefile
|
||||
@@ -38,7 +12,7 @@
|
||||
-funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
|
||||
-fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
|
||||
LDFLAGS += -I. -shared -lm
|
||||
- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
+ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
# invoke build files
|
||||
OBJECTS = plugin/$(NAME).cpp
|
||||
GUI_OBJECTS = gui/$(NAME)_x11ui.c
|
||||
@@ -75,9 +49,9 @@ endif
|
||||
#@build resource object files
|
||||
$(RES_OBJECTS) : gui/pedal.png gui/pswitch_on.png gui/pswitch_off.png
|
||||
@echo $(LGREEN)"generate resource files,"$(NONE)
|
||||
- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o
|
||||
- -@cd ./gui && ld -r -b binary pswitch_on.png -o pswitch_on.o
|
||||
- -@cd ./gui && ld -r -b binary pswitch_off.png -o pswitch_off.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pswitch_on.png -o pswitch_on.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pswitch_off.png -o pswitch_off.o
|
||||
|
||||
clean :
|
||||
@rm -f $(NAME).so
|
||||
diff --git a/GxSVT.lv2/Makefile b/GxSVT.lv2/Makefile
|
||||
index 74a96a8..a8bc7f6 100644
|
||||
--- a/GxSVT.lv2/Makefile
|
||||
+++ b/GxSVT.lv2/Makefile
|
||||
@@ -38,7 +12,7 @@
|
||||
-fPIC -DPIC -O2 -Wall -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
|
||||
-fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
|
||||
LDFLAGS += -I. -shared -lm
|
||||
- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
+ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
# invoke build files
|
||||
OBJECTS = plugin/$(NAME).cpp
|
||||
GUI_OBJECTS = gui/$(NAME)_x11ui.c
|
||||
@@ -75,9 +49,9 @@ endif
|
||||
#@build resource object files
|
||||
$(RES_OBJECTS) : gui/pedal.png gui/pswitch_on.png gui/pswitch_off.png
|
||||
@echo $(LGREEN)"generate resource files,"$(NONE)
|
||||
- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o
|
||||
- -@cd ./gui && ld -r -b binary pswitch_on.png -o pswitch_on.o
|
||||
- -@cd ./gui && ld -r -b binary pswitch_off.png -o pswitch_off.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pswitch_on.png -o pswitch_on.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pswitch_off.png -o pswitch_off.o
|
||||
|
||||
clean :
|
||||
@rm -f $(NAME).so
|
||||
diff --git a/GxSaturator.lv2/Makefile b/GxSaturator.lv2/Makefile
|
||||
index 62aea02..5c71786 100644
|
||||
--- a/GxSaturator.lv2/Makefile
|
||||
+++ b/GxSaturator.lv2/Makefile
|
||||
@@ -38,7 +12,7 @@
|
||||
-funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
|
||||
-fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
|
||||
LDFLAGS += -I. -shared -lm
|
||||
- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
+ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
# invoke build files
|
||||
OBJECTS = plugin/$(NAME).cpp
|
||||
GUI_OBJECTS = gui/$(NAME)_x11ui.c
|
||||
@@ -75,7 +49,7 @@ endif
|
||||
#@build resource object files
|
||||
$(RES_OBJECTS) : gui/pedal.png
|
||||
@echo $(LGREEN)"generate resource files,"$(NONE)
|
||||
- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
|
||||
|
||||
clean :
|
||||
@rm -f $(NAME).so
|
||||
diff --git a/GxSlowGear.lv2/Makefile b/GxSlowGear.lv2/Makefile
|
||||
index 6b236a1..ad72d70 100644
|
||||
--- a/GxSlowGear.lv2/Makefile
|
||||
+++ b/GxSlowGear.lv2/Makefile
|
||||
@@ -38,7 +12,7 @@
|
||||
-funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
|
||||
-fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
|
||||
LDFLAGS += -I. -shared -lm
|
||||
- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
+ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
# invoke build files
|
||||
OBJECTS = plugin/$(NAME).cpp
|
||||
GUI_OBJECTS = gui/$(NAME)_x11ui.c
|
||||
@@ -75,7 +49,7 @@ endif
|
||||
#@build resource object files
|
||||
$(RES_OBJECTS) : gui/pedal.png
|
||||
@echo $(LGREEN)"generate resource files,"$(NONE)
|
||||
- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
|
||||
|
||||
clean :
|
||||
@rm -f $(NAME).so
|
||||
diff --git a/GxSunFace.lv2/Makefile b/GxSunFace.lv2/Makefile
|
||||
index 428539b..ded15f6 100644
|
||||
--- a/GxSunFace.lv2/Makefile
|
||||
+++ b/GxSunFace.lv2/Makefile
|
||||
@@ -38,7 +12,7 @@
|
||||
-funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
|
||||
-fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
|
||||
LDFLAGS += -I. -shared -lm
|
||||
- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
+ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
# invoke build files
|
||||
OBJECTS = plugin/$(NAME).cpp
|
||||
GUI_OBJECTS = gui/$(NAME)_x11ui.c
|
||||
@@ -75,9 +49,9 @@ endif
|
||||
#@build resource object files
|
||||
$(RES_OBJECTS) : gui/pedal.png gui/pswitch_on.png gui/pswitch_off.png
|
||||
@echo $(LGREEN)"generate resource files,"$(NONE)
|
||||
- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o
|
||||
- -@cd ./gui && ld -r -b binary pswitch_on.png -o pswitch_on.o
|
||||
- -@cd ./gui && ld -r -b binary pswitch_off.png -o pswitch_off.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pswitch_on.png -o pswitch_on.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pswitch_off.png -o pswitch_off.o
|
||||
|
||||
clean :
|
||||
@rm -f $(NAME).so
|
||||
diff --git a/GxSuperFuzz.lv2/Makefile b/GxSuperFuzz.lv2/Makefile
|
||||
index c3fe9f2..b102d7c 100644
|
||||
--- a/GxSuperFuzz.lv2/Makefile
|
||||
+++ b/GxSuperFuzz.lv2/Makefile
|
||||
@@ -38,7 +12,7 @@
|
||||
-fPIC -DPIC -O2 -Wall -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
|
||||
-fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
|
||||
LDFLAGS += -I. -shared -lm
|
||||
- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
+ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
# invoke build files
|
||||
OBJECTS = plugin/$(NAME).cpp
|
||||
GUI_OBJECTS = gui/$(NAME)_x11ui.c
|
||||
@@ -75,7 +49,7 @@ endif
|
||||
#@build resource object files
|
||||
$(RES_OBJECTS) : gui/pedal.png
|
||||
@echo $(LGREEN)"generate resource files,"$(NONE)
|
||||
- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
|
||||
|
||||
clean :
|
||||
@rm -f $(NAME).so
|
||||
diff --git a/GxSuppaToneBender.lv2/Makefile b/GxSuppaToneBender.lv2/Makefile
|
||||
index ab640c2..e79fc1c 100644
|
||||
--- a/GxSuppaToneBender.lv2/Makefile
|
||||
+++ b/GxSuppaToneBender.lv2/Makefile
|
||||
@@ -38,7 +12,7 @@
|
||||
-fPIC -DPIC -O2 -Wall -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
|
||||
-fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
|
||||
LDFLAGS += -I. -shared -lm
|
||||
- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
+ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
# invoke build files
|
||||
OBJECTS = plugin/$(NAME).cpp
|
||||
GUI_OBJECTS = gui/$(NAME)_x11ui.c
|
||||
@@ -75,7 +49,7 @@ endif
|
||||
#@build resource object files
|
||||
$(RES_OBJECTS) : gui/pedal.png
|
||||
@echo $(LGREEN)"generate resource files,"$(NONE)
|
||||
- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
|
||||
|
||||
clean :
|
||||
@rm -f $(NAME).so
|
||||
diff --git a/GxToneMachine.lv2/Makefile b/GxToneMachine.lv2/Makefile
|
||||
index 92b7825..43f3668 100644
|
||||
--- a/GxToneMachine.lv2/Makefile
|
||||
+++ b/GxToneMachine.lv2/Makefile
|
||||
@@ -38,7 +12,7 @@
|
||||
-funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
|
||||
-fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
|
||||
LDFLAGS += -I. -shared -lm
|
||||
- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
+ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
# invoke build files
|
||||
OBJECTS = plugin/$(NAME).cpp
|
||||
GUI_OBJECTS = gui/$(NAME)_x11ui.c
|
||||
@@ -75,7 +49,7 @@ endif
|
||||
#@build resource object files
|
||||
$(RES_OBJECTS) : gui/pedal.png
|
||||
@echo $(LGREEN)"generate resource files,"$(NONE)
|
||||
- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
|
||||
|
||||
clean :
|
||||
@rm -f $(NAME).so
|
||||
diff --git a/GxTubeDistortion.lv2/Makefile b/GxTubeDistortion.lv2/Makefile
|
||||
index dfb58e5..1839ed7 100644
|
||||
--- a/GxTubeDistortion.lv2/Makefile
|
||||
+++ b/GxTubeDistortion.lv2/Makefile
|
||||
@@ -38,7 +12,7 @@
|
||||
-fPIC -DPIC -O2 -Wall -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
|
||||
-fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
|
||||
LDFLAGS += -I. -shared -lm
|
||||
- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
+ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
# invoke build files
|
||||
OBJECTS = plugin/$(NAME).cpp
|
||||
GUI_OBJECTS = gui/$(NAME)_x11ui.c
|
||||
@@ -75,9 +49,9 @@ endif
|
||||
#@build resource object files
|
||||
$(RES_OBJECTS) : gui/pedal.png gui/pswitch_on.png gui/pswitch_off.png
|
||||
@echo $(LGREEN)"generate resource files,"$(NONE)
|
||||
- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o
|
||||
- -@cd ./gui && ld -r -b binary pswitch_on.png -o pswitch_on.o
|
||||
- -@cd ./gui && ld -r -b binary pswitch_off.png -o pswitch_off.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pswitch_on.png -o pswitch_on.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pswitch_off.png -o pswitch_off.o
|
||||
|
||||
clean :
|
||||
@rm -f $(NAME).so
|
||||
diff --git a/GxUVox720k.lv2/Makefile b/GxUVox720k.lv2/Makefile
|
||||
index 3933ea2..705dd6c 100644
|
||||
--- a/GxUVox720k.lv2/Makefile
|
||||
+++ b/GxUVox720k.lv2/Makefile
|
||||
@@ -38,7 +12,7 @@
|
||||
-funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
|
||||
-fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
|
||||
LDFLAGS += -I. -shared -lm
|
||||
- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
+ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
# invoke build files
|
||||
OBJECTS = plugin/$(NAME).cpp
|
||||
GUI_OBJECTS = gui/$(NAME)_x11ui.c
|
||||
@@ -75,7 +49,7 @@ endif
|
||||
#@build resource object files
|
||||
$(RES_OBJECTS) : gui/pedal.png
|
||||
@echo $(LGREEN)"generate resource files,"$(NONE)
|
||||
- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
|
||||
|
||||
clean :
|
||||
@rm -f $(NAME).so
|
||||
diff --git a/GxVBassPreAmp.lv2/Makefile b/GxVBassPreAmp.lv2/Makefile
|
||||
index bc60ce1..fd6a707 100644
|
||||
--- a/GxVBassPreAmp.lv2/Makefile
|
||||
+++ b/GxVBassPreAmp.lv2/Makefile
|
||||
@@ -38,7 +12,7 @@
|
||||
-fPIC -DPIC -O2 -Wall -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
|
||||
-fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
|
||||
LDFLAGS += -I. -shared -lm
|
||||
- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
+ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
# invoke build files
|
||||
OBJECTS = plugin/$(NAME).cpp
|
||||
GUI_OBJECTS = gui/$(NAME)_x11ui.c
|
||||
@@ -75,10 +49,10 @@ endif
|
||||
#@build resource object files
|
||||
$(RES_OBJECTS) : gui/pedal.png gui/pswitch_on.png gui/pswitch_off.png gui/frame.png
|
||||
@echo $(LGREEN)"generate resource files,"$(NONE)
|
||||
- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o
|
||||
- -@cd ./gui && ld -r -b binary pswitch_on.png -o pswitch_on.o
|
||||
- -@cd ./gui && ld -r -b binary pswitch_off.png -o pswitch_off.o
|
||||
- -@cd ./gui && ld -r -b binary frame.png -o frame.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pswitch_on.png -o pswitch_on.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pswitch_off.png -o pswitch_off.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary frame.png -o frame.o
|
||||
|
||||
clean :
|
||||
@rm -f $(NAME).so
|
||||
diff --git a/GxValveCaster.lv2/Makefile b/GxValveCaster.lv2/Makefile
|
||||
index 54c6df5..bbfc7e9 100644
|
||||
--- a/GxValveCaster.lv2/Makefile
|
||||
+++ b/GxValveCaster.lv2/Makefile
|
||||
@@ -39,7 +13,7 @@
|
||||
-fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
|
||||
DEBUGFLAGS += -I. -I./dsp -I./plugin -fPIC -DPIC -O2 -Wall -D DEBUG
|
||||
LDFLAGS += -I. -shared -lm
|
||||
- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
+ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
# invoke build files
|
||||
OBJECTS = plugin/$(NAME).cpp
|
||||
GUI_OBJECTS = gui/$(NAME)_x11ui.c
|
||||
@@ -85,8 +59,8 @@ endif
|
||||
#@build resource object files
|
||||
$(RES_OBJECTS) : gui/pedal.png gui/pswitch.png
|
||||
@$(ECHO) $(LGREEN)"generate resource files,"$(NONE)
|
||||
- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o
|
||||
- -@cd ./gui && ld -r -b binary pswitch.png -o pswitch.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pswitch.png -o pswitch.o
|
||||
|
||||
clean :
|
||||
@rm -f $(NAME).so
|
||||
diff --git a/GxVintageFuzzMaster.lv2/Makefile b/GxVintageFuzzMaster.lv2/Makefile
|
||||
index 03ff63e..0f96ffd 100644
|
||||
--- a/GxVintageFuzzMaster.lv2/Makefile
|
||||
+++ b/GxVintageFuzzMaster.lv2/Makefile
|
||||
@@ -38,7 +12,7 @@
|
||||
-funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
|
||||
-fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
|
||||
LDFLAGS += -I. -shared -lm
|
||||
- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
+ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
# invoke build files
|
||||
OBJECTS = plugin/$(NAME).cpp
|
||||
GUI_OBJECTS = gui/$(NAME)_x11ui.c
|
||||
@@ -75,7 +49,7 @@ endif
|
||||
#@build resource object files
|
||||
$(RES_OBJECTS) : gui/pedal.png
|
||||
@echo $(LGREEN)"generate resource files,"$(NONE)
|
||||
- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
|
||||
|
||||
clean :
|
||||
@rm -f $(NAME).so
|
||||
diff --git a/GxVmk2.lv2/Makefile b/GxVmk2.lv2/Makefile
|
||||
index 53c6dc6..74c9fa2 100644
|
||||
--- a/GxVmk2.lv2/Makefile
|
||||
+++ b/GxVmk2.lv2/Makefile
|
||||
@@ -38,7 +12,7 @@
|
||||
-fPIC -DPIC -O2 -Wall -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
|
||||
-fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
|
||||
LDFLAGS += -I. -shared -lm
|
||||
- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
+ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
# invoke build files
|
||||
OBJECTS = plugin/$(NAME).cpp
|
||||
GUI_OBJECTS = gui/$(NAME)_x11ui.c
|
||||
@@ -75,8 +49,8 @@ endif
|
||||
#@build resource object files
|
||||
$(RES_OBJECTS) : gui/pedal.png gui/frame.png
|
||||
@echo $(LGREEN)"generate resource files,"$(NONE)
|
||||
- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o
|
||||
- -@cd ./gui && ld -r -b binary frame.png -o frame.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary frame.png -o frame.o
|
||||
|
||||
clean :
|
||||
@rm -f $(NAME).so
|
||||
diff --git a/GxVoodoFuzz.lv2/Makefile b/GxVoodoFuzz.lv2/Makefile
|
||||
index 2f00294..fdd609a 100644
|
||||
--- a/GxVoodoFuzz.lv2/Makefile
|
||||
+++ b/GxVoodoFuzz.lv2/Makefile
|
||||
@@ -38,7 +12,7 @@
|
||||
-funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
|
||||
-fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
|
||||
LDFLAGS += -I. -shared -lm
|
||||
- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
+ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
|
||||
# invoke build files
|
||||
OBJECTS = plugin/$(NAME).cpp
|
||||
GUI_OBJECTS = gui/$(NAME)_x11ui.c
|
||||
@@ -75,7 +49,7 @@ endif
|
||||
#@build resource object files
|
||||
$(RES_OBJECTS) : gui/pedal.png
|
||||
@echo $(LGREEN)"generate resource files,"$(NONE)
|
||||
- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o
|
||||
+ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
|
||||
|
||||
clean :
|
||||
@rm -f $(NAME).so
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
SUMMARY = "A set of extra lv2 plugins from the guitarix project"
|
||||
HOMEPAGE = "https://github.com/brummer10/GxPlugins.lv2"
|
||||
LICENSE = "GPLv3"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d"
|
||||
|
||||
SRC_URI = " \
|
||||
gitsm://github.com/brummer10/GxPlugins.lv2.git \
|
||||
file://0001-Adjust-Makefiles-for-cross-compiling.patch \
|
||||
"
|
||||
SRCREV = "63f19485984c002caddec734a9ee94faad2acb55"
|
||||
S = "${WORKDIR}/git"
|
||||
PV = "0.6"
|
||||
|
||||
inherit pkgconfig
|
||||
|
||||
DEPENDS += " \
|
||||
cairo \
|
||||
virtual/libx11 \
|
||||
lv2 \
|
||||
"
|
||||
|
||||
do_compile() {
|
||||
oe_runmake SSE_CFLAGS= STRIP=echo
|
||||
}
|
||||
|
||||
do_install() {
|
||||
oe_runmake DESTDIR=${D} PREFIX=${prefix} INSTALL_DIR=${libdir}/lv2 install
|
||||
}
|
||||
|
||||
|
||||
FILES_${PN} += "${libdir}/lv2"
|
||||
@@ -1,30 +0,0 @@
|
||||
From 2999f6b8525cac503122d95197f7a3ae314db4e4 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Sun, 29 Jan 2017 21:13:45 +0100
|
||||
Subject: [PATCH 3/3] do not create ttl files - it won't work fo cross
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
builds/linux/LV2/Makefile | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/builds/linux/LV2/Makefile b/builds/linux/LV2/Makefile
|
||||
index 4a9995f..8ec7d44 100644
|
||||
--- a/builds/linux/LV2/Makefile
|
||||
+++ b/builds/linux/LV2/Makefile
|
||||
@@ -11,10 +11,8 @@ ttl_generator:
|
||||
$(MAKE) -f Makefile.ttl_generator CONFIG=$(CONFIG)
|
||||
|
||||
lv2: ttl_generator binary
|
||||
- ./lv2_ttl_generator build/helm.so
|
||||
mkdir -p helm.lv2
|
||||
cp build/helm.so helm.lv2
|
||||
- mv *.ttl helm.lv2
|
||||
|
||||
clean:
|
||||
$(MAKE) clean CONFIG=$(CONFIG) -f Makefile.binary
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user