1 |
commit: f582f7cadbbf9f546e289ff3a123966085b8d5cc |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jul 13 13:55:36 2016 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jul 13 13:55:36 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f582f7ca |
7 |
|
8 |
www-plugins/adobe-flash: Version bump (bug #588738). |
9 |
|
10 |
Package-Manager: portage-2.3.0 |
11 |
|
12 |
www-plugins/adobe-flash/Manifest | 3 + |
13 |
.../adobe-flash/adobe-flash-11.2.202.632.ebuild | 235 +++++++++++++++++++++ |
14 |
2 files changed, 238 insertions(+) |
15 |
|
16 |
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest |
17 |
index 660862f..eb66178 100644 |
18 |
--- a/www-plugins/adobe-flash/Manifest |
19 |
+++ b/www-plugins/adobe-flash/Manifest |
20 |
@@ -1,3 +1,6 @@ |
21 |
DIST adobe-flash-11.2.202.626-debug.i386.tar.gz 7465648 SHA256 830269b22315898096d45576ecc13ab34f9ecd40e73fa1bc6558a9ca070686fe SHA512 d772c2833065ac26b0253a41d3e9a8c13b9fc342f6698cc88823a7a8989442cc293a8e7493a813cb386c24800999d17549006f35090eac6a3e7f606aa1e450e3 WHIRLPOOL 5369798eb5e2578295de95406c0aa434be9fecbd094c3697d66deb10fba5a62af66af0dba7d77447fe3c6a9f2017db7e8dc36016b039e0633700b9382c87e77c |
22 |
DIST adobe-flash-11.2.202.626.i386.tar.gz 6981743 SHA256 1ec079f9d8578255435e15f704f05e4af69e749a480427af2be64fe447e2ca8c SHA512 d88c893cf11bd4d93dc77971e2c0cb50e59ae371b1f4e3dfeda2046b9f571f93ea074b35de9bf824aa67f5bee6cc4ac987a387451457bdc686d0a1d4dee28798 WHIRLPOOL a9c70f90d8c6af66f1bd1c03ebeb8f584bda7b9798daef97b65a6dd2455d018f0dc1a57c373327079eccf911af88cf421fd56faa9e6a47cd6257c41745a3a271 |
23 |
DIST adobe-flash-11.2.202.626.x86_64.tar.gz 7295646 SHA256 14f6f10c664984302e2cb67bda06b8da8358cf4110235a3ad1dff06df22ad0ad SHA512 13d0f0aa206e4ca3e4e024760574d3e05445d57979a951ae3e5d51b61da8adae2b953f9b642be13c158cbb0fcd824ff4ff6af6636a01b7078a517af84506a595 WHIRLPOOL c465e13280152d809f8bd314257d46581b8828664592da33bef0af471cb98d300324e96e2312dedf86509ab87ebea2d54dbcc8d1bd2b8d45a70b68c9c874b216 |
24 |
+DIST adobe-flash-11.2.202.632-debug.i386.tar.gz 7464481 SHA256 a0d82fdfc50912e89e9ee51777947ce02753c5c439a08ace4eccdd3765c57dd9 SHA512 ac16e3cc9d0ffb672b61b246a8ccf4c1211eb1af8fb24d31ad2d995a175cec885c4efc7375b0325ed2221124885c9e22e62c38ace4b29bbc109a8633277acac8 WHIRLPOOL 3f39e91902ff7d9988ab2fc14012a34b396aa76597909e3ea959ff3bda9f675cc13e9a1ec2ee1d25308c646d4b2d144516dacde4d0be6b44ffbae575eb53dbee |
25 |
+DIST adobe-flash-11.2.202.632.i386.tar.gz 6986419 SHA256 c455ba9b72318d87434c7199a94ca15dc0f1c7fca590ee3703e013cbdecce942 SHA512 b33f4fbc888e10ce034cd2236272960bed4c429ee5c6f3f93162bbd1642fd6ee3bb5b0273654818eef5b84540c826e3c3dd039e982b26e93091532e5a30941aa WHIRLPOOL fe7d364442ba5543d4d7f54d0f039c8c8a69d5e72b145d12a0add32ed7635b56abd9966e49d577bc45733c6f81c8b43db20d2a407e188320d6def540d4f17493 |
26 |
+DIST adobe-flash-11.2.202.632.x86_64.tar.gz 7296191 SHA256 8a0cea025f854f2c6e139f623851eee60bb3842d5326fb7502644a1a94a6d1d7 SHA512 cdda85ec491d0e3b08333d8547fbb693e342cd73110231b2df8b285424cdf30fe7296892c2744c3a33eac2eb4b4562d08ecb8f80f62f45834e739e0bd13c3da8 WHIRLPOOL 5bc3a9079b18623d2ee227496d91429131075a2ba04d901075a0e83d599031909c2f750fd31e7393409994cd4ff0e164d2e5f67eea82fab4c95849d960d0c1ac |
27 |
|
28 |
diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.632.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.632.ebuild |
29 |
new file mode 100644 |
30 |
index 0000000..df210f7 |
31 |
--- /dev/null |
32 |
+++ b/www-plugins/adobe-flash/adobe-flash-11.2.202.632.ebuild |
33 |
@@ -0,0 +1,235 @@ |
34 |
+# Copyright 1999-2016 Gentoo Foundation |
35 |
+# Distributed under the terms of the GNU General Public License v2 |
36 |
+# $Id$ |
37 |
+ |
38 |
+EAPI=5 |
39 |
+inherit nsplugins toolchain-funcs versionator multilib multilib-minimal |
40 |
+ |
41 |
+DESCRIPTION="Adobe Flash Player" |
42 |
+HOMEPAGE=" |
43 |
+ http://www.adobe.com/products/flashplayer.html |
44 |
+ http://get.adobe.com/flashplayer/ |
45 |
+ https://helpx.adobe.com/security/products/flash-player.html#version11 |
46 |
+" |
47 |
+ |
48 |
+AF_URI="http://fpdownload.macromedia.com/get/flashplayer/pdc" |
49 |
+AF_DB_URI="http://fpdownload.macromedia.com/pub/flashplayer/updaters" |
50 |
+PV_M=$(get_major_version) |
51 |
+AF_32_URI="${AF_URI}/${PV}/install_flash_player_${PV_M}_linux.i386.tar.gz -> ${P}.i386.tar.gz" |
52 |
+AF_64_URI="${AF_URI}/${PV}/install_flash_player_${PV_M}_linux.x86_64.tar.gz -> ${P}.x86_64.tar.gz" |
53 |
+AF_32_DB_URI="${AF_DB_URI}/${PV_M}/flashplayer_${PV_M}_plugin_debug.i386.tar.gz -> ${P}-debug.i386.tar.gz" |
54 |
+ |
55 |
+SRC_URI=" |
56 |
+ abi_x86_32? ( |
57 |
+ !debug? ( ${AF_32_URI} ) |
58 |
+ debug? ( ${AF_32_DB_URI} ) |
59 |
+ ) |
60 |
+ abi_x86_64? ( ${AF_64_URI} ) |
61 |
+" |
62 |
+IUSE="debug kde selinux cpu_flags_x86_sse2" |
63 |
+REQUIRED_USE=" |
64 |
+ cpu_flags_x86_sse2 |
65 |
+ debug? ( abi_x86_32 ) |
66 |
+ || ( abi_x86_64 abi_x86_32 ) |
67 |
+" |
68 |
+SLOT="0" |
69 |
+ |
70 |
+KEYWORDS="-* ~amd64 ~x86" |
71 |
+LICENSE="AdobeFlash-11.x" |
72 |
+RESTRICT="strip mirror" |
73 |
+ |
74 |
+S="${WORKDIR}" |
75 |
+ |
76 |
+NATIVE_DEPS=" |
77 |
+ dev-libs/atk |
78 |
+ dev-libs/glib:2 |
79 |
+ dev-libs/nspr |
80 |
+ dev-libs/nss |
81 |
+ kde? ( |
82 |
+ dev-qt/qtcore:4 |
83 |
+ dev-qt/qtdbus:4 |
84 |
+ dev-qt/qtgui:4 |
85 |
+ dev-qt/qtsvg:4 |
86 |
+ kde-base/kdelibs |
87 |
+ x11-libs/libICE |
88 |
+ x11-libs/libSM |
89 |
+ x11-libs/libXau |
90 |
+ x11-libs/libXdmcp |
91 |
+ x11-libs/libXext |
92 |
+ x11-libs/libXft |
93 |
+ x11-libs/libXpm |
94 |
+ ) |
95 |
+ media-libs/fontconfig |
96 |
+ media-libs/freetype |
97 |
+ >=sys-libs/glibc-2.4 |
98 |
+ x11-libs/cairo |
99 |
+ x11-libs/gdk-pixbuf |
100 |
+ x11-libs/gtk+:2 |
101 |
+ x11-libs/libX11 |
102 |
+ x11-libs/libXcursor |
103 |
+ x11-libs/libXext |
104 |
+ x11-libs/libXrender |
105 |
+ x11-libs/libXt |
106 |
+ x11-libs/pango |
107 |
+" |
108 |
+ |
109 |
+DEPEND=" |
110 |
+ amd64? ( abi_x86_32? ( !abi_x86_64? ( www-plugins/nspluginwrapper ) ) ) |
111 |
+" |
112 |
+RDEPEND=" |
113 |
+ ${DEPEND} |
114 |
+ abi_x86_64? ( ${NATIVE_DEPS} ) |
115 |
+ abi_x86_32? ( |
116 |
+ amd64? ( |
117 |
+ >=dev-libs/atk-2.10.0[abi_x86_32(-)] |
118 |
+ >=dev-libs/glib-2.34.3:2[abi_x86_32(-)] |
119 |
+ >=dev-libs/nspr-4.10.4[abi_x86_32(-)] |
120 |
+ >=dev-libs/nss-3.15.4[abi_x86_32(-)] |
121 |
+ >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] |
122 |
+ >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] |
123 |
+ >=x11-libs/cairo-1.12.14-r4[abi_x86_32(-)] |
124 |
+ >=x11-libs/gdk-pixbuf-2.30.7[abi_x86_32(-)] |
125 |
+ >=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)] |
126 |
+ >=x11-libs/libX11-1.6.2[abi_x86_32(-)] |
127 |
+ >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] |
128 |
+ >=x11-libs/libXext-1.3.2[abi_x86_32(-)] |
129 |
+ >=x11-libs/libXrender-0.9.8[abi_x86_32(-)] |
130 |
+ >=x11-libs/libXt-1.1.4[abi_x86_32(-)] |
131 |
+ >=x11-libs/pango-1.36.3[abi_x86_32(-)] |
132 |
+ ) |
133 |
+ x86? ( ${NATIVE_DEPS} ) |
134 |
+ ) |
135 |
+ || ( media-fonts/liberation-fonts media-fonts/corefonts ) |
136 |
+ selinux? ( sec-policy/selinux-flash ) |
137 |
+" |
138 |
+ |
139 |
+# Ignore QA warnings in these closed-source binaries, since we can't fix them: |
140 |
+QA_PREBUILT="usr/*" |
141 |
+ |
142 |
+any_cpu_missing_flag() { |
143 |
+ local value=${1} |
144 |
+ grep '^flags' /proc/cpuinfo | grep -qv "${value}" |
145 |
+} |
146 |
+ |
147 |
+pkg_setup() { |
148 |
+ unset need_lahf_wrapper |
149 |
+ if use abi_x86_64 && any_cpu_missing_flag 'lahf_lm'; then |
150 |
+ export need_lahf_wrapper=1 |
151 |
+ fi |
152 |
+} |
153 |
+ |
154 |
+src_unpack() { |
155 |
+ local files=( ${A} ) |
156 |
+ |
157 |
+ multilib_src_unpack() { |
158 |
+ mkdir -p "${BUILD_DIR}" || die |
159 |
+ cd "${BUILD_DIR}" || die |
160 |
+ |
161 |
+ # we need to filter out the other archive(s) |
162 |
+ local other_abi |
163 |
+ [[ ${ABI} == amd64 ]] && other_abi=i386 || other_abi=x86_64 |
164 |
+ unpack ${files[@]//*${other_abi}*/} |
165 |
+ } |
166 |
+ |
167 |
+ multilib_parallel_foreach_abi multilib_src_unpack |
168 |
+} |
169 |
+ |
170 |
+src_configure() { :; } |
171 |
+ |
172 |
+multilib_src_compile() { |
173 |
+ if [[ ${ABI} == amd64 && ${need_lahf_wrapper} ]]; then |
174 |
+ # This experimental wrapper, from Maks Verver via bug #268336 should |
175 |
+ # emulate the missing lahf instruction affected platforms. |
176 |
+ set -- $(tc-getCC) -fPIC -shared -nostdlib -lc \ |
177 |
+ -oflashplugin-lahf-fix.so "${FILESDIR}/flashplugin-lahf-fix.c" |
178 |
+ echo "${@}" >&2 |
179 |
+ "${@}" || die "Compile of flashplugin-lahf-fix.so failed" |
180 |
+ fi |
181 |
+} |
182 |
+ |
183 |
+multilib_src_install() { |
184 |
+ # PLUGINS_DIR comes from nsplugins.eclass |
185 |
+ exeinto /usr/$(get_libdir)/${PLUGINS_DIR} |
186 |
+ doexe libflashplayer.so |
187 |
+ |
188 |
+ if [[ ${ABI} == amd64 && ${need_lahf_wrapper} ]]; then |
189 |
+ # This experimental wrapper, from Maks Verver via bug #268336 should |
190 |
+ # emulate the missing lahf instruction affected platforms. |
191 |
+ doexe flashplugin-lahf-fix.so |
192 |
+ fi |
193 |
+ |
194 |
+ if multilib_is_native_abi; then |
195 |
+ if use kde; then |
196 |
+ local pkglibdir=lib |
197 |
+ [[ -d usr/lib64 ]] && pkglibdir=lib64 |
198 |
+ |
199 |
+ exeinto /usr/$(get_libdir)/kde4 |
200 |
+ doexe usr/${pkglibdir}/kde4/kcm_adobe_flash_player.so |
201 |
+ insinto /usr/share/kde4/services |
202 |
+ doins usr/share/kde4/services/kcm_adobe_flash_player.desktop |
203 |
+ else |
204 |
+ # No KDE applet, so allow the GTK utility to show up in KDE: |
205 |
+ sed -i usr/share/applications/flash-player-properties.desktop \ |
206 |
+ -e "/^NotShowIn=KDE;/d" || die "sed of .desktop file failed" |
207 |
+ fi |
208 |
+ |
209 |
+ # The userland 'flash-player-properties' standalone app: |
210 |
+ dobin usr/bin/flash-player-properties |
211 |
+ |
212 |
+ # Icon and .desktop for 'flash-player-properties' |
213 |
+ insinto /usr/share |
214 |
+ doins -r usr/share/{icons,applications} |
215 |
+ dosym ../icons/hicolor/48x48/apps/flash-player-properties.png \ |
216 |
+ /usr/share/pixmaps/flash-player-properties.png |
217 |
+ fi |
218 |
+ |
219 |
+ # The magic config file! |
220 |
+ insinto "/etc/adobe" |
221 |
+ doins "${FILESDIR}/mms.cfg" |
222 |
+} |
223 |
+ |
224 |
+unregister_pluginwrapper() { |
225 |
+ # TODO: Perhaps parse the output of 'nspluginwrapper -l' |
226 |
+ # TODO: However, the 64b flash plugin makes |
227 |
+ # TODO: 'nspluginwrapper -l' segfault. |
228 |
+ local FLASH_WRAPPER="${ROOT}/usr/lib64/${PLUGINS_DIR}/npwrapper.libflashplayer.so" |
229 |
+ if has_version 'www-plugins/nspluginwrapper' && [[ -f ${FLASH_WRAPPER} ]]; then |
230 |
+ einfo "Removing 32-bit plugin wrapper" |
231 |
+ nspluginwrapper -r "${FLASH_WRAPPER}" |
232 |
+ fi |
233 |
+} |
234 |
+ |
235 |
+pkg_postinst() { |
236 |
+ if use amd64 ; then |
237 |
+ if [[ ${need_lahf_wrapper} ]]; then |
238 |
+ ewarn "Your processor does not support the 'lahf' instruction which is used" |
239 |
+ ewarn "by Adobe's 64-bit flash binary. We have installed a wrapper which" |
240 |
+ ewarn "should allow this plugin to run. If you encounter problems, please" |
241 |
+ ewarn "adjust your USE flags to install only the 32-bit version and reinstall:" |
242 |
+ ewarn " ${CATEGORY}/${PN}[abi_x86_32,-abi_x86_64]" |
243 |
+ elog |
244 |
+ fi |
245 |
+ # needed to clean up upgrades from older installs |
246 |
+ if use abi_x86_64 && [[ -n ${REPLACING_VERSIONS} ]]; then |
247 |
+ unregister_pluginwrapper |
248 |
+ fi |
249 |
+ if has_version 'www-plugins/nspluginwrapper'; then |
250 |
+ if use abi_x86_32 && ! use abi_x86_64; then |
251 |
+ einfo "nspluginwrapper detected: Installing plugin wrapper" |
252 |
+ local oldabi="${ABI}" |
253 |
+ ABI="x86" |
254 |
+ local FLASH_SOURCE="${ROOT}/usr/lib32/${PLUGINS_DIR}/libflashplayer.so" |
255 |
+ nspluginwrapper -i "${FLASH_SOURCE}" |
256 |
+ ABI="${oldabi}" |
257 |
+ fi |
258 |
+ elif use abi_x86_32; then |
259 |
+ elog "To use the 32-bit flash player in a native 64-bit browser," |
260 |
+ elog "you must install www-plugins/nspluginwrapper" |
261 |
+ fi |
262 |
+ fi |
263 |
+} |
264 |
+ |
265 |
+pkg_prerm() { |
266 |
+ use amd64 && use abi_x86_32 && ! use abi_x86_64 && \ |
267 |
+ unregister_pluginwrapper |
268 |
+} |