From 1b883431ad62317a8a8d92264f64bdc04c6e3b81 Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Thu, 31 Mar 2016 12:18:37 +0200 Subject: [PATCH] chromium-widevine: fix post phase, really --- srcpkgs/chromium-widevine/INSTALL | 25 ++++++------------------- srcpkgs/chromium-widevine/REMOVE | 5 +---- srcpkgs/chromium-widevine/template | 2 +- 3 files changed, 8 insertions(+), 24 deletions(-) diff --git a/srcpkgs/chromium-widevine/INSTALL b/srcpkgs/chromium-widevine/INSTALL index d967f40519..5529cdaf16 100644 --- a/srcpkgs/chromium-widevine/INSTALL +++ b/srcpkgs/chromium-widevine/INSTALL @@ -1,29 +1,16 @@ # INSTALL DISTFILE="https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb" -BUILD_DIR="./var/tmp/$PKGNAME.build" +BUILD_DIR="/var/tmp/$PKGNAME.build" case "$ACTION" in -pre) +post) # Actions to execute before the package files are unpacked. mkdir -p $BUILD_DIR xbps-uhelper fetch "${DISTFILE}>$BUILD_DIR/$PKGNAME.deb" - ;; -post) # Things that have to happen no matter what - ar x "$BUILD_DIR/$PKGNAME.deb" - tar xf data.tar.xz - mv $BUILD_DIR/opt/google/chrome/libwidevinecdm.so usr/lib/${PKGNAME} - mv $BUILD_DIR/opt/google/chrome/libwidevinecdmadapter.so usr/lib/${PKGNAME} - - if [ "$UPDATE" = "yes" ]; then - # actions to execute if package is being updated. - ... - else - # actions to execute if package is being installed. - ln -s usr/lib/$PKGNAME/libwidevinecdm.so usr/lib/chromium - ln -s usr/lib/$PKGNAME/libwidevinecdmadapter.so usr/lib/chromium - fi + cd $BUILD_DIR + ar x $PKGNAME.deb + tar xf data.tar.xz --wildcards './opt/google/chrome/libwidevine*' + mv opt/google/chrome/libwidevine* /usr/lib/chromium rm -r $BUILD_DIR - chmod 775 usr/lib/$PKGNAME/libwidevinecdm.so - chmod 775 usr/lib/$PKGNAME/libwidevinecdmadapter.so ;; esac diff --git a/srcpkgs/chromium-widevine/REMOVE b/srcpkgs/chromium-widevine/REMOVE index c97e82895f..71a5db4df7 100644 --- a/srcpkgs/chromium-widevine/REMOVE +++ b/srcpkgs/chromium-widevine/REMOVE @@ -1,8 +1,5 @@ case "$ACTION" in pre) - rm -f usr/lib/chromium/libwidevinecdm.so - rm -f usr/lib/chromium/libwidevinecdmadapter.so - rm -f usr/lib/chromium-widevine/libwidevinecdm.so - rm -f usr/lib/chromium-widevine/libwidevinecdmadapter.so + rm -f usr/lib/chromium/libwidevine* ;; esac diff --git a/srcpkgs/chromium-widevine/template b/srcpkgs/chromium-widevine/template index baf777fbb4..014864e3f5 100644 --- a/srcpkgs/chromium-widevine/template +++ b/srcpkgs/chromium-widevine/template @@ -4,7 +4,7 @@ _channel="stable" pkgname=chromium-widevine version=49.0.2623.110 -revision=3 +revision=4 short_desc="A browser plugin designed for the viewing of premium video content" maintainer="Benjamin Hoffmeyer " homepage="http://www.google.com/chrome"