Gentoo Archives: gentoo-commits

From: "Chi-Thanh Christopher Nguyen (chithanh)" <chithanh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-plugins/gnash: ChangeLog gnash-0.8.8.ebuild
Date: Tue, 28 Sep 2010 12:55:20
Message-Id: 20100928125512.BF48020051@flycatcher.gentoo.org
1 chithanh 10/09/28 12:55:12
2
3 Modified: ChangeLog gnash-0.8.8.ebuild
4 Log:
5 Allow building of several media handlers, bug #334145
6
7 (Portage version: 2.2_rc85/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.44 www-plugins/gnash/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/gnash/ChangeLog?rev=1.44&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/gnash/ChangeLog?rev=1.44&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/gnash/ChangeLog?r1=1.43&r2=1.44
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v
19 retrieving revision 1.43
20 retrieving revision 1.44
21 diff -u -r1.43 -r1.44
22 --- ChangeLog 24 Aug 2010 14:01:19 -0000 1.43
23 +++ ChangeLog 28 Sep 2010 12:55:12 -0000 1.44
24 @@ -1,6 +1,11 @@
25 # ChangeLog for www-plugins/gnash
26 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.43 2010/08/24 14:01:19 chithanh Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.44 2010/09/28 12:55:12 chithanh Exp $
29 +
30 + 28 Sep 2010; Chí-Thanh Christopher Nguyễn <chithanh@g.o>
31 + gnash-0.8.8.ebuild:
32 + Switch mysql dependency to virtual, bug #333831. Allow building of several
33 + media handlers, bug #334145
34
35 24 Aug 2010; Chí-Thanh Christopher Nguyễn <chithanh@g.o>
36 gnash-0.8.8.ebuild:
37
38
39
40 1.5 www-plugins/gnash/gnash-0.8.8.ebuild
41
42 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/gnash/gnash-0.8.8.ebuild?rev=1.5&view=markup
43 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/gnash/gnash-0.8.8.ebuild?rev=1.5&content-type=text/plain
44 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/gnash/gnash-0.8.8.ebuild?r1=1.4&r2=1.5
45
46 Index: gnash-0.8.8.ebuild
47 ===================================================================
48 RCS file: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.8.ebuild,v
49 retrieving revision 1.4
50 retrieving revision 1.5
51 diff -u -r1.4 -r1.5
52 --- gnash-0.8.8.ebuild 28 Sep 2010 12:30:21 -0000 1.4
53 +++ gnash-0.8.8.ebuild 28 Sep 2010 12:55:12 -0000 1.5
54 @@ -1,6 +1,6 @@
55 # Copyright 1999-2010 Gentoo Foundation
56 # Distributed under the terms of the GNU General Public License v2
57 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.8.ebuild,v 1.4 2010/09/28 12:30:21 chithanh Exp $
58 +# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.8.ebuild,v 1.5 2010/09/28 12:55:12 chithanh Exp $
59
60 EAPI=3
61 CMAKE_REQUIRED="never"
62 @@ -146,7 +146,7 @@
63 eautoreconf
64 }
65 src_configure() {
66 - local gui hwaccel input myconf myext renderers
67 + local gui hwaccel input media myconf myext renderers
68
69 # Set nsplugin install directory.
70 use nsplugin && myconf="${myconf} --with-npapi-plugindir=/usr/$(get_libdir)/gnash/npapi/"
71 @@ -174,13 +174,10 @@
72 fi
73
74 # Set media handler.
75 - if use ffmpeg; then
76 - myconf="${myconf} --enable-media=ffmpeg"
77 - elif use gstreamer; then
78 - myconf="${myconf} --enable-media=gst"
79 - else
80 - myconf="${myconf} --enable-media=none"
81 - fi
82 + use ffmpeg || use gstreamer || media+=",none"
83 + use ffmpeg && media+=",ffmpeg"
84 + use gstreamer && media+=",gst"
85 +
86 # Set gui.
87 use gtk && gui=",gtk"
88 use fbcon && gui="${gui},fb"
89 @@ -202,6 +199,7 @@
90 hwaccel=$( echo $hwaccel | sed -e 's/,//' )
91 myext=$( echo $myext | sed -e 's/,//' )
92 renderers=$( echo $renderers | sed -e 's/,//' )
93 + media=$( echo $media | sed -e 's/,//' )
94
95 econf \
96 --docdir=/usr/share/doc/${PF} \
97 @@ -224,6 +222,7 @@
98 --enable-extensions=${myext} \
99 --enable-renderer=${renderers} \
100 --enable-hwaccel=${hwaccel} \
101 + --enable-media=${media} \
102 ${myconf}
103 }
104 src_test() {