r2027 - in vdr/vdr-plugin-mp3/trunk/debian: . patches

[Thomas Schmidt]

Author: tschmidt
Date: 2006-03-14 16:04:14 +0000 (Tue, 14 Mar 2006)
New Revision: 2027

Added:
   vdr/vdr-plugin-mp3/trunk/debian/patches/01_g++4.1-fix.dpatch
Modified:
   vdr/vdr-plugin-mp3/trunk/debian/changelog
   vdr/vdr-plugin-mp3/trunk/debian/patches/00list
Log:
vdr-plugin-mp3: added 01_g++4.1.dpatch

Modified: vdr/vdr-plugin-mp3/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/changelog	2006-03-14 15:55:02 UTC (rev 2026)
+++ vdr/vdr-plugin-mp3/trunk/debian/changelog	2006-03-14 16:04:14 UTC (rev 2027)
@@ -4,8 +4,10 @@
 
   * Thomas Schmidt <tschmidt at debian.org>
     - Build-Depend on vdr-dev (>=1.3.41-1)
+    - Added 01_g++4.1-fix.dpatch to fix FTBFS with g++4.1, many thanks
+      to Martin Michlmayr (closes: #356176)
 
- -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Thu,  2 Feb 2006 15:22:05 +0100
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Tue, 14 Mar 2006 17:02:48 +0100
 
 vdr-plugin-mp3 (0.9.14-2) unstable; urgency=low
 

Modified: vdr/vdr-plugin-mp3/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/patches/00list	2006-03-14 15:55:02 UTC (rev 2026)
+++ vdr/vdr-plugin-mp3/trunk/debian/patches/00list	2006-03-14 16:04:14 UTC (rev 2027)
@@ -1 +1,2 @@
+01_g++4.1-fix
 10_mount.sh-path

Added: vdr/vdr-plugin-mp3/trunk/debian/patches/01_g++4.1-fix.dpatch
===================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/patches/01_g++4.1-fix.dpatch	2006-03-14 15:55:02 UTC (rev 2026)
+++ vdr/vdr-plugin-mp3/trunk/debian/patches/01_g++4.1-fix.dpatch	2006-03-14 16:04:14 UTC (rev 2027)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+## 01_g++4.1-fix.dpatch by Martin Michlmayr <tbm at cyrius.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes FTBFS with g++4.1 (closes: #356176)
+
+ at DPATCH@
+diff -urNad vdr-plugin-mp3-0.9.14/decoder-ogg.h /tmp/dpep.p5GRLd/vdr-plugin-mp3-0.9.14/decoder-ogg.h
+--- vdr-plugin-mp3-0.9.14/decoder-ogg.h	2005-02-06 12:42:26.000000000 +0100
++++ /tmp/dpep.p5GRLd/vdr-plugin-mp3-0.9.14/decoder-ogg.h	2006-03-14 16:59:45.218308000 +0100
+@@ -49,7 +49,7 @@
+   ~cOggFile();
+   bool Open(bool log=true);
+   void Close(void);
+-  long long cOggFile::Seek(long long posMs=0, bool relativ=false);
++  long long Seek(long long posMs=0, bool relativ=false);
+   int Stream(short *buffer, int samples);
+   bool CanSeek(void) { return canSeek; }
+   long long IndexMs(void);


Property changes on: vdr/vdr-plugin-mp3/trunk/debian/patches/01_g++4.1-fix.dpatch
___________________________________________________________________
Name: svn:executable
   + *