summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--multimedia/flash-player-plugin/README1
-rw-r--r--multimedia/flash-player-plugin/flash-player-plugin.SlackBuild24
-rw-r--r--multimedia/flash-player-plugin/flash-player-plugin.info8
3 files changed, 23 insertions, 10 deletions
diff --git a/multimedia/flash-player-plugin/README b/multimedia/flash-player-plugin/README
index f015dd1d4d..ba93743528 100644
--- a/multimedia/flash-player-plugin/README
+++ b/multimedia/flash-player-plugin/README
@@ -7,4 +7,3 @@ Plugin is subject to Adobe terms of use:
http://www.adobe.com/go/labs_term_of_use
Plugin is subject to Adobe Flash EULA:
http://labs.adobe.com/technologies/eula/flashplayer.html
-
diff --git a/multimedia/flash-player-plugin/flash-player-plugin.SlackBuild b/multimedia/flash-player-plugin/flash-player-plugin.SlackBuild
index 53312808a8..4bfe4be87e 100644
--- a/multimedia/flash-player-plugin/flash-player-plugin.SlackBuild
+++ b/multimedia/flash-player-plugin/flash-player-plugin.SlackBuild
@@ -5,11 +5,19 @@
# Script maintained by Robby Workman <rworkman@slackbuilds.org>
PRGNAM=flash-player-plugin
-VERSION=9.0_r124
+VERSION=10.0_r12
ARCH=i386
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
+# If you use or intend to use Opera at some point, and you want
+# this plugin available to it, then pass "yes" as the value to this
+# variable: USE_OPERA=yes ./flash-player-plugin.SlackBuild
+# Note that this should *NOT* be needed if you installed Opera using
+# the SlackBuilds.org build script, as we do a simple patch there to
+# make it look in /usr/lib/mozilla/plugins
+USE_OPERA=${USE_OPERA:-no}
+
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
@@ -20,8 +28,8 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-tar xvf $CWD/install_flash_player_9_linux.tar.gz
-cd install_flash_player_9_linux
+tar xvf $CWD/install_flash_player_10_linux.tar.gz
+cd install_flash_player_10_linux
chown -R root:root .
chmod -R u+w,go+r-w,a-s .
@@ -41,11 +49,17 @@ if [ ! "$(echo $_REALVERS | tr ' ' _)" = "$(echo $VERSION)" ]; then
sleep 5
fi
-# This is repackaging of a binary plugin - no SLKCFLAGS required,
-# nor does anything need to be compiled
mkdir -p $PKG/usr/lib/mozilla/plugins
install -m 0755 libflashplayer.so $PKG/usr/lib/mozilla/plugins
+# If the user wants an opera plugin installed, then we'll do that too.
+if [ ! "$USE_OPERA" = "no" ]; then
+ mkdir -p $PKG/usr/lib/opera/plugins
+ cd $PKG/usr/lib/opera/plugins
+ ln -s /usr/lib/mozilla/plugins/libflashplayer.so .
+ cd -
+fi
+
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/multimedia/flash-player-plugin/flash-player-plugin.info b/multimedia/flash-player-plugin/flash-player-plugin.info
index 6e22dc3540..253e5ecacd 100644
--- a/multimedia/flash-player-plugin/flash-player-plugin.info
+++ b/multimedia/flash-player-plugin/flash-player-plugin.info
@@ -1,8 +1,8 @@
PRGNAM="flash-player-plugin"
-VERSION="9.0_r124"
-HOMEPAGE="http://www.adobe.com/"
-DOWNLOAD="http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_9_linux.tar.gz"
-MD5SUM="a311fd97aa6c214f63dc089a20cf7a39"
+VERSION="10.0_r12"
+HOMEPAGE="http://www.adobe.com/products/flashplayer"
+DOWNLOAD="http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz"
+MD5SUM="4777665a6149af11233d8a000b89ffb1"
MAINTAINER="Robby Workman"
EMAIL="rw@rlworkman.net"
APPROVED="David Somero"