| [proaudio] [1400] ReZound -9999 updates: |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 1400
Author: gimpel
Date: 2008-12-17 20:17:06 +0100 (Wed, 17 Dec 2008)
Log Message:
-----------
ReZound -9999 updates:
* uses SVN meanwhile
* ebuild uses (newer) qt4-port branch
KNOWN ISSUES:
* ALSA seems broken
* imported MP3 seems to crash on playback
* no button icons are displayed
* frontend_qt4 build is very noisy
Modified Paths:
--------------
trunk/overlays/proaudio/media-sound/rezound/Manifest
trunk/overlays/proaudio/media-sound/rezound/rezound-9999.ebuild
Added Paths:
-----------
trunk/overlays/proaudio/media-sound/rezound/files/rezound-9999-gcc43.patch
trunk/overlays/proaudio/media-sound/rezound/files/rezound-9999-qt44.patch
Removed Paths:
-------------
trunk/overlays/proaudio/media-sound/rezound/files/Makefile.in.in.gz
trunk/overlays/proaudio/media-sound/rezound/files/rezound-0.12.2_beta-foxinclude.patch
trunk/overlays/proaudio/media-sound/rezound/files/rezound-0.12.2_beta-patches.tar.bz2
trunk/overlays/proaudio/media-sound/rezound/files/rezound-flac-1.2.patch
trunk/overlays/proaudio/media-sound/rezound/files/undefined-functions.patch
Modified: trunk/overlays/proaudio/media-sound/rezound/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/rezound/Manifest 2008-12-16 22:58:45 UTC (rev 1399)
+++ trunk/overlays/proaudio/media-sound/rezound/Manifest 2008-12-17 19:17:06 UTC (rev 1400)
@@ -1,8 +1,6 @@
-AUX Makefile.in.in.gz 2928 RMD160 aeb4a9b01bc559a2b73b946869ae8137025884bc SHA1 6b8ec171a33f9c3ee54ea23fced34002405e05a8 SHA256 771ca7de6c060521c292f929a6b5ab368fcd692ae5b47715f419f6cf9fc91dfa
-AUX rezound-0.12.2_beta-foxinclude.patch 550 RMD160 28762c3a1ea58b2a8b825f53d332b06c838cecc8 SHA1 6b405f22903a30034805df498b9440af00928791 SHA256 4b81b271e092abcffbbef23d407f764b2a2bee2ee474d6e11f1b2b917398a2b6
-AUX rezound-0.12.2_beta-patches.tar.bz2 7479 RMD160 c23f4208d38c271cea04ecd4f4af852cd2e4eda4 SHA1 fbad278a4f336428fb37147e8616f6c118239e71 SHA256 37ab114e34144be9fa198efd6de7610720a906a0d94d77a4e912982d72263392
-AUX rezound-flac-1.2.patch 2226 RMD160 51856ac59ca3c1ce5d1550cd5312da817ba5dbf3 SHA1 760b0c03a493bb52ccfce56cbde2e9cddda3d10f SHA256 2229ad3fcc4a1bacfcaad166b0605c315d18d793ebf0fecf5bd61b24fc7e6bc1
-AUX undefined-functions.patch 1084 RMD160 4a2086423af2571cfb863ca95ec500a0e627527f SHA1 64a0ba99259e4d6e2b51f71c350c08055eb9ced5 SHA256 3093932261d232f81ca3bccdbccc258e932e85525f1b2d277b4a7b58c752ab27
-EBUILD rezound-9999.ebuild 2849 RMD160 ef18a0ab4c7840f3107e93ace7e83124e3ad1d97 SHA1 0ce49475f6022ecd28f3de37d97c9374ed71923d SHA256 90c35a5e8ee3de1842aa1b63ba3e616b799473f69a1ef959ebab08a1a1cdeeef
+AUX rezound-9999-gcc43.patch 30494 RMD160 71959c67927359ffc277303bf6f879b09a5153fe SHA1 0facd68d74de9bb507a038dec30885b77c75d0b4 SHA256 1473b55f95b2b6ab7607de61e4aed7ba42ac8ccc7371c52aaabe20bbcee48246
+AUX rezound-9999-qt44.patch 485 RMD160 89ca07e742533f0beb4d91a942e8bd163e3f31e5 SHA1 b681c88a6ddb0f03706058589dfd94d09598c9b5 SHA256 34828dfe25a96df290281d0e452d205dd380fb06a3d80b45f5db4798f9e58e70
+DIST rezound-0.12.3_beta-patches-5.tar.bz2 11361 RMD160 a44ee3b5d82bb8d2e7b15e0634d20cb08b723975 SHA1 7fd816e637299ca9ae1d0f1b5b5a4d9e97600b24 SHA256 c2f7d192f05881c46de7a7027b2ef2369e9ac9821f3ddeb57a94389cf3d502c7
+EBUILD rezound-9999.ebuild 2522 RMD160 c3f4b8b124d562e0d4937f3134b9bf7c74415922 SHA1 b4fc0d5da6d8bcb25040e5ca31452bd95dbb4316 SHA256 470d1d6f092b6a9cf09d8d7cfa7b66dbd76960f6fb9a98e18230960c4a28d36b
MISC ChangeLog 207 RMD160 db203944a59277b2207f38d9433d34dec51d5136 SHA1 adddd6b1b12c5ad98078d593641cdc26e05fbc5c SHA256 2b23a4aa098f8af408f0c4e685cd11c3e5a898582340bf9129bd4acf9e11e4bd
MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89
Deleted: trunk/overlays/proaudio/media-sound/rezound/files/Makefile.in.in.gz
===================================================================
(Binary files differ)
Deleted: trunk/overlays/proaudio/media-sound/rezound/files/rezound-0.12.2_beta-foxinclude.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/rezound/files/rezound-0.12.2_beta-foxinclude.patch 2008-12-16 22:58:45 UTC (rev 1399)
+++ trunk/overlays/proaudio/media-sound/rezound/files/rezound-0.12.2_beta-foxinclude.patch 2008-12-17 19:17:06 UTC (rev 1400)
@@ -1,11 +0,0 @@
---- src/frontend_fox/Makefile.am.old 2006-10-31 23:06:43.000000000 +0100
-+++ src/frontend_fox/Makefile.am 2006-10-31 23:07:10.000000000 +0100
-@@ -122,7 +122,7 @@
- rezound_DEPENDENCIES=$(_rezound_LDADD)
-
-
--AM_CXXFLAGS=-I/usr/include/fox-1.6 @FOX_1_6_CXXFLAGS@ @FOX_1_5_CXXFLAGS@ @FOX_1_4_CXXFLAGS@ @FOX_1_3_CXXFLAGS@ @FOX_1_2_CXXFLAGS@ @FOX_1_1_CXXFLAGS@ @FOX_CXXFLAGS@
-+AM_CXXFLAGS=@FOX_1_6_CXXFLAGS@ @FOX_1_5_CXXFLAGS@ @FOX_1_4_CXXFLAGS@ @FOX_1_3_CXXFLAGS@ @FOX_1_2_CXXFLAGS@ @FOX_1_1_CXXFLAGS@ @FOX_CXXFLAGS@
-
- noinst_HEADERS=\
- fox_compat.h \
Deleted: trunk/overlays/proaudio/media-sound/rezound/files/rezound-0.12.2_beta-patches.tar.bz2
===================================================================
(Binary files differ)
Added: trunk/overlays/proaudio/media-sound/rezound/files/rezound-9999-gcc43.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/rezound/files/rezound-9999-gcc43.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/rezound/files/rezound-9999-gcc43.patch 2008-12-17 19:17:06 UTC (rev 1400)
@@ -0,0 +1,452 @@
+diff -Naur rezound.orig/src/backend/ALFO.h rezound/src/backend/ALFO.h
+--- rezound.orig/src/backend/ALFO.h 2008-12-17 10:23:03.000000000 +0100
++++ rezound/src/backend/ALFO.h 2008-12-17 10:23:24.000000000 +0100
+@@ -21,6 +21,16 @@
+ #ifndef __ALFO_H__
+ #define __ALFO_H__
+
++#ifndef GCC_VERSION
++#define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
++#endif
++
++#if GCC_VERSION >= 403
++# define STATIC
++#else
++# define STATIC static
++#endif
++
+ #include "../../config/common.h"
+
+ #include "CSound_defs.h"
+@@ -94,7 +104,7 @@
+ };
+
+ #include <CNestedDataFile/anytype.h>
+-template<> static const CLFODescription string_to_anytype<CLFODescription>(const string &str,CLFODescription &ret)
++template<> STATIC const CLFODescription string_to_anytype<CLFODescription>(const string &str,CLFODescription &ret)
+ {
+ CNestedDataFile f;
+ f.parseString(s2at::remove_surrounding_quotes(str));
+@@ -102,7 +112,7 @@
+ return ret;
+ }
+
+-template<> static const string anytype_to_string<CLFODescription>(const CLFODescription &any)
++template<> STATIC const string anytype_to_string<CLFODescription>(const CLFODescription &any)
+ {
+ CNestedDataFile f; any.writeToFile(&f,"");
+ return "\""+s2at::escape_chars(istring(f.asString()).searchAndReplace("\n"," ",true))+"\"";
+diff -Naur rezound.orig/src/backend/CGraphParamValueNode.h rezound/src/backend/CGraphParamValueNode.h
+--- rezound.orig/src/backend/CGraphParamValueNode.h 2008-12-17 10:23:03.000000000 +0100
++++ rezound/src/backend/CGraphParamValueNode.h 2008-12-17 10:23:24.000000000 +0100
+@@ -21,6 +21,15 @@
+ #ifndef __CGraphParamValueNode_H__
+ #define __CGraphParamValueNode_H__
+
++#ifndef GCC_VERSION
++#define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
++#endif
++
++#if GCC_VERSION >= 403
++# define STATIC
++#else
++# define STATIC static
++#endif
+
+ #include "../../config/common.h"
+
+@@ -45,7 +54,7 @@
+ typedef vector<CGraphParamValueNode> CGraphParamValueNodeList;
+
+ #include <CNestedDataFile/anytype.h>
+-template<> static const CGraphParamValueNode string_to_anytype<CGraphParamValueNode>(const string &_str,CGraphParamValueNode &ret)
++template<> STATIC const CGraphParamValueNode string_to_anytype<CGraphParamValueNode>(const string &_str,CGraphParamValueNode &ret)
+ {
+ const string str=s2at::remove_surrounding_quotes(_str);
+ const size_t pos=str.find("|");
+@@ -56,7 +65,7 @@
+ return ret;
+ }
+
+-template<> static const string anytype_to_string<CGraphParamValueNode>(const CGraphParamValueNode &any)
++template<> STATIC const string anytype_to_string<CGraphParamValueNode>(const CGraphParamValueNode &any)
+ {
+ return "\""+anytype_to_string<double>(any.x)+"|"+anytype_to_string<double>(any.y)+"\"";
+ }
+diff -Naur rezound.orig/src/backend/CPluginMapping.h rezound/src/backend/CPluginMapping.h
+--- rezound.orig/src/backend/CPluginMapping.h 2008-12-17 10:23:03.000000000 +0100
++++ rezound/src/backend/CPluginMapping.h 2008-12-17 10:23:24.000000000 +0100
+@@ -21,6 +21,16 @@
+ #ifndef __CPluginMapping_H__
+ #define __CPluginMapping_H__
+
++#ifndef GCC_VERSION
++#define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
++#endif
++
++#if GCC_VERSION >= 403
++# define STATIC
++#else
++# define STATIC static
++#endif
++
+ #include "../../config/common.h"
+
+ #include <string>
+@@ -215,7 +225,7 @@
+ };
+
+ #include <CNestedDataFile/anytype.h>
+-template<> static const CPluginMapping string_to_anytype<CPluginMapping>(const string &str,CPluginMapping &ret)
++template<> STATIC const CPluginMapping string_to_anytype<CPluginMapping>(const string &str,CPluginMapping &ret)
+ {
+ CNestedDataFile f;
+ f.parseString(s2at::remove_surrounding_quotes(str));
+@@ -223,7 +233,7 @@
+ return ret;
+ }
+
+-template<> static const string anytype_to_string<CPluginMapping>(const CPluginMapping &any)
++template<> STATIC const string anytype_to_string<CPluginMapping>(const CPluginMapping &any)
+ {
+ CNestedDataFile f;
+ any.writeToFile(&f,"");
+diff -Naur rezound.orig/src/backend/CSound_defs.h rezound/src/backend/CSound_defs.h
+--- rezound.orig/src/backend/CSound_defs.h 2008-12-17 10:23:03.000000000 +0100
++++ rezound/src/backend/CSound_defs.h 2008-12-17 10:23:24.000000000 +0100
+@@ -21,6 +21,16 @@
+ #ifndef __CSound_defs_H__
+ #define __CSound_defs_H__
+
++#ifndef GCC_VERSION
++#define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
++#endif
++
++#if GCC_VERSION >= 403
++# define STATIC
++#else
++# define STATIC static
++#endif
++
+ #include "../../config/common.h"
+
+ class CSound;
+@@ -161,10 +171,10 @@
+
+ // int8_t -> ...
+ // int8_t -> int8_t
+- template<> static inline const int8_t convert_sample<int8_t,int8_t>(const register int8_t sample) { return sample; }
++ template<> STATIC inline const int8_t convert_sample<int8_t,int8_t>(const register int8_t sample) { return sample; }
+
+ // int8_t -> int16_t
+- template<> static inline const int16_t convert_sample<int8_t,int16_t>(const register int8_t sample) { return sample*256; }
++ template<> STATIC inline const int16_t convert_sample<int8_t,int16_t>(const register int8_t sample) { return sample*256; }
+
+ // int8_t -> int24_t
+ //template<> static inline const int24_t convert_sample<int8_t,int24_t>(const register int8_t sample) { }
+@@ -173,7 +183,7 @@
+ //template<> static inline const int32_t convert_sample<int8_t,int32_t>(const register int8_t sample) { }
+
+ // int8_t -> float
+- template<> static inline const float convert_sample<int8_t,float>(const register int8_t sample) { return ((float)sample)/127.0f; }
++ template<> STATIC inline const float convert_sample<int8_t,float>(const register int8_t sample) { return ((float)sample)/127.0f; }
+
+ // int8_t -> double
+ //template<> static inline const double convert_sample<int8_t,double>(const register int8_t sample) { }
+@@ -181,22 +191,22 @@
+
+ // int16_t -> ...
+ // int16_t -> int8_t
+- template<> static inline const int8_t convert_sample<int16_t,int8_t>(const register int16_t sample) { return sample/256; }
++ template<> STATIC inline const int8_t convert_sample<int16_t,int8_t>(const register int16_t sample) { return sample/256; }
+
+ // int16_t -> int16_t
+- template<> static inline const int16_t convert_sample<int16_t,int16_t>(const register int16_t sample) { return sample; }
++ template<> STATIC inline const int16_t convert_sample<int16_t,int16_t>(const register int16_t sample) { return sample; }
+
+ // int16_t -> int24_t
+- template<> static inline const int24_t convert_sample<int16_t,int24_t>(const register int16_t sample) { int24_t r; r.set(sample*256); return r; }
++ template<> STATIC inline const int24_t convert_sample<int16_t,int24_t>(const register int16_t sample) { int24_t r; r.set(sample*256); return r; }
+
+ // int16_t -> int32_t
+- template<> static inline const int32_t convert_sample<int16_t,int32_t>(const register int16_t sample) { return sample*65536; }
++ template<> STATIC inline const int32_t convert_sample<int16_t,int32_t>(const register int16_t sample) { return sample*65536; }
+
+ // int16_t -> float
+- template<> static inline const float convert_sample<int16_t,float>(const register int16_t sample) { return (float)sample/32767.0f; }
++ template<> STATIC inline const float convert_sample<int16_t,float>(const register int16_t sample) { return (float)sample/32767.0f; }
+
+ // int16_t -> double
+- template<> static inline const double convert_sample<int16_t,double>(const register int16_t sample) { return (double)sample/32767.0; }
++ template<> STATIC inline const double convert_sample<int16_t,double>(const register int16_t sample) { return (double)sample/32767.0; }
+
+
+ // int24_t -> ...
+@@ -204,16 +214,16 @@
+ //template<> static inline const int8_t convert_sample<int24_t,int8_t>(const int24_t sample) { }
+
+ // int24_t -> int16_t
+- template<> static inline const int16_t convert_sample<int24_t,int16_t>(const int24_t sample) { return sample.get()>>8; }
++ template<> STATIC inline const int16_t convert_sample<int24_t,int16_t>(const int24_t sample) { return sample.get()>>8; }
+
+ // int24_t -> int24_t
+- template<> static inline const int24_t convert_sample<int24_t,int24_t>(const int24_t sample) { return sample; }
++ template<> STATIC inline const int24_t convert_sample<int24_t,int24_t>(const int24_t sample) { return sample; }
+
+ // int24_t -> int32_t
+ //template<> static inline const int32_t convert_sample<int24_t,int32_t>(const int24_t sample) { }
+
+ // int24_t -> float
+- template<> static inline const float convert_sample<int24_t,float>(const int24_t sample) { return sample.get()/8388607.0f; }
++ template<> STATIC inline const float convert_sample<int24_t,float>(const int24_t sample) { return sample.get()/8388607.0f; }
+
+ // int24_t -> double
+ //template<> static inline const double convert_sample<int24_t,double>(const int24_t sample) { }
+@@ -224,16 +234,16 @@
+ //template<> static inline const int8_t convert_sample<int32_t,int8_t>(const register int32_t sample) { }
+
+ // int32_t -> int16_t
+- template<> static inline const int16_t convert_sample<int32_t,int16_t>(const register int32_t sample) { return sample/65536; }
++ template<> STATIC inline const int16_t convert_sample<int32_t,int16_t>(const register int32_t sample) { return sample/65536; }
+
+ // int32_t -> int24_t
+ //template<> static inline const int24_t convert_sample<int32_t,int24_t>(const register int32_t sample) { }
+
+ // int32_t -> int32_t
+- template<> static inline const int32_t convert_sample<int32_t,int32_t>(const register int32_t sample) { return sample; }
++ template<> STATIC inline const int32_t convert_sample<int32_t,int32_t>(const register int32_t sample) { return sample; }
+
+ // int32_t -> float
+- template<> static inline const float convert_sample<int32_t,float>(const register int32_t sample) { return ((double)sample)/2147483647.0; }
++ template<> STATIC inline const float convert_sample<int32_t,float>(const register int32_t sample) { return ((double)sample)/2147483647.0; }
+
+ // int32_t -> double
+ //template<> static inline const double convert_sample<int32_t,double >(const register int32_t sample) { }
+@@ -241,22 +251,22 @@
+
+ // float -> ...
+ // float -> int8_t
+- template<> static inline const int8_t convert_sample<float,int8_t>(const register float sample) { return (int8_t)floorf((sample>1.0f ? 1.0f : (sample<-1.0f ? -1.0f : sample))*127.0f); }
++ template<> STATIC inline const int8_t convert_sample<float,int8_t>(const register float sample) { return (int8_t)floorf((sample>1.0f ? 1.0f : (sample<-1.0f ? -1.0f : sample))*127.0f); }
+
+ // float -> int16_t
+- template<> static inline const int16_t convert_sample<float,int16_t>(const register float sample) { return (int16_t)floorf((sample>1.0f ? 1.0f : (sample<-1.0f ? -1.0f : sample))*32767.0f); }
++ template<> STATIC inline const int16_t convert_sample<float,int16_t>(const register float sample) { return (int16_t)floorf((sample>1.0f ? 1.0f : (sample<-1.0f ? -1.0f : sample))*32767.0f); }
+
+ // float -> int24_t
+- template<> static inline const int24_t convert_sample<float,int24_t>(const register float sample) { int24_t r; r.set((int_fast32_t)floorf((sample>1.0f ? 1.0f : (sample<-1.0f ? -1.0f : sample))*8388607.0f)); return r; }
++ template<> STATIC inline const int24_t convert_sample<float,int24_t>(const register float sample) { int24_t r; r.set((int_fast32_t)floorf((sample>1.0f ? 1.0f : (sample<-1.0f ? -1.0f : sample))*8388607.0f)); return r; }
+
+ // float -> int32_t
+- template<> static inline const int32_t convert_sample<float,int32_t>(const register float sample) { return (int32_t) floor((double)(sample>1.0f ? 1.0f : (sample<-1.0f ? -1.0f : sample)) * 2147483647.0); }
++ template<> STATIC inline const int32_t convert_sample<float,int32_t>(const register float sample) { return (int32_t) floor((double)(sample>1.0f ? 1.0f : (sample<-1.0f ? -1.0f : sample)) * 2147483647.0); }
+
+ // float -> float
+- template<> static inline const float convert_sample<float,float>(const register float sample) { return sample; }
++ template<> STATIC inline const float convert_sample<float,float>(const register float sample) { return sample; }
+
+ // float -> double
+- template<> static inline const double convert_sample<float,double>(const register float sample) { return (double)sample; }
++ template<> STATIC inline const double convert_sample<float,double>(const register float sample) { return (double)sample; }
+
+
+ // double -> ...
+@@ -264,7 +274,7 @@
+ //template<> static inline const int8_t convert_sample<double,int8_t>(const register double sample) { }
+
+ // double -> int16_t
+- template<> static inline const int16_t convert_sample<double,int16_t>(const register double sample) { return (int16_t)floor((sample>1.0 ? 1.0 : (sample<-1.0 ? -1.0 : sample))*32767.0); }
++ template<> STATIC inline const int16_t convert_sample<double,int16_t>(const register double sample) { return (int16_t)floor((sample>1.0 ? 1.0 : (sample<-1.0 ? -1.0 : sample))*32767.0); }
+
+ // double -> int24_t
+ //template<> static inline const int24_t convert_sample<double,int24_t>(const register double sample) { }
+@@ -273,10 +283,10 @@
+ //template<> static inline const int32_t convert_sample<double,int32_t>(const register double sample) { }
+
+ // double -> float
+- template<> static inline const float convert_sample<double,float>(const register double sample) { return (float)sample; }
++ template<> STATIC inline const float convert_sample<double,float>(const register double sample) { return (float)sample; }
+
+ // double -> double
+- template<> static inline const double convert_sample<double,double>(const register double sample) { return sample; }
++ template<> STATIC inline const double convert_sample<double,double>(const register double sample) { return sample; }
+
+
+
+diff -Naur rezound.orig/src/backend/Generate/CGenerateNoiseAction.cpp rezound/src/backend/Generate/CGenerateNoiseAction.cpp
+--- rezound.orig/src/backend/Generate/CGenerateNoiseAction.cpp 2008-12-17 10:23:03.000000000 +0100
++++ rezound/src/backend/Generate/CGenerateNoiseAction.cpp 2008-12-17 10:23:24.000000000 +0100
+@@ -22,6 +22,7 @@
+ #include "CGenerateNoiseAction.h"
+
+ #include "../CActionParameters.h"
++#include <cstdlib>
+
+ CGenerateNoiseAction::CGenerateNoiseAction(const AActionFactory *factory,const CActionSound *actionSound,const double _noiseLength,const double _volume,const NoiseTypes _noiseType,const StereoImage _stereoImage,const double _maxParticleVelocity):
+ AAction(factory,actionSound),
+diff -Naur rezound.orig/src/misc/CNestedDataFile/anytype.h rezound/src/misc/CNestedDataFile/anytype.h
+--- rezound.orig/src/misc/CNestedDataFile/anytype.h 2008-12-17 10:23:05.000000000 +0100
++++ rezound/src/misc/CNestedDataFile/anytype.h 2008-12-17 10:38:54.000000000 +0100
+@@ -20,6 +20,16 @@
+ #ifndef __anytype_H__
+ #define __anytype_H__
+
++#ifndef GCC_VERSION
++#define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
++#endif
++
++#if GCC_VERSION >= 403
++# define STATIC
++#else
++# define STATIC static
++#endif
++
+ #include <sstream>
+ #include <string>
+ #include <vector> // for the vector implemenation to/from string
+@@ -68,28 +78,28 @@
+
+ // template specializations of string_to_anytype
+
+-template<> static const string string_to_anytype<string>(const string &str,string &ret) { return ret=s2at::unescape_chars(s2at::remove_surrounding_quotes(str)); }
++template<> STATIC const string string_to_anytype<string>(const string &str,string &ret) { return s2at::unescape_chars(s2at::remove_surrounding_quotes(str)); }
+
+-template<> static const bool string_to_anytype<bool>(const string &str,bool &ret) { return s2at::remove_surrounding_quotes(str)=="true" ? ret=true : ret=false; }
++template<> STATIC const bool string_to_anytype<bool>(const string &str,bool &ret) { return s2at::remove_surrounding_quotes(str)=="true" ? ret=true : ret=false; }
+
+-template<> static const char string_to_anytype<char>(const string &str,char &ret) { istringstream ss(s2at::remove_surrounding_quotes(str)); NO_LOCALE(ss) ret=0; ss >> ret; return ret; }
+-template<> static const unsigned char string_to_anytype<unsigned char>(const string &str,unsigned char &ret) { istringstream ss(s2at::remove_surrounding_quotes(str)); NO_LOCALE(ss) ret=0; ss >> ret; return ret; }
++template<> STATIC const char string_to_anytype<char>(const string &str,char &ret) { istringstream ss(s2at::remove_surrounding_quotes(str)); NO_LOCALE(ss) ret=0; ss >> ret; return ret; }
++template<> STATIC const unsigned char string_to_anytype<unsigned char>(const string &str,unsigned char &ret) { istringstream ss(s2at::remove_surrounding_quotes(str)); NO_LOCALE(ss) ret=0; ss >> ret; return ret; }
+
+-template<> static const short string_to_anytype<short>(const string &str,short &ret) { istringstream ss(s2at::remove_surrounding_quotes(str)); NO_LOCALE(ss) ret=0; ss >> ret; return ret; }
+-template<> static const unsigned short string_to_anytype<unsigned short>(const string &str,unsigned short &ret) { istringstream ss(s2at::remove_surrounding_quotes(str)); NO_LOCALE(ss) ret=0; ss >> ret; return ret; }
++template<> STATIC const short string_to_anytype<short>(const string &str,short &ret) { istringstream ss(s2at::remove_surrounding_quotes(str)); NO_LOCALE(ss) ret=0; ss >> ret; return ret; }
++template<> STATIC const unsigned short string_to_anytype<unsigned short>(const string &str,unsigned short &ret) { istringstream ss(s2at::remove_surrounding_quotes(str)); NO_LOCALE(ss) ret=0; ss >> ret; return ret; }
+
+-template<> static const int string_to_anytype<int>(const string &str,int &ret) { istringstream ss(s2at::remove_surrounding_quotes(str)); NO_LOCALE(ss) ret=0; ss >> ret; return ret; }
+-template<> static const unsigned int string_to_anytype<unsigned int>(const string &str,unsigned int &ret) { istringstream ss(s2at::remove_surrounding_quotes(str)); NO_LOCALE(ss) ret=0; ss >> ret; return ret; }
++template<> STATIC const int string_to_anytype<int>(const string &str,int &ret) { istringstream ss(s2at::remove_surrounding_quotes(str)); NO_LOCALE(ss) ret=0; ss >> ret; return ret; }
++template<> STATIC const unsigned int string_to_anytype<unsigned int>(const string &str,unsigned int &ret) { istringstream ss(s2at::remove_surrounding_quotes(str)); NO_LOCALE(ss) ret=0; ss >> ret; return ret; }
+
+-template<> static const long string_to_anytype<long>(const string &str,long &ret) { istringstream ss(s2at::remove_surrounding_quotes(str)); NO_LOCALE(ss) ret=0; ss >> ret; return ret; }
+-template<> static const unsigned long string_to_anytype<unsigned long>(const string &str,unsigned long &ret) { istringstream ss(s2at::remove_surrounding_quotes(str)); NO_LOCALE(ss) ret=0; ss >> ret; return ret; }
++template<> STATIC const long string_to_anytype<long>(const string &str,long &ret) { istringstream ss(s2at::remove_surrounding_quotes(str)); NO_LOCALE(ss) ret=0; ss >> ret; return ret; }
++template<> STATIC const unsigned long string_to_anytype<unsigned long>(const string &str,unsigned long &ret) { istringstream ss(s2at::remove_surrounding_quotes(str)); NO_LOCALE(ss) ret=0; ss >> ret; return ret; }
+
+-template<> static const long long string_to_anytype<long long>(const string &str,long long &ret) { istringstream ss(s2at::remove_surrounding_quotes(str)); NO_LOCALE(ss) ret=0; ss >> ret; return ret; }
+-template<> static const unsigned long long string_to_anytype<unsigned long long>(const string &str,unsigned long long &ret) { istringstream ss(s2at::remove_surrounding_quotes(str)); NO_LOCALE(ss) ret=0; ss >> ret; return ret; }
++template<> STATIC const long long string_to_anytype<long long>(const string &str,long long &ret) { istringstream ss(s2at::remove_surrounding_quotes(str)); NO_LOCALE(ss) ret=0; ss >> ret; return ret; }
++template<> STATIC const unsigned long long string_to_anytype<unsigned long long>(const string &str,unsigned long long &ret) { istringstream ss(s2at::remove_surrounding_quotes(str)); NO_LOCALE(ss) ret=0; ss >> ret; return ret; }
+
+-template<> static const float string_to_anytype<float>(const string &str,float &ret) { istringstream ss(s2at::remove_surrounding_quotes(str)); NO_LOCALE(ss) ret=0.0f; if(str=="inf") ret=INFINITY; else if(str=="-inf") ret=-INFINITY; else ss >> ret; return ret; }
+-template<> static const double string_to_anytype<double>(const string &str,double &ret) { istringstream ss(s2at::remove_surrounding_quotes(str)); NO_LOCALE(ss) ret=0.0; if(str=="inf") ret=INFINITY; else if(str=="-inf") ret=-INFINITY; else ss >> ret; return ret; }
+-template<> static const long double string_to_anytype<long double>(const string &str,long double &ret) { istringstream ss(s2at::remove_surrounding_quotes(str)); NO_LOCALE(ss) ret=0.0; if(str=="inf") ret=INFINITY; else if(str=="-inf") ret=-INFINITY; else ss >> ret; return ret; }
++template<> STATIC const float string_to_anytype<float>(const string &str,float &ret) { istringstream ss(s2at::remove_surrounding_quotes(str)); NO_LOCALE(ss) ret=0.0f; ss >> ret; return ret; }
++template<> STATIC const double string_to_anytype<double>(const string &str,double &ret) { istringstream ss(s2at::remove_surrounding_quotes(str)); NO_LOCALE(ss) ret=0.0; ss >> ret; return ret; }
++template<> STATIC const long double string_to_anytype<long double>(const string &str,long double &ret) { istringstream ss(s2at::remove_surrounding_quotes(str)); NO_LOCALE(ss) ret=0.0; ss >> ret; return ret; }
+
+ // I really wished that I didn't have to explicitly use 'vector' in the definition; I'd have like to use any container with an iterator interface
+ #include <CMutex.h>
+@@ -120,32 +130,30 @@
+
+ // template specializations of anytype_to_string
+
+-template<> static const string anytype_to_string<string>(const string &any) { return "\""+s2at::escape_chars(any)+"\""; }
+-
+-template<> static const string anytype_to_string<bool>(const bool &any) { return any ? "true" : "false"; }
++template<> STATIC const string anytype_to_string<string>(const string &any) { return "\""+s2at::escape_chars(any)+"\""; }
+
+-template<> static const string anytype_to_string<char>(const char &any) { ostringstream ss; NO_LOCALE(ss) ss << any; return ss.str(); }
+-template<> static const string anytype_to_string<unsigned char>(const unsigned char &any) { ostringstream ss; NO_LOCALE(ss) ss << any; return ss.str(); }
++template<> STATIC const string anytype_to_string<bool>(const bool &any) { return any ? "true" : "false"; }
+
+-template<> static const string anytype_to_string<short>(const short &any) { ostringstream ss; NO_LOCALE(ss) ss << any; return ss.str(); }
+-template<> static const string anytype_to_string<unsigned short>(const unsigned short &any) { ostringstream ss; NO_LOCALE(ss) ss << any; return ss.str(); }
++template<> STATIC const string anytype_to_string<char>(const char &any) { ostringstream ss; NO_LOCALE(ss) ss << any; return ss.str(); }
++template<> STATIC const string anytype_to_string<unsigned char>(const unsigned char &any) { ostringstream ss; NO_LOCALE(ss) ss << any; return ss.str(); }
+
+-template<> static const string anytype_to_string<int>(const int &any) { ostringstream ss; NO_LOCALE(ss) ss << any; return ss.str(); }
+-template<> static const string anytype_to_string<unsigned int>(const unsigned int &any) { ostringstream ss; NO_LOCALE(ss) ss << any; return ss.str(); }
++template<> STATIC const string anytype_to_string<short>(const short &any) { ostringstream ss; NO_LOCALE(ss) ss << any; return ss.str(); }
++template<> STATIC const string anytype_to_string<unsigned short>(const unsigned short &any) { ostringstream ss; NO_LOCALE(ss) ss << any; return ss.str();}
+
+-template<> static const string anytype_to_string<long>(const long &any) { ostringstream ss; NO_LOCALE(ss) ss << any; return ss.str(); }
+-template<> static const string anytype_to_string<unsigned long>(const unsigned long &any) { ostringstream ss; NO_LOCALE(ss) ss << any; return ss.str(); }
++template<> STATIC const string anytype_to_string<int>(const int &any) { ostringstream ss; NO_LOCALE(ss) ss << any; return ss.str(); }
++template<> STATIC const string anytype_to_string<unsigned int>(const unsigned int &any) { ostringstream ss; NO_LOCALE(ss) ss << any; return ss.str(); }
+
+-template<> static const string anytype_to_string<long long>(const long long &any) { ostringstream ss; NO_LOCALE(ss) ss << any; return ss.str(); }
+-template<> static const string anytype_to_string<unsigned long long>(const unsigned long long &any) { ostringstream ss; NO_LOCALE(ss) ss << any; return ss.str(); }
++template<> STATIC const string anytype_to_string<long>(const long &any) { ostringstream ss; NO_LOCALE(ss) ss << any; return ss.str(); }
++template<> STATIC const string anytype_to_string<unsigned long>(const unsigned long &any) { ostringstream ss; NO_LOCALE(ss) ss << any; return ss.str(); }
+
++template<> STATIC const string anytype_to_string<long long>(const long long &any) { ostringstream ss; NO_LOCALE(ss) ss << any; return ss.str(); }
++template<> STATIC const string anytype_to_string<unsigned long long>(const unsigned long long &any) { ostringstream ss; NO_LOCALE(ss) ss << any; return ss.str(); }
+ // I've picked a rather arbitrary way of formatting floats one way or another depending on how big it is.. I wish there were a way to output the ascii in such a way as to preserve all the information in the float (without printing the hex of it or something like that)
+ #include <istring>
+ #include <math.h> // for isnan which I hope is there (maybe fix in common.h if it's not
+-template<> static const string anytype_to_string<float>(const float &any) { if(isnan(any)) return "0"; else if(isinf(any)==1) return "inf"; else if(isinf(any)==-1) return "-inf"; else { ostringstream ss; NO_LOCALE(ss) if(any>999999.0) {ss.setf(ios::scientific); ss.width(0); ss.precision(12); ss.fill(' '); } else {ss.setf(ios::fixed); ss.precision(6); ss.fill(' '); } ss << any; return istring(ss.str()).trim(); } }
+-template<> static const string anytype_to_string<double>(const double &any) { if(isnan(any)) return "0"; else if(isinf(any)==1) return "inf"; else if(isinf(any)==-1) return "-inf"; else { ostringstream ss; NO_LOCALE(ss) if(any>999999.0) {ss.setf(ios::scientific); ss.width(0); ss.precision(12); ss.fill(' '); } else {ss.setf(ios::fixed); ss.precision(6); ss.fill(' '); } ss << any; return istring(ss.str()).trim(); } }
+-template<> static const string anytype_to_string<long double>(const long double &any) { if(isnan(any)) return "0"; else if(isinf(any)==1) return "inf"; else if(isinf(any)==-1) return "-inf"; else { ostringstream ss; NO_LOCALE(ss) if(any>999999.0) {ss.setf(ios::scientific); ss.width(0); ss.precision(12); ss.fill(' '); } else {ss.setf(ios::fixed); ss.precision(6); ss.fill(' '); } ss << any; return istring(ss.str()).trim(); } }
+-
++template<> STATIC const string anytype_to_string<float>(const float &any) { if(isnan(any)) return "0"; else { ostringstream ss; NO_LOCALE(ss) if(any>999999.0) {ss.setf(ios::scientific); ss.width(0); ss.precision(12); ss.fill(' '); } else {ss.setf(ios::fixed); ss.precision(6); ss.fill(' '); } ss << any; return istring(ss.str()).trim(); } }
++template<> STATIC const string anytype_to_string<double>(const double &any) { if(isnan(any)) return "0"; else { ostringstream ss; NO_LOCALE(ss) if(any>999999.0) {ss.setf(ios::scientific); ss.width(0); ss.precision(12); ss.fill(' '); } else {ss.setf(ios::fixed); ss.precision(6); ss.fill(' '); } ss << any;return istring(ss.str()).trim(); } }
++template<> STATIC const string anytype_to_string<long double>(const long double &any) { if(isnan(any)) return "0"; else { ostringstream ss; NO_LOCALE(ss) if(any>999999.0) {ss.setf(ios::scientific); ss.width(0); ss.precision(12); ss.fill(' '); } else {ss.setf(ios::fixed); ss.precision(6); ss.fill(' '); } ss <<any; return istring(ss.str()).trim(); } }
+
+ // I really wished that I didn't have to explicitly use 'vector' in the definition, I'd have like to use any container with an iterator interface
+ template<class Type> static const string anytype_to_string(const vector<Type> &any)
+diff -Naur rezound.orig/src/misc/endian_util.h rezound/src/misc/endian_util.h
+--- rezound.orig/src/misc/endian_util.h 2008-12-17 10:23:05.000000000 +0100
++++ rezound/src/misc/endian_util.h 2008-12-17 10:23:24.000000000 +0100
+@@ -21,6 +21,16 @@
+ #ifndef __endian_util_H__
+ #define __endian_util_H__
+
++#ifndef GCC_VERSION
++#define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
++#endif
++
++#if GCC_VERSION >= 403
++# define STATIC
++#else
++# define STATIC static
++#endif
++
+ /*
+ * This header files given functionality to convenient change endian-ness of values
+ * and through the use of very few function names regardless of the type.
+@@ -131,13 +141,13 @@
+ }
+
+ // --- implementation for 1 byte quantities (nothing)
+- template<> inline static void really_swap_endian_ptr<1>(void *value,const unsigned size)
++ template<> inline STATIC void really_swap_endian_ptr<1>(void *value,const unsigned size)
+ {
+ // nothing to do
+ }
+
+ // --- implementation for 2 byte quantities
+- template<> inline static void really_swap_endian_ptr<2>(void *value,const unsigned size)
++ template<> inline STATIC void really_swap_endian_ptr<2>(void *value,const unsigned size)
+ {
+ const register uint16_t v=((uint16_t *)value)[0];
+ ((uint16_t *)value)[0]=
+@@ -147,7 +157,7 @@
+ }
+
+ // --- implementation for 4 byte quantities
+- template<> inline static void really_swap_endian_ptr<4>(void *value,const unsigned size)
++ template<> inline STATIC void really_swap_endian_ptr<4>(void *value,const unsigned size)
+ {
+ const register uint32_t v=((uint32_t *)value)[0];
+ ((uint32_t *)value)[0]=
+@@ -157,7 +167,7 @@
+ }
+
+ // --- implementation for 8 byte quantities
+- template<> inline static void really_swap_endian_ptr<8>(void *value,const unsigned size)
++ template<> inline STATIC void really_swap_endian_ptr<8>(void *value,const unsigned size)
+ {
+ const register uint64_t v=((uint64_t *)value)[0];
+ // of 8, swap upper most and lower most octets then the next two inward, and so on ..
Added: trunk/overlays/proaudio/media-sound/rezound/files/rezound-9999-qt44.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/rezound/files/rezound-9999-qt44.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/rezound/files/rezound-9999-qt44.patch 2008-12-17 19:17:06 UTC (rev 1400)
@@ -0,0 +1,11 @@
+--- ./src/frontend_qt4/ActionParam/CLFOParamValue.cpp.orig 2008-12-17 19:36:15.000000000 +0100
++++ ./src/frontend_qt4/ActionParam/CLFOParamValue.cpp 2008-12-17 19:38:26.000000000 +0100
+@@ -84,7 +84,7 @@
+
+ LFOTypeComboBox->setIconSize(QSize(45,25));
+ dynamic_cast<QListView *>(LFOTypeComboBox->view())->setSpacing(3);
+- for(size_t t=0;t<gLFORegistry.getCount();t++)
++ for(unsigned int t=0;t<gLFORegistry.getCount();t++)
+ {
+ if(!hideBipolarLFOs || !gLFORegistry.isBipolar(t))
+ {
Deleted: trunk/overlays/proaudio/media-sound/rezound/files/rezound-flac-1.2.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/rezound/files/rezound-flac-1.2.patch 2008-12-16 22:58:45 UTC (rev 1399)
+++ trunk/overlays/proaudio/media-sound/rezound/files/rezound-flac-1.2.patch 2008-12-17 19:17:06 UTC (rev 1400)
@@ -1,68 +0,0 @@
---- rezound-0.12.3beta/src/backend/CFLACSoundTranslator.cpp.ark 2007-08-09 12:41:25.000000000 +0200
-+++ rezound-0.12.3beta/src/backend/CFLACSoundTranslator.cpp 2007-08-09 12:56:22.000000000 +0200
-@@ -75,15 +75,13 @@
- for(unsigned t=0;t<MAX_CHANNELS;t++)
- accessers[t]=NULL;
-
-- set_filename(filename.c_str());
--
- set_metadata_ignore_all();
- //set_metadata_respond(FLAC__METADATA_TYPE_VORBIS_COMMENT);
- //set_metadata_respond(FLAC__METADATA_TYPE_CUESHEET);
-
-- State s=init();
-- if(s!=FLAC__FILE_DECODER_OK)
-- throw runtime_error(string(__func__)+" -- "+s.as_cstring());
-+ FLAC__StreamDecoderInitStatus s=init(filename.c_str());
-+ if(s!=FLAC__STREAM_DECODER_INIT_STATUS_OK)
-+ throw runtime_error(string(__func__)+" -- "+FLAC__StreamDecoderInitStatusString[s]);
- }
-
- virtual ~MyFLACDecoderFile()
-@@ -170,7 +168,7 @@
-
- // update status bar and detect user cancel
- FLAC__uint64 filePosition;
-- FLAC__file_decoder_get_decode_position(decoder_, &filePosition);
-+ FLAC__stream_decoder_get_decode_position(decoder_, &filePosition);
- return statusBar.update(filePosition) ? FLAC__STREAM_DECODER_WRITE_STATUS_ABORT : FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
- }
-
-@@ -215,7 +213,7 @@
- bool CFLACSoundTranslator::onLoadSound(const string filename,CSound *sound) const
- {
- MyFLACDecoderFile f(filename,sound);
-- return f.process_until_end_of_file();
-+ return f.process_until_end_of_stream();
- }
-
-
-@@ -258,8 +256,6 @@
-
- MyFLACEncoderFile f(saveLength);
-
-- f.set_filename(filename.c_str());
--
- f.set_channels(sound->getChannelCount());
-
- /* ??? needs to be a user choice */
-@@ -274,8 +270,8 @@
- //f.set_metadata(...) // ??? to do to set cues and user notes, etc
-
-
-- MyFLACEncoderFile::State s=f.init();
-- if(s==FLAC__STREAM_ENCODER_OK)
-+ FLAC__StreamEncoderInitStatus s=f.init(filename.c_str());
-+ if(s==FLAC__STREAM_ENCODER_INIT_STATUS_OK)
- {
- #define BUFFER_SIZE 65536
- TAutoBuffer<FLAC__int32> buffers[MAX_CHANNELS];
-@@ -328,7 +324,7 @@
- return true;
- }
- else
-- throw runtime_error(string(__func__)+" -- error creating FLAC encoder -- "+s.as_cstring());
-+ throw runtime_error(string(__func__)+" -- error creating FLAC encoder -- "+FLAC__StreamEncoderInitStatusString[s]);
-
- }
-
Deleted: trunk/overlays/proaudio/media-sound/rezound/files/undefined-functions.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/rezound/files/undefined-functions.patch 2008-12-16 22:58:45 UTC (rev 1399)
+++ trunk/overlays/proaudio/media-sound/rezound/files/undefined-functions.patch 2008-12-17 19:17:06 UTC (rev 1400)
@@ -1,38 +0,0 @@
---- config/common.h.orig 2004-12-23 20:00:50.710795840 +0100
-+++ config/common.h 2004-12-23 20:39:40.271648760 +0100
-@@ -21,6 +21,23 @@
- #ifndef COMMON_H
- #define COMMON_H
-
-+/* Bugfix for ppc, some functions aren't defined */
-+#include <cmath>
-+
-+#undef MAX
-+#define MAX(a,b) ((a) > (b)?(a):(b))
-+#undef MIN
-+#define MIN(a,b) ((a) < (b)?(a):(b))
-+#undef ABS
-+#define ABS(a) ((a) >= 0?(a):-(a))
-+
-+#define floorl(l) floor(l)
-+#define nearbyintl(l) nearbyint(l)
-+#define fabsl(l) fabs(l)
-+#define logl(l) log(l)
-+#define expl(l) exp(l)
-+#define ceill(l) ceil(l)
-+
- /* common.h -- This file will deal with low-level portability problems. It
- * should be includede at the top of every package file. */
-
---- src/frontend_fox/FXWaveCanvas.cpp.orig 2004-12-23 20:18:55.790838600 +0100
-+++ src/frontend_fox/FXWaveCanvas.cpp 2004-12-23 20:39:37.568059768 +0100
-@@ -56,6 +56,9 @@
- #include "../backend/CSoundPlayerChannel.h"
- #include "drawPortion.h"
-
-+#include "../../config/common.h"
-+#define max(a,b) MAX(a,b)
-+
- static FXColor playStatusColor=FXRGB(255,0,0);
-
- #define RIGHT_MARGIN 10
Modified: trunk/overlays/proaudio/media-sound/rezound/rezound-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/rezound/rezound-9999.ebuild 2008-12-16 22:58:45 UTC (rev 1399)
+++ trunk/overlays/proaudio/media-sound/rezound/rezound-9999.ebuild 2008-12-17 19:17:06 UTC (rev 1400)
@@ -1,31 +1,31 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-inherit eutils autotools cvs unpacker
+EAPI=1
-MY_P="${P/_/}"
-S="${WORKDIR}/${MY_P}"
+inherit eutils autotools flag-o-matic subversion
+PATCHLEVEL="5"
+
DESCRIPTION="Sound editor and recorder"
HOMEPAGE="http://rezound.sourceforge.net";
-SRC_URI=""
-ECVS_SERVER="rezound.cvs.sourceforge.net:/cvsroot/rezound"
-ECVS_MODULE="rezound"
-S=${WORKDIR}/${ECVS_MODULE}
+SRC_URI="mirror://gentoo/${PN}-0.12.3_beta-patches-${PATCHLEVEL}.tar.bz2"
+ESVN_REPO_URI="https://rezound.svn.sourceforge.net/svnroot/rezound/branches/rezound/qt4-port";
+
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
-IUSE="16bittmp alsa flac jack nls oss portaudio soundtouch vorbis"
+IUSE="16bittmp alsa audiofile doc flac jack ladspa nls oss portaudio soundtouch vorbis"
-RDEPEND="=sci-libs/fftw-2*
- >=x11-libs/fox-1.6.14
- >=dev-util/reswrap-3.2.0
- >=media-libs/audiofile-0.2.3
- >=media-libs/ladspa-sdk-1.12
- >=media-libs/ladspa-cmt-1.15
+RDEPEND="|| ( ( x11-libs/qt-core x11-libs/qt-gui )
+ x11-libs/qt:4 )
+ sci-libs/fftw:2.1
+ ladspa? ( >=media-libs/ladspa-sdk-1.12
+ >=media-libs/ladspa-cmt-1.15 )
+ audiofile? ( >=media-libs/audiofile-0.2.2 )
alsa? ( >=media-libs/alsa-lib-1.0 )
flac? ( >=media-libs/flac-1.1.0 )
jack? ( media-sound/jack-audio-connection-kit )
@@ -34,33 +34,26 @@
vorbis? ( media-libs/libvorbis media-libs/libogg )"
DEPEND="${RDEPEND}
- sys-devel/autoconf
- sys-devel/automake
- sys-devel/bison
- sys-devel/flex"
+ doc? ( sys-devel/gettext
+ virtual/libintl )"
src_unpack() {
- cvs_src_unpack
- unpacker "${FILESDIR}/rezound-0.12.2_beta-patches.tar.bz2"
- cd "${S}"
- EPATCH_EXCLUDE="40_rezound-0.12.2_beta-float.patch 50_rezound-0.12.2_beta-64bits.patch 20_rezound-0.12.2_beta-gcc4.patch 30_rezound-0.12.2_beta-fox-1.6.patch rezound-0.12.2_beta-foxinclude.patch" \
- EPATCH_SOURCE="${WORKDIR}" EPATCH_SUFFIX="patch"\
- EPATCH_FORCE="yes" epatch
+ unpack ${A}
+ subversion_src_unpack
+
+ EPATCH_EXCLUDE="010_all_flac-1.1.3.patch
+ 030_all_dont-ignore-cxxflags.patch
+ 090_all_gcc_4.3.patch
+ 100_all_reconf_warnings.patch"
+ EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
- # fix for >=flac-1.2
- has_version ">media-libs/flac-1.1.4" && epatch ${FILESDIR}/${PN}-flac-1.2.patch
-
- ./bootstrap
-
- # add missing Makefile.in.in to po/
- [ ! -e po/Makefile.in.in ] && gzip -cdf "${FILESDIR}"/Makefile.in.in.gz > po/Makefile.in.in
+ epatch "${FILESDIR}/${P}-gcc43.patch"
+ epatch "${FILESDIR}/${P}-qt44.patch"
+ #AT_M4DIR="config/m4" eautoreconf
+ ./bootstrap || die
}
src_compile() {
- # fix compilation errors on ppc, where some
- # of the required functions aren't defined
- test "${ARCH}" = ppc && epatch ${FILESDIR}/undefined-functions.patch
-
# following features can't be disabled if already installed:
# -> flac, oggvorbis, soundtouch <-- why not? I've added missing flags
local sampletype="--enable-internal-sample-type=float"
@@ -69,19 +62,18 @@
econf \
$(use_enable alsa) \
$(use_enable jack) \
+ $(use_enable ladspa) \
$(use_enable nls) \
$(use_enable oss) \
$(use_enable portaudio) \
- $(use_with flac libFLAC) \
+ $(use_enable flac) \
$(use_enable soundtouch soundtouch-check) \
- $(use_with ogg ) \
- $(use_with vorbis ) \
+ $(use_enable vorbis ) \
${sampletype} \
- --enable-ladspa \
--enable-largefile \
|| die "configure failed"
- emake || die "make failed"
+ emake -j1 || die "make failed"
}
src_install() {
@@ -96,6 +88,6 @@
docinto code
dodoc docs/code/*
- newicon src/images/icon_logo_32.gif rezound.gif
- make_desktop_entry rezound Rezound rezound.gif AudioVideo
+ newicon shared/images/icon_logo_32.png rezound.png
+ make_desktop_entry "rezound" "Rezound" "rezound" "AudioVideo;Audio;Recorder"
}