diff options
Diffstat (limited to 'chromium-dev/build/chromium-dev.SlackBuild')
-rwxr-xr-x | chromium-dev/build/chromium-dev.SlackBuild | 33 |
1 files changed, 24 insertions, 9 deletions
diff --git a/chromium-dev/build/chromium-dev.SlackBuild b/chromium-dev/build/chromium-dev.SlackBuild index 7a78172e..fec20bd0 100755 --- a/chromium-dev/build/chromium-dev.SlackBuild +++ b/chromium-dev/build/chromium-dev.SlackBuild @@ -64,6 +64,9 @@ # 46.0.2478.0-1: # 12/aug/2015 by Eric Hameleers <alien@slackware.com> # * Update. +# 48.0.2535.0-1: +# 16/oct/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 . @@ -74,9 +77,8 @@ SRCNAM=chromium SRCEXT=${SRCEXT:-"-dev"} # "-dev" = development build; "" = stable build PRGNAM=${SRCNAM}${SRCEXT} # chromium or chromium-dev -VERSION=${VERSION:-46.0.2478.0} +VERSION=${VERSION:-48.0.2535.0} BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:" -j4 "} TAG=${TAG:-alien} # Differentiate between stable and development releases: @@ -92,6 +94,10 @@ else BINTREE="" fi +# By default the ffmpeg library is built statically into the chromium binary. +# You can also build a shared library libffmpeg.so (formerly libffmpegsumo.so): +USE_FFMPEG=${USE_FFMPEG:-shared} # other option is "static" + # You can build without NaCl (native client) if you set USE_NACL to "0", # but you'll lose some Chrome functionality like using in-browser applications: USE_NACL=${USE_NACL:-1} @@ -307,7 +313,7 @@ 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. @@ -362,6 +368,7 @@ _chromium_conf=( -Denable_webrtc=1 -Denable_widevine=${USE_CDM} -Dffmpeg_branding=Chrome + -Dffmpeg_component=${USE_FFMPEG}_library -Dgoogle_api_key=$_google_api_key -Dgoogle_default_client_id=$_google_default_client_id -Dgoogle_default_client_secret=$_google_default_client_secret @@ -428,7 +435,7 @@ 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 \ +ninja -C out/Release \ pdf chrome chrome_sandbox chromedriver widevinecdmadapter clearkeycdm \ 2>&1 | tee $OUTPUT/ninja-${PRGNAM}.log @@ -449,10 +456,15 @@ 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/libffmpegsumo.so ]; then +if [ -f out/Release/libffmpeg*.so ]; then cp -a \ - out/Release/libffmpegsumo.so \ + out/Release/libffmpeg*.so \ $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/ +elif [ -f out/Release/lib/libffmpeg.so ]; then + mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/lib/ + cp -a \ + out/Release/lib/libffmpeg.so \ + $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/lib/ fi if [ -f out/Release/natives_blob.bin ]; then cp -a \ @@ -478,9 +490,12 @@ 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}/libffmpegsumo.so ]; then +if [ -f $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/libffmpeg*.so ]; then + strip --strip-unneeded \ + $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/libffmpeg*.so +elif [ -f $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/lib/libffmpeg*.so ]; then strip --strip-unneeded \ - $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/libffmpegsumo.so + $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/lib/libffmpeg*.so fi if [ ${USE_NACL} -eq 1 ]; then strip --strip-unneeded \ @@ -537,7 +552,7 @@ install -D -m0644 \ # Move the 'default' file into place. # This allows users to override command-line options: -mkdir -p $PKG/etc/${PRGNAM} +mkdir -p $PKG/etc/${PRGNAM} cat $SRCDIR/${PRGNAM}.default | sed \ -e "s/@PRGNAM@/${PRGNAM}/g" \ -e "s/@SRCEXT@/${SRCEXT}/g" \ |