old

Package-Manager: portage-2.1.5_rc3

5 files changed, 0 insertions, 436 deletions

diff --git a/media-sound/cheesetracker/Manifest b/media-sound/cheesetracker/Manifest
index 6f2984e615a4..f37e73816168 100644
--- a/media-sound/cheesetracker/Manifest
+++ b/media-sound/cheesetracker/Manifest
@@ -1,11 +1,6 @@
-AUX cheesetracker-0.9.9-64bit-clean.diff 4677 RMD160 7225cad56b1cef3d0aac54d89f1b46d9bd42159f SHA1 6a41f6ba2ad1f0a6d4ce84f3b904c989a9426b1c SHA256 e02de0bcf144fd0b7d9b6423d5bb0752f91ab24730e2b5b3665195bfd0aebdd7
-AUX cheesetracker-0.9.9-buffer-overflow.diff 694 RMD160 37e8cbf346deb82b49ba46cf5ce65d12614562da SHA1 37edd1f7caefa4c0d9517f00b2a3c593341a5248 SHA256 96c758768373091bca6e1f0e287e42e7ddbaed951e134258958b8e5c1ee9dadb
-AUX cheesetracker-0.9.9-gcc4.patch 9385 RMD160 312842506ea3481c6e65dc71e7a99525d1a3e957 SHA1 042a3e6fff57e70a1fa3f0daa6a9bffc7acfc8c6 SHA256 173bffe11cfa1cd4e7622b9841599b0ac03e56d2f0ef2607fd4424c961bbec6f
 DIST cheesetracker-0.9.15.2.tar.bz2 797891 RMD160 fae37fff528f7ead129b6e5e868d9c88b77dc3fa SHA1 66fbe87a9628161d36f32075a76e6f5c02d31b27 SHA256 ad0e56cf578819ef723f5a6d4aadd9af5086395475be9adb0c8e0ee9b76afcda
 DIST cheesetracker-0.9.15.3.tar.gz 896347 RMD160 5b1103679ecf28cfc874d48ab2903531e11026c2 SHA1 1748afcc038921316f97e8f8daf62487f2055ea9 SHA256 848faf089f61d4b13106b4745fed6699455c61c51d65e012317bf3adc4ce37b4
-DIST cheesetracker-0.9.9.tar.gz 842246 RMD160 2fba963f614a2436088d1bb00a61379bcb3f4c79 SHA1 0f23430a24afde2fd4999af1bffe1f1c638e0180 SHA256 97ddb3a7e6959400c1f042b8661a43540b3d5790db39c18bb9ce413a76d41d55
 EBUILD cheesetracker-0.9.15.2.ebuild 1174 RMD160 f6fcbb0b3cc55f03c5ef9bad6875bf632332dabe SHA1 e02680e51f866a3c9b4d67146cc33c9a588d5b5e SHA256 106598648585ebb8a5e4494d23f0be1f6ca554e0e92d231c517ffd76621938b8
 EBUILD cheesetracker-0.9.15.3.ebuild 1174 RMD160 f81ba7592f98e2ceee0d7714c47c946793e12a6b SHA1 ce411a2d47631e03c0a259dde212398b73f1e959 SHA256 ec44c8499342e3f2ab9ddc3a26649ef9fbad94a882ee1d9d4e36d4f6923221da
-EBUILD cheesetracker-0.9.9-r1.ebuild 1003 RMD160 b8839efda43c3769f3cb88170f138439ab461d31 SHA1 3c487b16f50c07f858dfc5e3fafd96162fe6ce94 SHA256 99bfcbe2242203ad44459c793114e35d7c9c43787d5e1f4cc671efa9739ebce9
 MISC ChangeLog 4121 RMD160 356a5dd2bb80e4f901bc8ef28f5a089b49bbdf24 SHA1 8a806e9998fb12396885b271a59c9a97aaecc6b4 SHA256 4c59e3d8cdc05125f91ebbc6703a72741d8995c8d1602ea1417ba88c01228dcb
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
diff --git a/media-sound/cheesetracker/cheesetracker-0.9.9-r1.ebuild b/media-sound/cheesetracker/cheesetracker-0.9.9-r1.ebuild
deleted file mode 100644
index 93ca3b606ca1..000000000000
--- a/media-sound/cheesetracker/cheesetracker-0.9.9-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cheesetracker/cheesetracker-0.9.9-r1.ebuild,v 1.4 2006/10/24 10:44:11 tcort Exp $
-
-inherit eutils
-
-DESCRIPTION="A clone of Impulse Tracker with some extensions and a built-in sample editor; uses QT"
-HOMEPAGE="http://cheesetronic.sf.net/"
-SRC_URI="mirror://sourceforge/cheesetronic/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~ppc sparc x86"
-IUSE="jack"
-
-RDEPEND="jack? ( media-sound/jack-audio-connection-kit )
-	=dev-libs/libsigc++-1.2*
-	=x11-libs/qt-3*"
-DEPEND="${RDEPEND}
-	>=dev-util/scons-0.94-r2"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-64bit-clean.diff"
-	epatch "${FILESDIR}/${P}-gcc4.patch"
-	epatch "${FILESDIR}"/${P}-buffer-overflow.diff
-}
-
-src_compile() {
-	scons || die
-}
-
-src_install() {
-	dodir /usr/bin
-	scons prefix=${D}/usr install || die
-	dodoc AUTHORS ChangeLog NEWS README TODO docs/*.txt
-}
diff --git a/media-sound/cheesetracker/files/cheesetracker-0.9.9-64bit-clean.diff b/media-sound/cheesetracker/files/cheesetracker-0.9.9-64bit-clean.diff
deleted file mode 100644
index 85ff51a59634..000000000000
--- a/media-sound/cheesetracker/files/cheesetracker-0.9.9-64bit-clean.diff
+++ /dev/null
@@ -1,114 +0,0 @@
-diff -ruNd cheesetracker-0.9.9.orig/common/components/data/dds_packer.cpp cheesetracker-0.9.9/common/components/data/dds_packer.cpp
---- cheesetracker-0.9.9.orig/common/components/data/dds_packer.cpp	2004-05-29 18:43:34.000000000 +0200
-+++ cheesetracker-0.9.9/common/components/data/dds_packer.cpp	2004-05-29 18:59:21.000000000 +0200
-@@ -63,8 +63,11 @@
- 		}; break;
- 
- 		case DDS::T_POINTER: {
--			// warning
--			aux_int = (Uint32*)&p_I->second.data_ptr;
-+			p_data.resize(p_data.size() + sizeof(void *));
-+			store_ptr(p_data, data_index, p_I->second.data_ptr);
-+			data_index += sizeof(void *);
-+
-+			return (data_index - p_index);
- 		}; break;
- 
- 		case DDS::T_INT_ARRAY: {
-@@ -234,6 +237,13 @@
- 
- };
- 
-+void DDSPacker::store_ptr(data& p_data, Uint32 p_index, void * p_ptr)
-+{
-+	for (int i = 0; i < sizeof(void *); ++i) {
-+		p_data[p_index + i] = ((Uint8 *) &p_ptr)[i];
-+	}
-+}
-+
- void DDSPacker::store_dword(data& p_data, Uint32 data_index, Uint32 p_dword) {
- 
- 	//p_data.resize(p_data.size() + 4);
-@@ -312,8 +322,8 @@
- 
- 		case DDS::T_POINTER: {
- 			// warning
--			void* aux_pointer = (void*)get_dword(p_data, data_index);
--			data_index += 4;
-+			void* aux_pointer = get_ptr(p_data, data_index);
-+			data_index += sizeof(void *);
- 			p_struct->set_pointer_var(name, aux_pointer);
- 		}; break;
- 
-@@ -451,6 +461,17 @@
- 
- };
- 
-+void * DDSPacker::get_ptr(const Uint8* p_data, Uint32 p_index)
-+{
-+	void * result = NULL;
-+
-+	for (int i = 0; i < sizeof(void *); ++i) {
-+		((Uint8 *) &result)[i] = p_data[p_index + i];
-+	}
-+
-+	return result;
-+}
-+
- Uint32 DDSPacker::get_dword(const Uint8* p_data, Uint32 p_index) {
- 
- 	Uint32 aux_value = 0;
-diff -ruNd cheesetracker-0.9.9.orig/common/components/data/dds_packer.h cheesetracker-0.9.9/common/components/data/dds_packer.h
---- cheesetracker-0.9.9.orig/common/components/data/dds_packer.h	2004-05-29 18:43:34.000000000 +0200
-+++ cheesetracker-0.9.9/common/components/data/dds_packer.h	2004-05-29 18:56:21.000000000 +0200
-@@ -29,8 +29,10 @@
- 
- public:
- 	static void store_data(data& p_data, Uint32 p_index, const Uint8* p_data_ptr, Uint32 p_size);
-+	static void store_ptr(data& p_data, Uint32 p_index, void * p_ptr);
- 	static void store_dword(data& p_data, Uint32 data_index, Uint32 p_dword);
- 	static Uint32 get_dword(const Uint8* p_data, Uint32 p_index);
-+	static void * get_ptr(const Uint8* p_data, Uint32 p_index);
- 	static Sint32 get_string(const Uint8* p_data, Uint32 p_data_size, Uint32 p_index, string &p_str);
- 
- 	static void pack(DDS* p_struct, data& p_vector, Uint32 p_offset = 0);
-diff -ruNd cheesetracker-0.9.9.orig/common/plugins/resamplers/resampler_cosine.cpp 
-cheesetracker-0.9.9/common/plugins/resamplers/resampler_cosine.cpp
---- cheesetracker-0.9.9.orig/common/plugins/resamplers/resampler_cosine.cpp	2004-05-29 18:43:34.000000000 +0200
-+++ cheesetracker-0.9.9/common/plugins/resamplers/resampler_cosine.cpp	2004-05-30 11:05:31.417363920 +0200
-@@ -26,7 +26,14 @@
- static void mix_cosine(Resampler::Mix_Data *mixdata,Sint32 *p_table) {
- 
- 	HELPER_INITIALIZE
--	Uint32 real_index;
-+	/* 64bit: real_index was of type unsigned. If the index was in reality
-+	 * representing a negative values (let's say -1 or 0xffffffff), there
-+	 * was no problem on 32bit systems, because it was only used as an index
-+	 * into a byte-array, where adding 0xffffffff or subtracting -1 is equivalent.
-+	 * On a 64 bit system this is no longer the case, because no overflow occurs,
-+	 * so that real_index is now signed.
-+	 */
-+	Sint32 real_index;
- 	Sint32 last_sample=mixdata->sample->get_size()-1;
- 	Uint32 fractional_mask=(1L<<fractional_size)-1L;
- 	//sample_t next_index;
-diff -ruNd cheesetracker-0.9.9.orig/common/plugins/resamplers/resampler_linear.cpp 
-cheesetracker-0.9.9/common/plugins/resamplers/resampler_linear.cpp
---- cheesetracker-0.9.9.orig/common/plugins/resamplers/resampler_linear.cpp	2004-05-29 18:43:34.000000000 +0200
-+++ cheesetracker-0.9.9/common/plugins/resamplers/resampler_linear.cpp	2004-05-30 11:10:57.120849464 +0200
-@@ -21,7 +21,14 @@
- static void mix_linear(Resampler::Mix_Data *mixdata) {
- 
- 	HELPER_INITIALIZE
--	Uint32 real_index;
-+	/* 64bit: real_index was of type unsigned. If the index was in reality
-+	 * representing a negative values (let's say -1 or 0xffffffff), there
-+	 * was no problem on 32bit systems, because it was only used as an index
-+	 * into a byte-array, where adding 0xffffffff or subtracting -1 is equivalent.
-+	 * On a 64 bit system this is no longer the case, because no overflow occurs,
-+	 * so that real_index is now signed.
-+	 */
-+	Sint32 real_index;
- //	Sint32 last_sample=mixdata->sample->get_size()-1;
- 	Uint32 fractional_mask=(1L<<fractional_size)-1L;
- 	//sample_t next_index;
diff --git a/media-sound/cheesetracker/files/cheesetracker-0.9.9-buffer-overflow.diff b/media-sound/cheesetracker/files/cheesetracker-0.9.9-buffer-overflow.diff
deleted file mode 100644
index de046a6b29ae..000000000000
--- a/media-sound/cheesetracker/files/cheesetracker-0.9.9-buffer-overflow.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- cheesetracker-0.9.9.orig/cheesetracker/loaders/loader_xm.cpp
-+++ cheesetracker-0.9.9/cheesetracker/loaders/loader_xm.cpp
-@@ -494,7 +494,10 @@
- 
- 			if ((reader.get_file_pos()-p_cpos)<p_hsize) {
- 
--				Uint8 junkbuster[500];
-+                                // allocate a buffer big enough for the data being read
-+                                Uint8 *junkbuster = new Uint8 [p_hsize-(reader.get_file_pos()-p_cpos)];
-+                                // return in error if it can't be allocated
-+                                if (!junkbuster) return FILE_ERROR;
- 
- 				//printf("extra junk XM instrument in header! hsize is %i, extra junk: %i\n",p_hsize,(reader.get_file_pos()-p_cpos));
- 
\ No newline at end of file
diff --git a/media-sound/cheesetracker/files/cheesetracker-0.9.9-gcc4.patch b/media-sound/cheesetracker/files/cheesetracker-0.9.9-gcc4.patch
deleted file mode 100644
index f80d0acc4b84..000000000000
--- a/media-sound/cheesetracker/files/cheesetracker-0.9.9-gcc4.patch
+++ /dev/null
@@ -1,265 +0,0 @@
-diff -Naur cheesetracker-0.9.9.old/cheesetracker/interface__QT/interface.cpp cheesetracker-0.9.9/cheesetracker/interface__QT/interface.cpp
---- cheesetracker-0.9.9.old/cheesetracker/interface__QT/interface.cpp	2006-04-01 00:03:44.000000000 -0500
-+++ cheesetracker-0.9.9/cheesetracker/interface__QT/interface.cpp	2006-04-01 00:03:43.000000000 -0500
-@@ -42,7 +42,7 @@
- #include <qmessagebox.h>
- 
- 
--Saver::Error  Interface::save_song() {
-+Audio::Saver::Error  Interface::save_song() {
- 
- 	FILE *f=fopen(tracker.song.variables.filename.c_str(),"rb");
- 	if (!f) { //file doesnt exist, cant do direct save
-@@ -53,14 +53,14 @@
-         if (tracker.format_manager.save_module(tracker.song.variables.filename.c_str())) {
- 
- 		QMessageBox::warning( this, "Oops!","Error saving song!","Ok");
--		return Saver::SAVE_ERROR;
-+		return Audio::Saver::SAVE_ERROR;
- 	}
- 
--	return Saver::SAVE_OK;
-+	return Audio::Saver::SAVE_OK;
- 
- }
- 
--Saver::Error  Interface::save_song_as() {
-+Audio::Saver::Error  Interface::save_song_as() {
- 
- 	QString s=QString::null;
- 
-@@ -87,7 +87,7 @@
- 
- 
- 	if (s==QString::null)
--		return Saver::SAVE_OK; //nothing selected
-+		return Audio::Saver::SAVE_OK; //nothing selected
- 
- 
- 
-@@ -97,19 +97,19 @@
- 		if ( QMessageBox::warning( this, "Question:","File exists! Overwrite?","Yes", "No") ) {
- 
- //			//printf("Leaving file alone!\n");
--			return Saver::SAVE_OK;
-+			return Audio::Saver::SAVE_OK;
- 		}
- 	}
- 
-         if (tracker.format_manager.save_module(s.ascii())) {
- 
- 		QMessageBox::warning( this, "Oops!","Error saving song!","Ok");
--		return Saver::SAVE_ERROR;
-+		return Audio::Saver::SAVE_ERROR;
- 	}
- 
- 	tracker.song.variables.filename=s.ascii();
- 
--	return Saver::SAVE_OK;
-+	return Audio::Saver::SAVE_OK;
- }
- 
- string Interface::get_song_name() {
-diff -Naur cheesetracker-0.9.9.old/cheesetracker/interface__QT/interface.h cheesetracker-0.9.9/cheesetracker/interface__QT/interface.h
---- cheesetracker-0.9.9.old/cheesetracker/interface__QT/interface.h	2006-04-01 00:03:44.000000000 -0500
-+++ cheesetracker-0.9.9/cheesetracker/interface__QT/interface.h	2006-04-01 00:03:43.000000000 -0500
-@@ -112,8 +112,8 @@
- 	PageList get_current_page();
- 
- 	Loader::Error  open_song(string p_name);
--	Saver::Error  save_song();
--	Saver::Error  save_song_as();
-+	Audio::Saver::Error  save_song();
-+	Audio::Saver::Error  save_song_as();
- 
- 
-     Interface(QWidget *p_widget);
-diff -Naur cheesetracker-0.9.9.old/cheesetracker/savers/saver_ct.h cheesetracker-0.9.9/cheesetracker/savers/saver_ct.h
---- cheesetracker-0.9.9.old/cheesetracker/savers/saver_ct.h	2006-04-01 00:03:44.000000000 -0500
-+++ cheesetracker-0.9.9/cheesetracker/savers/saver_ct.h	2006-04-01 00:03:43.000000000 -0500
-@@ -15,6 +15,8 @@
- #include "trackercore/saver.h"
- #include "components/audio/dds_helpers.h"
- 
-+using namespace Audio;
-+
- /**
- @author Juan Linietsky
- */
-diff -Naur cheesetracker-0.9.9.old/cheesetracker/savers/saver_it.h cheesetracker-0.9.9/cheesetracker/savers/saver_it.h
---- cheesetracker-0.9.9.old/cheesetracker/savers/saver_it.h	2006-04-01 00:03:44.000000000 -0500
-+++ cheesetracker-0.9.9/cheesetracker/savers/saver_it.h	2006-04-01 00:03:43.000000000 -0500
-@@ -51,7 +51,7 @@
- ********************************/
- 
- 
--
-+using namespace Audio;
- 
- 
- class Saver_IT : public Saver {
-diff -Naur cheesetracker-0.9.9.old/cheesetracker/savers/saver_raw.h cheesetracker-0.9.9/cheesetracker/savers/saver_raw.h
---- cheesetracker-0.9.9.old/cheesetracker/savers/saver_raw.h	2006-04-01 00:03:44.000000000 -0500
-+++ cheesetracker-0.9.9/cheesetracker/savers/saver_raw.h	2006-04-01 00:03:43.000000000 -0500
-@@ -42,7 +42,7 @@
-   *@author red
-   */
- 
--
-+using namespace Audio;
- 
- 
- class Saver_Raw : public Saver  {
-diff -Naur cheesetracker-0.9.9.old/cheesetracker/savers/saver_wav.h cheesetracker-0.9.9/cheesetracker/savers/saver_wav.h
---- cheesetracker-0.9.9.old/cheesetracker/savers/saver_wav.h	2006-04-01 00:03:44.000000000 -0500
-+++ cheesetracker-0.9.9/cheesetracker/savers/saver_wav.h	2006-04-01 00:03:43.000000000 -0500
-@@ -39,7 +39,7 @@
-   *@author red
-   */
- 
--
-+using namespace Audio;
- 
- 
- class Saver_Wav : public Saver  {
-diff -Naur cheesetracker-0.9.9.old/cheesetracker/trackercore/file_format_manager.cpp cheesetracker-0.9.9/cheesetracker/trackercore/file_format_manager.cpp
---- cheesetracker-0.9.9.old/cheesetracker/trackercore/file_format_manager.cpp	2006-04-01 00:03:44.000000000 -0500
-+++ cheesetracker-0.9.9/cheesetracker/trackercore/file_format_manager.cpp	2006-04-01 00:04:22.000000000 -0500
-@@ -35,7 +35,7 @@
- 
- #include "file_format_manager.h"
- 
--
-+using namespace Audio;
- 
- 
- File_Format_Manager::File_Format_Manager(){
-@@ -78,7 +78,7 @@
- 	return temperr;
- }
- 
--void File_Format_Manager::register_saver(Saver *p_saver) {
-+void File_Format_Manager::register_saver(Audio::Saver *p_saver) {
- 
- 	if (song==NULL) {
- 
-@@ -93,11 +93,11 @@
- int File_Format_Manager::save_module(const char *p_filename) {
- 	
- 	Saver_List::const_iterator I;
--	int temperr=Saver::UNKNOWN_TYPE;
-+	int temperr=Audio::Saver::UNKNOWN_TYPE;
- 
- 	for (I=saver_list.begin();I!=saver_list.end();I++) {
- 
--		if ((temperr=(*I)->save(p_filename))!=Saver::UNKNOWN_TYPE) {
-+		if ((temperr=(*I)->save(p_filename))!=Audio::Saver::UNKNOWN_TYPE) {
- 
- 				return temperr;
- 		}
-@@ -109,11 +109,11 @@
- int File_Format_Manager::save_sample(const char *p_filename, int p_index) {
- 
- 	Saver_List::const_iterator I;
--	int temperr=Saver::UNKNOWN_TYPE;
-+	int temperr=Audio::Saver::UNKNOWN_TYPE;
- 
- 	for (I=saver_list.begin();I!=saver_list.end();I++) {
- 
--		if ((temperr=(*I)->save_sample(p_filename,p_index))!=Saver::UNKNOWN_TYPE) {
-+		if ((temperr=(*I)->save_sample(p_filename,p_index))!=Audio::Saver::UNKNOWN_TYPE) {
- 
- 				return temperr;
- 		}
-@@ -124,11 +124,11 @@
- int File_Format_Manager::save_instrument(const char *p_filename, int p_index) {
- 
- 	Saver_List::const_iterator I;
--	int temperr=Saver::UNKNOWN_TYPE;
-+	int temperr=Audio::Saver::UNKNOWN_TYPE;
- 
- 	for (I=saver_list.begin();I!=saver_list.end();I++) {
- 
--		if ((temperr=(*I)->save_instrument(p_filename,p_index))!=Saver::UNKNOWN_TYPE) {
-+		if ((temperr=(*I)->save_instrument(p_filename,p_index))!=Audio::Saver::UNKNOWN_TYPE) {
- 
- 				return temperr;
- 		}
-diff -Naur cheesetracker-0.9.9.old/cheesetracker/trackercore/file_format_manager.h cheesetracker-0.9.9/cheesetracker/trackercore/file_format_manager.h
---- cheesetracker-0.9.9.old/cheesetracker/trackercore/file_format_manager.h	2006-04-01 00:03:44.000000000 -0500
-+++ cheesetracker-0.9.9/cheesetracker/trackercore/file_format_manager.h	2006-04-01 00:03:43.000000000 -0500
-@@ -60,7 +60,7 @@
- class File_Format_Manager {
- 
- 	typedef list<Loader*> Loader_List;
--	typedef list<Saver*> Saver_List;
-+	typedef list<Audio::Saver*> Saver_List;
- 
- 	Loader_List loader_list;
- 	Saver_List saver_list;
-@@ -80,7 +80,7 @@
- 
-         Loader* load_sample_library(const char *p_filename); // Usually, from an instrument, but soundfonds would be cool!
- 
--	void register_saver(Saver *p_saver);
-+	void register_saver(Audio::Saver *p_saver);
-         int save_module(const char *p_filename);
- 
- 	int save_sample(const char *p_filename, int p_index);
-diff -Naur cheesetracker-0.9.9.old/cheesetracker/trackercore/saver.h cheesetracker-0.9.9/cheesetracker/trackercore/saver.h
---- cheesetracker-0.9.9.old/cheesetracker/trackercore/saver.h	2006-04-01 00:03:44.000000000 -0500
-+++ cheesetracker-0.9.9/cheesetracker/trackercore/saver.h	2006-04-01 00:03:43.000000000 -0500
-@@ -53,7 +53,7 @@
- 
- 
- 
--
-+namespace Audio{
- class Saver {
- protected:
- 	Song *song;
-@@ -78,7 +78,7 @@
- 	Saver();
- 	virtual ~Saver();
- };
--
-+}
- 
- 
- #endif
-diff -Naur cheesetracker-0.9.9.old/common/components/audio/resampler_manager.h cheesetracker-0.9.9/common/components/audio/resampler_manager.h
---- cheesetracker-0.9.9.old/common/components/audio/resampler_manager.h	2006-04-01 00:03:44.000000000 -0500
-+++ cheesetracker-0.9.9/common/components/audio/resampler_manager.h	2006-04-01 00:03:43.000000000 -0500
-@@ -34,7 +34,7 @@
- 
- public:
- 
--	static Resampler_Manager * Resampler_Manager::get_resampler_manager();
-+	static Resampler_Manager * get_resampler_manager();
- 	int get_resampler_count();
- 	Resampler * get_resampler(int p_index);
- 
-diff -Naur cheesetracker-0.9.9.old/common/components/data/property_bridges.h cheesetracker-0.9.9/common/components/data/property_bridges.h
---- cheesetracker-0.9.9.old/common/components/data/property_bridges.h	2006-04-01 00:03:44.000000000 -0500
-+++ cheesetracker-0.9.9/common/components/data/property_bridges.h	2006-04-01 00:03:43.000000000 -0500
-@@ -41,7 +41,7 @@
-   */
- 
-   #define BRIDGE_COPY_VALUE(T) \
--	virtual bool T::copy_value(const Property_Bridge& rvalue) {\
-+	virtual bool copy_value(const Property_Bridge& rvalue) {\
- 		T* rcast = dynamic_cast<T*>((T*)&rvalue);\
- 		if (rcast) {\
- 			set(rcast->get());\
-diff -Naur cheesetracker-0.9.9.old/common/drivers/posix/sound_driver_jack.h cheesetracker-0.9.9/common/drivers/posix/sound_driver_jack.h
---- cheesetracker-0.9.9.old/common/drivers/posix/sound_driver_jack.h	2006-04-01 00:03:44.000000000 -0500
-+++ cheesetracker-0.9.9/common/drivers/posix/sound_driver_jack.h	2006-04-01 00:03:43.000000000 -0500
-@@ -72,7 +72,7 @@
- 
- 	int jack_callback_nframes;
- 
--	Sound_Driver::Status Sound_Driver_JACK::process();
-+	Sound_Driver::Status process();
- 
-         static int process_jack_callback(jack_nframes_t nframes,void *arg);
-         static int jack_set_mixfreq(jack_nframes_t nframes,void *arg);