caps: Upgrade 0.9.24 -> 0.9.26

Remove patches applied upstream.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Adrian Bunk 2019-05-08 22:58:46 +03:00 committed by Khem Raj
parent b5fce8b53f
commit 89158b7ead
3 changed files with 2 additions and 86 deletions

View File

@ -1,50 +0,0 @@
From 0cc7362e171616dcfeb93c6e1576362761bf14e5 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
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 <raj.khem@gmail.com>
---
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<pow10f> (A);
+ A = v4f_map<exp10f> (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<pow10f> (A);
+ A = v4f_map<exp10f> (A);
RBJv4 p (f[i], Q[i]);
--
2.16.1

View File

@ -1,32 +0,0 @@
From 1ea09653692efdd6443fb6770e8523bf6c9e49b9 Mon Sep 17 00:00:00 2001
From: Fabio Berton <fabio.berton@ossystems.com.br>
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 <fabio.berton@ossystems.com.br>
---
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

View File

@ -4,14 +4,12 @@ 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"
SRC_URI[md5sum] = "36b30c7c7db2d2bc5f4f54077e97b5ee"
SRC_URI[sha256sum] = "e7496c5bce05abebe3dcb635926153bbb58a9337a6e423f048d3b61d8a4f98c9"
EXTRA_OEMAKE = " \
CC='${CXX}' \