network/vivaldi: Updated for version 5.2.2623.46.

Signed-off-by: Dave Woodfall <dave@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

7 files changed, 56 insertions, 53 deletions

diff --git a/network/vivaldi/README b/network/vivaldi/README
index 011f935eb1..4abc7d7eba 100644
--- a/network/vivaldi/README
+++ b/network/vivaldi/README
@@ -1,8 +1,8 @@
 vivaldi (web browser).
 
-A Browser for Our Friends. An advanced browser made with the power user
-in mind. Finally you can surf your way.
+Experience the web in a whole new way with Vivaldi.
 
-Vivaldi for ARM/ARM64 can be downloaded from:
+Vivaldi is a browser that has the features you need, a style that fits
+and values you can stand by. Your browser matters. Take control with
+Vivaldi.
 
-    https://vivaldi.com/download/archive
diff --git a/network/vivaldi/README.SBo b/network/vivaldi/README.SBo
deleted file mode 100644
index 13e8edce7d..0000000000
--- a/network/vivaldi/README.SBo
+++ /dev/null
@@ -1,4 +0,0 @@
-This SlackBuild used to support a variable CUSTOM_CSS that made it
-possible to customize the user interface using a css file.
-
-Now the same can be done via vivaldi://experiments/
diff --git a/network/vivaldi/doinst.sh b/network/vivaldi/doinst.sh
index 65c7e2eeb9..1d19707da6 100644
--- a/network/vivaldi/doinst.sh
+++ b/network/vivaldi/doinst.sh
@@ -7,3 +7,10 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
     /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
   fi
 fi
+
+# Adding a suitable libffmpeg.so with support for H.264 & AAC directly into
+# the package makes redistribution of the output package difficult.
+# The following is used in postinstall for the official rpm and debs.
+# (Cleanup on uninstall will be handled by douninst.sh)
+nohup /opt/vivaldi/update-ffmpeg > /dev/null 2>&1 &
+
diff --git a/network/vivaldi/douninst.sh b/network/vivaldi/douninst.sh
new file mode 100644
index 0000000000..2ab916b6df
--- /dev/null
+++ b/network/vivaldi/douninst.sh
@@ -0,0 +1,9 @@
+# Remove any lib fetched by update-ffmpeg, when doinst.sh was first run
+if ls /var/opt/vivaldi/media-codecs-*/libffmpeg.so >/dev/null 2>&1; then
+  rm /var/opt/vivaldi/media-codecs-*/libffmpeg.so
+fi
+if [ -d /var/opt/vivaldi ]; then
+  # This removes directory trees that are empty or only populated by other
+  # empty directories.
+  find /var/opt/vivaldi -depth -type d -empty -exec rmdir {} \;
+fi
diff --git a/network/vivaldi/slack-desc b/network/vivaldi/slack-desc
index fb2335b9c7..9d1efaa13e 100644
--- a/network/vivaldi/slack-desc
+++ b/network/vivaldi/slack-desc
@@ -8,12 +8,12 @@
        |-----handy-ruler------------------------------------------------------|
 vivaldi: vivaldi (web browser)
 vivaldi:
-vivaldi: A Browser for Our Friends.
+vivaldi: Experience the web in a whole new way with Vivaldi.
 vivaldi:
-vivaldi: An advanced browser made with the power user in mind. Finally you
-vivaldi: can surf your way.
+vivaldi: Vivaldi is a browser that has the features you need, a style that fits
+vivaldi: and values you can stand by. Your browser matters. Take control with
+vivaldi: Vivaldi.
 vivaldi:
 vivaldi: Home Page: https://vivaldi.com
 vivaldi:
 vivaldi:
-vivaldi:
diff --git a/network/vivaldi/vivaldi.SlackBuild b/network/vivaldi/vivaldi.SlackBuild
index 60b05db300..e6e90a0135 100644
--- a/network/vivaldi/vivaldi.SlackBuild
+++ b/network/vivaldi/vivaldi.SlackBuild
@@ -4,7 +4,7 @@
 #
 # Copyright 2015-2017  Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # Copyright 2017-2019, Alexander Verbovetsky, Moscow, Russia
-# Copyright 2019-2021, Ruari Oedegaard, Oslo, Norway
+# Copyright 2019-2022, Ruari Oedegaard, Oslo, Norway
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -27,29 +27,18 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=vivaldi
-VERSION=${VERSION:-3.7.2218.52}
-FFMPEG_VERSION="89.0.4389.90"
-WIDEVINE_VERSION="4.10.1582.2"
+VERSION=${VERSION:-5.2.2623.46}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-case "$ARCH" in
-    i?86) BITS="i386" ; WBITS="ia32" ; PBITS="x86" ;;
-  x86_64) BITS="amd64" ; WBITS="x64" ; PBITS="x64" ;;
-    arm*) BITS="armhf" ;;
-       *) echo "$ARCH is not supported."
-          exit 1 ;;
-esac
-
 # If the variable PRINT_PACKAGE_NAME is set, then this script will report what
 # the name of the created package would be, and then exit. This information
 # could be useful to other scripts.
@@ -67,21 +56,7 @@ 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 ./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 Widevine on ARM."
-elif [ "x$BITS" = "xi386" ] ; then
-  rm -f opt/vivaldi/WidevineCdm
-  mkdir -p opt/vivaldi/WidevineCdm/_platform_specific/linux_${PBITS}
-  unzip -oq $CWD/${WIDEVINE_VERSION}-linux-${WBITS}.zip \
-    -d opt/vivaldi/WidevineCdm
-  mv opt/vivaldi/WidevineCdm/libwidevinecdm.so \
-    opt/vivaldi/WidevineCdm/_platform_specific/linux_${PBITS}
-fi
+ar p $CWD/${PRGNAM}-stable_${VERSION}-*.deb data.tar.xz | tar xJ ./opt ./usr
 
 chown -R root:root .
 find -L . \
@@ -96,7 +71,12 @@ 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
+# Make symlinks relative
+rm -f $PKG/usr/bin/vivaldi* $PKG/opt/vivaldi/WidevineCdm
+ln -s ../../opt/vivaldi/vivaldi $PKG/usr/bin/vivaldi
+ln -s ../../opt/vivaldi/vivaldi $PKG/usr/bin/vivaldi-stable
+# Note that this is a broken link until the user manually installs widevineCdm
+ln -s ../google/chrome/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" \
@@ -116,9 +96,26 @@ rm -rf $PKG/usr/share/doc
 cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-mkdir -p $PKG/install
+# Add a note about uninstall on Slackware 14.2
+cat <<EON> $PKG/usr/doc/$PRGNAM-$VERSION/UNINSTALL-Slackware-14.2.txt
+Since '${0##*/}' was created with Slackware 15 and above in mind, it
+uses the new 'douninst.sh' script to clear down any proprietary media libs
+fetched by 'update-ffmpeg' during post install.
+
+If you run 14.2 (or older), make a copy of the douninst.sh *before* uninstall:
+
+  cp /var/lib/pkgtools/douninst.sh/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG .
+
+Then simply run it as root after uninstall.
+
+(If you forget it is not the end of the world, you will just potentially leave
+behind a small file [libffmpeg.so] under /var/opt/vivaldi*)
+EON
+
+mkdir -p $PKG/install $PKG/var/lib/pkgtools/douninst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
+cat $CWD/douninst.sh > $PKG/var/lib/pkgtools/douninst.sh/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/vivaldi/vivaldi.info b/network/vivaldi/vivaldi.info
index 710424f19f..f84fe650a6 100644
--- a/network/vivaldi/vivaldi.info
+++ b/network/vivaldi/vivaldi.info
@@ -1,16 +1,10 @@
 PRGNAM="vivaldi"
-VERSION="3.7.2218.52"
+VERSION="5.2.2623.46"
 HOMEPAGE="https://vivaldi.com"
-DOWNLOAD="https://downloads.vivaldi.com/stable/vivaldi-stable_3.7.2218.52-1_i386.deb \
-          https://launchpadlibrarian.net/528923945/chromium-codecs-ffmpeg-extra_89.0.4389.90-0ubuntu0.16.04.2_i386.deb \
-          https://dl.google.com/widevine-cdm/4.10.1582.2-linux-ia32.zip"
-MD5SUM="688dcaabbded8a31e70c2be6a5ba3ddf \
-        00d2f09afa9447e9a506c9a4ff52bbdd \
-        247a331a4d5bceb9f20366a39136a4fa"
-DOWNLOAD_x86_64="https://downloads.vivaldi.com/stable/vivaldi-stable_3.7.2218.52-1_amd64.deb \
-                 https://launchpadlibrarian.net/528666745/chromium-codecs-ffmpeg-extra_89.0.4389.90-0ubuntu0.16.04.2_amd64.deb"
-MD5SUM_x86_64="89626848f295aa3d6b9fd60706a03f3a \
-               7bbb3d45d15b806c0b29ed0a1728af64"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://downloads.vivaldi.com/stable/vivaldi-stable_5.2.2623.46-1_amd64.deb"
+MD5SUM_x86_64="d26d1feac504a989628fede376d9751b"
 REQUIRES=""
 MAINTAINER="Ruari Oedegaard"
 EMAIL="sbo@ruari.com"