1 files changed, 15 insertions, 17 deletions
diff --git a/network/vivaldi/vivaldi.SlackBuild b/network/vivaldi/vivaldi.SlackBuild
index 6670340490..8931c0d5dd 100644
--- a/network/vivaldi/vivaldi.SlackBuild
+++ b/network/vivaldi/vivaldi.SlackBuild
@@ -25,9 +25,9 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=vivaldi
-VERSION=${VERSION:-2.10.1745.23}
-FFMPEG_VERSION="78.0.3904.70"
-WIDEVINE_VERSION="4.10.1440.18"
+VERSION=${VERSION:-2.10.1745.27}
+FFMPEG_VERSION="79.0.3945.79"
+WIDEVINE_VERSION="4.10.1582.2"
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -56,21 +56,21 @@ set -e
 
 rm -rf $PKG $TMP/$PRGNAM
 mkdir -p $TMP/$PRGNAM $PKG $OUTPUT
-
 cd $TMP/$PRGNAM
-ar p $CWD/${PRGNAM}-stable_${VERSION}-*_${BITS}.deb data.tar.xz | tar xvJ
+ar p $CWD/${PRGNAM}-stable_${VERSION}-*_${BITS}.deb data.tar.xz | tar xvJ ./opt ./usr
+ar p $CWD/chromium-codecs-ffmpeg-extra_${FFMPEG_VERSION}-*_${BITS}.deb \
+  data.tar.xz | tar xOJ ./usr/lib/chromium-browser/libffmpeg.so \
+  > opt/vivaldi/libffmpeg.so.${VERSION%\.*\.*}
+
 if [ "x$BITS" = "xarmhf" ] ; then
-  echo "This script doesn't support installing proprietary media codecs on ARM."
+  echo "This script doesn't support installing Widevine on ARM."
 else
-  mkdir -p var/opt/vivaldi/WidevineCdm/_platform_specific/linux_${PBITS}
-  mkdir -p var/opt/vivaldi/media-codecs-${FFMPEG_VERSION}
-  ar p $CWD/chromium-codecs-ffmpeg-extra_${FFMPEG_VERSION}-*_${BITS}.deb \
-    data.tar.xz | tar xJf - ./usr/lib/chromium-browser/libffmpeg.so --strip 4
-  mv libffmpeg.so var/opt/vivaldi/media-codecs-${FFMPEG_VERSION}
+  rm -f opt/vivaldi/WidevineCdm
+  mkdir -p opt/vivaldi/WidevineCdm/_platform_specific/linux_${PBITS}
   unzip -oq $CWD/${WIDEVINE_VERSION}-linux-${WBITS}.zip \
-    -d var/opt/vivaldi/WidevineCdm
-  mv var/opt/vivaldi/WidevineCdm/libwidevinecdm.so \
-    var/opt/vivaldi/WidevineCdm/_platform_specific/linux_${PBITS}
+    -d opt/vivaldi/WidevineCdm
+  mv opt/vivaldi/WidevineCdm/libwidevinecdm.so \
+    opt/vivaldi/WidevineCdm/_platform_specific/linux_${PBITS}
 fi
 
 chown -R root:root .
@@ -81,14 +81,12 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 rm -r opt/vivaldi/cron
-rm -f opt/vivaldi/WidevineCdm
-mv opt usr var $PKG/
+mv opt usr $PKG/
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 ln -sf /opt/vivaldi/vivaldi $PKG/usr/bin/vivaldi
-ln -fs /var/opt/vivaldi/WidevineCdm $PKG/opt/vivaldi/WidevineCdm
 
 for res in 16 22 24 32 48 64 128 256; do
    install -Dm644 "$PKG/opt/vivaldi/product_logo_${res}.png" \