Control: tags 853585 + patch
Control: tags 853585 + pending

Dear maintainer,

I've prepared an NMU for opal (versioned as 3.10.10~dfsg2-2.1) and 
uploaded it to DELAYED/10. Please feel free to tell me if I should 
cancel it.

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

diff -Nru opal-3.10.10~dfsg2/debian/changelog opal-3.10.10~dfsg2/debian/changelog
--- opal-3.10.10~dfsg2/debian/changelog	2016-01-11 17:44:36.000000000 +0200
+++ opal-3.10.10~dfsg2/debian/changelog	2017-10-13 08:32:03.000000000 +0300
@@ -1,3 +1,10 @@
+opal (3.10.10~dfsg2-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS with gcc 7. (Closes: #853585)
+
+ -- Adrian Bunk <b...@debian.org>  Fri, 13 Oct 2017 08:32:03 +0300
+
 opal (3.10.10~dfsg2-2) unstable; urgency=low
 
   * Fix FTBFS with upcoming ffmpeg 2.9, patch from A. Cadhalpun (Closes:
diff -Nru opal-3.10.10~dfsg2/debian/patches/gcc7.patch opal-3.10.10~dfsg2/debian/patches/gcc7.patch
--- opal-3.10.10~dfsg2/debian/patches/gcc7.patch	1970-01-01 02:00:00.000000000 +0200
+++ opal-3.10.10~dfsg2/debian/patches/gcc7.patch	2017-10-13 08:31:57.000000000 +0300
@@ -0,0 +1,17 @@
+Description: Fix FTBFS with gcc 7
+Author: Adrian Bunk <b...@debian.org>
+Bug-Debian: https://bugs.debian.org/853585
+
+--- opal-3.10.10~dfsg2.orig/plugins/video/common/mpi.cxx
++++ opal-3.10.10~dfsg2/plugins/video/common/mpi.cxx
+@@ -132,8 +132,8 @@ bool MPIList::getNegotiatedMPI( unsigned
+   // to the desired one or matches it
+   for (i=0; i < MPIs.size(); i++) {
+     // we square the value in order to get absolute distances
+-    distance = ( abs(MPIs[i].width  - desiredWidth ) *
+-                 abs(MPIs[i].height - desiredHeight) );
++    distance = ( abs((signed)(MPIs[i].width  - desiredWidth)) *
++                 abs((signed)(MPIs[i].height - desiredHeight)));
+ 
+     if (distance < minDistance) {
+       minDistance = distance;
diff -Nru opal-3.10.10~dfsg2/debian/patches/series opal-3.10.10~dfsg2/debian/patches/series
--- opal-3.10.10~dfsg2/debian/patches/series	2016-01-11 17:46:30.000000000 +0200
+++ opal-3.10.10~dfsg2/debian/patches/series	2017-10-13 08:26:34.000000000 +0300
@@ -3,3 +3,4 @@
 libav9.patch
 libav10.patch
 ffmpeg_2.9.patch
+gcc7.patch

Reply via email to