diff options
| author |   Eric Hameleers <alien@slackware.com> | 2015-08-13 11:32:08 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2015-08-13 11:32:08 +0000 |
| commit | e10843be6be342d17611d6d6e2559b0f70832687 (patch) | |
| tree | 7d7b4bded570503cd31e680994c62af510e5b7d6 | |
| parent | 52e78a76e738b128f0ed141d315f7ce9eeaf9042 (diff) | |
| download | asb-e10843be6be342d17611d6d6e2559b0f70832687.tar.gz asb-e10843be6be342d17611d6d6e2559b0f70832687.tar.xz | |
chromium: re-align this script with the changes in chromium-dev
| -rwxr-xr-x | chromium/build/chromium.SlackBuild | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/chromium/build/chromium.SlackBuild b/chromium/build/chromium.SlackBuild index fa94d068..243780d4 100755 --- a/chromium/build/chromium.SlackBuild +++ b/chromium/build/chromium.SlackBuild @@ -228,7 +228,7 @@ 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 +# 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="44.0.2403.155" @@ -388,9 +388,11 @@ for (( i = 0; i < ${#SOURCE[*]}; i++ )) ; do fi done -if [ "$P1" == "--download" -a $USE_CDM -eq 1 ]; then +if [ "$P1" == "--download" ]; then echo "Download complete." - 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 @@ -544,7 +546,7 @@ build/gyp_chromium --depth=. "${_chromium_conf[@]}" \ 2>&1 | tee $OUTPUT/gyp-${PRGNAM}.log # Compile everything: ninja $NUMJOBS -C out/Release \ - chrome chrome_sandbox chromedriver widevinecdmadapter clearkeycdm \ + pdf chrome chrome_sandbox chromedriver widevinecdmadapter clearkeycdm \ 2>&1 | tee $OUTPUT/ninja-${PRGNAM}.log # Manually install everything: @@ -564,6 +566,11 @@ install -D out/Release/chromedriver $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/chrome cp -a \ out/Release/*.pak \ $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/ +if [ -f out/Release/libffmpeg*.so ]; then + cp -a \ + out/Release/libffmpeg*.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} \ @@ -588,6 +595,10 @@ fi strip --strip-unneeded \ $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/{${PRGNAM},chrome-sandbox} \ $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/chromedriver +if [ -f $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/libffmpeg*.so ]; then + strip --strip-unneeded \ + $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/libffmpeg*.so +fi if [ ${USE_NACL} -eq 1 ]; then strip --strip-unneeded \ $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/nacl_helper{,_bootstrap,_nonsfi} @@ -643,8 +654,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" \ |