Patchwork [2/3] caps: new package

login
register
mail settings
Submitter Martin Bark
Date April 24, 2014, 9:19 p.m.
Message ID <1398374384-8814-2-git-send-email-martin@barkynet.com>
Download mbox | patch
Permalink /patch/342482/
State Changes Requested
Headers show

Comments

Martin Bark - April 24, 2014, 9:19 p.m.
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.

Signed-off-by: Martin Bark <martin@barkynet.com>
---
 package/Config.in                            |    1 +
 package/caps/Config.in                       |   12 ++++++
 package/caps/caps-01-cross-compile-fix.patch |   54 ++++++++++++++++++++++++++
 package/caps/caps.mk                         |   21 ++++++++++
 4 files changed, 88 insertions(+)
 create mode 100644 package/caps/Config.in
 create mode 100644 package/caps/caps-01-cross-compile-fix.patch
 create mode 100644 package/caps/caps.mk
Thomas Petazzoni - Aug. 4, 2014, 8:28 p.m.
Dear Martin Bark,

Thanks for your contribution, and sorry for the slow feedback. Some
comments below.

On Thu, 24 Apr 2014 22:19:43 +0100, Martin Bark wrote:

> diff --git a/package/Config.in b/package/Config.in
> index 5956154..33d16ac 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -491,6 +491,7 @@ menu "Libraries"
>  menu "Audio/Sound"
>  source "package/alsa-lib/Config.in"
>  source "package/audiofile/Config.in"
> +source "package/caps/Config.in"

This will have to be rebased on top of the latest master.

> new file mode 100644
> index 0000000..28ff332
> --- /dev/null
> +++ b/package/caps/Config.in
> @@ -0,0 +1,12 @@
> +config BR2_PACKAGE_CAPS
> +	bool "caps"

Missing dependency on C++ in toolchain. Also, this package uses
ladspa.h, so surely it should select BR2_PACKAGE_LADSPA_SDK, no?

> diff --git a/package/caps/caps-01-cross-compile-fix.patch b/package/caps/caps-01-cross-compile-fix.patch
> new file mode 100644
> index 0000000..4667191
> --- /dev/null
> +++ b/package/caps/caps-01-cross-compile-fix.patch

Missing description + Signed-off-by line.

> diff --git a/package/caps/caps.mk b/package/caps/caps.mk
> new file mode 100644
> index 0000000..d642bc8
> --- /dev/null
> +++ b/package/caps/caps.mk
> @@ -0,0 +1,21 @@
> +################################################################################
> +#
> +# caps
> +#
> +################################################################################
> +
> +CAPS_VERSION = 0.9.23
> +CAPS_SOURCE = caps_$(CAPS_VERSION).tar.bz2
> +CAPS_SITE = http://quitte.de/dsp/
> +CAPS_LICENSE = GPLv3
> +CAPS_LICENSE_FILES = COPYING

CAPS_DEPENDENCIES = ladspa-sdk

maybe ?

> +
> +define CAPS_BUILD_CMDS
> +	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) all

We normally try to pass $(TARGET_CONFIGURE_OPTS) on the right hand side
of $(MAKE), and we pass $(TARGET_MAKE_ENV) on the left hand side of
make.

> +define CAPS_INSTALL_TARGET_CMDS
> +	$(MAKE) -C $(@D) install DESTDIR=$(TARGET_DIR)

$(TARGET_MAKE_ENV) on the left hand side, and DESTDIR passed before
'install' would be preferred here.

Otherwise, looks good.

Thanks,

Thomas
Martin Bark - Aug. 5, 2014, 8:51 p.m.
Thomas,

Thanks for the feedback


On 04/08/14 21:28, Thomas Petazzoni wrote:
> Dear Martin Bark,
>
> Thanks for your contribution, and sorry for the slow feedback. Some
> comments below.
>
> On Thu, 24 Apr 2014 22:19:43 +0100, Martin Bark wrote:
>
>> diff --git a/package/Config.in b/package/Config.in
>> index 5956154..33d16ac 100644
>> --- a/package/Config.in
>> +++ b/package/Config.in
>> @@ -491,6 +491,7 @@ menu "Libraries"
>>   menu "Audio/Sound"
>>   source "package/alsa-lib/Config.in"
>>   source "package/audiofile/Config.in"
>> +source "package/caps/Config.in"
>
> This will have to be rebased on top of the latest master.

will do

>
>> new file mode 100644
>> index 0000000..28ff332
>> --- /dev/null
>> +++ b/package/caps/Config.in
>> @@ -0,0 +1,12 @@
>> +config BR2_PACKAGE_CAPS
>> +	bool "caps"
>
> Missing dependency on C++ in toolchain. Also, this package uses
> ladspa.h, so surely it should select BR2_PACKAGE_LADSPA_SDK, no?

I'll fix the c++ dependency issue.  As per my other email caps includes 
a copy of the ladsp-sdk header hence it's not a dependency.

>
>> diff --git a/package/caps/caps-01-cross-compile-fix.patch b/package/caps/caps-01-cross-compile-fix.patch
>> new file mode 100644
>> index 0000000..4667191
>> --- /dev/null
>> +++ b/package/caps/caps-01-cross-compile-fix.patch
>
> Missing description + Signed-off-by line.
>
>> diff --git a/package/caps/caps.mk b/package/caps/caps.mk
>> new file mode 100644
>> index 0000000..d642bc8
>> --- /dev/null
>> +++ b/package/caps/caps.mk
>> @@ -0,0 +1,21 @@
>> +################################################################################
>> +#
>> +# caps
>> +#
>> +################################################################################
>> +
>> +CAPS_VERSION = 0.9.23
>> +CAPS_SOURCE = caps_$(CAPS_VERSION).tar.bz2
>> +CAPS_SITE = http://quitte.de/dsp/
>> +CAPS_LICENSE = GPLv3
>> +CAPS_LICENSE_FILES = COPYING
>
> CAPS_DEPENDENCIES = ladspa-sdk
>
> maybe ?

As above

>
>> +
>> +define CAPS_BUILD_CMDS
>> +	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) all
>
> We normally try to pass $(TARGET_CONFIGURE_OPTS) on the right hand side
> of $(MAKE), and we pass $(TARGET_MAKE_ENV) on the left hand side of
> make.

I'll fix that

>
>> +define CAPS_INSTALL_TARGET_CMDS
>> +	$(MAKE) -C $(@D) install DESTDIR=$(TARGET_DIR)
>
> $(TARGET_MAKE_ENV) on the left hand side, and DESTDIR passed before
> 'install' would be preferred here.

I'll fix that too

>
> Otherwise, looks good.
>
> Thanks,
>
> Thomas
>

Thanks

Martin

Patch

diff --git a/package/Config.in b/package/Config.in
index 5956154..33d16ac 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -491,6 +491,7 @@  menu "Libraries"
 menu "Audio/Sound"
 source "package/alsa-lib/Config.in"
 source "package/audiofile/Config.in"
+source "package/caps/Config.in"
 source "package/celt051/Config.in"
 source "package/fdk-aac/Config.in"
 source "package/ladspa-sdk/Config.in"
diff --git a/package/caps/Config.in b/package/caps/Config.in
new file mode 100644
index 0000000..28ff332
--- /dev/null
+++ b/package/caps/Config.in
@@ -0,0 +1,12 @@ 
+config BR2_PACKAGE_CAPS
+	bool "caps"
+	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
diff --git a/package/caps/caps-01-cross-compile-fix.patch b/package/caps/caps-01-cross-compile-fix.patch
new file mode 100644
index 0000000..4667191
--- /dev/null
+++ b/package/caps/caps-01-cross-compile-fix.patch
@@ -0,0 +1,54 @@ 
+--- caps-0.9.23.original/Makefile	2014-03-13 08:06:40.000000000 +0000
++++ caps-0.9.23/Makefile	2014-04-24 15:29:40.008145963 +0100
+@@ -3,18 +3,18 @@
+ PREFIX = /usr
+ DESTDIR = 
+ 
+-CC = g++
++CXX ?= g++
+ 
+ OPTS = -O3 -ffast-math -funroll-loops -Wall -fPIC -DPIC
+ #OPTS = -g -DDEBUG 
+ 
+ _LDFLAGS = -shared 
+-STRIP = strip
++STRIP ?= strip
+ 
+ -include defines.make
+ 
+-CFLAGS += $(OPTS) $(_CFLAGS)
+-LDFLAGS += $(_LDFLAGS) $(CFLAGS)
++CXXFLAGS += $(OPTS) $(_CXXFLAGS)
++LDFLAGS += $(_LDFLAGS) $(CXXFLAGS)
+ 
+ PLUG = caps
+ 
+@@ -48,13 +48,13 @@
+ 	python tools/make-rdf.py > $(PLUG).rdf
+ 
+ $(PLUG).so: $(OBJECTS)
+-	$(CC) $(ARCH) $(LDFLAGS) -o $@ $(OBJECTS)
++	$(CXX) $(ARCH) $(LDFLAGS) -o $@ $(OBJECTS)
+ 
+ .cc.s: 
+-	$(CC) $(ARCH) $(CFLAGS) -S $<
++	$(CXX) $(ARCH) $(CXXFLAGS) -S $<
+ 
+ .cc.o: depend 
+-	$(CC) $(ARCH) $(CFLAGS) -o $@ -c $<
++	$(CXX) $(ARCH) $(CXXFLAGS) -o $@ -c $<
+ 
+ tags: $(SOURCES) $(HEADERS)
+ 	@-if [ -x /usr/bin/ctags ]; then ctags $(SOURCES) $(HEADERS) >/dev/null 2>&1 ; fi
+@@ -87,9 +87,9 @@
+ 	@VERSION=$(VERSION) python tools/make-version.h.py
+ 
+ dist: all $(PLUG).rdf version.h
+-	tools/make-dist.py caps $(VERSION) $(CFLAGS)
++	tools/make-dist.py caps $(VERSION) $(CXXFLAGS)
+ 
+ depend: $(SOURCES) $(HEADERS)
+-	$(CC) -MM $(CFLAGS) $(DEFINES) $(SOURCES) > depend
++	$(CXX) -MM $(CXXFLAGS) $(DEFINES) $(SOURCES) > depend
+ 
+ -include depend
diff --git a/package/caps/caps.mk b/package/caps/caps.mk
new file mode 100644
index 0000000..d642bc8
--- /dev/null
+++ b/package/caps/caps.mk
@@ -0,0 +1,21 @@ 
+################################################################################
+#
+# caps
+#
+################################################################################
+
+CAPS_VERSION = 0.9.23
+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_CONFIGURE_OPTS) $(MAKE) -C $(@D) all
+endef
+
+define CAPS_INSTALL_TARGET_CMDS
+	$(MAKE) -C $(@D) install DESTDIR=$(TARGET_DIR)
+endef
+
+$(eval $(generic-package))