diff options
author | Jeroen Roovers <jer@gentoo.org> | 2016-12-15 11:19:50 +0100 |
---|---|---|
committer | Jeroen Roovers <jer@gentoo.org> | 2016-12-15 11:31:47 +0100 |
commit | afdb156aebf70781a2838053a9d8e4ab8625fbe2 (patch) | |
tree | d22316d07e7803eba61390f8f19112fe851bde6c /www-plugins | |
parent | www-plugins/adobe-flash: Stable for AMD64 x86 too. (diff) | |
download | gentoo-afdb156aebf70781a2838053a9d8e4ab8625fbe2.tar.gz gentoo-afdb156aebf70781a2838053a9d8e4ab8625fbe2.tar.bz2 gentoo-afdb156aebf70781a2838053a9d8e4ab8625fbe2.zip |
www-plugins/adobe-flash: Old.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'www-plugins')
-rw-r--r-- | www-plugins/adobe-flash/Manifest | 5 | ||||
-rw-r--r-- | www-plugins/adobe-flash/adobe-flash-11.2.202.644.ebuild | 235 | ||||
-rw-r--r-- | www-plugins/adobe-flash/adobe-flash-23.0.0.207.ebuild | 68 | ||||
-rw-r--r-- | www-plugins/adobe-flash/files/flashplugin-lahf-fix.c | 29 |
4 files changed, 0 insertions, 337 deletions
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest index 8ec73a366ddb..a9fa1f0d2192 100644 --- a/www-plugins/adobe-flash/Manifest +++ b/www-plugins/adobe-flash/Manifest @@ -1,8 +1,3 @@ -DIST adobe-flash-11.2.202.644-debug.i386.tar.gz 7470879 SHA256 6554fcad56f63e6b4bdb3d300ce3afbcde839b10a224c993e572646fd69785bc SHA512 ad6cb79e61fbd0400dfc37ef07a6365bdce3d21aad87eeffac13dd95e692f017c9158ec2c51f83501ca2b07bace53fa8ad24627e4ab863179d43e6d01b20ba74 WHIRLPOOL b25b1d125f6acdcfe4d540ae3fade723273bc95fc4e8a370c43b47ebaa80997342f162585360f1c473fe09786c2465c00e5b9d106ebd226f43e05e0fc3f21b9e -DIST adobe-flash-11.2.202.644.i386.tar.gz 6992226 SHA256 63ca6e1ad1e1b39ae6e35265b628a818dfc4544b1aa857b8a8365d056779f297 SHA512 8a72caf129ba98711d71eb55b7320f8afedb8c06e2d3831f455fea5c7cdaa84f0d4b689b65e1f3f3b045a85e56e35fa7f40a9f95c25b2fac84cc9df4ecd67155 WHIRLPOOL 7d98ee1740b17205833bf9d20677e4138bbee16c6e1974956d9e54646b141cbe56425148297404f2716807d844bf775a870ebf003f4653f59801be1d75432b57 -DIST adobe-flash-11.2.202.644.x86_64.tar.gz 7301011 SHA256 ad2f70c3f1ba41636445de5e4f1243e38fc469288600cdb4ee26765ee391462d SHA512 e61683ed7c4bd2f15e896eca4ecead279843cb3a6547ea81989d927a61251a8846b10bf35782da21dd2a2ad01e4230f508708f49980d57ccf0d30874b35cebd2 WHIRLPOOL 1de557092f3d5b725648b813ecc77a113a95fed404a2f219e44df33049721320be6921b497d52e9557c03ae0b2ed49e0560fd1a1087dd75fcc8d78d68551b312 -DIST adobe-flash-23.0.0.207.i386.tar.gz 6001506 SHA256 41a90f239154fe8f0ce9557964f30c9f9921e378e98ae6ec28f7a18d00871317 SHA512 74c90e553326e5029546a6472ef09ccca9bad1ffdbcc9453dc066880d30f21034a292f9ab6fce235ef3c0b3847489bd33a9b7b8610bcd7c6539ec3d9e4715e49 WHIRLPOOL 4dd262b31c9a767432f707ead40fe51e1133cd6297175ef6537d527874c19a1163e66f3f0763e68828c1640d55fc697236ff4509d5f3fb24a2af9ee435ed0a49 -DIST adobe-flash-23.0.0.207.x86_64.tar.gz 6921662 SHA256 06a7535cd7fcfb5b60512bc38821124f1cb725825ad64578dced86395ff7f1cb SHA512 bfb79317ee9047ee1b9eb9f797e48b63d6fa6aede2da07d1bb851c310c2da48cb6df9fbaf978f9db65c2fc382bf2c71fd2fd3d832a82e4aba65226f1aa067ece WHIRLPOOL 5014a51027c72ad2465cb29e5e60e482951acbe7be9ccbf741d497bd1a31ac2c91ff2530a8b4b8b2da8adf69c9035d2053395ffea350e0b2e4a5f8bef43494e0 DIST adobe-flash-24.0.0.186-npapi.i386.tar.gz 9159537 SHA256 3b5803388f31940484c1020db4c5533aa48cfccab3880eb55a6f25610eb691fd SHA512 3ecee0240193171c383721186c33495a73b9992c07583e7eb59a5a6b7c1476d1a7abf6df33d52ffb2785cbf9d4bdc47c9dfd7ba10e743a6dea9e1c706023e921 WHIRLPOOL 31825020725ef1a612c2a5d0fdf62ff6c4938efabe36df4e77c4ad4ad4f1fc7add47a5e524ed3c4a6593de681f52bfd639476e78d4a421fcab46582840baeef5 DIST adobe-flash-24.0.0.186-npapi.x86_64.tar.gz 9698084 SHA256 c721b59102d12597a8592f0e8d2fb3d65ccda33d8e499435fe02871b46874663 SHA512 c495b2980cc4038fa0144e6acbce4a5faaa3ddbd7f06adfdadc6d359aae9bcacc4b37c503c2ed55e5d5941535205de9e16746a6c5e2561e7a79e7b1e9517f7af WHIRLPOOL ea06dab827991bbff1aaf6744a7bd191868c29d3a947add50a47d104ada1cd40ded93ae11a6eff4cace75cb0e0275ffe031be8bd001bedb44a8f808d8621751e DIST adobe-flash-24.0.0.186-ppapi.i386.tar.gz 8557210 SHA256 8fff4214db24a07f971455d9363fb210c838a7ca2d469cb5db2eed49d012b446 SHA512 5db68c0c56855e2c7e401f68797d5b53f3610dbfaecfb25868b06dc774bb9619ce6a10aeb4265487a0765f93516e8cd825652ce66faa3b2e0f5921d2a21635fe WHIRLPOOL 38ff6a2ad6544d9f699c2409edaebede5406ba8dc659ec70dc14fb9fc2ec2dbe5dc0d5bf1f6b5ca1d291bf117b32d632ec2ae9184d326381e86d2bcf3597b092 diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.644.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.644.ebuild deleted file mode 100644 index ae35599ecaca..000000000000 --- a/www-plugins/adobe-flash/adobe-flash-11.2.202.644.ebuild +++ /dev/null @@ -1,235 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 -inherit nsplugins toolchain-funcs versionator multilib multilib-minimal - -DESCRIPTION="Adobe Flash Player" -HOMEPAGE=" - http://www.adobe.com/products/flashplayer.html - http://get.adobe.com/flashplayer/ - https://helpx.adobe.com/security/products/flash-player.html -" - -AF_URI="http://fpdownload.macromedia.com/get/flashplayer/pdc" -AF_DB_URI="http://fpdownload.macromedia.com/pub/flashplayer/updaters" -PV_M=$(get_major_version) -AF_32_URI="${AF_URI}/${PV}/install_flash_player_${PV_M}_linux.i386.tar.gz -> ${P}.i386.tar.gz" -AF_64_URI="${AF_URI}/${PV}/install_flash_player_${PV_M}_linux.x86_64.tar.gz -> ${P}.x86_64.tar.gz" -AF_32_DB_URI="${AF_DB_URI}/${PV_M}/flashplayer_${PV_M}_plugin_debug.i386.tar.gz -> ${P}-debug.i386.tar.gz" - -SRC_URI=" - abi_x86_32? ( - !debug? ( ${AF_32_URI} ) - debug? ( ${AF_32_DB_URI} ) - ) - abi_x86_64? ( ${AF_64_URI} ) -" -IUSE="debug kde selinux cpu_flags_x86_sse2" -REQUIRED_USE=" - cpu_flags_x86_sse2 - debug? ( abi_x86_32 ) - || ( abi_x86_64 abi_x86_32 ) -" -SLOT="0" - -KEYWORDS="-* amd64 x86" -LICENSE="AdobeFlash-11.x" -RESTRICT="strip mirror" - -S="${WORKDIR}" - -NATIVE_RDEPEND=" - dev-libs/atk - dev-libs/glib:2 - dev-libs/nspr - dev-libs/nss - kde? ( - dev-qt/qtcore:4 - dev-qt/qtdbus:4 - dev-qt/qtgui:4 - dev-qt/qtsvg:4 - kde-base/kdelibs - x11-libs/libICE - x11-libs/libSM - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXft - x11-libs/libXpm - ) - media-libs/fontconfig - media-libs/freetype - >=sys-libs/glibc-2.4 - x11-libs/cairo - x11-libs/gdk-pixbuf - x11-libs/gtk+:2 - x11-libs/libX11 - x11-libs/libXcursor - x11-libs/libXext - x11-libs/libXrender - x11-libs/libXt - x11-libs/pango -" - -DEPEND=" - amd64? ( abi_x86_32? ( !abi_x86_64? ( www-plugins/nspluginwrapper ) ) ) -" -RDEPEND=" - ${DEPEND} - abi_x86_64? ( ${NATIVE_RDEPEND} ) - abi_x86_32? ( - amd64? ( - >=dev-libs/atk-2.10.0[abi_x86_32(-)] - >=dev-libs/glib-2.34.3:2[abi_x86_32(-)] - >=dev-libs/nspr-4.10.4[abi_x86_32(-)] - >=dev-libs/nss-3.15.4[abi_x86_32(-)] - >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] - >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] - >=x11-libs/cairo-1.12.14-r4[abi_x86_32(-)] - >=x11-libs/gdk-pixbuf-2.30.7[abi_x86_32(-)] - >=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)] - >=x11-libs/libX11-1.6.2[abi_x86_32(-)] - >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] - >=x11-libs/libXext-1.3.2[abi_x86_32(-)] - >=x11-libs/libXrender-0.9.8[abi_x86_32(-)] - >=x11-libs/libXt-1.1.4[abi_x86_32(-)] - >=x11-libs/pango-1.36.3[abi_x86_32(-)] - ) - x86? ( ${NATIVE_RDEPEND} ) - ) - || ( media-fonts/liberation-fonts media-fonts/corefonts ) - selinux? ( sec-policy/selinux-flash ) -" - -# Ignore QA warnings in these closed-source binaries, since we can't fix them: -QA_PREBUILT="usr/*" - -any_cpu_missing_flag() { - local value=${1} - grep '^flags' /proc/cpuinfo | grep -qv "${value}" -} - -pkg_setup() { - unset need_lahf_wrapper - if use abi_x86_64 && any_cpu_missing_flag 'lahf_lm'; then - export need_lahf_wrapper=1 - fi -} - -src_unpack() { - local files=( ${A} ) - - multilib_src_unpack() { - mkdir -p "${BUILD_DIR}" || die - cd "${BUILD_DIR}" || die - - # we need to filter out the other archive(s) - local other_abi - [[ ${ABI} == amd64 ]] && other_abi=i386 || other_abi=x86_64 - unpack ${files[@]//*${other_abi}*/} - } - - multilib_parallel_foreach_abi multilib_src_unpack -} - -src_configure() { :; } - -multilib_src_compile() { - if [[ ${ABI} == amd64 && ${need_lahf_wrapper} ]]; then - # This experimental wrapper, from Maks Verver via bug #268336 should - # emulate the missing lahf instruction affected platforms. - set -- $(tc-getCC) -fPIC -shared -nostdlib -lc \ - -oflashplugin-lahf-fix.so "${FILESDIR}/flashplugin-lahf-fix.c" - echo "${@}" >&2 - "${@}" || die "Compile of flashplugin-lahf-fix.so failed" - fi -} - -multilib_src_install() { - # PLUGINS_DIR comes from nsplugins.eclass - exeinto /usr/$(get_libdir)/${PLUGINS_DIR} - doexe libflashplayer.so - - if [[ ${ABI} == amd64 && ${need_lahf_wrapper} ]]; then - # This experimental wrapper, from Maks Verver via bug #268336 should - # emulate the missing lahf instruction affected platforms. - doexe flashplugin-lahf-fix.so - fi - - if multilib_is_native_abi; then - if use kde; then - local pkglibdir=lib - [[ -d usr/lib64 ]] && pkglibdir=lib64 - - exeinto /usr/$(get_libdir)/kde4 - doexe usr/${pkglibdir}/kde4/kcm_adobe_flash_player.so - insinto /usr/share/kde4/services - doins usr/share/kde4/services/kcm_adobe_flash_player.desktop - else - # No KDE applet, so allow the GTK utility to show up in KDE: - sed -i usr/share/applications/flash-player-properties.desktop \ - -e "/^NotShowIn=KDE;/d" || die "sed of .desktop file failed" - fi - - # The userland 'flash-player-properties' standalone app: - dobin usr/bin/flash-player-properties - - # Icon and .desktop for 'flash-player-properties' - insinto /usr/share - doins -r usr/share/{icons,applications} - dosym ../icons/hicolor/48x48/apps/flash-player-properties.png \ - /usr/share/pixmaps/flash-player-properties.png - fi - - # The magic config file! - insinto "/etc/adobe" - doins "${FILESDIR}/mms.cfg" -} - -unregister_pluginwrapper() { - # TODO: Perhaps parse the output of 'nspluginwrapper -l' - # TODO: However, the 64b flash plugin makes - # TODO: 'nspluginwrapper -l' segfault. - local FLASH_WRAPPER="${ROOT}/usr/lib64/${PLUGINS_DIR}/npwrapper.libflashplayer.so" - if has_version 'www-plugins/nspluginwrapper' && [[ -f ${FLASH_WRAPPER} ]]; then - einfo "Removing 32-bit plugin wrapper" - nspluginwrapper -r "${FLASH_WRAPPER}" - fi -} - -pkg_postinst() { - if use amd64 ; then - if [[ ${need_lahf_wrapper} ]]; then - ewarn "Your processor does not support the 'lahf' instruction which is used" - ewarn "by Adobe's 64-bit flash binary. We have installed a wrapper which" - ewarn "should allow this plugin to run. If you encounter problems, please" - ewarn "adjust your USE flags to install only the 32-bit version and reinstall:" - ewarn " ${CATEGORY}/${PN}[abi_x86_32,-abi_x86_64]" - elog - fi - # needed to clean up upgrades from older installs - if use abi_x86_64 && [[ -n ${REPLACING_VERSIONS} ]]; then - unregister_pluginwrapper - fi - if has_version 'www-plugins/nspluginwrapper'; then - if use abi_x86_32 && ! use abi_x86_64; then - einfo "nspluginwrapper detected: Installing plugin wrapper" - local oldabi="${ABI}" - ABI="x86" - local FLASH_SOURCE="${ROOT}/usr/lib32/${PLUGINS_DIR}/libflashplayer.so" - nspluginwrapper -i "${FLASH_SOURCE}" - ABI="${oldabi}" - fi - elif use abi_x86_32; then - elog "To use the 32-bit flash player in a native 64-bit browser," - elog "you must install www-plugins/nspluginwrapper" - fi - fi -} - -pkg_prerm() { - use amd64 && use abi_x86_32 && ! use abi_x86_64 && \ - unregister_pluginwrapper -} diff --git a/www-plugins/adobe-flash/adobe-flash-23.0.0.207.ebuild b/www-plugins/adobe-flash/adobe-flash-23.0.0.207.ebuild deleted file mode 100644 index 44893e240322..000000000000 --- a/www-plugins/adobe-flash/adobe-flash-23.0.0.207.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 -inherit multilib multilib-minimal - -DESCRIPTION="Adobe Flash Player" -HOMEPAGE=" - http://www.adobe.com/products/flashplayer.html - http://get.adobe.com/flashplayer/ - https://helpx.adobe.com/security/products/flash-player.html -" - -AF_URI="https://fpdownload.adobe.com/pub/flashplayer/pdc" -AF_32_URI="${AF_URI}/${PV}/flash_player_ppapi_linux.i386.tar.gz -> ${P}.i386.tar.gz" -AF_64_URI="${AF_URI}/${PV}/flash_player_ppapi_linux.x86_64.tar.gz -> ${P}.x86_64.tar.gz" - -SRC_URI=" - abi_x86_32? ( ${AF_32_URI} ) - abi_x86_64? ( ${AF_64_URI} ) -" -SLOT="22" - -KEYWORDS="-* amd64 x86" -LICENSE="AdobeFlash-11.x" -RESTRICT="strip mirror" - -RDEPEND=" - !www-plugins/chrome-binary-plugins[flash(-)] -" - -S="${WORKDIR}" - -# Ignore QA warnings in these closed-source binaries, since we can't fix them: -QA_PREBUILT="usr/*" - -src_unpack() { - local files=( ${A} ) - - multilib_src_unpack() { - mkdir -p "${BUILD_DIR}" || die - cd "${BUILD_DIR}" || die - - # we need to filter out the other archive(s) - local other_abi - [[ ${ABI} == amd64 ]] && other_abi=i386 || other_abi=x86_64 - unpack ${files[@]//*${other_abi}*/} - } - - multilib_parallel_foreach_abi multilib_src_unpack -} - -multilib_src_install() { - exeinto /usr/$(get_libdir)/chromium-browser/PepperFlash - doexe libpepflashplayer.so - insinto /usr/$(get_libdir)/chromium-browser/PepperFlash - doins manifest.json - - if multilib_is_native_abi; then - dodir /etc/chromium - sed "${FILESDIR}"/pepper-flash \ - -e "s|@FP_LIBDIR@|$(get_libdir)|g" \ - -e "s|@FP_PV@|${PV}|g" \ - > "${D}"/etc/chromium/pepper-flash \ - || die - fi -} diff --git a/www-plugins/adobe-flash/files/flashplugin-lahf-fix.c b/www-plugins/adobe-flash/files/flashplugin-lahf-fix.c deleted file mode 100644 index 9338b7337317..000000000000 --- a/www-plugins/adobe-flash/files/flashplugin-lahf-fix.c +++ /dev/null @@ -1,29 +0,0 @@ -/* Simple work-around for running the 64-bit Adobe Flash plug-in version 10 - on Athlon64 processors without support for the lahf instruction. - -Compile with: -cc -fPIC -shared -nostdlib -lc -oflashplugin-lahf-fix.so flashplugin-lahf-fix.c -Then place the .so file in the plug-in directory (e.g. $HOME/.mozilla/plugins) -or use LD_PRELOAD to force Firefox to load the library. - - - Maks Verver <maksverver@geocities.com> July 2009 */ - -#define _GNU_SOURCE -#include <stdlib.h> -#include <signal.h> -#include <ucontext.h> - -static void sig_handler(int signal, siginfo_t *info, void *context) { - if (signal != SIGILL) return; - if (*(char*)info->si_addr != (char)0x9f) abort(); - greg_t *regs = ((ucontext_t*)context)->uc_mcontext.gregs; - ((char*)®s[REG_RAX])[1] = ((char*)®s[REG_EFL])[0]; - regs[REG_RIP]++; -} - -static struct sigaction old_sa, new_sa = { - .sa_flags = SA_SIGINFO, - .sa_sigaction = &sig_handler }; - -int _init() { sigaction(SIGILL, &new_sa, &old_sa); return 0; } -int _fini() { sigaction(SIGILL, &old_sa, &new_sa); return 0; } |