[SCM] hydrogen packaging branch, master, updated. c1ebe0bf09c1ecd0fb25fd8c5c9fb901551f74d4

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 8af438dbfde74429a130ac670d0ca150059460bd
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Feb 13 01:56:25 2010 +0100

    Drop patch 04: Improved FLAC support adopted upstream now.

diff --git a/debian/patches/04_build_flac.patch b/debian/patches/04_build_flac.patch
deleted file mode 100644
index 2389812..0000000
--- a/debian/patches/04_build_flac.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Build with FLAC
-
-Index: hydrogen/src/lib/FLACFile.cpp
-===================================================================
---- hydrogen.orig/src/lib/FLACFile.cpp	2010-02-12 17:32:59.000000000 +0100
-+++ hydrogen/src/lib/FLACFile.cpp	2010-02-12 17:33:04.000000000 +0100
-@@ -33,6 +33,13 @@
- //#include "FLAC/file_decoder.h"
- #include <FLAC++/all.h>
- 
-+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8
-+#define LEGACY_FLAC
-+#else
-+#undef LEGACY_FLAC
-+#endif
-+
-+
- /// Reads a FLAC file...not optimized yet
- class FLACFile_real : public FLAC::Decoder::File, public Object
- {
-@@ -166,16 +173,28 @@
- 	}
- 
- 	set_metadata_ignore_all();
-+
-+#ifdef LEGACY_FLAC
- 	set_filename( sFilename.c_str() );
- 
- 	State s=init();
- 	if( s != FLAC__FILE_DECODER_OK ) {
-+#else
-+	FLAC__StreamDecoderInitStatus s=init(sFilename.c_str() );
-+	if(s!=FLAC__STREAM_DECODER_INIT_STATUS_OK) {
-+#endif
- 		errorLog( "[load] Error in init()" );
- 	}
- 
-+#ifdef LEGACY_FLAC
- 	if ( process_until_end_of_file() == false ) {
- 		errorLog( "[load] Error in process_until_end_of_file()" );
- 	}
-+#else
-+	if ( process_until_end_of_stream() == false ) {
-+		errorLog( "[load] Error in process_until_end_of_stream()" );
-+	}
-+#endif
- }
- 
- 
diff --git a/debian/patches/series b/debian/patches/series
index e74a85c..01e1a85 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 02_gcc41.patch
 03_gcc43.patch
-04_build_flac.patch
 05_defaultsong.patch
 06_drumkit_load.patch
 07_gcc44.patch

-- 
hydrogen packaging