chromium-dev: updated to 46.0.2478.0

1 files changed, 43 insertions, 22 deletions

diff --git a/chromium-dev/build/chromium-dev.SlackBuild b/chromium-dev/build/chromium-dev.SlackBuild
index 0a103389..19745ba8 100755
--- a/chromium-dev/build/chromium-dev.SlackBuild
+++ b/chromium-dev/build/chromium-dev.SlackBuild
@@ -61,6 +61,9 @@
 # 45.0.2414.0-1:
 #              02/jun/2015 by Eric Hameleers <alien@slackware.com>
 #              * Update.
+# 46.0.2478.0-1:
+#              12/aug/2015 by Eric Hameleers <alien@slackware.com>
+#              * Update.
 # 
 # Run 'sh chromium-dev.SlackBuild' to build a Slackware package.
 # The package (.txz) and .txt file as well as build logs are created in /tmp .
@@ -69,9 +72,9 @@
 # -----------------------------------------------------------------------------
 
 SRCNAM=chromium
-SRCEXT=${SRCEXT:-"-dev"}
+SRCEXT=${SRCEXT:-"-dev"}       # "-dev" = development build; "" = stable build
 PRGNAM=${SRCNAM}${SRCEXT}      # chromium or chromium-dev
-VERSION=${VERSION:-45.0.2414.0}
+VERSION=${VERSION:-46.0.2478.0}
 BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:" -j4 "}
 TAG=${TAG:-alien}
@@ -81,10 +84,12 @@ 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
 
 # You can build without NaCl (native client) if you set USE_NACL to "0",
@@ -99,12 +104,17 @@ USE_CLANG=${USE_CLANG:-0}
 # (content decryption module) say "0" here.
 USE_CDM=${USE_CDM:-1}
 
+# If you are OK with the "OK Google" hotwording feature which will
+# automatically download a binary blob with proprietary code, set this to "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-unstable/chrome 2>&1 | strings | grep -C 1 " (version:" | tail -1
+# rpm2cpio ${SOURCE[1]} | cpio --to-stdout -i ./opt/google/chrome${BINTREE}/chrome 2>&1 | strings | grep -C 1 " (version:" | tail -1
 RPMSUB=${RPMSUB:-"-1"}
-WIDEVINE_VERSION="1.4.8.823" # CHROME_VERSION="45.0.2414.0"
+WIDEVINE_VERSION="1.4.8.824"   # CHROME_VERSION="46.0.2478.0"
 
 DOCS="AUTHORS DEPS LICENSE README*"
 
@@ -211,15 +221,6 @@ case "$ARCH" in
     *)       TARGET=$ARCH-slackware-linux ;;
 esac
 
-# Source locations:
-SOURCE[0]="$SRCDIR/${SRCNAM}-${VERSION}.tar.xz"
-SRCURL[0]="https://commondatastorage.googleapis.com/${SRCNAM}-browser-official/${SRCNAM}-${VERSION}.tar.xz"
-
-if [ $USE_CDM -eq 1 ]; 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
-
 # Exit the script on errors:
 set -e
 trap 'echo "$0 FAILED at line ${LINENO}" | tee $OUTPUT/error-${PRGNAM}.log' ERR
@@ -231,6 +232,15 @@ P1=${1:-1}
 _UMASK_=$(umask)
 umask 0022
 
+# Source locations:
+SOURCE[0]="$SRCDIR/${SRCNAM}-${VERSION}.tar.xz"
+SRCURL[0]="https://commondatastorage.googleapis.com/${SRCNAM}-browser-official/${SRCNAM}-${VERSION}.tar.xz"
+
+if [ "$P1" == "--download" -a $USE_CDM -eq 1 ]; 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
+
 # Create working directories:
 mkdir -p $OUTPUT          # place for the package to be saved
 mkdir -p $TMP/tmp-$PRGNAM # location to build the source
@@ -264,8 +274,9 @@ done
 
 if [ "$P1" == "--download" ]; then
   echo "Download complete."
-  [ "x$SRCEXT" = "x-dev" ] && BINTREE="-unstable" || BINTREE=""
-  echo "Widevine version is: \"$(rpm2cpio ${SOURCE[1]} | cpio --to-stdout -i ./opt/google/chrome${BINTREE}/chrome 2>&1 | strings | grep -C 1 ' (version:' | tail -1)\"   # CHROME_VERSION=\"$VERSION\""
+  if [ $USE_CDM -eq 1 ]; then
+    echo "Widevine version is: \"$(rpm2cpio ${SOURCE[1]} | cpio --to-stdout -i ./opt/google/chrome${BINTREE}/chrome 2>&1 | strings | grep -C 1 ' (version:' | tail -1)\"   # CHROME_VERSION=\"$VERSION\""
+  fi
   exit 0
 fi
 
@@ -346,9 +357,10 @@ export -n CFLAGS="$SLKCFLAGS -Wno-unused-local-typedefs"
 _chromium_conf=(
     ${CLANG_OPTS}
     -Ddisable_glibc=1
+    -Denable_hotwording=${USE_HOTWORD}
     -Denable_pepper_cdms=1
     -Denable_webrtc=1
-    -Denable_widevine=1
+    -Denable_widevine=${USE_CDM}
     -Dffmpeg_branding=Chrome
     -Dgoogle_api_key=$_google_api_key
     -Dgoogle_default_client_id=$_google_default_client_id
@@ -432,8 +444,13 @@ install -D out/Release/chromedriver $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/chrome
 
 # Copy over the remaining binaries:
 cp -a \
-  out/Release/{*.pak,libffmpegsumo.so} \
+  out/Release/*.pak \
   $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/
+if [ -f out/Release/libffmpegsumo.so ]; then
+  cp -a \
+    out/Release/libffmpegsumo.so \
+    $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/
+fi
 if [ -f out/Release/natives_blob.bin ]; then
   cp -a \
     out/Release/{natives_blob.bin,snapshot_blob.bin} \
@@ -457,15 +474,19 @@ fi
 # Manually strip binaries so that 'nacl_irt_*.nexe' is left intact
 strip  --strip-unneeded \
   $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/{${PRGNAM},chrome-sandbox} \
-  $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/chromedriver \
-  $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/libffmpegsumo.so
+  $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/chromedriver
+if [ -f $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/libffmpegsumo.so ]; then
+  strip  --strip-unneeded \
+    $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/libffmpegsumo.so
+fi
 if [ ${USE_NACL} -eq 1 ]; then
   strip  --strip-unneeded \
     $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/nacl_helper{,_bootstrap,_nonsfi}
 fi
 if [ ${USE_CDM} -eq 1 ]; then
   strip  --strip-unneeded \
-  $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/lib{widevinecdmadapter,clearkeycdm}.so
+    $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/libwidevinecdmadapter.so \
+    $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/libclearkeycdm.so
 fi
 
 # Add locales:
@@ -485,7 +506,7 @@ cp -a third_party/icu/source/data/in/icudtl.dat $PKG/usr/lib${LIBDIRSUFFIX}/${PR
 # Install a wrapper script:
 install -D -m0755 $SRCDIR/${PRGNAM}.sh $PKG/usr/bin/${PRGNAM}
 sed \
-    -e "s/@PRGNAM@/${SRCNAM}${SRCEXT}/g" \
+    -e "s/@PRGNAM@/${PRGNAM}/g" \
     -e "s/@SRCEXT@/${SRCEXT}/g" \
     -e "s/@LIBDIRSUFFIX@/${LIBDIRSUFFIX}/g" \
     -e "s/@CRFLAGS@/${CRFLAGS}/g" \
@@ -513,7 +534,7 @@ install -D -m0644 \
 
 # Move the 'default' file into place.
 # This allows users to override command-line options:
-install -D -m0644 $SRCDIR/${PRGNAM}.default $PKG/etc/${PRGNAM}/00-default.conf.new
+mkdir -p  $PKG/etc/${PRGNAM}
 cat $SRCDIR/${PRGNAM}.default | sed \
   -e "s/@PRGNAM@/${PRGNAM}/g" \
   -e "s/@SRCEXT@/${SRCEXT}/g" \