[SCM] caps/master: Avoid ambiguity in div invocation

fsateler at users.alioth.debian.org fsateler at users.alioth.debian.org
Fri Jul 1 23:22:09 UTC 2016


The following commit has been merged in the master branch:
commit 9a99c225fb813ae69f146e3d90f7b47bdbd97708
Author: Felipe Sateler <fsateler at debian.org>
Date:   Fri Jul 1 19:07:12 2016 -0400

    Avoid ambiguity in div invocation
    
    Be specific and use long version.
    Fixes build failure with gcc >= 6.
    Closes: #816568

diff --git a/debian/patches/0001-Avoid-ambiguity-in-div-invocation.patch b/debian/patches/0001-Avoid-ambiguity-in-div-invocation.patch
new file mode 100644
index 0000000..32de7c4
--- /dev/null
+++ b/debian/patches/0001-Avoid-ambiguity-in-div-invocation.patch
@@ -0,0 +1,23 @@
+From: Felipe Sateler <fsateler at debian.org>
+Date: Fri, 1 Jul 2016 19:06:31 -0400
+Subject: Avoid ambiguity in div invocation
+
+Be specific and use int version.
+Fixes build failure with gcc >= 6
+---
+ 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;
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..ae5d9a4
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Avoid-ambiguity-in-div-invocation.patch

-- 
caps packaging



More information about the pkg-multimedia-commits mailing list