summaryrefslogtreecommitdiffstats
path: root/chromium
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2015-06-23 20:45:20 +0000
committer Eric Hameleers <alien@slackware.com>2015-06-23 20:45:20 +0000
commite385088bdde56d9b13488862111307ff63eaeae5 (patch)
treec80a810f71549dea937edadf8fc78358ea860b5d /chromium
parent175f79ebede1b44f34890591c3874253bcd423fd (diff)
downloadasb-e385088bdde56d9b13488862111307ff63eaeae5.tar.gz
asb-e385088bdde56d9b13488862111307ff63eaeae5.tar.xz
chromium: updated to 43.0.2357.130.
Allow easy enabling of hotwording at compile-time. The package is built without hotwording, this cannot be changed at runtime.
Diffstat (limited to 'chromium')
-rwxr-xr-xchromium/build/chromium.SlackBuild26
1 files changed, 15 insertions, 11 deletions
diff --git a/chromium/build/chromium.SlackBuild b/chromium/build/chromium.SlackBuild
index e9c99488..0f3da090 100755
--- a/chromium/build/chromium.SlackBuild
+++ b/chromium/build/chromium.SlackBuild
@@ -159,6 +159,9 @@
# 43.0.2357.125-2:
# 19/jun/2015 by Eric Hameleers <alien@slackware.com>
# * Disable "OK Google" hotwording completely.
+# 43.0.2357.130-1:
+# 22/jun/2015 by Eric Hameleers <alien@slackware.com>
+# * Update.
#
# Run 'sh chromium.SlackBuild' to build a Slackware package.
# The package (.txz) and .txt file as well as build logs are created in /tmp .
@@ -169,8 +172,8 @@
SRCNAM=chromium
SRCEXT=${SRCEXT:-""} # could be "-dev" for development build
PRGNAM=${SRCNAM}${SRCEXT} # chromium or chromium-dev
-VERSION=${VERSION:-43.0.2357.125}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-43.0.2357.130}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:" -j4 "}
TAG=${TAG:-alien}
@@ -199,12 +202,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/chrome 2>&1 | strings | grep -C 1 " (version:" | tail -1
RPMSUB=${RPMSUB:-"-1"}
-WIDEVINE_VERSION="1.4.8.823" # CHROME_VERSION="43.0.2357.124"
+WIDEVINE_VERSION="1.4.8.823" # CHROME_VERSION="43.0.2357.130"
DOCS="AUTHORS DEPS LICENSE README*"
@@ -381,17 +389,13 @@ cd ${SRCNAM}-${VERSION}
# Patches:
touch $OUTPUT/patch-${PRGNAM}.log
-## Prevent crashes when accessing google.com and youtube.com just because
-## this is not an official build:
-#cat $SRCDIR/patches/chromium_secure_referrer.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 \
2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
-# At compile-time, disable 'Ok Google' hotwording feature, which downloads
-# a binary blob that can access your microphone if you allow it.
+# 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
-# Patch will be included by default in Chromium 45.
+# 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
@@ -463,7 +467,7 @@ export -n CFLAGS="$SLKCFLAGS -Wno-unused-local-typedefs"
_chromium_conf=(
${CLANG_OPTS}
-Ddisable_glibc=1
- -Denable_hotwording=0
+ -Denable_hotwording=${USE_HOTWORD}
-Denable_pepper_cdms=1
-Denable_webrtc=1
-Dffmpeg_branding=Chrome