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

Gentoo Archives: gentoo-commits

From: "Patrick Lauer (patrick)" <patrick@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-plugins/adobe-flash: adobe-flash-11.2.202.442.ebuild ChangeLog
Date: Fri, 06 Feb 2015 03:32:01
Message-Id: 20150206033156.E9D411126E@oystercatcher.gentoo.org
1 patrick 15/02/06 03:31:56
2
3 Modified: ChangeLog
4 Added: adobe-flash-11.2.202.442.ebuild
5 Log:
6 Bump #538982
7
8 (Portage version: 2.2.15/cvs/Linux x86_64, unsigned Manifest commit)
9
10 Revision Changes Path
11 1.296 www-plugins/adobe-flash/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/adobe-flash/ChangeLog?rev=1.296&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/adobe-flash/ChangeLog?rev=1.296&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/adobe-flash/ChangeLog?r1=1.295&r2=1.296
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v
20 retrieving revision 1.295
21 retrieving revision 1.296
22 diff -u -r1.295 -r1.296
23 --- ChangeLog 28 Jan 2015 22:30:26 -0000 1.295
24 +++ ChangeLog 6 Feb 2015 03:31:56 -0000 1.296
25 @@ -1,6 +1,12 @@
26 # ChangeLog for www-plugins/adobe-flash
27 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.295 2015/01/28 22:30:26 mgorny Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.296 2015/02/06 03:31:56 patrick Exp $
30 +
31 +*adobe-flash-11.2.202.442 (06 Feb 2015)
32 +
33 + 06 Feb 2015; Patrick Lauer <patrick@g.o>
34 + +adobe-flash-11.2.202.442.ebuild:
35 + Bump #538982
36
37 28 Jan 2015; Michał Górny <mgorny@g.o> adobe-flash-11.2.202.440.ebuild:
38 Switch to CPU_FLAGS_X86.
39
40
41
42 1.1 www-plugins/adobe-flash/adobe-flash-11.2.202.442.ebuild
43
44 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/adobe-flash/adobe-flash-11.2.202.442.ebuild?rev=1.1&view=markup
45 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/adobe-flash/adobe-flash-11.2.202.442.ebuild?rev=1.1&content-type=text/plain
46
47 Index: adobe-flash-11.2.202.442.ebuild
48 ===================================================================
49 # Copyright 1999-2015 Gentoo Foundation
50 # Distributed under the terms of the GNU General Public License v2
51 # $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-11.2.202.442.ebuild,v 1.1 2015/02/06 03:31:56 patrick Exp $
52
53 EAPI=5
54 inherit nsplugins toolchain-funcs versionator multilib multilib-minimal
55
56 DESCRIPTION="Adobe Flash Player"
57 HOMEPAGE="
58 http://www.adobe.com/products/flashplayer.html
59 http://get.adobe.com/flashplayer/
60 "
61
62 AF_URI="http://fpdownload.macromedia.com/get/flashplayer/pdc"
63 AF_DB_URI="http://fpdownload.macromedia.com/pub/flashplayer/updaters"
64 PV_M=$(get_major_version)
65 AF_32_URI="${AF_URI}/${PV}/install_flash_player_${PV_M}_linux.i386.tar.gz -> ${P}.i386.tar.gz"
66 AF_64_URI="${AF_URI}/${PV}/install_flash_player_${PV_M}_linux.x86_64.tar.gz -> ${P}.x86_64.tar.gz"
67 AF_32_DB_URI="${AF_DB_URI}/${PV_M}/flashplayer_${PV_M}_plugin_debug.i386.tar.gz -> ${P}-debug.i386.tar.gz"
68
69 SRC_URI="
70 abi_x86_32? (
71 !debug? ( ${AF_32_URI} )
72 debug? ( ${AF_32_DB_URI} )
73 )
74 abi_x86_64? ( ${AF_64_URI} )
75 "
76 IUSE="debug kde selinux cpu_flags_x86_sse2"
77 REQUIRED_USE="
78 cpu_flags_x86_sse2
79 debug? ( abi_x86_32 )
80 || ( abi_x86_64 abi_x86_32 )
81 "
82 SLOT="0"
83
84 KEYWORDS="-* ~amd64 ~x86"
85 LICENSE="AdobeFlash-11.x"
86 RESTRICT="strip mirror"
87
88 S="${WORKDIR}"
89
90 NATIVE_DEPS="
91 dev-libs/atk
92 dev-libs/glib:2
93 dev-libs/nspr
94 dev-libs/nss
95 kde? (
96 dev-qt/qtcore:4
97 dev-qt/qtdbus:4
98 dev-qt/qtgui:4
99 dev-qt/qtsvg:4
100 kde-base/kdelibs
101 x11-libs/libICE
102 x11-libs/libSM
103 x11-libs/libXau
104 x11-libs/libXdmcp
105 x11-libs/libXext
106 x11-libs/libXft
107 x11-libs/libXpm
108 )
109 media-libs/fontconfig
110 media-libs/freetype
111 >=sys-libs/glibc-2.4
112 x11-libs/cairo
113 x11-libs/gdk-pixbuf
114 x11-libs/gtk+:2
115 x11-libs/libX11
116 x11-libs/libXcursor
117 x11-libs/libXext
118 x11-libs/libXrender
119 x11-libs/libXt
120 x11-libs/pango
121 "
122
123 DEPEND="
124 amd64? ( abi_x86_32? ( !abi_x86_64? ( www-plugins/nspluginwrapper ) ) )
125 "
126 RDEPEND="
127 ${DEPEND}
128 abi_x86_64? ( ${NATIVE_DEPS} )
129 abi_x86_32? (
130 amd64? (
131 || (
132 (
133 >=dev-libs/atk-2.10.0[abi_x86_32(-)]
134 >=x11-libs/cairo-1.12.14-r4[abi_x86_32(-)]
135 >=x11-libs/gdk-pixbuf-2.30.7[abi_x86_32(-)]
136 >=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)]
137 >=x11-libs/pango-1.36.3[abi_x86_32(-)]
138 )
139 app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
140 )
141 || (
142 (
143 >=dev-libs/glib-2.34.3:2[abi_x86_32(-)]
144 >=dev-libs/nspr-4.10.4[abi_x86_32(-)]
145 >=dev-libs/nss-3.15.4[abi_x86_32(-)]
146 )
147 app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
148 )
149 || (
150 (
151 >=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
152 >=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
153 >=x11-libs/libX11-1.6.2[abi_x86_32(-)]
154 >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
155 >=x11-libs/libXext-1.3.2[abi_x86_32(-)]
156 >=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
157 >=x11-libs/libXt-1.1.4[abi_x86_32(-)]
158 )
159 app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
160 )
161 )
162 x86? ( ${NATIVE_DEPS} )
163 )
164 || ( media-fonts/liberation-fonts media-fonts/corefonts )
165 selinux? ( sec-policy/selinux-flash )
166 "
167
168 # Ignore QA warnings in these closed-source binaries, since we can't fix them:
169 QA_PREBUILT="usr/*"
170
171 any_cpu_missing_flag() {
172 local value=${1}
173 grep '^flags' /proc/cpuinfo | grep -qv "${value}"
174 }
175
176 pkg_setup() {
177 unset need_lahf_wrapper
178 if use abi_x86_64 && any_cpu_missing_flag 'lahf_lm'; then
179 export need_lahf_wrapper=1
180 fi
181 }
182
183 src_unpack() {
184 local files=( ${A} )
185
186 multilib_src_unpack() {
187 mkdir -p "${BUILD_DIR}" || die
188 cd "${BUILD_DIR}" || die
189
190 # we need to filter out the other archive(s)
191 local other_abi
192 [[ ${ABI} == amd64 ]] && other_abi=i386 || other_abi=x86_64
193 unpack ${files[@]//*${other_abi}*/}
194 }
195
196 multilib_parallel_foreach_abi multilib_src_unpack
197 }
198
199 src_configure() { :; }
200
201 multilib_src_compile() {
202 if [[ ${ABI} == amd64 && ${need_lahf_wrapper} ]]; then
203 # This experimental wrapper, from Maks Verver via bug #268336 should
204 # emulate the missing lahf instruction affected platforms.
205 set -- $(tc-getCC) -fPIC -shared -nostdlib -lc \
206 -oflashplugin-lahf-fix.so "${FILESDIR}/flashplugin-lahf-fix.c"
207 echo "${@}" >&2
208 "${@}" || die "Compile of flashplugin-lahf-fix.so failed"
209 fi
210 }
211
212 multilib_src_install() {
213 # PLUGINS_DIR comes from nsplugins.eclass
214 exeinto /usr/$(get_libdir)/${PLUGINS_DIR}
215 doexe libflashplayer.so
216
217 if [[ ${ABI} == amd64 && ${need_lahf_wrapper} ]]; then
218 # This experimental wrapper, from Maks Verver via bug #268336 should
219 # emulate the missing lahf instruction affected platforms.
220 doexe flashplugin-lahf-fix.so
221 fi
222
223 if multilib_is_native_abi; then
224 if use kde; then
225 local pkglibdir=lib
226 [[ -d usr/lib64 ]] && pkglibdir=lib64
227
228 exeinto /usr/$(get_libdir)/kde4
229 doexe usr/${pkglibdir}/kde4/kcm_adobe_flash_player.so
230 insinto /usr/share/kde4/services
231 doins usr/share/kde4/services/kcm_adobe_flash_player.desktop
232 else
233 # No KDE applet, so allow the GTK utility to show up in KDE:
234 sed -i usr/share/applications/flash-player-properties.desktop \
235 -e "/^NotShowIn=KDE;/d" || die "sed of .desktop file failed"
236 fi
237
238 # The userland 'flash-player-properties' standalone app:
239 dobin usr/bin/flash-player-properties
240
241 # Icon and .desktop for 'flash-player-properties'
242 insinto /usr/share
243 doins -r usr/share/{icons,applications}
244 dosym ../icons/hicolor/48x48/apps/flash-player-properties.png \
245 /usr/share/pixmaps/flash-player-properties.png
246 fi
247
248 # The magic config file!
249 insinto "/etc/adobe"
250 doins "${FILESDIR}/mms.cfg"
251 }
252
253 unregister_pluginwrapper() {
254 # TODO: Perhaps parse the output of 'nspluginwrapper -l'
255 # TODO: However, the 64b flash plugin makes
256 # TODO: 'nspluginwrapper -l' segfault.
257 local FLASH_WRAPPER="${ROOT}/usr/lib64/${PLUGINS_DIR}/npwrapper.libflashplayer.so"
258 if has_version 'www-plugins/nspluginwrapper' && [[ -f ${FLASH_WRAPPER} ]]; then
259 einfo "Removing 32-bit plugin wrapper"
260 nspluginwrapper -r "${FLASH_WRAPPER}"
261 fi
262 }
263
264 pkg_postinst() {
265 if use amd64 ; then
266 if [[ ${need_lahf_wrapper} ]]; then
267 ewarn "Your processor does not support the 'lahf' instruction which is used"
268 ewarn "by Adobe's 64-bit flash binary. We have installed a wrapper which"
269 ewarn "should allow this plugin to run. If you encounter problems, please"
270 ewarn "adjust your USE flags to install only the 32-bit version and reinstall:"
271 ewarn " ${CATEGORY}/${PN}[abi_x86_32,-abi_x86_64]"
272 elog
273 fi
274 # needed to clean up upgrades from older installs
275 if use abi_x86_64 && [[ -n ${REPLACING_VERSIONS} ]]; then
276 unregister_pluginwrapper
277 fi
278 if has_version 'www-plugins/nspluginwrapper'; then
279 if use abi_x86_32 && ! use abi_x86_64; then
280 einfo "nspluginwrapper detected: Installing plugin wrapper"
281 local oldabi="${ABI}"
282 ABI="x86"
283 local FLASH_SOURCE="${ROOT}/usr/lib32/${PLUGINS_DIR}/libflashplayer.so"
284 nspluginwrapper -i "${FLASH_SOURCE}"
285 ABI="${oldabi}"
286 fi
287 elif use abi_x86_32; then
288 elog "To use the 32-bit flash player in a native 64-bit browser,"
289 elog "you must install www-plugins/nspluginwrapper"
290 fi
291 fi
292 }
293
294 pkg_prerm() {
295 use amd64 && use abi_x86_32 && ! use abi_x86_64 && \
296 unregister_pluginwrapper
297 }
Report Message
Find on MARC Find on Google Groups