Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-sound/bpmdetect/files: bpmdetect-0.6.1-gcc44_and_fmodex_path.patch
Date: Wed, 03 Jun 2009 19:37:09
Message-Id: E1MBwGq-0005uT-71@stork.gentoo.org
1 ssuominen 09/06/03 19:37:08
2
3 Added: bpmdetect-0.6.1-gcc44_and_fmodex_path.patch
4 Log:
5 Fix compile with GCC 4.4, and append correct fmodex library path in /opt wrt #252400.
6 (Portage version: 2.1.6.13/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 media-sound/bpmdetect/files/bpmdetect-0.6.1-gcc44_and_fmodex_path.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/bpmdetect/files/bpmdetect-0.6.1-gcc44_and_fmodex_path.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/bpmdetect/files/bpmdetect-0.6.1-gcc44_and_fmodex_path.patch?rev=1.1&content-type=text/plain
13
14 Index: bpmdetect-0.6.1-gcc44_and_fmodex_path.patch
15 ===================================================================
16 diff -ur bpmdetect.orig/src/main.cpp bpmdetect/src/main.cpp
17 --- bpmdetect.orig/src/main.cpp 2008-05-01 12:50:18.000000000 +0300
18 +++ bpmdetect/src/main.cpp 2009-06-03 22:24:56.000000000 +0300
19 @@ -20,6 +20,8 @@
20 * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
21 ***************************************************************************/
22
23 +#include <cstdio>
24 +
25 #ifndef NO_GUI
26 #ifdef USE_QT3
27 #include "dlgbpmdetect3.h"
28 diff -ur bpmdetect.orig/src/SConscript bpmdetect/src/SConscript
29 --- bpmdetect.orig/src/SConscript 2008-04-24 19:49:52.000000000 +0300
30 +++ bpmdetect/src/SConscript 2009-06-03 22:33:57.000000000 +0300
31 @@ -234,7 +234,7 @@
32
33 env.Append(LIBS = ['id3', 'fmodex', 'z'])
34 env.Append(CPPPATH = ['.', '..', '../includes'])
35 - env.Append(LIBPATH = ['.', '../libs'])
36 + env.Append(LIBPATH = ['.', '../libs', '/opt/fmodex/api/lib'])
37 env['ISCONFIGURED']=1
38 # And finally save the options in the cache
39 opts.Save(cachefile, env)
40 diff -ur bpmdetect.orig/src/track.cpp bpmdetect/src/track.cpp
41 --- bpmdetect.orig/src/track.cpp 2008-04-25 22:33:18.000000000 +0300
42 +++ bpmdetect/src/track.cpp 2009-06-03 22:26:24.000000000 +0300
43 @@ -20,6 +20,8 @@
44 * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
45 ***************************************************************************/
46
47 +#include <cstdio>
48 +
49 #include "track.h"
50 #include "trackfmod.h"
51 #include "BPMDetect.h"