tags 777790 + patch
thanks

Here's a patch to fix the build failure with GCC 5.

debian/patches/gcc45.patch made sure it builds with 4.5 and other 4.x
releases higher than 4.5, but not with 5.x.

Martin


diff -urN avifile-0.7.48~20090503.ds~/debian/patches/gcc5.patch 
avifile-0.7.48~20090503.ds/debian/patches/gcc5.patch
--- avifile-0.7.48~20090503.ds~/debian/patches/gcc5.patch       1970-01-01 
00:00:00.000000000 +0000
+++ avifile-0.7.48~20090503.ds/debian/patches/gcc5.patch        2015-06-24 
23:25:31.721223758 +0000
@@ -0,0 +1,24 @@
+Description: Fix FTBFS with GCC 5
+Author: Martin Michlmayr <t...@cyrius.com>
+---
+
+--- avifile-0.7.48~20090503.ds~/lib/common/avm_output.cpp      2015-06-24 
23:22:37.000000000 +0000
++++ avifile-0.7.48~20090503.ds/lib/common/avm_output.cpp       2015-06-24 
23:23:02.013220660 +0000
+@@ -14,7 +14,7 @@
+ 
+ AVM_BEGIN_NAMESPACE;
+ 
+-#if __GNUC__ == 4 && __GNUC_MINOR__ >= 5
++#if (__GNUC__ == 4 && __GNUC_MINOR__ >= 5) || __GNUC__ >= 5
+ typename AvmOutput::AvmOutput* AvmOutput::m_pSelf = 0;
+ #else
+ AvmOutput::AvmOutput* AvmOutput::m_pSelf = 0;
+@@ -59,7 +59,7 @@
+     new AvmOutput();
+ }
+ 
+-#if __GNUC__ == 4 && __GNUC_MINOR__ >= 5
++#if (__GNUC__ == 4 && __GNUC_MINOR__ >= 5) || __GNUC__ >= 5
+ typename AvmOutput::AvmOutput* AvmOutput::singleton()
+ #else
+ AvmOutput::AvmOutput* AvmOutput::singleton()
diff -urN avifile-0.7.48~20090503.ds~/debian/patches/series 
avifile-0.7.48~20090503.ds/debian/patches/series
--- avifile-0.7.48~20090503.ds~/debian/patches/series   2014-10-20 
11:28:43.000000000 +0000
+++ avifile-0.7.48~20090503.ds/debian/patches/series    2015-06-24 
23:25:02.401223151 +0000
@@ -11,3 +11,4 @@
 ftbfs-gcc4.7.patch
 fix-ftbfs-libav9.patch
 libav10.patch
+gcc5.patch

-- 
Martin Michlmayr
Linux for HP Helion OpenStack, Hewlett-Packard


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to