chromium: updated to 60.0.3112.78

1 files changed, 12 insertions, 26 deletions

diff --git a/chromium/build/chromium.SlackBuild b/chromium/build/chromium.SlackBuild
index f7650a7b..d86662a0 100755
--- a/chromium/build/chromium.SlackBuild
+++ b/chromium/build/chromium.SlackBuild
@@ -278,6 +278,9 @@
 # 59.0.3071.86-1:
 #              06/jun/2017 by Eric Hameleers <alien@slackware.com>
 #              * Update to 59.
+# 60.0.3112.78-1:
+#              25/jun/2017 by Eric Hameleers <alien@slackware.com>
+#              * Update to 60.
 # 
 # -----------------------------------------------------------------------------
 # 
@@ -290,21 +293,17 @@
 SRCNAM=chromium
 SRCEXT=${SRCEXT:-""}             # could be "-dev" for development build
 PRGNAM=${SRCNAM}${SRCEXT}        # chromium or chromium-dev
-VERSION=${VERSION:-59.0.3071.86}
+VERSION=${VERSION:-60.0.3112.78}
 BUILD=${BUILD:-1}
 TAG=${TAG:-alien}
 
 # Differentiate between stable and development releases:
 if [ "x$SRCEXT" = "x-dev" ]; then
-  RPMCHAN="unstable"
   CRFLAGS="CHROMIUM_DEV_FLAGS"
   CRUSERFLAGS="CHROMIUM_DEV_USER_FLAGS"
-  BINTREE="-unstable"
 else
-  RPMCHAN="stable"
   CRFLAGS="CHROMIUM_FLAGS"
   CRUSERFLAGS="CHROMIUM_USER_FLAGS"
-  BINTREE=""
 fi
 
 # If pulseaudio is installed we support it unless you explicitly disable it:
@@ -335,13 +334,6 @@ USE_CDM=${USE_CDM:-1}
 # Some people object to a download without consent so it is disabled by default:
 USE_HOTWORD=${USE_HOTWORD:-0}
 
-# Find the version of Widevine using this commandline on the chrome binary.
-# Note that the chrome binary RPM needs to have the same version
-# as our chromium sources:
-# rpm2cpio ${SOURCE[1]} |cpio --to-stdout -i ./opt/google/chrome${BINTREE}/chrome 2>&1 |strings |grep -E " \(version: .*\)$" |rev |cut -d' ' -f1 |rev |cut -d')' -f1
-RPMSUB=${RPMSUB:-"-1"}
-WIDEVINE_VERSION="1.4.8.977"   # CHROME_VERSION="59.0.3071.86"
-
 DOCS="AUTHORS BUILD.gn CODE_OF_CONDUCT.md DEPS LICENSE* OWNERS WATCHLISTS README*"
 
 # Where do we look for sources?
@@ -396,7 +388,7 @@ fi
 MARCH=$( uname -m )
 if [ -z "$ARCH" ]; then
   case "$MARCH" in
-    i?86)    export ARCH=i486 ;;
+    i?86)    export ARCH=i586 ;;
     armv7hl) export ARCH=$MARCH ;;
     armv6hl) export ARCH=$MARCH ;;
     arm*)    export ARCH=arm ;;
@@ -406,7 +398,7 @@ if [ -z "$ARCH" ]; then
 fi
 
 case "$ARCH" in
-  i486)      SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  i?86)      SLKCFLAGS="-O2 -march=${ARCH} -mtune=i686"
              SLKLDFLAGS=""; LIBDIRSUFFIX=""
              RPMARCH="i386"
              DSSE="1"
@@ -456,12 +448,9 @@ umask 0022
 # Source locations:
 SOURCE[0]="$SRCDIR/${SRCNAM}-${VERSION}.tar.xz"
 SRCURL[0]="https://commondatastorage.googleapis.com/${SRCNAM}-browser-official/${SRCNAM}-${VERSION}.tar.xz"
-#SRCURL[0]="https://github.com/zcbenz/chromium-source-tarball/releases/download/${VERSION}/${SRCNAM}-${VERSION}.tar.xz"
 
-if [ "$P1" == "--download" -a $USE_CDM -eq 1 -a "$ARCH" = "x86_64" ]; then
-  SOURCE[1]="$SRCDIR/google-chrome-$RPMCHAN-$VERSION$RPMSUB.$RPMARCH.rpm"
-  SRCURL[1]="https://dl.google.com/linux/chrome/rpm/stable/$RPMARCH/google-chrome-$RPMCHAN-$VERSION$RPMSUB.$RPMARCH.rpm"
-fi
+SOURCE[1]="$SRCDIR/widevine-version.txt"
+SRCURL[1]="https://redirector.gvt1.com/edgedl/widevine-cdm/current.txt"
 
 # Create working directories:
 mkdir -p $OUTPUT          # place for the package to be saved
@@ -496,9 +485,6 @@ done
 
 if [ "$P1" == "--download" ]; then
   echo "Download complete."
-  if [ $USE_CDM -eq 1 -a "$ARCH" = "x86_64" ]; then
-    echo "Widevine version is: \"$(rpm2cpio ${SOURCE[1]} |cpio --to-stdout -i ./opt/google/chrome${BINTREE}/chrome 2>&1 |strings |grep -E " \(version: .*\)$" |rev |cut -d' ' -f1 |rev |cut -d')' -f1)\"   # CHROME_VERSION=\"$VERSION\""
-  fi
   exit 0
 fi
 
@@ -508,6 +494,9 @@ echo "++"
 echo "|| $PRGNAM-$VERSION"
 echo "++"
 
+# Find the version of Widevine:
+WIDEVINE_VERSION="1.4.8.$(cat ${SOURCE[1]})"
+
 cd $TMP/tmp-$PRGNAM
 echo "Extracting the source archive(s) for $PRGNAM..."
 tar -xf ${SOURCE[0]}
@@ -516,7 +505,7 @@ cd ${SRCNAM}-${VERSION}
 # Patches:
 touch $OUTPUT/patch-${PRGNAM}.log
 # Fix bootstrapping 'gn':
-cat $SRCDIR/patches/chromium-gn-bootstrap-r2.patch | patch -p1 --verbose \
+cat $SRCDIR/patches/chromium-gn-bootstrap-r8.patch | patch -p1 --verbose \
   2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
 ## Enable VAAPI hardware decoding on Linux platform:
 #cat $SRCDIR/patches/chromium_vaapi.patch | patch -p1 --verbose \
@@ -560,9 +549,6 @@ if [ $USE_CDM -eq 1 ]; then
   # Add support for widevine cdm to this build.
   # Note that the resulting Slackware package will *not* include the
   # proprietary Widevine CDM, only the adapter library which is built from OSS.
-  # Also note that it is no longer required to extract the Widevine CDM from
-  # the chrome RPM in order to compile the adapter library. We do it anyway,
-  # but only to determine the version of the Widevine library.
   # To compile, we just add one #define - see https://crbug.com/473866
   sed '14i#define WIDEVINE_CDM_VERSION_STRING "'$WIDEVINE_VERSION'"' \
     -i third_party/widevine/cdm/stub/widevine_cdm_version.h