* [gentoo-commits] gentoo-x86 commit in www-plugins/adobe-flash: adobe-flash-11.2.202.310.ebuild ChangeLog adobe-flash-11.2.202.297-r1.ebuild
@ 2013-09-11 1:49 Jeroen Roovers (jer)
0 siblings, 0 replies; only message in thread
From: Jeroen Roovers (jer) @ 2013-09-11 1:49 UTC (permalink / raw
To: gentoo-commits
jer 13/09/11 01:49:01
Modified: ChangeLog
Added: adobe-flash-11.2.202.310.ebuild
Removed: adobe-flash-11.2.202.297-r1.ebuild
Log:
Version bump (bug #484512).
(Portage version: 2.2.2/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Revision Changes Path
1.211 www-plugins/adobe-flash/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/adobe-flash/ChangeLog?rev=1.211&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/adobe-flash/ChangeLog?rev=1.211&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/adobe-flash/ChangeLog?r1=1.210&r2=1.211
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- ChangeLog 21 Jul 2013 15:39:35 -0000 1.210
+++ ChangeLog 11 Sep 2013 01:49:01 -0000 1.211
@@ -1,6 +1,12 @@
# ChangeLog for www-plugins/adobe-flash
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.210 2013/07/21 15:39:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.211 2013/09/11 01:49:01 jer Exp $
+
+*adobe-flash-11.2.202.310 (11 Sep 2013)
+
+ 11 Sep 2013; Jeroen Roovers <jer@gentoo.org> +adobe-flash-11.2.202.310.ebuild,
+ -adobe-flash-11.2.202.297-r1.ebuild:
+ Version bump (bug #484512).
*adobe-flash-11.2.202.297-r1 (21 Jul 2013)
1.1 www-plugins/adobe-flash/adobe-flash-11.2.202.310.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/adobe-flash/adobe-flash-11.2.202.310.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/adobe-flash/adobe-flash-11.2.202.310.ebuild?rev=1.1&content-type=text/plain
Index: adobe-flash-11.2.202.310.ebuild
===================================================================
# Copyright 1999-2013 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.310.ebuild,v 1.1 2013/09/11 01:49:01 jer Exp $
EAPI=5
inherit nsplugins multilib toolchain-funcs versionator
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="
x86? (
!debug? ( ${AF_32_URI} )
debug? ( ${AF_32_DB_URI} )
)
amd64? (
multilib? (
32bit? (
!debug? ( ${AF_32_URI} )
debug? ( ${AF_32_DB_URI} )
)
64bit? ( ${AF_64_URI} )
)
!multilib? ( ${AF_64_URI} )
)
"
IUSE="-32bit +64bit debug kde multilib selinux sse2"
REQUIRED_USE="sse2"
SLOT="0"
KEYWORDS="-* ~amd64 ~x86"
LICENSE="AdobeFlash-11.x"
RESTRICT="strip mirror"
S="${WORKDIR}"
NATIVE_DEPS="
>=sys-libs/glibc-2.4
dev-libs/nspr
dev-libs/nss
kde? ( kde-base/kcmshell )
media-libs/fontconfig
net-misc/curl
x11-libs/gtk+:2
"
EMUL_DEPS="
>=app-emulation/emul-linux-x86-gtklibs-20100409-r1
app-emulation/emul-linux-x86-soundlibs
"
DEPEND="
amd64? ( multilib? ( !64bit? ( www-plugins/nspluginwrapper ) ) )
selinux? ( sec-policy/selinux-flash )
"
RDEPEND="
${DEPEND}
x86? ( $NATIVE_DEPS )
amd64? (
multilib? (
64bit? ( $NATIVE_DEPS )
32bit? ( $EMUL_DEPS )
)
!multilib? ( $NATIVE_DEPS )
)
|| ( media-fonts/liberation-fonts media-fonts/corefonts )
"
# Where should this all go? (Bug #328639)
INSTALL_BASE="opt/Adobe/flash-player"
# Ignore QA warnings in these closed-source binaries, since we can't fix them:
QA_PREBUILT="opt/*"
any_cpu_missing_flag() {
local value=$1
grep '^flags' /proc/cpuinfo | grep -qv "$value"
}
pkg_setup() {
if use x86; then
export native_install=1
elif use amd64; then
# amd64 users may unselect the native 64bit binary, if they choose
# TODO: In future revisions, remove this ability now that 64-bit
# binaries are officially released and working.
if ! use multilib || use 64bit; then
export native_install=1
else
unset native_install
fi
if use multilib && use 32bit; then
export amd64_32bit=1
else
unset amd64_32bit
fi
if use multilib && ! use 32bit && ! use 64bit; then
eerror "You must select at least one architecture USE flag (32bit or 64bit)"
die "No library version selected [-32bit -64bit]"
fi
unset need_lahf_wrapper
if [[ $native_install ]]; then
# 64bit flash requires the 'lahf' instruction (bug #268336)
if any_cpu_missing_flag 'lahf_lm'; then
export need_lahf_wrapper=1
fi
fi
fi
}
src_unpack() {
if [[ $amd64_32bit ]]; then
# Since the 32-bit and 64-bit packages collide, put the 32-bit one
# elsewhere:
local my_32b_src=${AF_32_URI##*>}
local my_64b_src=${AF_64_URI##*>}
if [[ $native_install ]]; then
unpack $my_64b_src
fi
mkdir 32bit
pushd 32bit >/dev/null
unpack $my_32b_src
popd >/dev/null
else
default_src_unpack
fi
}
src_compile() {
if [[ $need_lahf_wrapper ]]; then
# This experimental wrapper, from Maks Verver via bug #268336 should
# emulate the missing lahf instruction affected platforms.
$(tc-getCC) -fPIC -shared -nostdlib -lc -oflashplugin-lahf-fix.so \
"${FILESDIR}/flashplugin-lahf-fix.c" \
|| die "Compile of flashplugin-lahf-fix.so failed"
fi
}
src_install() {
if [[ $native_install ]]; then
if use x86; then
local PKGLIB=lib
else
local PKGLIB=lib64
fi
local BASE=${INSTALL_BASE}
# The plugin itself
exeinto /${BASE}/flash-plugin
doexe libflashplayer.so
inst_plugin /${BASE}/flash-plugin/libflashplayer.so
# The optional KDE4 KCM plugin
if use kde; then
exeinto /${BASE}/kde4
doexe usr/${PKGLIB}/kde4/kcm_adobe_flash_player.so
dosym /${BASE}/kde4/kcm_adobe_flash_player.so \
/usr/$(get_libdir)/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:
exeinto /${BASE}/bin
doexe usr/bin/flash-player-properties
dosym /${BASE}/bin/flash-player-properties \
usr/bin/flash-player-properties
# Icon and .desktop for 'flash-player-properties'
for icon in $(find usr/share/icons/ -name '*.png'); do
insinto /$(dirname $icon)
doins $icon
done
dosym ../icons/hicolor/48x48/apps/flash-player-properties.png \
usr/share/pixmaps/flash-player-properties.png
insinto usr/share/applications
sed -i usr/share/applications/flash-player-properties.desktop \
-e "s:^Exec=:Exec=/${BASE}/bin/:" || die "sed of .desktop file failed"
doins usr/share/applications/flash-player-properties.desktop
fi
if [[ $need_lahf_wrapper ]]; then
# This experimental wrapper, from Maks Verver via bug #268336 should
# emulate the missing lahf instruction affected platforms.
exeinto /${INSTALL_BASE}
doexe flashplugin-lahf-fix.so
inst_plugin /${INSTALL_BASE}/flashplugin-lahf-fix.so
fi
if [[ $amd64_32bit ]]; then
# Only install the plugin, nothing else for 32-bit.
local oldabi="${ABI}"
ABI="x86"
# 32b plugin
pushd "${S}/32bit"
exeinto /${INSTALL_BASE}32
doexe libflashplayer.so
inst_plugin /${INSTALL_BASE}32/libflashplayer.so
popd
ABI="${oldabi}"
fi
# The magic config file!
insinto "/etc/adobe"
doins "${FILESDIR}/mms.cfg"
}
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[+32bit -64bit]"
elog
fi
if has_version 'www-plugins/nspluginwrapper'; then
if [[ $native_install ]]; then
# 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/nsbrowser/plugins/npwrapper.libflashplayer.so"
if [[ -f ${FLASH_WRAPPER} ]]; then
einfo "Removing duplicate 32-bit plugin wrapper: Native 64-bit plugin installed"
nspluginwrapper -r "${FLASH_WRAPPER}"
fi
else
einfo "nspluginwrapper detected: Installing plugin wrapper"
local oldabi="${ABI}"
ABI="x86"
local FLASH_SOURCE="${ROOT}/${INSTALL_BASE}32/libflashplayer.so"
nspluginwrapper -i "${FLASH_SOURCE}"
ABI="${oldabi}"
fi
elif [[ ! $native_install ]]; then
elog "To use the 32-bit flash player in a native 64-bit browser,"
elog "you must install www-plugins/nspluginwrapper"
fi
fi
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-09-11 1:49 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-11 1:49 [gentoo-commits] gentoo-x86 commit in www-plugins/adobe-flash: adobe-flash-11.2.202.310.ebuild ChangeLog adobe-flash-11.2.202.297-r1.ebuild Jeroen Roovers (jer)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox