Gentoo Archives: gentoo-commits

From: "Alfredo Tupone (tupone)" <tupone@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in games-emulation/daphne: ChangeLog daphne-1.0.ebuild
Date: Tue, 05 Oct 2010 07:42:32
Message-Id: 20101005074225.EA41620051@flycatcher.gentoo.org
1 tupone 10/10/05 07:42:25
2
3 Modified: ChangeLog daphne-1.0.ebuild
4 Log:
5 Respect LDFLAGS. Bug #337184
6
7 (Portage version: 2.1.9.13/cvs/Linux i686)
8
9 Revision Changes Path
10 1.16 games-emulation/daphne/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/daphne/ChangeLog?rev=1.16&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/daphne/ChangeLog?rev=1.16&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/daphne/ChangeLog?r1=1.15&r2=1.16
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/games-emulation/daphne/ChangeLog,v
19 retrieving revision 1.15
20 retrieving revision 1.16
21 diff -u -r1.15 -r1.16
22 --- ChangeLog 21 Nov 2009 19:18:09 -0000 1.15
23 +++ ChangeLog 5 Oct 2010 07:42:25 -0000 1.16
24 @@ -1,6 +1,10 @@
25 # ChangeLog for games-emulation/daphne
26 -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/daphne/ChangeLog,v 1.15 2009/11/21 19:18:09 maekke Exp $
28 +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
29 +# $Header: /var/cvsroot/gentoo-x86/games-emulation/daphne/ChangeLog,v 1.16 2010/10/05 07:42:25 tupone Exp $
30 +
31 + 05 Oct 2010; Tupone Alfredo <tupone@g.o> daphne-1.0.ebuild,
32 + +files/daphne-1.0-ldflags.patch:
33 + Respect LDFLAGS. Bug #337184 by flameeyes@g.o
34
35 21 Nov 2009; Markus Meier <maekke@g.o> daphne-1.0.ebuild:
36 x86 stable, bug #288963
37
38
39
40 1.5 games-emulation/daphne/daphne-1.0.ebuild
41
42 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/daphne/daphne-1.0.ebuild?rev=1.5&view=markup
43 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/daphne/daphne-1.0.ebuild?rev=1.5&content-type=text/plain
44 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/daphne/daphne-1.0.ebuild?r1=1.4&r2=1.5
45
46 Index: daphne-1.0.ebuild
47 ===================================================================
48 RCS file: /var/cvsroot/gentoo-x86/games-emulation/daphne/daphne-1.0.ebuild,v
49 retrieving revision 1.4
50 retrieving revision 1.5
51 diff -u -r1.4 -r1.5
52 --- daphne-1.0.ebuild 21 Nov 2009 19:18:09 -0000 1.4
53 +++ daphne-1.0.ebuild 5 Oct 2010 07:42:25 -0000 1.5
54 @@ -1,6 +1,7 @@
55 -# Copyright 1999-2009 Gentoo Foundation
56 +# Copyright 1999-2010 Gentoo Foundation
57 # Distributed under the terms of the GNU General Public License v2
58 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/daphne/daphne-1.0.ebuild,v 1.4 2009/11/21 19:18:09 maekke Exp $
59 +# $Header: /var/cvsroot/gentoo-x86/games-emulation/daphne/daphne-1.0.ebuild,v 1.5 2010/10/05 07:42:25 tupone Exp $
60 +EAPI="2"
61
62 inherit eutils toolchain-funcs games
63
64 @@ -13,25 +14,24 @@
65 KEYWORDS="~amd64 x86"
66 IUSE=""
67
68 -DEPEND="media-libs/libogg
69 +RDEPEND="media-libs/libogg
70 media-libs/libvorbis
71 media-libs/libsdl
72 media-libs/sdl-mixer
73 media-libs/glew"
74 +DEPEND="${RDEPEND}"
75
76 S="${WORKDIR}"/v_1_0/src
77
78 -src_unpack() {
79 - unpack ${A}
80 - cd "${S}"
81 -
82 +src_prepare() {
83 # Fix no sound issue with >=media-libs/libvorbis-1.2.0
84 epatch "${FILESDIR}/${P}"-vorbisfilefix.patch
85
86 # amd64 does not like int pointers
87 epatch "${FILESDIR}/${P}"-typefix.patch
88
89 - epatch "${FILESDIR}/${P}"-gcc43.patch
90 + epatch "${FILESDIR}/${P}"-gcc43.patch \
91 + "${FILESDIR}"/${P}-ldflags.patch
92
93 sed -i "/m_appdir =/s:\.:${GAMES_DATADIR}/${PN}:" \
94 io/homedir.cpp \
95 @@ -54,6 +54,11 @@
96 || die "sed failed"
97 }
98
99 +src_configure() {
100 + cd vldp2
101 + egamesconf --disable-accel-detect
102 +}
103 +
104 src_compile() {
105 local archflags
106
107 @@ -70,7 +75,6 @@
108 DFLAGS="${CXXFLAGS} ${archflags}" \
109 || die "src build failed"
110 cd vldp2
111 - egamesconf --disable-accel-detect || die
112 emake \
113 -f Makefile.linux \
114 CC=$(tc-getCC) \