summaryrefslogtreecommitdiffstats
path: root/chromium
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2018-06-01 09:21:51 +0000
committer Eric Hameleers <alien@slackware.com>2018-06-01 09:21:51 +0000
commit197b550dee1d6d6cfd344a492f860a71a0b69e6d (patch)
treece2ebd4d04e94138f2347bd5bae3545355a75a33 /chromium
parent15c6d3de33fc735d57da59174b92c2cb65db1bac (diff)
downloadasb-197b550dee1d6d6cfd344a492f860a71a0b69e6d.tar.gz
asb-197b550dee1d6d6cfd344a492f860a71a0b69e6d.tar.xz
chromium: updated to 67.0.3396.62
Diffstat (limited to 'chromium')
-rwxr-xr-xchromium/build/chromium.SlackBuild22
1 files changed, 8 insertions, 14 deletions
diff --git a/chromium/build/chromium.SlackBuild b/chromium/build/chromium.SlackBuild
index 1fc0bb9b..0dc31ffe 100755
--- a/chromium/build/chromium.SlackBuild
+++ b/chromium/build/chromium.SlackBuild
@@ -332,6 +332,9 @@
# 66.0.3359.181-1:
# 18/may/2018 by Eric Hameleers <alien@slackware.com>
# * Update.
+# 67.0.3396.62-1:
+# 31/may/2018 by Eric Hameleers <alien@slackware.com>
+# * Update to M67.
#
#
# -----------------------------------------------------------------------------
@@ -345,7 +348,7 @@
SRCNAM=chromium
SRCEXT=${SRCEXT:-""} # could be "-dev" for development build
PRGNAM=${SRCNAM}${SRCEXT} # chromium or chromium-dev
-VERSION=${VERSION:-66.0.3359.181}
+VERSION=${VERSION:-67.0.3396.62}
BUILD=${BUILD:-1}
TAG=${TAG:-alien}
@@ -638,6 +641,9 @@ if [ $USE_CDM -eq 1 ]; then
# 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
+ # And since M67 we also need to explicitly enable linux as a supported OS:
+ sed -e 's/assert(!enable_widevine || is_win || is_mac || is_chromecast/& || is_linux/' \
+ -i third_party/widevine/cdm/BUILD.gn
fi
if [ "x$SRCEXT" = "x-dev" ]; then
@@ -870,7 +876,7 @@ export AR=ar
LC_ALL=C \
ninja -C out/Release \
- pdf chrome chrome_sandbox chromedriver widevinecdmadapter clear_key_cdm \
+ pdf chrome chrome_sandbox chromedriver \
2>&1 | tee $OUTPUT/ninja-${PRGNAM}.log
# Manually install everything:
@@ -913,13 +919,6 @@ if [ ${USE_NACL} -eq 1 ]; then
out/Release/nacl_irt_*.nexe \
$PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/
fi
-if [ $USE_CDM -eq 1 ]; then
- # Widevine and ClearKey CDM adapter:
- cp -a \
- out/Release/libwidevinecdmadapter.so \
- out/Release/libclearkeycdm.so \
- $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/
-fi
# Manually strip binaries so that 'nacl_irt_*.nexe' is left intact
strip --strip-unneeded \
@@ -936,11 +935,6 @@ 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}/libwidevinecdmadapter.so \
- $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/libclearkeycdm.so
-fi
# Add locales:
cp -a out/Release/locales $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/