Rev bump removing automagic deps and flac 1.1.3 ready

(Portage version: 2.1.2_rc2-r5)

3 files changed, 166 insertions, 0 deletions

diff --git a/media-sound/rezound/files/digest-rezound-0.12.2_beta-r3 b/media-sound/rezound/files/digest-rezound-0.12.2_beta-r3
new file mode 100644
index 000000000000..3b6d5f63b0f5
--- /dev/null
+++ b/media-sound/rezound/files/digest-rezound-0.12.2_beta-r3
@@ -0,0 +1,6 @@
+MD5 693d4e7221cf243630a154ba9b76066e rezound-0.12.2_beta-patches.tar.bz2 7479
+RMD160 c23f4208d38c271cea04ecd4f4af852cd2e4eda4 rezound-0.12.2_beta-patches.tar.bz2 7479
+SHA256 37ab114e34144be9fa198efd6de7610720a906a0d94d77a4e912982d72263392 rezound-0.12.2_beta-patches.tar.bz2 7479
+MD5 acbe0d885643081db1c6b6e93d89f4b2 rezound-0.12.2beta.tar.gz 1729771
+RMD160 d5779d2dee47f504c32c87864504bdd3e8eed2c7 rezound-0.12.2beta.tar.gz 1729771
+SHA256 0e170622c52866e71069372a3d94c8c6eb4e4ce5a45abc8d2458b77aa59157cc rezound-0.12.2beta.tar.gz 1729771
diff --git a/media-sound/rezound/files/rezound-0.12.2_beta-automagic.patch b/media-sound/rezound/files/rezound-0.12.2_beta-automagic.patch
new file mode 100644
index 000000000000..3def7a9702df
--- /dev/null
+++ b/media-sound/rezound/files/rezound-0.12.2_beta-automagic.patch
@@ -0,0 +1,61 @@
+--- rezound-0.12.2beta/configure.ac.old	2006-12-04 18:20:25.000000000 +0100
++++ rezound-0.12.2beta/configure.ac	2006-12-04 18:25:53.000000000 +0100
+@@ -505,12 +505,20 @@
+ AC_LANG_PUSH(C) # xiph needs to include vorbisenc.h as well if C++ is going to compile the code
+ 
+ AH_TEMPLATE(HAVE_LIBOGG)
++
++AC_ARG_ENABLE(vorbis, AC_HELP_STRING([--disable-vorbis], [disable support for vorbis (default=autodetect)]), [ enable_vorbis=$enableval ], [ enable_vorbis=yes ])
++
++
+ # this macro detects libogg and does an AC_SUBST on OGG_CFLAGS and OGG_LIBS, so I put these variables in src/backend/Makefile.am for substitution
++if test "x$enable_vorbis" = "xyes"; then
+ XIPH_PATH_OGG(AC_DEFINE(HAVE_LIBOGG),AC_MSG_NOTICE([Ogg Vorbis website: http://www.xiph.org]))
++fi
+ 
+ AH_TEMPLATE(HAVE_LIBVORBIS)
+ # this macro detects libvorbis and does an AC_SUBST on VORBIS_CFLAGS, VORBIS_LIBS, VORBISFILE_LIBS and VORBISENC_LIBS, so I put these variables in src/backend/Makefile.am for substitution
++if test "x$enable_vorbis" = "xyes"; then
+ XIPH_PATH_VORBIS(AC_DEFINE(HAVE_LIBVORBIS),AC_MSG_NOTICE([Ogg Vorbis website: http://www.xiph.org]))
++fi
+ 
+ AC_LANG_POP(C)
+ 
+@@ -524,7 +532,12 @@
+ AH_TEMPLATE(HAVE_LIBFLACPP)
+ AH_TEMPLATE(HAVE_LIBFLAC)
+ 
++AC_ARG_ENABLE(flac, AC_HELP_STRING([--disable-flac], [disable support for flac (default=autodetect)]), [ enable_flac=$enableval ], [ enable_flac=yes ])
++
++
++
+ # look for libFLAC and if it's found then look for libFLAC++
++if test "x$enable_flac" = "xyes"; then
+ AM_PATH_LIBFLAC(
+ 	[
+ 		AC_DEFINE(HAVE_LIBFLAC)
+@@ -532,8 +545,7 @@
+ 	],
+ 	AC_MSG_NOTICE([FLAC website: http://flac.sourceforge.net])
+ )
+-
+-
++fi
+ 
+ 
+ 
+@@ -603,9 +615,13 @@
+ dnl ############################################################################
+ dnl # Handle the flags for a library to to tempo/pitch changing independantly  *
+ dnl ############################################################################
+-AM_PATH_SOUNDTOUCH([],[],AC_MSG_WARN([***** libSoundTouch not found -- tempo and pitch changing will be disabled (http://www.iki.fi/oparviai/soundtouch) *****]))
++AC_ARG_ENABLE(soundtouch, AC_HELP_STRING([--disable-soundtouch], [disable support for soundtouch (default=autodetect)]), [ enable_soundtouch=$enableval ], [ enable_soundtouch=yes ])
+ 
+ 
++if test "x$enable_soundtouch" = "xyes"; then
++AM_PATH_SOUNDTOUCH([],[],AC_MSG_WARN([***** libSoundTouch not found -- tempo and pitch changing will be disabled (http://www.iki.fi/oparviai/soundtouch) *****]))
++fi
++
+ 
+ 
+ 
diff --git a/media-sound/rezound/files/rezound-0.12.2_beta-flac-1.1.3.patch b/media-sound/rezound/files/rezound-0.12.2_beta-flac-1.1.3.patch
new file mode 100644
index 000000000000..6dbb69db1992
--- /dev/null
+++ b/media-sound/rezound/files/rezound-0.12.2_beta-flac-1.1.3.patch
@@ -0,0 +1,99 @@
+--- rezound-0.12.2beta/src/backend/CFLACSoundTranslator.cpp.old	2006-12-04 19:08:26.000000000 +0100
++++ rezound-0.12.2beta/src/backend/CFLACSoundTranslator.cpp	2006-12-04 19:33:45.000000000 +0100
+@@ -42,6 +42,12 @@
+ #include "CSound.h"
+ #include "AStatusComm.h"
+ 
++#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8
++#define LEGACY_FLAC
++#else
++#undef LEGACY_FLAC
++#endif
++
+ CFLACSoundTranslator::CFLACSoundTranslator()
+ {
+ }
+@@ -75,15 +81,23 @@
+ 		for(unsigned t=0;t<MAX_CHANNELS;t++)
+ 			accessers[t]=NULL;
+ 
++#ifdef LEGACY_FLAC
+ 		set_filename(filename.c_str());
++#endif
+ 
+ 		set_metadata_ignore_all();
+ 		//set_metadata_respond(FLAC__METADATA_TYPE_VORBIS_COMMENT);
+ 		//set_metadata_respond(FLAC__METADATA_TYPE_CUESHEET);
+ 
++#ifdef LEGACY_FLAC
+ 		State s=init();
+ 		if(s!=FLAC__FILE_DECODER_OK)
+ 			throw runtime_error(string(__func__)+" -- "+s.as_cstring());
++#else
++		FLAC__StreamDecoderInitStatus s=init(filename.c_str());
++		if(s!=FLAC__STREAM_DECODER_INIT_STATUS_OK)
++			throw runtime_error(string(__func__)+" -- FLAC__STREAM_DECODER_INIT_STATUS not OK");
++#endif
+ 	}
+ 
+ 	virtual ~MyFLACDecoderFile()
+@@ -170,7 +184,11 @@
+ 
+ 		// update status bar and detect user cancel
+ 		FLAC__uint64 filePosition;
++#ifdef LEGACY_FLAC
+ 		FLAC__file_decoder_get_decode_position(decoder_, &filePosition);
++#else
++		FLAC__stream_decoder_get_decode_position(decoder_, &filePosition);
++#endif
+ 		return statusBar.update(filePosition) ? FLAC__STREAM_DECODER_WRITE_STATUS_ABORT : FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
+ 	}
+ 
+@@ -215,7 +233,11 @@
+ bool CFLACSoundTranslator::onLoadSound(const string filename,CSound *sound) const
+ {
+ 	MyFLACDecoderFile f(filename,sound);
++#ifdef LEGACY_FLAC
+ 	return f.process_until_end_of_file();
++#else
++	return f.process_until_end_of_stream();
++#endif	
+ }
+ 
+ 
+@@ -258,7 +280,9 @@
+ 
+ 	MyFLACEncoderFile f(saveLength);
+ 
++#ifdef LEGACY_FLAC
+ 	f.set_filename(filename.c_str());
++#endif
+ 
+ 	f.set_channels(sound->getChannelCount());
+ 
+@@ -274,8 +298,13 @@
+ 	//f.set_metadata(...) // ??? to do to set cues and user notes, etc
+ 
+ 
++#ifdef LEGACY_FLAC
+ 	MyFLACEncoderFile::State s=f.init();
+ 	if(s==FLAC__STREAM_ENCODER_OK)
++#else
++	FLAC__StreamEncoderInitStatus s=f.init(filename.c_str());
++	if(s==FLAC__STREAM_ENCODER_INIT_STATUS_OK)
++#endif
+ 	{
+ 		#define BUFFER_SIZE 65536
+ 		TAutoBuffer<FLAC__int32> buffers[MAX_CHANNELS];
+@@ -328,7 +357,11 @@
+ 		return true;
+ 	}
+ 	else
++#ifdef LEGACY_FLAC
+ 		throw runtime_error(string(__func__)+" -- error creating FLAC encoder -- "+s.as_cstring());
++#else
++		throw runtime_error(string(__func__)+" -- error creating FLAC encoder -- ");
++#endif
+ 
+ }
+