chromium: updated to 44.0.2403.89.

1 files changed, 19 insertions, 22 deletions

diff --git a/chromium/build/chromium.SlackBuild b/chromium/build/chromium.SlackBuild
index e7519ee6..b840f210 100755
--- a/chromium/build/chromium.SlackBuild
+++ b/chromium/build/chromium.SlackBuild
@@ -171,6 +171,9 @@
 # 43.0.2357.134-1:
 #              15/jul/2015 by Eric Hameleers <alien@slackware.com>
 #              * Update.
+# 44.0.2403.89-1:
+#              22/jul/2015 by Eric Hameleers <alien@slackware.com>
+#              * Update - first 44 release.
 # 
 # Run 'sh chromium.SlackBuild' to build a Slackware package.
 # The package (.txz) and .txt file as well as build logs are created in /tmp .
@@ -181,7 +184,7 @@
 SRCNAM=chromium
 SRCEXT=${SRCEXT:-""}             # could be "-dev" for development build
 PRGNAM=${SRCNAM}${SRCEXT}        # chromium or chromium-dev
-VERSION=${VERSION:-43.0.2357.134}
+VERSION=${VERSION:-44.0.2403.89}
 BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:" -j4 "}
 TAG=${TAG:-alien}
@@ -221,7 +224,7 @@ USE_HOTWORD=${USE_HOTWORD:-0}
 # as our chromium sources:
 # rpm2cpio ${SOURCE[1]} | cpio --to-stdout -i ./opt/google/chrome/chrome 2>&1 | strings | grep -C 1 " (version:" | tail -1
 RPMSUB=${RPMSUB:-"-1"}
-WIDEVINE_VERSION="1.4.8.823"   # CHROME_VERSION="43.0.2357.134"
+WIDEVINE_VERSION="1.4.8.823"   # CHROME_VERSION="44.0.2403.89"
 
 DOCS="AUTHORS DEPS LICENSE README*"
 
@@ -401,12 +404,6 @@ touch $OUTPUT/patch-${PRGNAM}.log
 # Enable VAAPI hardware decoding on Linux platform:
 cat $SRCDIR/patches/chromium_vaapi.patch | patch -p1 --verbose \
   2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
-# At compile-time, allow to disable 'Ok Google' hotwording feature,
-# which downloads a binary blob that can access your microphone if you allow it.
-# See https://code.google.com/p/chromium/issues/detail?id=491435
-# This patch will be included by default in Chromium 45.
-cat $SRCDIR/patches/chromium_hotwording.patch | patch -p1 --verbose \
-  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
 # Fix broken password manager on KDE, http://crbug.com/494229
 # This patch will be included in Chromium 45.
 cat $SRCDIR/patches/chromium_kde_pickles.patch | patch -p1 --verbose \
@@ -422,21 +419,15 @@ fi
 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:
+  # 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
   cat $SRCDIR/patches/chromium_widevine.patch \
     | sed -e "s/@WIDEVINE_VERSION@/$WIDEVINE_VERSION/" \
     | patch -p1 --verbose \
     2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
-  mkdir -p third_party/widevine/cdm/linux/${TARGETARCH}
-  cp third_party/widevine/cdm/widevine_cdm_*.h \
-    third_party/widevine/cdm/linux/${TARGETARCH}/
-  # Grab the Widevine CDM library from the Chrome .rpm package
-  # (the adapter library will be custom-built):
-  echo "Extracting libwidevinecdm.so from $(basename ${SOURCE[1]})"
-  rpm2cpio ${SOURCE[1]} \
-    | cpio -i --to-stdout ./opt/google/chrome${BINTREE}/libwidevinecdm.so 2>/dev/null \
-    > third_party/widevine/cdm/linux/${TARGETARCH}/libwidevinecdm.so
-  chmod 755 third_party/widevine/cdm/linux/${TARGETARCH}/libwidevinecdm.so
 fi
 
 if [ "x$SRCEXT" = "x-dev" ]; then
@@ -483,6 +474,7 @@ _chromium_conf=(
     -Denable_hotwording=${USE_HOTWORD}
     -Denable_pepper_cdms=1
     -Denable_webrtc=1
+    -Denable_widevine=${USE_CDM}
     -Dffmpeg_branding=Chrome
     -Dgoogle_api_key=$_google_api_key
     -Dgoogle_default_client_id=$_google_default_client_id
@@ -547,7 +539,8 @@ build/linux/unbundle/replace_gyp_files.py "${_chromium_conf[@]}" \
 build/gyp_chromium --depth=. "${_chromium_conf[@]}" \
   2>&1 | tee $OUTPUT/gyp-${PRGNAM}.log
 # Compile everything:
-ninja $NUMJOBS  -C out/Release chrome chrome_sandbox chromedriver
+ninja $NUMJOBS  -C out/Release \
+  chrome chrome_sandbox chromedriver widevinecdmadapter clearkeycdm
   2>&1 | tee $OUTPUT/ninja-${PRGNAM}.log
 
 # Manually install everything:
@@ -580,9 +573,10 @@ if [ ${USE_NACL} -eq 1 ]; then
     $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/
 fi
 if [ $USE_CDM -eq 1 ]; then
-  # Widevine CDM adapter:
+  # Widevine and ClearKey CDM adapter:
   cp -a \
     out/Release/libwidevinecdmadapter.so \
+    out/Release/libclearkeycdm.so \
     $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/
 fi
 
@@ -597,11 +591,14 @@ if [ ${USE_NACL} -eq 1 ]; then
 fi
 if [ ${USE_CDM} -eq 1 ]; then
   strip  --strip-unneeded \
-    $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/libwidevinecdmadapter.so
+    $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/libwidevinecdmadapter.so \
+    $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/libclearkeycdm.so
 fi
 
 # Add locales:
 cp -a out/Release/locales $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/
+cp -a out/Release/pseudo_locales $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/
+ln -s locales $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/remoting_locales
 
 # Add resource files:
 cp -a out/Release/resources $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/