From 58ef0eb06110c7a6720b02366c924fe1d3671382 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Mon, 9 Jan 2017 00:43:49 +0100 Subject: [PATCH] calf: initial add 0.0.60+ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- .../calf-studio-gear/calf-native.bb | 9 ++ .../calf-studio-gear/calf.bb | 27 ++++ .../calf-studio-gear/calf.inc | 16 ++ ...ion-that-calfmakerdf-is-build-and-in.patch | 143 ++++++++++++++++++ ...0002-don-not-build-cross-calfmakerdf.patch | 30 ++++ 5 files changed, 225 insertions(+) create mode 100644 recipes-misc/recipes-multimedia/calf-studio-gear/calf-native.bb create mode 100644 recipes-misc/recipes-multimedia/calf-studio-gear/calf.bb create mode 100644 recipes-misc/recipes-multimedia/calf-studio-gear/calf.inc create mode 100644 recipes-misc/recipes-multimedia/calf-studio-gear/files/0001-align-configuration-that-calfmakerdf-is-build-and-in.patch create mode 100644 recipes-misc/recipes-multimedia/calf-studio-gear/files/0002-don-not-build-cross-calfmakerdf.patch diff --git a/recipes-misc/recipes-multimedia/calf-studio-gear/calf-native.bb b/recipes-misc/recipes-multimedia/calf-studio-gear/calf-native.bb new file mode 100644 index 00000000..dfab84a8 --- /dev/null +++ b/recipes-misc/recipes-multimedia/calf-studio-gear/calf-native.bb @@ -0,0 +1,9 @@ +require ${BPN}.inc + +inherit autotools pkgconfig native + +DEPENDS += " \ + lv2-native \ +" + +SRC_URI += "file://0001-align-configuration-that-calfmakerdf-is-build-and-in.patch" diff --git a/recipes-misc/recipes-multimedia/calf-studio-gear/calf.bb b/recipes-misc/recipes-multimedia/calf-studio-gear/calf.bb new file mode 100644 index 00000000..e3f48094 --- /dev/null +++ b/recipes-misc/recipes-multimedia/calf-studio-gear/calf.bb @@ -0,0 +1,27 @@ +require ${BPN}.inc + +inherit autotools-brokensep pkgconfig gtk-icon-cache bash-completion + +DEPENDS += " \ + ${BPN}-native \ + gtk+ \ + jack \ + fluidsynth \ + liblo \ + ladspa-sdk \ +" + +SRC_URI += "file://0002-don-not-build-cross-calfmakerdf.patch" + +EXTRA_OECONF += "--enable-experimental" + +do_compile_append() { + # we need native calfmakerdf at the position where the build expects it so + # link it there + ln -s ${STAGING_BINDIR_NATIVE}/calfmakerdf ${B}/src/calfmakerdf +} + +FILES_${PN} += "${libdir}/lv2" +INSANE_SKIP_${PN} = "dev-so" + +# TBD: SSE -> NEON diff --git a/recipes-misc/recipes-multimedia/calf-studio-gear/calf.inc b/recipes-misc/recipes-multimedia/calf-studio-gear/calf.inc new file mode 100644 index 00000000..e6550754 --- /dev/null +++ b/recipes-misc/recipes-multimedia/calf-studio-gear/calf.inc @@ -0,0 +1,16 @@ +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 \ +" + +DEPENDS += "glib-2.0" + +SRC_URI = " \ + git://github.com/calf-studio-gear/calf.git \ +" +SRCREV = "82188d3300fa6ed1084ca8874d6a6b2b74702172" +S = "${WORKDIR}/git" +PV = "0.0.60+git${SRCPV}" diff --git a/recipes-misc/recipes-multimedia/calf-studio-gear/files/0001-align-configuration-that-calfmakerdf-is-build-and-in.patch b/recipes-misc/recipes-multimedia/calf-studio-gear/files/0001-align-configuration-that-calfmakerdf-is-build-and-in.patch new file mode 100644 index 00000000..14b5dd0f --- /dev/null +++ b/recipes-misc/recipes-multimedia/calf-studio-gear/files/0001-align-configuration-that-calfmakerdf-is-build-and-in.patch @@ -0,0 +1,143 @@ +From fa4ca610a210ccc2029ba1300cce846c92aaa6b5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sun, 8 Jan 2017 20:36:48 +0100 +Subject: [PATCH] align configuration that calfmakerdf is build and installed + for native + +we need to pin LV2(GUI) support + +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Andreas Müller +--- + configure.ac | 80 --------------------------------------------------------- + src/Makefile.am | 2 +- + src/makerdf.cpp | 3 +++ + 3 files changed, 4 insertion(+), 81 deletions(-) + +diff --git a/configure.ac b/configure.ac +index ec9aa6d..bbb2def 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -53,90 +53,10 @@ AC_CHECK_HEADERS([memory.h stdint.h stdlib.h string.h time.h math.h]) + AC_CHECK_HEADER(expat.h, true, AC_MSG_ERROR([Expat XML library not found])) + AC_CHECK_LIB(expat, XML_Parse, true, AC_MSG_ERROR([Expat XML library not found])) + +-# JACK +-AC_CHECK_HEADERS([jack/jack.h], have_jack_header=yes, have_jack_header=no) +- + # GLib + PKG_CHECK_MODULES(GLIB_DEPS, glib-2.0 >= 2.0.0 gthread-2.0 >= 2.0.0, true, AC_MSG_ERROR([Calf requires glib2 and gthread2])) + +-# Fluidsynth +-PKG_CHECK_MODULES(FLUIDSYNTH_DEPS, fluidsynth >= 1.0.7, true, AC_MSG_ERROR([fluidsynth library not found])) +- +-# Sordi +-AC_CHECK_PROG(SORDI_ENABLED, sordi, yes, no) +- +-if test "$have_jack_header" = "yes"; then +- PKG_CHECK_MODULES(JACK_DEPS, jack >= 0.103.0, +- AC_CHECK_LIB([jack], [jack_port_register], JACK_FOUND="yes", ),) +-fi +- +-if test "$JACK_FOUND" = "yes"; then +- PKG_CHECK_MODULES(JACK_MIDI_DEPS, jack >= 0.105.0, OLD_JACK="no", OLD_JACK="yes") +-fi +- +-PKG_CHECK_MODULES(LV2_DEPS, lv2core >= 6, 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"), +- LASH_0_6_FOUND="no") +-if test "$LASH_0_6_FOUND" = "yes"; then +- LASH_FOUND="yes" +-else +- PKG_CHECK_MODULES(LASH_DEPS, lash-1.0 >= 0.5.2, LASH_FOUND="yes", LASH_FOUND="no") +-fi +-PKG_CHECK_MODULES(SLV2_HACK, slv2 <= 0.6.1, SLV2_UNSUPPORTED="yes", SLV2_UNSUPPORTED="no") +- +-############################################################################################ +-# Assign initial values to feature control variables +- +-LV2_ENABLED=$LV2_FOUND +-LASH_ENABLED=$LASH_FOUND +- +-if test "$JACK_FOUND" = "yes" -o "$LV2_FOUND" = "yes"; then +- PKG_CHECK_MODULES(GUI_DEPS, gtk+-2.0 >= 2.12.0 cairo >= 1.2.0, +- GUI_ENABLED="yes", +- GUI_ENABLED="no (GTK+ 2.12 and cairo 1.2 or newer required)" +- ) +-fi +- +-############################################################################################ +-# Look for settings and installed libraries to determine what to compile/install/use +-if test "$LV2_FOUND" = "yes"; then +- AC_MSG_CHECKING([whether to allow LV2]) +- AC_ARG_WITH(lv2, +- AC_HELP_STRING([--without-lv2],[disable LV2 interface]), +- [if test "$withval" = "no"; then LV2_ENABLED="no"; fi],[]) +- AC_MSG_RESULT($LV2_ENABLED) +-fi +- +-if test "$LASH_FOUND" = "yes"; then +- AC_MSG_CHECKING([whether to allow LASH]) +- AC_ARG_WITH(lash, +- AC_HELP_STRING([--without-lash],[disable LASH compatibility (GPL)]), +- [if test "$withval" = "no"; then LASH_ENABLED="no"; fi],[]) +- AC_MSG_RESULT($LASH_ENABLED) +-fi + +-AC_MSG_CHECKING([whether to enable experimental/unfinished features]) +-AC_ARG_ENABLE(experimental, +- AC_HELP_STRING([--enable-experimental],[enable unfinished features - not recommended!]), +- [set_enable_experimental="$enableval"], +- [set_enable_experimental="no"]) +-AC_MSG_RESULT($set_enable_experimental) +- +-AC_MSG_CHECKING([whether to enable debugging mode]) +-AC_ARG_ENABLE(debug, +- AC_HELP_STRING([--enable-debug],[enable debug mode - slow!]), +- [set_enable_debug="$enableval"], +- [set_enable_debug="no"]) +-AC_MSG_RESULT($set_enable_debug) +- +-AC_MSG_CHECKING([whether to compile with SSE]) +-AC_ARG_ENABLE(sse, +- AC_HELP_STRING([--enable-sse],[compile with SSE extensions]), +- [set_enable_sse="$enableval"], +- [set_enable_sse="no"]) +-AC_MSG_RESULT($set_enable_sse) + + ############################################################################################ + # Compute status shell variables +diff --git a/src/Makefile.am b/src/Makefile.am +index 794e668..dad8f89 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 + +diff --git a/src/makerdf.cpp b/src/makerdf.cpp +index ddc6318..4e3284d 100644 +--- a/src/makerdf.cpp ++++ b/src/makerdf.cpp +@@ -21,6 +21,8 @@ + #include + #include + #include ++#define USE_LV2 1 ++#define USE_LV2_GUI 1 + #if USE_LV2 + #include + #include +-- +2.5.5 + diff --git a/recipes-misc/recipes-multimedia/calf-studio-gear/files/0002-don-not-build-cross-calfmakerdf.patch b/recipes-misc/recipes-multimedia/calf-studio-gear/files/0002-don-not-build-cross-calfmakerdf.patch new file mode 100644 index 00000000..fb6858e4 --- /dev/null +++ b/recipes-misc/recipes-multimedia/calf-studio-gear/files/0002-don-not-build-cross-calfmakerdf.patch @@ -0,0 +1,30 @@ +From b99b13e109d4104904be39e8d3b3e71ceed2cd70 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sun, 8 Jan 2017 22:24:08 +0100 +Subject: [PATCH] don not build cross calfmakerdf +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Andreas Müller +--- + src/Makefile.am | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 794e668..ef8a3cd 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -30,9 +30,6 @@ endif + endif + + AM_CXXFLAGS += $(GLIB_DEPS_CFLAGS) +-noinst_PROGRAMS += calfmakerdf +-calfmakerdf_SOURCES = makerdf.cpp +-calfmakerdf_LDADD = calf.la + + calfbenchmark_SOURCES = benchmark.cpp + calfbenchmark_LDADD = calf.la +-- +2.5.5 +