diff --git a/chromium.spec b/chromium.spec index 5fa7665..e8e3e93 100644 --- a/chromium.spec +++ b/chromium.spec @@ -2,8 +2,8 @@ %define gcc_patchset 2 Name: chromium Epoch: 3 -Version: 85.0.4183.83 -Release: 1mamba +Version: 86.0.4240.193 +Release: 2mamba Summary: An open-source browser project that aims to build a safer, faster, and more stable way to experience the web Group: Graphical Desktop/Applications/Internet Vendor: openmamba @@ -110,7 +110,6 @@ BuildRequires: llvm-tools BuildRequires: gn BuildRequires: clang BuildRequires: compiler-rt -BuildRequires: libpipewire02-devel Requires(post): %{__install_info} Requires: xdg-utils Requires: libvdpau-Mesa @@ -130,10 +129,38 @@ Chromium is an open-source browser project that aims to build a safer, faster, a %prep %setup -q -a2 #-D -T -#:<< _EOF + +%define _use_internal_dependency_generator 0 + +%define __find_provides %{_builddir}/%{name}-%{version}/find_provides.sh +cat > %{_builddir}/%{name}-%{version}/find_provides.sh <<_EOF +#! /bin/sh +grep -v %{buildroot}%{_libdir}/chromium | \ +%{_prefix}/lib/rpm/find-provides %{buildroot} %{_target_cpu} +_EOF +chmod +x %{_builddir}/%{name}-%{version}/find_provides.sh + +%define __find_requires %{_builddir}/%{name}-%{version}/find_requires.sh +cat > %{_builddir}/%{name}-%{version}/find_requires.sh <<_EOF +#! /bin/sh +%{_prefix}/lib/rpm/find-requires %{buildroot} %{_target_cpu} 2>/dev/null | +while read line; do + echo "\$line" +done +_EOF +chmod +x %{_builddir}/%{name}-%{version}/find_requires.sh + +:<< _EOF + +# Allow building against system libraries in official builds +sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \ + tools/generate_shim_headers/generate_shim_headers.py + # Apply gcc patches for liststdc++ mv chromium-patches-%{version} patches -cat patches/chromium-85-*.patch |patch -p1 +#cat patches/chromium-86-*.patch |patch -p1 +# Fixes for building with libstdc++ instead of libc++ +patch -Np1 -i patches/chromium-86-nearby-include.patch %patch19 -p1 %patch28 -p1 @@ -150,7 +177,7 @@ cat patches/chromium-85-*.patch |patch -p1 #%patch63 -p1 -d v8 #%patch64 -p1 #%patch65 -p1 -%patch66 -p1 +#%patch66 -p1 #%patch67 -p1 #%patch68 -p1 #%patch69 -p1 @@ -196,7 +223,7 @@ declare -rgA _system_libs=( [opus]=opus [re2]=re2 [snappy]=snappy - [zlib]=libminizip + [zlib]=libminizip1 ) _unwanted_bundled_libs=( @@ -305,6 +332,8 @@ install -d -m0755 %{buildroot}%{_libdir}/chromium/ %{buildroot}%{_bindir} install -m0755 out/Release/chrome %{buildroot}%{_libdir}/chromium/chromium install -m0755 out/Release/chrome_sandbox %{buildroot}%{_libdir}/chromium/chrome-sandbox install -m0755 out/Release/chromedriver %{buildroot}%{_libdir}/chromium/chromedriver +install -m0755 out/Release/libEGL.so %{buildroot}%{_libdir}/chromium/libEGL.so +install -m0755 out/Release/libGLESv2.so %{buildroot}%{_libdir}/chromium/libGLESv2.so #install -m0755 out/Release/libwidevinecdm.so %{buildroot}%{_libdir}/chromium/libwidevinecdm.so #install -m0755 out/Release/libwidevinecdmadapter.so %{buildroot}%{_libdir}/chromium/libwidevinecdmadapter.so cp out/Release/*.bin %{buildroot}%{_libdir}/chromium/ @@ -416,6 +445,8 @@ ln -s %{_libdir}/chromium/chromedriver %{buildroot}%{_bindir}/chromedriver %{_libdir}/chromium/chrome-wrapper %attr(4755,root,root) %{_libdir}/chromium/chrome-sandbox #%{_libdir}/chromium/icudtl.dat +%{_libdir}/chromium/libEGL.so +%{_libdir}/chromium/libGLESv2.so #%{_libdir}/chromium/libwidevinecdm.so #%{_libdir}/chromium/libwidevinecdmadapter.so %{_libdir}/chromium/master_preferences @@ -428,6 +459,12 @@ ln -s %{_libdir}/chromium/chromedriver %{buildroot}%{_bindir}/chromedriver %{_mandir}/man1/chromium.1* %changelog +* Fri Nov 13 2020 Silvan Calarco 86.0.4240.193-2mamba +- install internal libEGL.so and libGLESv2.so to fix gpu acceleration support + +* Wed Nov 11 2020 Automatic Build System 86.0.4240.193-1mamba +- automatic version update by autodist + * Tue Sep 01 2020 Silvan Calarco 85.0.4183.83-1mamba - update to 85.0.4183.83