Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "PaweA Hajdan (phajdan.jr)" <phajdan.jr@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-client/chromium: chromium-5.0.371.0.ebuild ChangeLog chromium-9999.ebuild
Date: Fri, 09 Apr 2010 17:29:09
Message-Id: 20100409172906.612982C04A@corvid.gentoo.org
1 phajdan.jr 10/04/09 17:29:06
2
3 Modified: chromium-5.0.371.0.ebuild ChangeLog
4 chromium-9999.ebuild
5 Log:
6 Make ffmpeg support required, starting with the most recent versions.
7 (Portage version: 2.1.7.17/cvs/Linux i686)
8
9 Revision Changes Path
10 1.2 www-client/chromium/chromium-5.0.371.0.ebuild
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/chromium-5.0.371.0.ebuild?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/chromium-5.0.371.0.ebuild?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/chromium-5.0.371.0.ebuild?r1=1.1&r2=1.2
15
16 Index: chromium-5.0.371.0.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.371.0.ebuild,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- chromium-5.0.371.0.ebuild 9 Apr 2010 13:32:54 -0000 1.1
23 +++ chromium-5.0.371.0.ebuild 9 Apr 2010 17:29:05 -0000 1.2
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2010 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.371.0.ebuild,v 1.1 2010/04/09 13:32:54 phajdan.jr Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.371.0.ebuild,v 1.2 2010/04/09 17:29:05 phajdan.jr Exp $
29
30 EAPI="2"
31 inherit eutils flag-o-matic multilib portability toolchain-funcs
32 @@ -12,7 +12,7 @@
33 LICENSE="BSD"
34 SLOT="0"
35 KEYWORDS="~amd64 ~arm ~x86"
36 -IUSE="bindist +ffmpeg +plugins-symlink"
37 +IUSE="bindist +plugins-symlink"
38
39 RDEPEND="app-arch/bzip2
40 >=dev-libs/libevent-1.4.13
41 @@ -23,7 +23,7 @@
42 >=media-libs/alsa-lib-1.0.19
43 media-libs/jpeg:0
44 media-libs/libpng
45 - ffmpeg? ( >=media-video/ffmpeg-0.5_p21602 )
46 + >=media-video/ffmpeg-0.5_p21602
47 sys-libs/zlib
48 >=x11-libs/gtk+-2.14.7
49 x11-libs/libXScrnSaver"
50 @@ -120,7 +120,7 @@
51 export HOME="${S}"
52
53 # Configuration options (system libraries)
54 - local myconf="-Duse_system_zlib=1 -Duse_system_bzip2=1 -Duse_system_libevent=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 -Duse_system_libxml=1 -Duse_system_libxslt=1"
55 + local myconf="-Duse_system_zlib=1 -Duse_system_bzip2=1 -Duse_system_ffmpeg=1 -Duse_system_libevent=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 -Duse_system_libxml=1 -Duse_system_libxslt=1"
56 # -Duse_system_sqlite=1 : http://crbug.com/22208
57 # Others still bundled: icu (not possible?), hunspell (changes required for sandbox support)
58
59 @@ -143,10 +143,6 @@
60 myconf="${myconf} -Dno_strict_aliasing=1 -Dgcc_version=44"
61 fi
62
63 - if use ffmpeg; then
64 - myconf="${myconf} -Duse_system_ffmpeg=1"
65 - fi
66 -
67 build/gyp_chromium -f make build/all.gyp ${myconf} --depth=. || die "gyp failed"
68 }
69
70 @@ -183,13 +179,11 @@
71 newman out/Release/chrome.1 chrome.1
72 newman out/Release/chrome.1 chromium.1
73
74 - if use ffmpeg; then
75 - # Chromium looks for these in its folder
76 - # See media_posix.cc and base_paths_linux.cc
77 - dosym /usr/$(get_libdir)/libavcodec.so.52 ${CHROMIUM_HOME}
78 - dosym /usr/$(get_libdir)/libavformat.so.52 ${CHROMIUM_HOME}
79 - dosym /usr/$(get_libdir)/libavutil.so.50 ${CHROMIUM_HOME}
80 - fi
81 + # Chromium looks for these in its folder
82 + # See media_posix.cc and base_paths_linux.cc
83 + dosym /usr/$(get_libdir)/libavcodec.so.52 ${CHROMIUM_HOME}
84 + dosym /usr/$(get_libdir)/libavformat.so.52 ${CHROMIUM_HOME}
85 + dosym /usr/$(get_libdir)/libavutil.so.50 ${CHROMIUM_HOME}
86
87 # Plugins symlink, optional wrt bug #301911
88 if use plugins-symlink; then
89
90
91
92 1.80 www-client/chromium/ChangeLog
93
94 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/ChangeLog?rev=1.80&view=markup
95 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/ChangeLog?rev=1.80&content-type=text/plain
96 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/ChangeLog?r1=1.79&r2=1.80
97
98 Index: ChangeLog
99 ===================================================================
100 RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v
101 retrieving revision 1.79
102 retrieving revision 1.80
103 diff -u -r1.79 -r1.80
104 --- ChangeLog 9 Apr 2010 13:32:54 -0000 1.79
105 +++ ChangeLog 9 Apr 2010 17:29:05 -0000 1.80
106 @@ -1,6 +1,10 @@
107 # ChangeLog for www-client/chromium
108 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
109 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.79 2010/04/09 13:32:54 phajdan.jr Exp $
110 +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.80 2010/04/09 17:29:05 phajdan.jr Exp $
111 +
112 + 09 Apr 2010; Pawel Hajdan jr <phajdan.jr@g.o>
113 + chromium-5.0.371.0.ebuild, chromium-9999.ebuild:
114 + Make ffmpeg support required, starting with the most recent versions.
115
116 *chromium-5.0.371.0 (09 Apr 2010)
117
118
119
120
121 1.39 www-client/chromium/chromium-9999.ebuild
122
123 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/chromium-9999.ebuild?rev=1.39&view=markup
124 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/chromium-9999.ebuild?rev=1.39&content-type=text/plain
125 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/chromium-9999.ebuild?r1=1.38&r2=1.39
126
127 Index: chromium-9999.ebuild
128 ===================================================================
129 RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v
130 retrieving revision 1.38
131 retrieving revision 1.39
132 diff -u -r1.38 -r1.39
133 --- chromium-9999.ebuild 9 Apr 2010 13:32:54 -0000 1.38
134 +++ chromium-9999.ebuild 9 Apr 2010 17:29:05 -0000 1.39
135 @@ -1,6 +1,6 @@
136 # Copyright 1999-2010 Gentoo Foundation
137 # Distributed under the terms of the GNU General Public License v2
138 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.38 2010/04/09 13:32:54 phajdan.jr Exp $
139 +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.39 2010/04/09 17:29:05 phajdan.jr Exp $
140
141 EAPI="2"
142 inherit eutils flag-o-matic multilib portability subversion toolchain-funcs
143 @@ -14,7 +14,7 @@
144 LICENSE="BSD"
145 SLOT="0"
146 KEYWORDS=""
147 -IUSE="bindist +ffmpeg +plugins-symlink"
148 +IUSE="bindist +plugins-symlink"
149
150 RDEPEND="app-arch/bzip2
151 >=dev-libs/libevent-1.4.13
152 @@ -25,7 +25,7 @@
153 >=media-libs/alsa-lib-1.0.19
154 media-libs/jpeg:0
155 media-libs/libpng
156 - ffmpeg? ( >=media-video/ffmpeg-0.5_p21602 )
157 + >=media-video/ffmpeg-0.5_p21602
158 sys-libs/zlib
159 >=x11-libs/gtk+-2.14.7
160 x11-libs/libXScrnSaver"
161 @@ -164,7 +164,7 @@
162 export HOME="${S}"
163
164 # Configuration options (system libraries)
165 - local myconf="-Duse_system_zlib=1 -Duse_system_bzip2=1 -Duse_system_libevent=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 -Duse_system_libxml=1 -Duse_system_libxslt=1"
166 + local myconf="-Duse_system_zlib=1 -Duse_system_bzip2=1 -Duse_system_ffmpeg=1 -Duse_system_libevent=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 -Duse_system_libxml=1 -Duse_system_libxslt=1"
167 # -Duse_system_sqlite=1 : http://crbug.com/22208
168 # Others still bundled: icu (not possible?), hunspell (changes required for sandbox support)
169
170 @@ -187,10 +187,6 @@
171 myconf="${myconf} -Dno_strict_aliasing=1 -Dgcc_version=44"
172 fi
173
174 - if use ffmpeg; then
175 - myconf="${myconf} -Duse_system_ffmpeg=1"
176 - fi
177 -
178 build/gyp_chromium -f make build/all.gyp ${myconf} --depth=. || die "gyp failed"
179 }
180
181 @@ -227,13 +223,11 @@
182 newman out/Release/chrome.1 chrome.1
183 newman out/Release/chrome.1 chromium.1
184
185 - if use ffmpeg; then
186 - # Chromium looks for these in its folder
187 - # See media_posix.cc and base_paths_linux.cc
188 - dosym /usr/$(get_libdir)/libavcodec.so.52 ${CHROMIUM_HOME}
189 - dosym /usr/$(get_libdir)/libavformat.so.52 ${CHROMIUM_HOME}
190 - dosym /usr/$(get_libdir)/libavutil.so.50 ${CHROMIUM_HOME}
191 - fi
192 + # Chromium looks for these in its folder
193 + # See media_posix.cc and base_paths_linux.cc
194 + dosym /usr/$(get_libdir)/libavcodec.so.52 ${CHROMIUM_HOME}
195 + dosym /usr/$(get_libdir)/libavformat.so.52 ${CHROMIUM_HOME}
196 + dosym /usr/$(get_libdir)/libavutil.so.50 ${CHROMIUM_HOME}
197
198 # Plugins symlink, optional wrt bug #301911
199 if use plugins-symlink; then
Report Message
Find on MARC Find on Google Groups