New way of enabling the widevine cdm in chromium

1 files changed, 17 insertions, 19 deletions

diff --git a/chromium-widevine-plugin/build/chromium-widevine-plugin.SlackBuild b/chromium-widevine-plugin/build/chromium-widevine-plugin.SlackBuild
index 4cf42720..66bf330f 100755
--- a/chromium-widevine-plugin/build/chromium-widevine-plugin.SlackBuild
+++ b/chromium-widevine-plugin/build/chromium-widevine-plugin.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright 2014  Eric Hameleers, Eindhoven, NL
+# Copyright 2014, 2015  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -33,6 +33,9 @@
 # Changelog:   
 # 1.4.4.637-1: 31/aug/2014 by Eric Hameleers <alien@slackware.com>
 #              * Initial release.
+# 39.0.2171.95-1:
+#              01/jan/2015 by Eric Hameleers <alien@slackware.com>
+#              * Update and switch to using the chromium version.
 # 
 # Run 'sh chromium-widevine-plugin.SlackBuild' to build a Slackware package.
 # The package (.txz) and .txt file as well as build logs are created in /tmp .
@@ -48,14 +51,12 @@ BUILD=${BUILD:-1}
 TAG=${TAG:-alien}
 
 # What is the Chrome version we extract this from?
-CHANNEL=${CHANNEL:-"stable"}
-CHROMEVER=${CHROMEVER:-"37.0.2062.94"}
+# Version of the plugin as reported by the browser is determined in the
+# chromium package. Check "chrome://plugins"
+VERSION=${VERSION:-"39.0.2171.95"}
+RPMCHAN=${RPMCHAN:-"stable"}
 RPMSUB=${RPMSUB:-"-1"}
 
-# Version of this plugin - needs to be retrieved by actually running Chrome
-# and checking "chrome://plugins"
-VERSION=${VERSION:-"1.4.4.637"}
-
 # Where do we look for sources?
 SRCDIR=$(cd $(dirname $0); pwd)
 
@@ -85,8 +86,8 @@ case "$MARCH" in
     ;;
 esac
 
-SOURCE[0]="$SRCDIR/google-chrome-$CHANNEL-$CHROMEVER$RPMSUB.$ARCH.rpm"
-SRCURL[0]="https://dl.google.com/linux/chrome/rpm/stable/$ARCH/google-chrome-$CHANNEL-$CHROMEVER$RPMSUB.$ARCH.rpm"
+SOURCE[0]="$SRCDIR/google-chrome-$RPMCHAN-$VERSION$RPMSUB.$ARCH.rpm"
+SRCURL[0]="https://dl.google.com/linux/chrome/rpm/stable/$ARCH/google-chrome-$RPMCHAN-$VERSION$RPMSUB.$ARCH.rpm"
 
 SOURCE[1]="$SRCDIR/license.html"
 SRCURL[1]="http://www.google.com/chrome/intl/en/eula_text.html"
@@ -146,18 +147,18 @@ fi
 
 cd $TMP/tmp-$PRGNAM
 echo "Extracting the source archive(s) for $PRGNAM..."
-rpm2cpio ${SOURCE[0]} | cpio -idmv -R root:root \
-  ./opt/google/chrome/libwidevine*
+rpm2cpio ${SOURCE[0]} | cpio -dimv -R root:root \
+  ./opt/google/chrome/libwidevinecdm.so
 chmod -R u+w,go+r-w,a+X-s .
 
 echo "++"
-echo "Version '$VERSION' used for for libpwidevinecdmadapter.so"
+echo "Packaging $PRGNAM for chromium $VERSION"
 echo "++"
 
 # Move the extracted files over to the package location:
-install -d  $PKG/usr/lib${LIBDIRSUFFIX}/Pepper
+install -d  $PKG/usr/lib${LIBDIRSUFFIX}/chromium
 install -m0644 opt/google/chrome/libwidevine* \
-  $PKG/usr/lib${LIBDIRSUFFIX}/Pepper/
+  $PKG/usr/lib${LIBDIRSUFFIX}/chromium/
 
 # Add documentation:
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
@@ -166,13 +167,10 @@ cat $SRCDIR/$(basename $0) > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION
 find $PKG/usr/doc -type f -exec chmod 644 {} \;
 
-# Add a package description and post-install script:
+# Add a package description:
 mkdir -p $PKG/install
 cat $SRCDIR/slack-desc > $PKG/install/slack-desc
-cat $SRCDIR/doinst.sh | sed \
-  -e "s/@PRGNAM@/${PRGNAM}/g" \
-  -e "s/@LIBDIRSUFFIX@/${LIBDIRSUFFIX}/g" \
-  -e "s/@PEPVER@/${VERSION}/g" \
+cat $SRCDIR/doinst.sh | sed -e "s/@PRGNAM@/${PRGNAM}/g" \
   > $PKG/install/doinst.sh
 
 # Build the package: