Skip to contentSkip to conversation

package/caps: new package

PATCH New Jörg Krause 2 participants 2 messages Oct 14, 2019 – Oct 16, 2019

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 package/caps: new package

From: Martin Bark <[email protected]>

CAPS is a collection of audio plugins comprising virtual guitar amplification and a small range of basic classic effects, signal processors and generators of often elementary and occasionally exotic nature.

The plugins aim to satisfy the highest demands in sound quality with maximal computational efficiency and zero latency.

Note, that the original patch [1] dates back in 2014.

[1] https://patchwork.ozlabs.org/patch/376822/

---
Changes v2 -> v3:
- Update version to 0.9.26
- Add patch to fix build with musl
Changes v1 -> v2:
- Added dependency to BR2_INSTALL_LIBSTDCPP (Thomas Petazzoni)
- Add description and Signed-off-by to patch (Thomas Petazzoni)
- Fixed use of $(TARGET_CONFIGURE_OPTS) and $(TARGET_MAKE_ENV) (Thomas Petazzoni)

---
 DEVELOPERS                                    |  1 +
 package/Config.in                             |  1 +
 package/caps/0001-Fix-cross-compilation.patch | 82 +++++++++++++++++++
 .../0002-Fix-stdint-types-with-musl.patch     | 54 ++++++++++++
 package/caps/Config.in                        | 17 ++++
 package/caps/caps.hash                        |  3 +
 package/caps/caps.mk                          | 22 +++++
 7 files changed, 180 insertions(+)
 create mode 100644 package/caps/0001-Fix-cross-compilation.patch
 create mode 100644 package/caps/0002-Fix-stdint-types-with-musl.patch
 create mode 100644 package/caps/Config.in
 create mode 100644 package/caps/caps.hash
 create mode 100644 package/caps/caps.mk
DEVELOPERS +1 -0
index dbe8f9128d..8db3ac2a74 100644
@@ -1249,6 +1249,7 @@ F:	board/lemaker/bananapro/
 F:	configs/bananapro_defconfig
 F:	package/augeas/
 F:	package/bluez-alsa/
+F:	package/caps/
 F:	package/freescale-imx/imx-alsa-plugins/
 F:	package/libopusenc/
 F:	package/libupnpp/
package/Config.in +1 -0
index 47b602c547..d1f8176fc9 100644
@@ -1162,6 +1162,7 @@ menu "Audio/Sound"
 	source "package/aubio/Config.in"
 	source "package/audiofile/Config.in"
 	source "package/bcg729/Config.in"
+	source "package/caps/Config.in"
 	source "package/celt051/Config.in"
 	source "package/fdk-aac/Config.in"
 	source "package/libao/Config.in"
package/caps/0001-Fix-cross-compilation.patch new file +82 -0

82 lines not on this page · raw message

package/caps/0002-Fix-stdint-types-with-musl.patch new file +54 -0

54 lines not on this page · raw message

package/caps/Config.in new file +17 -0
new file mode 100644
index 0000000000..798ef74462
@@ -0,0 +1,17 @@
+config BR2_PACKAGE_CAPS
+	bool "caps"
+	depends on BR2_INSTALL_LIBSTDCPP
+	help
+	  CAPS is a collection of audio plugins comprising virtual
+	  guitar amplification and a small range of basic classic
+	  effects, signal processors and generators of often
+	  elementary and occasionally exotic nature.
+
+	  The plugins aim to satisfy the highest demands in sound
+	  quality with maximal computational efficiency and zero
+	  latency.
+
+	  http://quitte.de/dsp/caps.html
+
+comment "caps needs a toolchain w/ C++"
+	depends on !BR2_INSTALL_LIBSTDCPP
package/caps/caps.hash new file +3 -0
new file mode 100644
index 0000000000..958f4b68be
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256 e7496c5bce05abebe3dcb635926153bbb58a9337a6e423f048d3b61d8a4f98c9  caps_0.9.26.tar.bz2
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  COPYING
package/caps/caps.mk new file +22 -0
new file mode 100644
index 0000000000..b0596bc03e
@@ -0,0 +1,22 @@
+################################################################################
+#
+# caps
+#
+################################################################################
+
+CAPS_VERSION = 0.9.26
+CAPS_SOURCE = caps_$(CAPS_VERSION).tar.bz2
+CAPS_SITE = http://quitte.de/dsp
+CAPS_LICENSE = GPLv3
+CAPS_LICENSE_FILES = COPYING
+
+define CAPS_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) all -C $(@D)
+endef
+
+define CAPS_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
+		DESTDIR=$(TARGET_DIR) install -C $(@D)
+endef
+
+$(eval $(generic-package))
Signature · 1 line
2.23.0
#1 lore raw

PATCH v3 1/1 package/caps: new package

Hello,

Quoted 7 lines · On Mon, 14 Oct 2019 13:26:55 +0200 J?rg Krause <[email protected]>…

From: Martin Bark <[email protected]>

CAPS is a collection of audio plugins comprising virtual guitar amplification and a small range of basic classic effects, signal processors and generators of often elementary and occasionally exotic nature.

Quoted 6 lines

The plugins aim to satisfy the highest demands in sound quality with maximal computational efficiency and zero latency.

Note, that the original patch [1] dates back in 2014.

[1] https://patchwork.ozlabs.org/patch/376822/

I have applied, but after doing a few changes. See below.

Quoted 9 lines
package/caps/0001-Fix-cross-compilation.patch new file +3 -0
new file mode 100644
index 0000000000..6bb7111537
@@ -0,0 +1,82 @@
+From d9861488a91b9e6b96b8bfae8c2b94f90d8d421b Mon Sep 17 00:00:00 2001
+From: Martin Bark <[email protected]>
+Date: Tue, 5 Aug 2014 21:59:23 +0100

package/caps/0001-Fix-cross-compilation.patch line 13

Quoted 10 lines
package/caps/0001-Fix-cross-compilation.patch new file +10 -0
+Subject: [PATCH] Fix cross compilation
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Corrections to Makefile to correctly use CXX and CXXFLAGS when compiling
+c++ code.
+
+Signed-off-by: Martin Bark <[email protected]>
+Signed-off-by: J?rg Krause <[email protected]>

This patch was not needed. But using a slightly more elaborate logic in caps.mk, I could avoid this patch entirely.

Quoted 8 lines
package/caps/0002-Fix-stdint-types-with-musl.patch new file +2 -0
new file mode 100644
index 0000000000..23002c072e
@@ -0,0 +1,54 @@
+From 626e60a82120961ccee117dfcb5c28f72f8a26e5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=B6rg=20Krause?= <[email protected]>

package/caps/0002-Fix-stdint-types-with-musl.patch line 12

Quoted 10 lines
package/caps/0002-Fix-stdint-types-with-musl.patch new file +10 -0
+Date: Wed, 28 Aug 2019 11:25:49 +0200
+Subject: [PATCH] Fix stdint types with musl
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fetched from:
+https://github.com/dsacre/meta-lad/blob/master/recipes-multimedia/lv2/caps-lv2/fix-stdint-types-with-musl.patch
+
+Signed-off-by: J?rg Krause <[email protected]>

Could you submit this patch to the author of caps ?

package/caps/Config.in line 3

Quoted 9 lines
package/caps/Config.in new file +3 -0
new file mode 100644
index 0000000000..798ef74462
@@ -0,0 +1,17 @@
+config BR2_PACKAGE_CAPS
+	bool "caps"
+	depends on BR2_INSTALL_LIBSTDCPP

caps unconditionally builds a shared library, so I've added a depends on !BR2_STATIC_LIBS here.

package/caps/Config.in line 7

Quoted 4 lines
package/caps/Config.in new file +4 -0
+CAPS_VERSION = 0.9.26
+CAPS_SOURCE = caps_$(CAPS_VERSION).tar.bz2
+CAPS_SITE = http://quitte.de/dsp
+CAPS_LICENSE = GPLv3

And now that I looked again at this, it is wrong, it should be:

CAPS_LICENSE = GPL-3.0+

Could you send a follow-up patch to fix this ?

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com