r4760 - in /vdr/vdr-plugin-muggle/trunk/debian: changelog patches/00list patches/01_flac++-6.dpatch

[tiber-guest at users.alioth.debian.org]

Author: tiber-guest
Date: Sun Jun 17 18:05:55 2007
New Revision: 4760

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=4760
Log:
* Added 01_flac++-6.dpatch to fix problems with new Flac++ versions in Sid

Added:
    vdr/vdr-plugin-muggle/trunk/debian/patches/01_flac++-6.dpatch
Modified:
    vdr/vdr-plugin-muggle/trunk/debian/changelog
    vdr/vdr-plugin-muggle/trunk/debian/patches/00list

Modified: vdr/vdr-plugin-muggle/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-muggle/trunk/debian/changelog?rev=4760&op=diff
==============================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-muggle/trunk/debian/changelog Sun Jun 17 18:05:55 2007
@@ -1,10 +1,14 @@
 vdr-plugin-muggle (0.1.11-9) UNRELEASED; urgency=low
 
+  [ Thomas Schmidt ]
   * Added XS-Vcs-Svn and XS-Vcs-Browser fields to debian/control
   * Removed version from Build-Dependancy to dpatch - even Sarge has the
     required version
 
- -- Thomas Schmidt <tschmidt at debian.org>  Wed, 16 May 2007 23:09:46 +0200
+  [ Tobias Grimm ]
+  * Added 01_flac++-6.dpatch to fix problems with new Flac++ versions in Sid
+
+ -- Tobias Grimm <tg at e-tobi.net>  Sun, 17 Jun 2007 20:04:11 +0200
 
 vdr-plugin-muggle (0.1.11-8) unstable; urgency=low
 

Modified: vdr/vdr-plugin-muggle/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-muggle/trunk/debian/patches/00list?rev=4760&op=diff
==============================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/patches/00list (original)
+++ vdr/vdr-plugin-muggle/trunk/debian/patches/00list Sun Jun 17 18:05:55 2007
@@ -1,2 +1,3 @@
+01_flac++-6
 03_image_convert.sh-path
 90_muggle-0.1.11_include-getopt

Added: vdr/vdr-plugin-muggle/trunk/debian/patches/01_flac++-6.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-muggle/trunk/debian/patches/01_flac%2B%2B-6.dpatch?rev=4760&op=file
==============================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/patches/01_flac++-6.dpatch (added)
+++ vdr/vdr-plugin-muggle/trunk/debian/patches/01_flac++-6.dpatch Sun Jun 17 18:05:55 2007
@@ -1,0 +1,55 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_flac++-6.dpatch by Tobias Grimm <tg at e-tobi.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes problems with Flac++ API version 6.1.0
+
+ at DPATCH@
+--- vdr-plugin-muggle-0.1.11.orig/vdr_decoder_flac.c
++++ vdr-plugin-muggle-0.1.11/vdr_decoder_flac.c
+@@ -22,6 +22,8 @@
+ #include <mad.h>
+ 
+ 
++#include <FLAC++/decoder.h>
++
+ using namespace std;
+ 
+ static const unsigned MAX_RES_SIZE = 16384;
+@@ -66,7 +68,6 @@
+   
+   //  set_metadata_ignore_all();
+   set_metadata_respond( FLAC__METADATA_TYPE_STREAMINFO );
+-  set_filename( m_filename.c_str() );
+ 
+   m_first = true;
+   m_reservoir_count = 0;
+@@ -81,7 +82,14 @@
+   m_reservoir[0] = new FLAC__int32[MAX_RES_SIZE];
+   m_reservoir[1] = new FLAC__int32[MAX_RES_SIZE];
+ 
++#ifndef FLACPP_API_VERSION_CURRENT
++  // Old Flac++ API
++  set_filename( m_filename.c_str() );
+   /*FLAC::Decoder::File::State d =*/ init(); // TODO: check this
++#else
++  // New Flac++ API (tested with 6.0.1)
++  init( m_filename.c_str() );
++#endif
+ 
+   process_until_end_of_metadata(); // basically just skip metadata
+ 
+@@ -189,7 +197,13 @@
+ 	 
+ 	 // decode a single sample into reservoir_buffer (done by the write callback)
+ 	 process_single();
++#ifndef FLACPP_API_VERSION_CURRENT
++      // Old Flac++ API
+ 	 if (get_stream_decoder_state()==FLAC__STREAM_DECODER_END_OF_STREAM)
++#else
++      // New Flac++ API (tested with 6.0.1)
++	 if (get_state()==FLAC__STREAM_DECODER_END_OF_STREAM)
++#endif
+ 	 {
+       		m_decode_status = dsEof;
+ 		finished = true;