diff --git a/chromium.be0 b/chromium.be0 index 82b69cc72..b9b683523 100755 --- a/chromium.be0 +++ b/chromium.be0 @@ -1,10 +1,10 @@ #!/usr/bin/env beesh -# BEE_VERSION chromium-56.0.2924.87-1 +# BEE_VERSION chromium-58.0.3029.110-0 SRCURL[0]="https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${PKGVERSION}.tar.xz" -# PATCHURL+=() +PATCHURL[0]="http://www.linuxfromscratch.org/patches/blfs/svn/chromium-${PKGVERSION}-system_ffmpeg-1.patch" # EXCLUDE+=() @@ -52,43 +52,36 @@ launcher="chromium-launcher-3" #} mee_configure() { - #start_cmd sed "s/WIDEVINE_CDM_AVAILABLE/&\n\n#define WIDEVINE_CDM_VERSION_STRING \"Pinkie Pie\"/" \ - #-i ${S}/third_party/widevine/cdm/stub/widevine_cdm_version.h - - start_cmd sed 's/#include /&\n\n#if defined(MADV_FREE)\n#undef MADV_FREE\n#endif\n/' \ - -i ${S}/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp - - for LIB in flac harfbuzz-ng libwebp libxslt yasm; do + cd ${S} + for LIB in ffmpeg flac harfbuzz-ng libevent libpng \ + libjpeg libjpeg_turbo libwebp libxml libxslt yasm; do find -type f -path "*third_party/$LIB/*" \ \! -path "*third_party/$LIB/chromium/*" \ \! -path "*third_party/$LIB/google/*" \ + \! -path "*base/third_party/libevent/*" \ \! -regex '.*\.\(gn\|gni\|isolate\|py\)' \ -delete done start_cmd python ${S}/build/linux/unbundle/replace_gn_files.py \ - --system-libraries flac harfbuzz-ng libwebp libxslt yasm + --system-libraries ffmpeg flac harfbuzz-ng libevent libpng \ + libjpeg libwebp libxml libxslt yasm - # ninja compiler - #cd ${S} - #start_cmd git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git + start_cmd python ${S}/third_party/libaddressinput/chromium/tools/update-strings.py - #Widevine (Netflix) - #start_cmd wget http://mirror.glendaleacademy.org/chrome/pool/main/g/google-chrome-stable/google-chrome-stable_${PKGVERSION}-1_amd64.deb \ - #-O ${filedir}/widevine.deb + start_cmd sed "/internal\.cc',/a\ 'base/callback_helpers.cc'," \ + -i ${S}/tools/gn/bootstrap/bootstrap.py } mee_build() { - ## Chromium_build - #export PATH=${S}/depot_tools:${PATH} cd ${S} start_cmd python tools/gn/bootstrap/bootstrap.py --gn-gen-args "${GN_CONFIG[*]}" && out/Release/gn gen out/Release --args="${GN_CONFIG[*]}" + + start_cmd mkdir -p third_party/node/linux/node-linux-x64/bin + start_cmd ln -s /usr/local/package/bin/node third_party/node/linux/node-linux-x64/bin/ + start_cmd ninja ${BEE_MAKEFLAGS} -C out/Release chrome chrome_sandbox chromedriver - ## Chromium WideVine - #start_cmd mkdir widevine && cd widevine - #start_cmd ar -x ${filedir}/widevine.deb - #start_cmd tar -xf data.tar.xz -C ${S}/widevine } mee_install() { @@ -100,8 +93,6 @@ mee_install() { ${D}${LIBDIR}/chromium/chrome-sandbox start_cmd install -vDm755 out/Release/chromedriver \ ${D}${LIBDIR}/chromium/chromedriver - #start_cmd install -vm755 out/Release/libwidevinecdmadapter.so \ - #${D}${LIBDIR}/chromium/ start_cmd install -vDm644 out/Release/icudtl.dat ${D}${LIBDIR}/chromium start_cmd install -vDm644 out/Release/gen/content/content_resources.pak \ ${D}${LIBDIR}/chromium/ @@ -114,11 +105,6 @@ mee_install() { start_cmd ln -sv ${LIBDIR}/chromium/chromium usr/bin/chromium cd ${S} - ## install WideVine - #cd widevine - #start_cmd install -vm755 opt/google/chrome/libwidevinecdm.so ${D}${LIBDIR}/chromium/ - #cd .. - ## Desktop file for size in 16 32; do install -vDm644 \