summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2018-11-08 17:17:34 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2018-11-08 17:45:11 +0100
commitd4e1967147fd9a9a9e1525179ea15693fce522ca (patch)
tree3568521b279cf9d283c1fd334dfbecab47404442 /media-plugins/caps-plugins
parentapp-crypt/certbot-nginx: 0.28.0 bump (diff)
downloadgentoo-d4e1967147fd9a9a9e1525179ea15693fce522ca.tar.gz
gentoo-d4e1967147fd9a9a9e1525179ea15693fce522ca.tar.bz2
gentoo-d4e1967147fd9a9a9e1525179ea15693fce522ca.zip
media-plugins/caps-plugins: Fix build with glibc-2.27
Closes: https://bugs.gentoo.org/647874 Package-Manager: Portage-2.3.51, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'media-plugins/caps-plugins')
-rw-r--r--media-plugins/caps-plugins/caps-plugins-0.9.24.ebuild7
-rw-r--r--media-plugins/caps-plugins/files/caps-plugins-0.9.24-glibc-2.27.patch42
2 files changed, 47 insertions, 2 deletions
diff --git a/media-plugins/caps-plugins/caps-plugins-0.9.24.ebuild b/media-plugins/caps-plugins/caps-plugins-0.9.24.ebuild
index 607d8447c910..f427ec2503bb 100644
--- a/media-plugins/caps-plugins/caps-plugins-0.9.24.ebuild
+++ b/media-plugins/caps-plugins/caps-plugins-0.9.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -20,7 +20,10 @@ RDEPEND=""
S="${WORKDIR}/${MY_P}"
-PATCHES=( "${FILESDIR}/${PN}-0.9.15-fix-c++14.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-0.9.15-fix-c++14.patch"
+ "${FILESDIR}/${P}-glibc-2.27.patch" # bug 647874
+)
src_prepare() {
default
diff --git a/media-plugins/caps-plugins/files/caps-plugins-0.9.24-glibc-2.27.patch b/media-plugins/caps-plugins/files/caps-plugins-0.9.24-glibc-2.27.patch
new file mode 100644
index 000000000000..7c688d7f3bfc
--- /dev/null
+++ b/media-plugins/caps-plugins/files/caps-plugins-0.9.24-glibc-2.27.patch
@@ -0,0 +1,42 @@
+From: Aurelien Jarno <aurel32@debian.org>
+Date: Tue, 20 Mar 2018 18:29:34 -0300
+Subject: Use standard exp10f instead of pow10f
+
+Starting with glibc 2.27, the latter is no longer supported
+
+Bug-Debian: https://bugs.debian.org/890633
+---
+ 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..9682f7b 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 pow(10,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]);
+