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

Gentoo Archives: gentoo-commits

From: "Jeroen Roovers (jer)" <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-plugins/adobe-flash: adobe-flash-11.2.202.273.ebuild ChangeLog adobe-flash-10.3.183.67.ebuild adobe-flash-10.3.183.61.ebuild
Date: Wed, 27 Feb 2013 05:09:16
Message-Id: 20130227050912.BEEC82171D@flycatcher.gentoo.org
1 jer 13/02/27 05:09:12
2
3 Modified: ChangeLog
4 Added: adobe-flash-11.2.202.273.ebuild
5 adobe-flash-10.3.183.67.ebuild
6 Removed: adobe-flash-10.3.183.61.ebuild
7 Log:
8 Version bump (bug #459368).
9
10 (Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key A792A613)
11
12 Revision Changes Path
13 1.173 www-plugins/adobe-flash/ChangeLog
14
15 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/adobe-flash/ChangeLog?rev=1.173&view=markup
16 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/adobe-flash/ChangeLog?rev=1.173&content-type=text/plain
17 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/adobe-flash/ChangeLog?r1=1.172&r2=1.173
18
19 Index: ChangeLog
20 ===================================================================
21 RCS file: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v
22 retrieving revision 1.172
23 retrieving revision 1.173
24 diff -u -r1.172 -r1.173
25 --- ChangeLog 17 Feb 2013 17:52:10 -0000 1.172
26 +++ ChangeLog 27 Feb 2013 05:09:12 -0000 1.173
27 @@ -1,6 +1,13 @@
28 # ChangeLog for www-plugins/adobe-flash
29 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
30 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.172 2013/02/17 17:52:10 jer Exp $
31 +# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.173 2013/02/27 05:09:12 jer Exp $
32 +
33 +*adobe-flash-11.2.202.273 (27 Feb 2013)
34 +*adobe-flash-10.3.183.67 (27 Feb 2013)
35 +
36 + 27 Feb 2013; Jeroen Roovers <jer@g.o> -adobe-flash-10.3.183.61.ebuild,
37 + +adobe-flash-10.3.183.67.ebuild, +adobe-flash-11.2.202.273.ebuild:
38 + Version bump (bug #459368).
39
40 17 Feb 2013; Jeroen Roovers <jer@g.o> -adobe-flash-11.2.202.262.ebuild:
41 Old.
42
43
44
45 1.1 www-plugins/adobe-flash/adobe-flash-11.2.202.273.ebuild
46
47 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/adobe-flash/adobe-flash-11.2.202.273.ebuild?rev=1.1&view=markup
48 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/adobe-flash/adobe-flash-11.2.202.273.ebuild?rev=1.1&content-type=text/plain
49
50 Index: adobe-flash-11.2.202.273.ebuild
51 ===================================================================
52 # Copyright 1999-2013 Gentoo Foundation
53 # Distributed under the terms of the GNU General Public License v2
54 # $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-11.2.202.273.ebuild,v 1.1 2013/02/27 05:09:12 jer Exp $
55
56 EAPI=4
57 inherit nsplugins multilib toolchain-funcs versionator
58
59 AF_URI="http://fpdownload.macromedia.com/get/flashplayer/pdc"
60 MY_32B_URI="${AF_URI}/${PV}/install_flash_player_$(get_major_version)_linux.i386.tar.gz -> ${P}.i386.tar.gz"
61 MY_64B_URI="${AF_URI}/${PV}/install_flash_player_$(get_major_version)_linux.x86_64.tar.gz -> ${P}.x86_64.tar.gz"
62
63 DESCRIPTION="Adobe Flash Player"
64 SRC_URI="x86? ( ${MY_32B_URI} )
65 amd64? (
66 multilib? (
67 32bit? ( ${MY_32B_URI} )
68 64bit? ( ${MY_64B_URI} )
69 )
70 !multilib? ( ${MY_64B_URI} )
71 )"
72 HOMEPAGE="http://www.adobe.com/products/flashplayer.html"
73 IUSE="multilib -32bit +64bit selinux vdpau kde +sse2check"
74 SLOT="0"
75
76 KEYWORDS="-* ~amd64 ~x86"
77 LICENSE="AdobeFlash-11.x"
78 RESTRICT="strip mirror"
79
80 S="${WORKDIR}"
81
82 NATIVE_DEPS="x11-libs/gtk+:2
83 media-libs/fontconfig
84 dev-libs/nss
85 net-misc/curl
86 vdpau? ( x11-libs/libvdpau )
87 kde? ( kde-base/kcmshell )
88 >=sys-libs/glibc-2.4"
89
90 EMUL_DEPS="vdpau? ( >=app-emulation/emul-linux-x86-xlibs-20110129 )
91 >=app-emulation/emul-linux-x86-gtklibs-20100409-r1
92 app-emulation/emul-linux-x86-soundlibs"
93
94 DEPEND="amd64? ( multilib? ( !64bit? ( www-plugins/nspluginwrapper ) ) )
95 selinux? ( sec-policy/selinux-flash )"
96 RDEPEND="x86? ( $NATIVE_DEPS )
97 amd64? (
98 multilib? (
99 64bit? ( $NATIVE_DEPS )
100 32bit? ( $EMUL_DEPS )
101 )
102 !multilib? ( $NATIVE_DEPS )
103 )
104 || ( media-fonts/liberation-fonts media-fonts/corefonts )
105 ${DEPEND}"
106
107 # Where should this all go? (Bug #328639)
108 INSTALL_BASE="opt/Adobe/flash-player"
109
110 # Ignore QA warnings in these closed-source binaries, since we can't fix them:
111 QA_PREBUILT="opt/*"
112
113 any_cpu_missing_flag() {
114 local value=$1
115 grep '^flags' /proc/cpuinfo | grep -qv "$value"
116 }
117
118 pkg_pretend() {
119 if any_cpu_missing_flag 'sse2'; then
120 eerror "This version of adobe-flash requires a CPU that supports the"
121 eerror "SSE2 instruction set, and at least one of your CPUs does not"
122 eerror "support this feature."
123 eerror ""
124 if use sse2check; then
125 eerror "You should mask this version and use adobe-flash-10.3.* instead."
126 eerror "To do so, add the following line to your package.mask file:"
127 eerror " =${CATEGORY}/${P}"
128 eerror ""
129 eerror "Or if you are trying to build a binary package for another host"
130 eerror "that does support SSE2 instructions, you may override this"
131 eerror "check by setting USE=\"-sse2check\""
132 eerror ""
133 die "${P} requires CPU with SSE2"
134 else
135 eerror "Continuing anyway due to USE=\"-sse2check\", but be aware that flash"
136 eerror "will not function unless all of the CPUs on the system where it"
137 eerror "is installed support the SSE2 instruction set."
138 fi
139 fi
140 }
141
142 pkg_setup() {
143 if use x86; then
144 export native_install=1
145 elif use amd64; then
146 # amd64 users may unselect the native 64bit binary, if they choose
147 # TODO: In future revisions, remove this ability now that 64-bit
148 # binaries are officially released and working.
149 if ! use multilib || use 64bit; then
150 export native_install=1
151 else
152 unset native_install
153 fi
154
155 if use multilib && use 32bit; then
156 export amd64_32bit=1
157 else
158 unset amd64_32bit
159 fi
160
161 if use multilib && ! use 32bit && ! use 64bit; then
162 eerror "You must select at least one architecture USE flag (32bit or 64bit)"
163 die "No library version selected [-32bit -64bit]"
164 fi
165
166 unset need_lahf_wrapper
167 if [[ $native_install ]]; then
168 # 64bit flash requires the 'lahf' instruction (bug #268336)
169 if any_cpu_missing_flag 'lahf_lm'; then
170 export need_lahf_wrapper=1
171 fi
172 fi
173 fi
174 }
175
176 src_unpack() {
177 if [[ $amd64_32bit ]]; then
178 # Since the 32-bit and 64-bit packages collide, put the 32-bit one
179 # elsewhere:
180 local my_32b_src=${MY_32B_URI##*>}
181 local my_64b_src=${MY_64B_URI##*>}
182 if [[ $native_install ]]; then
183 unpack $my_64b_src
184 fi
185 mkdir 32bit
186 pushd 32bit >/dev/null
187 unpack $my_32b_src
188 popd >/dev/null
189 else
190 default_src_unpack
191 fi
192 }
193
194 src_compile() {
195 if [[ $need_lahf_wrapper ]]; then
196 # This experimental wrapper, from Maks Verver via bug #268336 should
197 # emulate the missing lahf instruction affected platforms.
198 $(tc-getCC) -fPIC -shared -nostdlib -lc -oflashplugin-lahf-fix.so \
199 "${FILESDIR}/flashplugin-lahf-fix.c" \
200 || die "Compile of flashplugin-lahf-fix.so failed"
201 fi
202 }
203
204 src_install() {
205 if [[ $native_install ]]; then
206 if use x86; then
207 local PKGLIB=lib
208 else
209 local PKGLIB=lib64
210 fi
211 local BASE=${INSTALL_BASE}
212
213 # The plugin itself
214 exeinto /${BASE}/flash-plugin
215 doexe libflashplayer.so
216 inst_plugin /${BASE}/flash-plugin/libflashplayer.so
217
218 # The optional KDE4 KCM plugin
219 if use kde; then
220 exeinto /${BASE}/kde4
221 doexe usr/${PKGLIB}/kde4/kcm_adobe_flash_player.so
222 dosym /${BASE}/kde4/kcm_adobe_flash_player.so \
223 /usr/$(get_libdir)/kde4/kcm_adobe_flash_player.so
224 insinto /usr/share/kde4/services
225 doins usr/share/kde4/services/kcm_adobe_flash_player.desktop
226 else
227 # No KDE applet, so allow the GTK utility to show up in KDE:
228 sed -i usr/share/applications/flash-player-properties.desktop \
229 -e "/^NotShowIn=KDE;/d" || die "sed of .desktop file failed"
230 fi
231
232 # The userland 'flash-player-properties' standalone app:
233 exeinto /${BASE}/bin
234 doexe usr/bin/flash-player-properties
235 dosym /${BASE}/bin/flash-player-properties \
236 usr/bin/flash-player-properties
237
238 # Icon and .desktop for 'flash-player-properties'
239 for icon in $(find usr/share/icons/ -name '*.png'); do
240 insinto /$(dirname $icon)
241 doins $icon
242 done
243 dosym ../icons/hicolor/48x48/apps/flash-player-properties.png \
244 usr/share/pixmaps/flash-player-properties.png
245 insinto usr/share/applications
246 sed -i usr/share/applications/flash-player-properties.desktop \
247 -e "s:^Exec=:Exec=/${BASE}/bin/:" || die "sed of .desktop file failed"
248 doins usr/share/applications/flash-player-properties.desktop
249 fi
250
251 if [[ $need_lahf_wrapper ]]; then
252 # This experimental wrapper, from Maks Verver via bug #268336 should
253 # emulate the missing lahf instruction affected platforms.
254 exeinto /${INSTALL_BASE}
255 doexe flashplugin-lahf-fix.so
256 inst_plugin /${INSTALL_BASE}/flashplugin-lahf-fix.so
257 fi
258
259 if [[ $amd64_32bit ]]; then
260 # Only install the plugin, nothing else for 32-bit.
261 local oldabi="${ABI}"
262 ABI="x86"
263
264 # 32b plugin
265 pushd "${S}/32bit"
266 exeinto /${INSTALL_BASE}32
267 doexe libflashplayer.so
268 inst_plugin /${INSTALL_BASE}32/libflashplayer.so
269 popd
270
271 ABI="${oldabi}"
272 fi
273
274 # The magic config file!
275 insinto "/etc/adobe"
276 doins "${FILESDIR}/mms.cfg"
277 }
278
279 pkg_postinst() {
280 if use amd64; then
281 if [[ $need_lahf_wrapper ]]; then
282 ewarn "Your processor does not support the 'lahf' instruction which is used"
283 ewarn "by Adobe's 64-bit flash binary. We have installed a wrapper which"
284 ewarn "should allow this plugin to run. If you encounter problems, please"
285 ewarn "adjust your USE flags to install only the 32-bit version and reinstall:"
286 ewarn " ${CATEGORY}/$PN[+32bit -64bit]"
287 elog
288 fi
289 if has_version 'www-plugins/nspluginwrapper'; then
290 if [[ $native_install ]]; then
291 # TODO: Perhaps parse the output of 'nspluginwrapper -l'
292 # However, the 64b flash plugin makes
293 # 'nspluginwrapper -l' segfault.
294 local FLASH_WRAPPER="${ROOT}/usr/lib64/nsbrowser/plugins/npwrapper.libflashplayer.so"
295 if [[ -f ${FLASH_WRAPPER} ]]; then
296 einfo "Removing duplicate 32-bit plugin wrapper: Native 64-bit plugin installed"
297 nspluginwrapper -r "${FLASH_WRAPPER}"
298 fi
299 else
300 einfo "nspluginwrapper detected: Installing plugin wrapper"
301 local oldabi="${ABI}"
302 ABI="x86"
303 local FLASH_SOURCE="${ROOT}/${INSTALL_BASE}32/libflashplayer.so"
304 nspluginwrapper -i "${FLASH_SOURCE}"
305 ABI="${oldabi}"
306 fi
307 elif [[ ! $native_install ]]; then
308 elog "To use the 32-bit flash player in a native 64-bit browser,"
309 elog "you must install www-plugins/nspluginwrapper"
310 fi
311 fi
312 }
313
314
315
316 1.1 www-plugins/adobe-flash/adobe-flash-10.3.183.67.ebuild
317
318 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.3.183.67.ebuild?rev=1.1&view=markup
319 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.3.183.67.ebuild?rev=1.1&content-type=text/plain
320
321 Index: adobe-flash-10.3.183.67.ebuild
322 ===================================================================
323 # Copyright 1999-2013 Gentoo Foundation
324 # Distributed under the terms of the GNU General Public License v2
325 # $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.3.183.67.ebuild,v 1.1 2013/02/27 05:09:12 jer Exp $
326
327 EAPI=4
328 inherit nsplugins multilib toolchain-funcs versionator
329
330 MY_32B_URI="http://fpdownload.macromedia.com/get/flashplayer/pdc/${PV}/install_flash_player_$(get_major_version)_linux.tar.gz -> ${P}.i386.tar.gz"
331
332 DESCRIPTION="Adobe Flash Player"
333 SRC_URI="${MY_32B_URI}"
334 HOMEPAGE="http://helpx.adobe.com/flash-player/kb/archived-flash-player-versions.html"
335 IUSE="selinux kde vdpau"
336 SLOT="0"
337
338 KEYWORDS="-* ~amd64 ~x86"
339 LICENSE="AdobeFlash-10.3"
340 RESTRICT="strip mirror"
341
342 S="${WORKDIR}"
343
344 NATIVE_DEPS="x11-libs/gtk+:2
345 media-libs/fontconfig
346 dev-libs/nss
347 net-misc/curl
348 vdpau? ( x11-libs/libvdpau )
349 kde? ( kde-base/kcmshell )
350 >=sys-libs/glibc-2.4"
351
352 EMUL_DEPS="vdpau? ( >=app-emulation/emul-linux-x86-xlibs-20110129 )
353 >=app-emulation/emul-linux-x86-gtklibs-20100409-r1
354 app-emulation/emul-linux-x86-soundlibs"
355
356 DEPEND="amd64? ( www-plugins/nspluginwrapper )
357 selinux? ( sec-policy/selinux-flash )"
358 RDEPEND="x86? ( $NATIVE_DEPS )
359 amd64? ( $EMUL_DEPS )
360 || ( media-fonts/liberation-fonts media-fonts/corefonts )
361 ${DEPEND}"
362
363 # Where should this all go? (Bug #328639)
364 INSTALL_BASE="opt/Adobe/flash-player"
365 INSTALL_BASE32="${INSTALL_BASE}32"
366
367 # Ignore QA warnings in these closed-source binaries, since we can't fix them:
368 QA_PREBUILT="opt/* usr/lib*/kde4/*"
369
370 src_install() {
371 if use amd64; then
372 local oldabi="${ABI}"
373 ABI="x86"
374 BASE=${INSTALL_BASE32}
375 else
376 BASE=${INSTALL_BASE}
377 fi
378
379 # The plugin itself
380 exeinto /${BASE}/plugin
381 doexe libflashplayer.so
382 inst_plugin /${BASE}/plugin/libflashplayer.so
383
384 # The optional KDE4 KCM plugin
385 if use kde && ! use amd64; then
386 exeinto /usr/$(get_libdir)/kde4/
387 doexe usr/$(get_libdir)/kde4/kcm_adobe_flash_player.so
388 insinto /usr/share/kde4/services
389 doins usr/share/kde4/services/kcm_adobe_flash_player.desktop
390 else
391 # No KDE applet, so allow the GTK utility to show up in KDE:
392 sed -i usr/share/applications/flash-player-properties.desktop \
393 -e "/^NotShowIn=KDE;/d" || die "sed of .desktop file failed"
394 fi
395
396 # The userland 'properties' standalone app:
397 exeinto /${BASE}/bin
398 doexe usr/bin/flash-player-properties
399 for icon in $(find usr/share/icons/ -name '*.png'); do
400 insinto /$(dirname $icon)
401 doins $icon
402 done
403 elog "Done with icons."
404 insinto usr/share/applications
405 sed -i usr/share/applications/flash-player-properties.desktop \
406 -e "s:^Exec=:Exec=/${BASE}/bin/:" || die "sed of .desktop file failed"
407 doins usr/share/applications/flash-player-properties.desktop
408
409 if use amd64; then
410 ABI="${oldabi}"
411 fi
412
413 # The magic config file!
414 insinto "/etc/adobe"
415 doins "${FILESDIR}/mms.cfg"
416 }
417
418 pkg_postinst() {
419 if use amd64; then
420 elog "Adobe has no stable 64-bit native version at this time."
421 #elog "The beta"
422 #elog "64-bit native release (codenamed \"square\") is installed as part"
423 #elog "of the unstable testing version of this package:"
424 #elog " ${CATEGORY}/${P}_p...."
425 elog
426 if has_version 'www-plugins/nspluginwrapper'; then
427 elog "nspluginwrapper detected: Installing plugin wrapper"
428 local oldabi="${ABI}"
429 ABI="x86"
430 local FLASH_SOURCE="${ROOT}/${INSTALL_BASE32}/plugin/libflashplayer.so"
431 nspluginwrapper -i "${FLASH_SOURCE}"
432 ABI="${oldabi}"
433 elog
434 else
435 elog "To use the 32-bit flash player in a native 64-bit firefox,"
436 elog "you must install www-plugins/nspluginwrapper."
437 elog
438 fi
439 fi
440 }
Report Message
Find on MARC Find on Google Groups