1 |
lack 10/12/01 13:51:02 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: adobe-flash-10.2.161.23_pre20101117.ebuild |
5 |
Log: |
6 |
Next prerelease is released (Bug #347363) |
7 |
|
8 |
(Portage version: 2.1.9.14/cvs/Linux i686) |
9 |
|
10 |
Revision Changes Path |
11 |
1.59 www-plugins/adobe-flash/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/adobe-flash/ChangeLog?rev=1.59&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/adobe-flash/ChangeLog?rev=1.59&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/adobe-flash/ChangeLog?r1=1.58&r2=1.59 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v |
20 |
retrieving revision 1.58 |
21 |
retrieving revision 1.59 |
22 |
diff -u -r1.58 -r1.59 |
23 |
--- ChangeLog 15 Nov 2010 18:16:35 -0000 1.58 |
24 |
+++ ChangeLog 1 Dec 2010 13:51:02 -0000 1.59 |
25 |
@@ -1,6 +1,16 @@ |
26 |
# ChangeLog for www-plugins/adobe-flash |
27 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.58 2010/11/15 18:16:35 lack Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.59 2010/12/01 13:51:02 lack Exp $ |
30 |
+ |
31 |
+*adobe-flash-10.2.161.23_pre20101117 (01 Dec 2010) |
32 |
+ |
33 |
+ 01 Dec 2010; Jim Ramsay <lack@g.o> |
34 |
+ +adobe-flash-10.2.161.23_pre20101117.ebuild: |
35 |
+ Next prerelease is ready (11-17-2010). Unfortunately Adobe has split up |
36 |
+ the versions so the 32-bit version is actually internally versioned as |
37 |
+ 10.2.151.49 (went down) while the 64-bit version is now 10.3.162.29 (went |
38 |
+ way up). So I'm keeping the ebulid version number the same (10.2.161.23) |
39 |
+ and just bumping the prerelease version number for this one. |
40 |
|
41 |
*adobe-flash-9.0.289.0 (15 Nov 2010) |
42 |
|
43 |
|
44 |
|
45 |
|
46 |
1.1 www-plugins/adobe-flash/adobe-flash-10.2.161.23_pre20101117.ebuild |
47 |
|
48 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.2.161.23_pre20101117.ebuild?rev=1.1&view=markup |
49 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.2.161.23_pre20101117.ebuild?rev=1.1&content-type=text/plain |
50 |
|
51 |
Index: adobe-flash-10.2.161.23_pre20101117.ebuild |
52 |
=================================================================== |
53 |
# Copyright 1999-2010 Gentoo Foundation |
54 |
# Distributed under the terms of the GNU General Public License v2 |
55 |
# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.2.161.23_pre20101117.ebuild,v 1.1 2010/12/01 13:51:02 lack Exp $ |
56 |
|
57 |
EAPI=3 |
58 |
inherit nsplugins multilib toolchain-funcs versionator |
59 |
|
60 |
# Specal version parsing for date-based 'square' releases |
61 |
# For proper date ordering in the ebuild we are using preCCYYMMDD whereas Adobe |
62 |
# uses MMDDYY |
63 |
EBUILD_DATE=$(get_version_component_range $(get_version_component_count)) |
64 |
DATE_SUFFIX=${EBUILD_DATE: -4}${EBUILD_DATE:5:2} |
65 |
MY_32B_URI="http://download.macromedia.com/pub/labs/flashplayer10/flashplayer10_2_p2_32bit_linux_${DATE_SUFFIX}.tar.gz" |
66 |
MY_64B_URI="http://download.macromedia.com/pub/labs/flashplayer10/flashplayer10_2_p3_64bit_linux_${DATE_SUFFIX}.tar.gz" |
67 |
|
68 |
DESCRIPTION="Adobe Flash Player" |
69 |
SRC_URI="x86? ( ${MY_32B_URI} ) |
70 |
amd64? ( |
71 |
multilib? ( |
72 |
32bit? ( ${MY_32B_URI} ) |
73 |
64bit? ( ${MY_64B_URI} ) |
74 |
) |
75 |
!multilib? ( ${MY_64B_URI} ) |
76 |
)" |
77 |
#HOMEPAGE="http://www.adobe.com/" |
78 |
HOMEPAGE="http://labs.adobe.com/technologies/flashplayer10/" |
79 |
IUSE="multilib nspluginwrapper +32bit +64bit" |
80 |
SLOT="0" |
81 |
|
82 |
KEYWORDS="-* ~amd64 ~x86" |
83 |
LICENSE="AdobeFlash-10.1" |
84 |
RESTRICT="strip mirror" |
85 |
|
86 |
S="${WORKDIR}" |
87 |
|
88 |
NATIVE_DEPS="x11-libs/gtk+:2 |
89 |
media-libs/fontconfig |
90 |
dev-libs/nss |
91 |
net-misc/curl |
92 |
>=sys-libs/glibc-2.4" |
93 |
|
94 |
EMUL_DEPS=">=app-emulation/emul-linux-x86-gtklibs-20100409-r1 |
95 |
app-emulation/emul-linux-x86-soundlibs" |
96 |
|
97 |
DEPEND="amd64? ( multilib? ( 32bit? ( nspluginwrapper? ( |
98 |
www-plugins/nspluginwrapper ) ) ) )" |
99 |
RDEPEND="x86? ( $NATIVE_DEPS ) |
100 |
amd64? ( |
101 |
multilib? ( |
102 |
64bit? ( $NATIVE_DEPS ) |
103 |
32bit? ( $EMUL_DEPS ) |
104 |
) |
105 |
!multilib? ( $NATIVE_DEPS ) |
106 |
) |
107 |
|| ( media-fonts/liberation-fonts media-fonts/corefonts ) |
108 |
${DEPEND}" |
109 |
|
110 |
# Where should this all go? (Bug #328639) |
111 |
INSTALL_BASE="opt/Adobe/flash-player" |
112 |
|
113 |
# Ignore QA warnings in these binary closed-source libraries, since we can't fix |
114 |
# them: |
115 |
QA_EXECSTACK="${INSTALL_BASE}32/libflashplayer.so |
116 |
${INSTALL_BASE}/libflashplayer.so" |
117 |
|
118 |
QA_DT_HASH="${INSTALL_BASE}32/libflashplayer.so |
119 |
${INSTALL_BASE}/libflashplayer.so" |
120 |
|
121 |
pkg_setup() { |
122 |
einfo "Date is $EBUILD_DATE suffix is $DATE_SUFFIX" |
123 |
if use x86; then |
124 |
export native_install=1 |
125 |
elif use amd64; then |
126 |
# amd64 users may unselect the native 64bit binary, if they choose |
127 |
if ! use multilib || use 64bit; then |
128 |
export native_install=1 |
129 |
else |
130 |
unset native_install |
131 |
fi |
132 |
|
133 |
if use multilib && use 32bit; then |
134 |
export amd64_32bit=1 |
135 |
else |
136 |
unset amd64_32bit |
137 |
fi |
138 |
|
139 |
if use multilib && ! use 32bit && ! use 64bit; then |
140 |
eerror "You must select at least one architecture USE flag (32bit or 64bit)" |
141 |
die "No library version selected [-32bit -64bit]" |
142 |
fi |
143 |
|
144 |
unset need_lahf_wrapper |
145 |
if [[ $native_install ]]; then |
146 |
# 64bit flash requires the 'lahf' instruction (bug #268336) |
147 |
# Also, check if *any* of the processors are affected (bug #286159) |
148 |
if grep '^flags' /proc/cpuinfo | grep -qv 'lahf_lm'; then |
149 |
export need_lahf_wrapper=1 |
150 |
fi |
151 |
fi |
152 |
fi |
153 |
} |
154 |
|
155 |
src_unpack() { |
156 |
# In this pre-release version, both tarballs have just 'libflashplayer.so' |
157 |
# and no prefix directory, so put the 32-bit one somewhere else. |
158 |
if [[ $amd64_32bit ]]; then |
159 |
mkdir 32bit |
160 |
pushd "${S}/32bit" |
161 |
unpack $(basename $MY_32B_URI) |
162 |
popd |
163 |
unpack $(basename $MY_64B_URI) |
164 |
else |
165 |
default_src_unpack |
166 |
fi |
167 |
} |
168 |
|
169 |
src_compile() { |
170 |
if [[ $need_lahf_wrapper ]]; then |
171 |
# This experimental wrapper, from Maks Verver via bug #268336 should |
172 |
# emulate the missing lahf instruction affected platforms. |
173 |
$(tc-getCC) -fPIC -shared -nostdlib -lc -oflashplugin-lahf-fix.so \ |
174 |
"${FILESDIR}/flashplugin-lahf-fix.c" \ |
175 |
|| die "Compile of flashplugin-lahf-fix.so failed" |
176 |
fi |
177 |
} |
178 |
|
179 |
src_install() { |
180 |
if [[ $native_install ]]; then |
181 |
exeinto /${INSTALL_BASE} |
182 |
doexe libflashplayer.so |
183 |
inst_plugin /${INSTALL_BASE}/libflashplayer.so |
184 |
fi |
185 |
|
186 |
if [[ $need_lahf_wrapper ]]; then |
187 |
# This experimental wrapper, from Maks Verver via bug #268336 should |
188 |
# emulate the missing lahf instruction affected platforms. |
189 |
exeinto /${INSTALL_BASE} |
190 |
doexe flashplugin-lahf-fix.so |
191 |
inst_plugin /${INSTALL_BASE}/flashplugin-lahf-fix.so |
192 |
fi |
193 |
|
194 |
if [[ $amd64_32bit ]]; then |
195 |
local oldabi="${ABI}" |
196 |
ABI="x86" |
197 |
|
198 |
# 32b plugin |
199 |
pushd "${S}/32bit" |
200 |
exeinto /${INSTALL_BASE}32 |
201 |
doexe libflashplayer.so |
202 |
inst_plugin /${INSTALL_BASE}32/libflashplayer.so |
203 |
popd |
204 |
|
205 |
ABI="${oldabi}" |
206 |
fi |
207 |
|
208 |
# The magic config file! |
209 |
insinto "/etc/adobe" |
210 |
doins "${FILESDIR}/mms.cfg" |
211 |
} |
212 |
|
213 |
pkg_postinst() { |
214 |
if use amd64; then |
215 |
if [[ $need_lahf_wrapper ]]; then |
216 |
ewarn "Your processor does not support the 'lahf' instruction which is used" |
217 |
ewarn "by Adobe's 64-bit flash binary. We have installed a wrapper which" |
218 |
ewarn "should allow this plugin to run. If you encounter problems, please" |
219 |
ewarn "adjust your USE flags to install only the 32-bit version and reinstall:" |
220 |
ewarn " ${CATEGORY}/$PN[+32bit -64bit]" |
221 |
elog |
222 |
fi |
223 |
if has_version 'www-plugins/nspluginwrapper'; then |
224 |
if [[ $native_install ]]; then |
225 |
# TODO: Perhaps parse the output of 'nspluginwrapper -l' |
226 |
# However, the 64b flash plugin makes |
227 |
# 'nspluginwrapper -l' segfault. |
228 |
local FLASH_WRAPPER="${ROOT}/usr/lib64/nsbrowser/plugins/npwrapper.libflashplayer.so" |
229 |
if [[ -f ${FLASH_WRAPPER} ]]; then |
230 |
einfo "Removing duplicate 32-bit plugin wrapper: Native 64-bit plugin installed" |
231 |
nspluginwrapper -r "${FLASH_WRAPPER}" |
232 |
fi |
233 |
else |
234 |
einfo "nspluginwrapper detected: Installing plugin wrapper" |
235 |
local oldabi="${ABI}" |
236 |
ABI="x86" |
237 |
local FLASH_SOURCE="${ROOT}/${INSTALL_BASE}32/libflashplayer.so" |
238 |
nspluginwrapper -i "${FLASH_SOURCE}" |
239 |
ABI="${oldabi}" |
240 |
fi |
241 |
elif [[ ! $native_install ]]; then |
242 |
elog "To use the 32-bit flash player in a native 64-bit browser," |
243 |
elog "you must install www-plugins/nspluginwrapper" |
244 |
fi |
245 |
fi |
246 |
|
247 |
ewarn "Flash player is closed-source, with a long history of security" |
248 |
ewarn "issues. Please consider only running flash applets you know to" |
249 |
ewarn "be safe. The 'flashblock' extension may help for mozilla users:" |
250 |
ewarn " https://addons.mozilla.org/en-US/firefox/addon/433" |
251 |
} |