adobe-flash updated
This commit is contained in:
parent
94aa6e5af7
commit
0122d509e0
|
|
@ -1,6 +1,3 @@
|
|||
DIST adobe-flash-11.2.202.359-debug.i386.tar.gz 7403524 SHA256 c56a1391081171ad0a2376eb0a516ba9ce790b3d2a30e2fcb2724f8af5c2a2ae SHA512 0827364ebde09e58c629ca8f7d644e236e90bfe56aaca9e2c0e460fa3850e92d4d44d8fee2eb2cd5151ef434a31f85665cf5de0595ac75fed7bb282543e20515 WHIRLPOOL 60c422cd731659fc26f05fec66b1dc85cdb4e47d89fd2a1767b79781bdbc108ee05847ca9fc8f5343e003dccf001e9345a99ff7f814b1e346541657ac6817b13
|
||||
DIST adobe-flash-11.2.202.359.i386.tar.gz 6924219 SHA256 15adcd18f039a00e87c8ef02be93e11c5ab9c585bdeb9ddba8e732bd240a9013 SHA512 717ff4693b626b5de2472ad882d6bc639b785c3c2db161911384b30299e0f3a676f1edddddf5efe3d290917c8ab0ddf4144fa1521682d199ffdeb4c903bd5df7 WHIRLPOOL 99e6b6d5c3a7c9dedbf850886fa5ba731b21ef2e46d165c60277acec04483a818967a6a304239c314854a96d190cff9b44349ae56148f26e8a7275bc53a170b9
|
||||
DIST adobe-flash-11.2.202.359.x86_64.tar.gz 7236046 SHA256 6ade0c217d7c5d5ebb6fce4529a256bbf5dc94ed6f9cfa960c1ea7949cc1be8e SHA512 040c2ed2a0510b1c6a1b5054352ebc0c8f435aa4776989fb47ebaa8afb507c87a316d7202c092093f77481ec0a5105be984900f8648fe45891ee4f99f494f05d WHIRLPOOL c947cb77841c1aad7b2b750a9a9d5625279003ed9c6ceee41fcbc11f958c2c3ad48f5df4a9c24cb53ece45cb285e2f15317d297c0c9fb1b8249a843bc85b55de
|
||||
DIST adobe-flash-11.2.202.378-debug.i386.tar.gz 7403282 SHA256 67b313d0d2bddebff0394f085a93007be6de90cf5b74e04208571f82e21fffc0 SHA512 c38dc20ecd8c8e07bd6adc2746d1a6d935d5dfd0bcacea53ada2347f7494d5ea092338c975773333f2de7f9a28a853c5f17c4326a5cb807027aaa4d6b5901ce2 WHIRLPOOL 1495be259f7cb9b5ada268b7ed37e58e3a2ac353b812a19001a28787be353c49de1f561bb695d51078980dc4249b227681d936e48fd850db887b0f0d1a08fd0f
|
||||
DIST adobe-flash-11.2.202.378.i386.tar.gz 6926052 SHA256 9f8fa4cf965189d421425fc2facc14fcebde1f2374a73bcd9750e407ed155eda SHA512 c7249b3466f86986ba3d5d115fd112ccb18d0a36028a593caf1136f7d9bea44d87741b09e4ced6080268f07ea85262a80a573a280978e73d42923efae832d47f WHIRLPOOL 484ee68ccafb2c82dba7e33454d9ae855cf33701c9c4272438ef963fc1b8b1bfb377d0ba5311eaad7c987c8fff34017e34e5c9be683dbe62325244c9aea7037e
|
||||
DIST adobe-flash-11.2.202.378.x86_64.tar.gz 7235503 SHA256 2c294a0c48c2aabe531c766756ccd712b84fa6f8f035e788d1477834c5285c21 SHA512 12a26546421f271001bc5ba0727792f98024d65debb52daaffa1076fa817d4422073303882729c0ca09450bda5f343a7452dedae23082211834f960c898c6297 WHIRLPOOL f02ef30d51215c6b3fea103b13b56c56442af27cbebdd4a97098ab3014d6e1f0e3656b9ec532bd87a4d9a8718cd91af9a1a88d85b3df7fb3bd1444b615d7844a
|
||||
DIST adobe-flash-11.2.202.394-debug.i386.tar.gz 7403282 SHA256 67b313d0d2bddebff0394f085a93007be6de90cf5b74e04208571f82e21fffc0 SHA512 c38dc20ecd8c8e07bd6adc2746d1a6d935d5dfd0bcacea53ada2347f7494d5ea092338c975773333f2de7f9a28a853c5f17c4326a5cb807027aaa4d6b5901ce2 WHIRLPOOL 1495be259f7cb9b5ada268b7ed37e58e3a2ac353b812a19001a28787be353c49de1f561bb695d51078980dc4249b227681d936e48fd850db887b0f0d1a08fd0f
|
||||
DIST adobe-flash-11.2.202.394.i386.tar.gz 6925990 SHA256 273d987a41f7b271b13d90d095269d941f71ce43607518f324424c6331b91c31 SHA512 26c9aa6a2e2db9ab2ff1631b4cc87a2e074518865aaaef1829ba24c44ab22513dd9f16024a6bed0ecd07e5c2d85c97e801ec19b1477a75434bb0531902bd99fb WHIRLPOOL 8b4c0450c77480901175ac5acf34cf62f1042ba3a10050c465aab6944a34a4e4801fd8223959dea9891daaa3b9968b081620876e0dbaae7c6ef192b3485d79b6
|
||||
DIST adobe-flash-11.2.202.394.x86_64.tar.gz 7235530 SHA256 ddce56a38e2440e178721ba60efcd76e59ae7f5e6ce57971d6ad87a45a9d02f1 SHA512 14faf00fefc31b5ff0c1d58ac5906641a185436d106cb94e2f808078d5cf38f0890295240f47846cfe2992d75179501e47d2aa5f0bf04fd6a12aa4dcbd909d74 WHIRLPOOL 9885e7efe5532ef15015cd77c0f0a4a7bc9fa5016b409a83472cada95a06a6a3c65e7d45e6af1bd3247cef4daf14274e5366d191b6ceab5bd7c883767048be33
|
||||
|
|
|
|||
|
|
@ -1,245 +0,0 @@
|
|||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-11.2.202.359.ebuild,v 1.1 2014/05/14 05:01:46 jer Exp $
|
||||
|
||||
EAPI=5
|
||||
inherit nsplugins toolchain-funcs versionator multilib multilib-minimal
|
||||
|
||||
DESCRIPTION="Adobe Flash Player"
|
||||
HOMEPAGE="http://www.adobe.com/products/flashplayer.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 sse2"
|
||||
REQUIRED_USE="
|
||||
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_DEPS="
|
||||
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 ) ) )
|
||||
selinux? ( sec-policy/selinux-flash )
|
||||
"
|
||||
RDEPEND="
|
||||
${DEPEND}
|
||||
abi_x86_64? ( ${NATIVE_DEPS} )
|
||||
abi_x86_32? (
|
||||
amd64? (
|
||||
|| (
|
||||
(
|
||||
dev-libs/atk[abi_x86_32(-)]
|
||||
x11-libs/cairo[abi_x86_32(-)]
|
||||
x11-libs/gdk-pixbuf[abi_x86_32(-)]
|
||||
x11-libs/gtk+:2[abi_x86_32(-)]
|
||||
x11-libs/pango[abi_x86_32(-)]
|
||||
)
|
||||
app-emulation/emul-linux-x86-gtklibs
|
||||
)
|
||||
|| (
|
||||
(
|
||||
dev-libs/glib:2[abi_x86_32(-)]
|
||||
dev-libs/nspr[abi_x86_32(-)]
|
||||
dev-libs/nss[abi_x86_32(-)]
|
||||
)
|
||||
app-emulation/emul-linux-x86-baselibs
|
||||
)
|
||||
|| (
|
||||
(
|
||||
media-libs/fontconfig[abi_x86_32(-)]
|
||||
media-libs/freetype[abi_x86_32(-)]
|
||||
x11-libs/libX11[abi_x86_32(-)]
|
||||
x11-libs/libXcursor[abi_x86_32(-)]
|
||||
x11-libs/libXext[abi_x86_32(-)]
|
||||
x11-libs/libXrender[abi_x86_32(-)]
|
||||
x11-libs/libXt[abi_x86_32(-)]
|
||||
)
|
||||
app-emulation/emul-linux-x86-xlibs
|
||||
)
|
||||
)
|
||||
x86? ( ${NATIVE_DEPS} )
|
||||
)
|
||||
|| ( media-fonts/liberation-fonts media-fonts/corefonts )
|
||||
"
|
||||
|
||||
# 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
|
||||
}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-11.2.202.378.ebuild,v 1.2 2014/06/10 21:19:19 zlogene Exp $
|
||||
# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-11.2.202.394.ebuild,v 1.2 2014/07/09 12:40:36 zlogene Exp $
|
||||
|
||||
EAPI=5
|
||||
inherit nsplugins toolchain-funcs versionator multilib multilib-minimal
|
||||
|
|
@ -79,31 +79,31 @@ RDEPEND="
|
|||
amd64? (
|
||||
|| (
|
||||
(
|
||||
dev-libs/atk[abi_x86_32(-)]
|
||||
x11-libs/cairo[abi_x86_32(-)]
|
||||
x11-libs/gdk-pixbuf[abi_x86_32(-)]
|
||||
x11-libs/gtk+:2[abi_x86_32(-)]
|
||||
x11-libs/pango[abi_x86_32(-)]
|
||||
>=dev-libs/atk-2.10.0[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/pango-1.36.3[abi_x86_32(-)]
|
||||
)
|
||||
app-emulation/emul-linux-x86-gtklibs
|
||||
)
|
||||
|| (
|
||||
(
|
||||
dev-libs/glib:2[abi_x86_32(-)]
|
||||
dev-libs/nspr[abi_x86_32(-)]
|
||||
dev-libs/nss[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(-)]
|
||||
)
|
||||
app-emulation/emul-linux-x86-baselibs
|
||||
)
|
||||
|| (
|
||||
(
|
||||
media-libs/fontconfig[abi_x86_32(-)]
|
||||
media-libs/freetype[abi_x86_32(-)]
|
||||
x11-libs/libX11[abi_x86_32(-)]
|
||||
x11-libs/libXcursor[abi_x86_32(-)]
|
||||
x11-libs/libXext[abi_x86_32(-)]
|
||||
x11-libs/libXrender[abi_x86_32(-)]
|
||||
x11-libs/libXt[abi_x86_32(-)]
|
||||
>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
|
||||
>=media-libs/freetype-2.5.0.1[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(-)]
|
||||
)
|
||||
app-emulation/emul-linux-x86-xlibs
|
||||
)
|
||||
Loading…
Reference in New Issue