1 |
compnerd 07/12/16 04:35:53 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: totem-2.20.1-r1.ebuild |
5 |
Log: |
6 |
be more strict about applying the xpcom hack |
7 |
(Portage version: 2.1.4_rc10) |
8 |
|
9 |
Revision Changes Path |
10 |
1.197 media-video/totem/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/totem/ChangeLog?rev=1.197&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/totem/ChangeLog?rev=1.197&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/totem/ChangeLog?r1=1.196&r2=1.197 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v |
19 |
retrieving revision 1.196 |
20 |
retrieving revision 1.197 |
21 |
diff -u -r1.196 -r1.197 |
22 |
--- ChangeLog 12 Dec 2007 05:20:05 -0000 1.196 |
23 |
+++ ChangeLog 16 Dec 2007 04:35:52 -0000 1.197 |
24 |
@@ -1,6 +1,11 @@ |
25 |
# ChangeLog for media-video/totem |
26 |
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.196 2007/12/12 05:20:05 compnerd Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.197 2007/12/16 04:35:52 compnerd Exp $ |
29 |
+ |
30 |
+ 16 Dec 2007; Saleem Abdulrasool <compnerd@g.o> |
31 |
+ +files/totem-2.20.1-startup-notification.patch, |
32 |
+ +files/totem-2.20.1-xpcom-hack.patch: |
33 |
+ Be more strict about applying the xpcom hack (bug #198058) |
34 |
|
35 |
12 Dec 2007; Saleem Abdulrasool <compnerd@g.o> |
36 |
-files/01_build_mozilla_plugin_with_seamonkey_xpcom.patch, |
37 |
|
38 |
|
39 |
|
40 |
1.1 media-video/totem/totem-2.20.1-r1.ebuild |
41 |
|
42 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/totem/totem-2.20.1-r1.ebuild?rev=1.1&view=markup |
43 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/totem/totem-2.20.1-r1.ebuild?rev=1.1&content-type=text/plain |
44 |
|
45 |
Index: totem-2.20.1-r1.ebuild |
46 |
=================================================================== |
47 |
# Copyright 1999-2007 Gentoo Foundation |
48 |
# Distributed under the terms of the GNU General Public License v2 |
49 |
# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.20.1-r1.ebuild,v 1.1 2007/12/16 04:35:52 compnerd Exp $ |
50 |
|
51 |
inherit autotools eutils gnome2 multilib |
52 |
|
53 |
DESCRIPTION="Media player for GNOME" |
54 |
HOMEPAGE="http://gnome.org/projects/totem/" |
55 |
|
56 |
LICENSE="GPL-2 LGPL-2" |
57 |
SLOT="0" |
58 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" |
59 |
|
60 |
# No 0.10.0 release for gst-plugins-pitdfdll yet |
61 |
# IUSE="win32codecs" |
62 |
|
63 |
IUSE="a52 bluetooth debug dvd ffmpeg flac galago gnome hal lirc mad mpeg nsplugin nvtv ogg python seamonkey theora vorbis xulrunner xv" |
64 |
|
65 |
RDEPEND=">=dev-libs/glib-2.13.4 |
66 |
>=x11-libs/gtk+-2.12.1 |
67 |
>=gnome-base/gconf-2.0 |
68 |
>=gnome-base/libglade-2.0 |
69 |
>=gnome-base/gnome-vfs-2.16 |
70 |
>=x11-themes/gnome-icon-theme-2.16 |
71 |
>=x11-libs/startup-notification-0.8 |
72 |
app-text/iso-codes |
73 |
dev-libs/libxml2 |
74 |
>=dev-libs/dbus-glib-0.71 |
75 |
>=media-libs/gstreamer-0.10.12 |
76 |
>=media-libs/gst-plugins-good-0.10 |
77 |
>=media-libs/gst-plugins-base-0.10.12 |
78 |
>=media-plugins/gst-plugins-pango-0.10 |
79 |
>=media-plugins/gst-plugins-gconf-0.10 |
80 |
>=media-plugins/gst-plugins-gnomevfs-0.10 |
81 |
|
82 |
x11-libs/libX11 |
83 |
x11-libs/libXtst |
84 |
>=x11-libs/libXrandr-1.1.1 |
85 |
>=x11-libs/libXxf86vm-1.0.1 |
86 |
|
87 |
bluetooth? ( net-wireless/bluez-libs ) |
88 |
galago? ( >=dev-libs/libgalago-0.5.2 ) |
89 |
gnome? ( |
90 |
>=gnome-base/libgnome-2.14 |
91 |
>=gnome-base/libgnomeui-2.4 |
92 |
>=gnome-base/gnome-desktop-2.2 |
93 |
>=gnome-base/nautilus-2.10 |
94 |
>=gnome-base/control-center-2.18 |
95 |
) |
96 |
hal? ( =sys-apps/hal-0.5* ) |
97 |
lirc? ( app-misc/lirc ) |
98 |
nsplugin? ( |
99 |
|| ( |
100 |
xulrunner? ( net-libs/xulrunner ) |
101 |
seamonkey? ( www-client/seamonkey ) |
102 |
www-client/mozilla-firefox |
103 |
) |
104 |
>=x11-misc/shared-mime-info-0.22 |
105 |
>=x11-libs/startup-notification-0.8 |
106 |
) |
107 |
python? ( >=dev-python/pygtk-2.8 ) |
108 |
nvtv? ( >=media-tv/nvtv-0.4.5 ) |
109 |
|
110 |
a52? ( >=media-plugins/gst-plugins-a52dec-0.10 ) |
111 |
!sparc? ( dvd? ( |
112 |
>=media-libs/gst-plugins-ugly-0.10 |
113 |
>=media-plugins/gst-plugins-a52dec-0.10 |
114 |
>=media-plugins/gst-plugins-dvdread-0.10 |
115 |
>=media-plugins/gst-plugins-mpeg2dec-0.10 |
116 |
) |
117 |
) |
118 |
!sparc? ( ffmpeg? ( >=media-plugins/gst-plugins-ffmpeg-0.10 ) ) |
119 |
flac? ( >=media-plugins/gst-plugins-flac-0.10 ) |
120 |
mad? ( >=media-plugins/gst-plugins-mad-0.10 ) |
121 |
!sparc? ( mpeg? ( >=media-plugins/gst-plugins-mpeg2dec-0.10 ) ) |
122 |
ogg? ( >=media-plugins/gst-plugins-ogg-0.10 ) |
123 |
theora? ( |
124 |
>=media-plugins/gst-plugins-ogg-0.10 |
125 |
>=media-plugins/gst-plugins-theora-0.10 |
126 |
) |
127 |
vorbis? ( |
128 |
>=media-plugins/gst-plugins-ogg-0.10 |
129 |
>=media-plugins/gst-plugins-vorbis-0.10 |
130 |
) |
131 |
xv? ( >=media-plugins/gst-plugins-xvideo-0.10 ) |
132 |
>=media-plugins/gst-plugins-x-0.10" |
133 |
|
134 |
# this belongs above xv? above. |
135 |
# win32codecs? ( >=media-plugins/gst-plugins-pitfdll-0.10 ) |
136 |
|
137 |
DEPEND="${RDEPEND} |
138 |
x11-proto/xproto |
139 |
x11-proto/inputproto |
140 |
app-text/scrollkeeper |
141 |
gnome-base/gnome-common |
142 |
app-text/gnome-doc-utils |
143 |
>=dev-util/intltool-0.35 |
144 |
>=dev-util/pkgconfig-0.20" |
145 |
|
146 |
DOCS="AUTHORS ChangeLog NEWS README TODO" |
147 |
|
148 |
pkg_setup() { |
149 |
# use global mozilla plugin dir |
150 |
G2CONF="${G2CONF} MOZILLA_PLUGINDIR=/usr/$(get_libdir)/nsbrowser/plugins" |
151 |
|
152 |
G2CONF="${G2CONF} --disable-vala --disable-vanity --enable-gstreamer --with-dbus" |
153 |
|
154 |
if use gnome ; then |
155 |
G2CONF="${G2CONF} --disable-gtk --enable-nautilus" |
156 |
else |
157 |
G2CONF="${G2CONF} --enable-gtk --disable-nautilus" |
158 |
fi |
159 |
|
160 |
if use nsplugin ; then |
161 |
G2CONF="${G2CONF} --enable-browser-plugins" |
162 |
if use xulrunner ; then |
163 |
G2CONF="${G2CONF} --with-gecko=xulrunner" |
164 |
elif use seamonkey ; then |
165 |
G2CONF="${G2CONF} --with-gecko=seamonkey" |
166 |
else |
167 |
G2CONF="${G2CONF} --with-gecko=firefox" |
168 |
fi |
169 |
else |
170 |
G2CONF="${G2CONF} --disable-browser-plugins" |
171 |
fi |
172 |
|
173 |
# Plugin Configuration |
174 |
G2CONF="${G2CONF} PLUGINDIR=/usr/$(get_libdir)/totem/plugins" |
175 |
local plugins="screensaver,ontop,gromit,skipto" |
176 |
use bluetooth && plugins="${plugins},bemused" |
177 |
use galago && plugins="${plugins},galago" |
178 |
use gnome && plugins="${plugins},media-player-keys,properties" |
179 |
use lirc && plugins="${plugins},lirc" |
180 |
|
181 |
G2CONF="${G2CONF} --with-plugins=${plugins}" |
182 |
|
183 |
G2CONF="${G2CONF} \ |
184 |
$(use_enable debug) \ |
185 |
$(use_with hal) \ |
186 |
$(use_enable lirc) \ |
187 |
$(use_enable nvtv) \ |
188 |
$(use_enable python)" |
189 |
} |
190 |
|
191 |
src_unpack() { |
192 |
gnome2_src_unpack |
193 |
|
194 |
if use nsplugin ; then |
195 |
epatch "${FILESDIR}/${PN}-2.20.1-startup-notification.patch" |
196 |
if ! use xulrunner && ! use seamonkey ; then |
197 |
epatch "${FILESDIR}/${PN}-2.20.1-xpcom-hack.patch" |
198 |
fi |
199 |
eautoreconf |
200 |
fi |
201 |
|
202 |
sed -i -e 's:mozilla/plugins:nsbrowser/plugins:' browser-plugin/Makefile* || die "sed failed" |
203 |
|
204 |
sed -i -e 's:.totem-plugin.desktop.in:.totem-plugin.in:' \ |
205 |
src/plugins/{galago,lirc,media-player-keys,ontop,screensaver}/Makefile* \ |
206 |
|| die "sed failed" |
207 |
|
208 |
} |
209 |
|
210 |
src_compile() { |
211 |
#fixme: why does it need write access here, probably need to set up a fake |
212 |
#home in /var/tmp like other pkgs do |
213 |
|
214 |
addpredict "/root/.gconfd" |
215 |
addpredict "/root/.gconf" |
216 |
addpredict "/root/.gnome2" |
217 |
|
218 |
gnome2_src_compile |
219 |
} |
220 |
|
221 |
|
222 |
|
223 |
-- |
224 |
gentoo-commits@g.o mailing list |