From 89158b7eadf311cc5202a06128e7d5db5a7147b4 Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Wed, 8 May 2019 22:58:46 +0300 Subject: caps: Upgrade 0.9.24 -> 0.9.26 Remove patches applied upstream. Signed-off-by: Adrian Bunk Signed-off-by: Khem Raj --- .../0001-Do-not-use-obsolete-pow10f-function.patch | 50 ---------------------- .../caps/Avoid-ambiguity-in-div-invocation.patch | 32 -------------- .../recipes-multimedia/caps/caps_0.9.24.bb | 29 ------------- .../recipes-multimedia/caps/caps_0.9.26.bb | 27 ++++++++++++ 4 files changed, 27 insertions(+), 111 deletions(-) delete mode 100644 meta-multimedia/recipes-multimedia/caps/caps/0001-Do-not-use-obsolete-pow10f-function.patch delete mode 100644 meta-multimedia/recipes-multimedia/caps/caps/Avoid-ambiguity-in-div-invocation.patch delete mode 100644 meta-multimedia/recipes-multimedia/caps/caps_0.9.24.bb create mode 100644 meta-multimedia/recipes-multimedia/caps/caps_0.9.26.bb diff --git a/meta-multimedia/recipes-multimedia/caps/caps/0001-Do-not-use-obsolete-pow10f-function.patch b/meta-multimedia/recipes-multimedia/caps/caps/0001-Do-not-use-obsolete-pow10f-function.patch deleted file mode 100644 index bd5e1b6030..0000000000 --- a/meta-multimedia/recipes-multimedia/caps/caps/0001-Do-not-use-obsolete-pow10f-function.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 0cc7362e171616dcfeb93c6e1576362761bf14e5 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 31 Jan 2018 18:37:16 -0800 -Subject: [PATCH] Do not use obsolete pow10f() function - -exp10 name is standardized in TS 18661-4 and its -available in glibc since version 2.1 -it has been now removed from glibc 2.27+ - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - dsp/v4f_IIR2.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/dsp/v4f_IIR2.h b/dsp/v4f_IIR2.h -index a68ecf5..ebd1234 100644 ---- a/dsp/v4f_IIR2.h -+++ b/dsp/v4f_IIR2.h -@@ -33,7 +33,7 @@ - namespace DSP { - - #ifdef __APPLE__ --inline float pow10f(float f) {return pow(10,f);} -+inline float exp10f(float f) {return __exp10f(f);} - #endif - - class RBJv4 -@@ -142,7 +142,7 @@ class IIR2v4 - /* A = pow (10, gain / 40) */ - v4f_t A = (v4f_t) {.025,.025,.025,.025}; - A *= gain; -- A = v4f_map (A); -+ A = v4f_map (A); - - RBJv4 p (f, Q); - -@@ -429,7 +429,7 @@ class IIR2v4Bank - /* A = pow (10, gain / 40) */ - v4f_t A = (v4f_t) {.025,.025,.025,.025}; - A *= gain[i]; -- A = v4f_map (A); -+ A = v4f_map (A); - - RBJv4 p (f[i], Q[i]); - --- -2.16.1 - diff --git a/meta-multimedia/recipes-multimedia/caps/caps/Avoid-ambiguity-in-div-invocation.patch b/meta-multimedia/recipes-multimedia/caps/caps/Avoid-ambiguity-in-div-invocation.patch deleted file mode 100644 index 1a050af917..0000000000 --- a/meta-multimedia/recipes-multimedia/caps/caps/Avoid-ambiguity-in-div-invocation.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 1ea09653692efdd6443fb6770e8523bf6c9e49b9 Mon Sep 17 00:00:00 2001 -From: Fabio Berton -Date: Thu, 6 Oct 2016 11:54:07 -0300 -Subject: Avoid ambiguity in div invocation -Organization: O.S. Systems Software LTDA. - -Patch from: -https://anonscm.debian.org/cgit/pkg-multimedia/caps.git/commit/?id=9a99c225fb813ae69f146e3d90f7b47bdbd97708 - -Upstream-Status: Pending - -Signed-off-by: Fabio Berton ---- - AutoFilter.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/AutoFilter.cc b/AutoFilter.cc -index fc087d0..bd6b12f 100644 ---- a/AutoFilter.cc -+++ b/AutoFilter.cc -@@ -69,7 +69,7 @@ AutoFilter::activate() - void - AutoFilter::cycle (uint frames) - { -- div_t qr = div (frames, blocksize); -+ div_t qr = div ((int)frames, (int)blocksize); - int blocks = qr.quot; - if (qr.rem) ++blocks; - double over_blocks = 1./blocks; --- -2.1.4 - diff --git a/meta-multimedia/recipes-multimedia/caps/caps_0.9.24.bb b/meta-multimedia/recipes-multimedia/caps/caps_0.9.24.bb deleted file mode 100644 index 0404bd5159..0000000000 --- a/meta-multimedia/recipes-multimedia/caps/caps_0.9.24.bb +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION = "The CAPS Audio Plugin Suite - LADSPA plugin suite" -HOMEPAGE = "http://quitte.de/dsp/caps.html" -LICENSE = "GPL-3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -SRC_URI = "http://quitte.de/dsp/${BPN}_${PV}.tar.bz2 \ - file://Avoid-ambiguity-in-div-invocation.patch \ - file://0001-basic.h-Use-c99-supported-stdint-types.patch \ - file://append_ldflags.patch \ - file://0001-Do-not-use-obsolete-pow10f-function.patch \ - " - -SRC_URI[md5sum] = "c1d634038dcb54702306c0e30cb1c626" -SRC_URI[sha256sum] = "f746feba57af316b159f0169de5d78b4fd1064c2c0c8017cb5856b2f22e83f20" - -EXTRA_OEMAKE = " \ - CC='${CXX}' \ - CFLAGS='${CFLAGS} -ffast-math -funroll-loops -fPIC -DPIC' \ - ARCH='' \ -" -do_compile() { - oe_runmake all -} - -do_install() { - install -Dm 0644 caps.so ${D}${libdir}/ladspa/caps.so -} - -FILES_${PN} = "${libdir}/ladspa/" diff --git a/meta-multimedia/recipes-multimedia/caps/caps_0.9.26.bb b/meta-multimedia/recipes-multimedia/caps/caps_0.9.26.bb new file mode 100644 index 0000000000..46bcf6c6a5 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/caps/caps_0.9.26.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "The CAPS Audio Plugin Suite - LADSPA plugin suite" +HOMEPAGE = "http://quitte.de/dsp/caps.html" +LICENSE = "GPL-3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +SRC_URI = "http://quitte.de/dsp/${BPN}_${PV}.tar.bz2 \ + file://0001-basic.h-Use-c99-supported-stdint-types.patch \ + file://append_ldflags.patch \ + " + +SRC_URI[md5sum] = "36b30c7c7db2d2bc5f4f54077e97b5ee" +SRC_URI[sha256sum] = "e7496c5bce05abebe3dcb635926153bbb58a9337a6e423f048d3b61d8a4f98c9" + +EXTRA_OEMAKE = " \ + CC='${CXX}' \ + CFLAGS='${CFLAGS} -ffast-math -funroll-loops -fPIC -DPIC' \ + ARCH='' \ +" +do_compile() { + oe_runmake all +} + +do_install() { + install -Dm 0644 caps.so ${D}${libdir}/ladspa/caps.so +} + +FILES_${PN} = "${libdir}/ladspa/" -- cgit 1.2.3-korg