[SCM] dvbcut/master: Add patch to fix build failure with GCC4.5 (Closes: #622079).

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Thu May 5 12:16:10 UTC 2011


The following commit has been merged in the master branch:
commit 6da2bbaf63dd1270f78ccdca52488c13016749fa
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu May 5 14:15:35 2011 +0200

    Add patch to fix build failure with GCC4.5 (Closes: #622079).

diff --git a/debian/patches/fix-ftbfs-gcc4.5.patch b/debian/patches/fix-ftbfs-gcc4.5.patch
new file mode 100644
index 0000000..290f3d2
--- /dev/null
+++ b/debian/patches/fix-ftbfs-gcc4.5.patch
@@ -0,0 +1,31 @@
+From: pquiney
+Subject: Fix build with gcc-4.5
+Bug-Archlinux: http://aur.archlinux.org/packages.php?ID=2793
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=622079
+---
+ src/main.cpp  |    2 +-
+ src/mpgfile.h |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- dvbcut.orig/src/main.cpp
++++ dvbcut/src/main.cpp
+@@ -171,7 +171,7 @@ main(int argc, char *argv[]) {
+       return 1;
+     }
+ 
+-    index::index idx(*mpg);
++    class index idx(*mpg);
+     int pics = idx.generate();
+     if (pics <= 0) {
+       fprintf(stderr, "%s: %s: %s\n", argv0, mpgfilename.c_str(),
+--- dvbcut.orig/src/mpgfile.h
++++ dvbcut/src/mpgfile.h
+@@ -49,7 +49,7 @@ protected:
+   stream s[MAXAVSTREAMS];
+   int videostreams, audiostreams;
+   int initialoffset;
+-  index::index idx;
++  class index idx;
+   int pictures;
+ 
+   mpgfile(inbuffer &b, int initial_offset);
diff --git a/debian/patches/series b/debian/patches/series
index c166ebd..63cac1a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 remove-ffmpeg-from-distfiles.patch
 fix-ftbfs-gcc4.4.patch
+fix-ftbfs-gcc4.5.patch

-- 
dvbcut packaging



More information about the pkg-multimedia-commits mailing list