1 |
ssuominen 09/06/03 19:37:07 |
2 |
|
3 |
Modified: bpmdetect-0.6.1.ebuild ChangeLog |
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.2 media-sound/bpmdetect/bpmdetect-0.6.1.ebuild |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/bpmdetect/bpmdetect-0.6.1.ebuild?rev=1.2&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/bpmdetect/bpmdetect-0.6.1.ebuild?rev=1.2&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/bpmdetect/bpmdetect-0.6.1.ebuild?r1=1.1&r2=1.2 |
14 |
|
15 |
Index: bpmdetect-0.6.1.ebuild |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/media-sound/bpmdetect/bpmdetect-0.6.1.ebuild,v |
18 |
retrieving revision 1.1 |
19 |
retrieving revision 1.2 |
20 |
diff -u -r1.1 -r1.2 |
21 |
--- bpmdetect-0.6.1.ebuild 21 Dec 2008 17:00:36 -0000 1.1 |
22 |
+++ bpmdetect-0.6.1.ebuild 3 Jun 2009 19:37:07 -0000 1.2 |
23 |
@@ -1,9 +1,8 @@ |
24 |
-# Copyright 1999-2008 Gentoo Foundation |
25 |
+# Copyright 1999-2009 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/media-sound/bpmdetect/bpmdetect-0.6.1.ebuild,v 1.1 2008/12/21 17:00:36 ssuominen Exp $ |
28 |
- |
29 |
-EAPI=1 |
30 |
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bpmdetect/bpmdetect-0.6.1.ebuild,v 1.2 2009/06/03 19:37:07 ssuominen Exp $ |
31 |
|
32 |
+EAPI=2 |
33 |
inherit eutils multilib |
34 |
|
35 |
DESCRIPTION="Automatic BPM detection utility" |
36 |
@@ -12,31 +11,34 @@ |
37 |
|
38 |
LICENSE="GPL-2" |
39 |
SLOT="0" |
40 |
-KEYWORDS="~x86" |
41 |
+KEYWORDS="~amd64 ~x86" |
42 |
IUSE="" |
43 |
|
44 |
RDEPEND="media-libs/taglib |
45 |
media-libs/id3lib |
46 |
- media-libs/fmod:1 |
47 |
+ >=media-libs/fmod-4.25.07-r1:1 |
48 |
x11-libs/qt-gui:4" |
49 |
DEPEND="${RDEPEND} |
50 |
+ sys-apps/sed |
51 |
dev-util/scons |
52 |
dev-util/pkgconfig" |
53 |
|
54 |
S=${WORKDIR}/${PN} |
55 |
|
56 |
-src_unpack() { |
57 |
- unpack ${A} |
58 |
- sed -i -e "s:-O2:${CXXFLAGS}:" "${S}"/src/SConscript || die "sed failed." |
59 |
+src_prepare() { |
60 |
+ epatch "${FILESDIR}"/${P}-gcc44_and_fmodex_path.patch |
61 |
+ sed -i -e "s:-O2:${CXXFLAGS}:" src/SConscript || die "sed failed" |
62 |
} |
63 |
|
64 |
+src_configure() { :; } |
65 |
+ |
66 |
src_compile() { |
67 |
export QTDIR="/usr/$(get_libdir)" |
68 |
- scons prefix=/usr || die "scons failed." |
69 |
+ scons prefix=/usr || die "scons failed" |
70 |
} |
71 |
|
72 |
src_install() { |
73 |
- dobin build/${PN} || die "dobin failed." |
74 |
+ dobin build/${PN} || die "dobin failed" |
75 |
doicon src/${PN}-icon.png |
76 |
domenu src/${PN}.desktop |
77 |
dodoc authors readme todo |
78 |
|
79 |
|
80 |
|
81 |
1.2 media-sound/bpmdetect/ChangeLog |
82 |
|
83 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/bpmdetect/ChangeLog?rev=1.2&view=markup |
84 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/bpmdetect/ChangeLog?rev=1.2&content-type=text/plain |
85 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/bpmdetect/ChangeLog?r1=1.1&r2=1.2 |
86 |
|
87 |
Index: ChangeLog |
88 |
=================================================================== |
89 |
RCS file: /var/cvsroot/gentoo-x86/media-sound/bpmdetect/ChangeLog,v |
90 |
retrieving revision 1.1 |
91 |
retrieving revision 1.2 |
92 |
diff -u -r1.1 -r1.2 |
93 |
--- ChangeLog 21 Dec 2008 17:00:36 -0000 1.1 |
94 |
+++ ChangeLog 3 Jun 2009 19:37:07 -0000 1.2 |
95 |
@@ -1,10 +1,16 @@ |
96 |
# ChangeLog for media-sound/bpmdetect |
97 |
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
98 |
-# $Header: /var/cvsroot/gentoo-x86/media-sound/bpmdetect/ChangeLog,v 1.1 2008/12/21 17:00:36 ssuominen Exp $ |
99 |
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
100 |
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bpmdetect/ChangeLog,v 1.2 2009/06/03 19:37:07 ssuominen Exp $ |
101 |
+ |
102 |
+ 03 Jun 2009; Samuli Suominen <ssuominen@g.o> |
103 |
+ bpmdetect-0.6.1.ebuild, |
104 |
+ +files/bpmdetect-0.6.1-gcc44_and_fmodex_path.patch: |
105 |
+ Fix compile with GCC 4.4, and append correct fmodex library path in /opt |
106 |
+ wrt #252400. |
107 |
|
108 |
*bpmdetect-0.6.1 (21 Dec 2008) |
109 |
|
110 |
- 21 Dec 2008; <ssuominen@g.o> +bpmdetect-0.6.1.ebuild: |
111 |
+ 21 Dec 2008; Samuli Suominen <ssuominen@g.o> +bpmdetect-0.6.1.ebuild: |
112 |
Initial commit for bug 180878, thanks to Jürgen Prömer from |
113 |
#gentoo-media, Freenode for helping out. |