commit d918bbe2cd59bb430f0602203ce3b4e194d11282 Author: Akarshan Biswas <akarshan.biswas(a)gmail.com&gt; Date: Tue Feb 19 20:40:02 2019 +0530 Update to 72.0.3626.109 remove ozone patches .gitignore | 1 + chromium-dma-buf.patch | 22 - chromium-drm.patch | 14 - chromium-non-void-return.patch | 1670 ---- chromium-vaapi.sh | 3 +- chromium-vaapi.spec | 68 +- chromium-webrtc-includes.patch | 16754 --------------------------------------- fixvaapiozone.patch | 33 - gn-gold.patch | 10 +- sources | 2 +- system-gbm.patch | 229 - 11 files changed, 35 insertions(+), 18771 deletions(-) --- diff --git a/.gitignore b/.gitignore index 57c83f9..750ad4c 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /chromium-71.0.3578.80.tar.xz /chromium-71.0.3578.98.tar.xz /chromium-72.0.3626.81.tar.xz +/chromium-72.0.3626.109.tar.xz diff --git a/chromium-vaapi.sh b/chromium-vaapi.sh index 55514fd..eb017a5 100644 --- a/chromium-vaapi.sh +++ b/chromium-vaapi.sh @@ -52,7 +52,6 @@ exec < /dev/null exec > >(exec cat) exec 2> >(exec cat >&2) -export CHROME_VERSION_EXTRA="Built from source for Fedora 29" CHROMIUM_DISTRO_FLAGS+=" --enable-plugins \ --enable-extensions \ @@ -61,4 +60,4 @@ CHROMIUM_DISTRO_FLAGS+=" --enable-plugins \ --enable-gpu-rasterization \ --enable-sync" -exec -a "$0" "/usr/lib64/chromium-vaapi/$(basename "$0" | sed 's/\.sh$//')" $CHROMIUM_DISTRO_FLAGS "$@" +exec -a "$0" "@@CHROMIUMDIR@@/$(basename "$0" | sed 's/\.sh$//')" $CHROMIUM_DISTRO_FLAGS "$@" diff --git a/chromium-vaapi.spec b/chromium-vaapi.spec index a972301..55dfce3 100644 --- a/chromium-vaapi.spec +++ b/chromium-vaapi.spec @@ -3,8 +3,6 @@ %global freeworld 1 #This can be any folder on out %global target out/Release -#Our installation folder -%global chromiumdir %{_libdir}/chromium-vaapi ### Google API keys (see http://www.chromium.org/developers/how-tos/api-keys) ### Note: These are for Fedora use ONLY. ### For your own distribution, please get your own set of keys. @@ -71,8 +69,8 @@ %global ozone 0 ##############################Package Definitions###################################### Name: chromium-vaapi -Version: 72.0.3626.81 -Release: 2%{?dist} +Version: 72.0.3626.109 +Release: 1%{?dist} Summary: A Chromium web browser with video decoding acceleration License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2) URL: https://www.chromium.org/Home @@ -99,7 +97,9 @@ Source10: %{name}.sh Source11: %{name}.appdata.xml #Personal stuff Source15: LICENSE - +######################## Installation Folder ################################################# +#Our installation folder +%global chromiumdir %{_libdir}/%{name} ######################################################################################## #Compiler settings %if %{clang} @@ -211,15 +211,6 @@ Patch54: brand.patch # Taken and rebased from https://chromium-review.googlesource.com/c/chromium/src/+/1352519 # The patch might land somewhere in the future and will be removed. Patch56: relax-libva-version.patch -#This reverts commit https://github.com/Igalia/chromium/commit/816f0e1e5c15d7fce9389a428cbd49b... -Patch58: system-gbm.patch -# Possibly fixes vaapi ozone build https://github.com/Igalia/chromium/commit/0fba13c7fb502568c38de99ba41719c... -Patch59: fixvaapiozone.patch -# Fix webrtc include error -Patch60: chromium-webrtc-includes.patch -Patch61: chromium-non-void-return.patch -Patch62: chromium-dma-buf.patch -Patch63: chromium-drm.patch #Use gold in gn bootstrap Patch64: gn-gold.patch %description @@ -240,14 +231,6 @@ chromium-vaapi is an open-source web browser, powered by WebKit (Blink) %patch54 -p1 -b .brand %endif %patch56 -p1 -b .relaxva -%if %{ozone} -%patch58 -p1 -b .sysgbm -%patch59 -p1 -b .fixozonevaapi -%endif -%patch60 -p1 -b .webrtc -%patch61 -p1 -b .nonvoid -%patch62 -p1 -b .dma -%patch63 -p1 -b .drm %patch64 -p1 -b .gn #Let's change the default shebang of python files. find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(python\|env python\)[23]\?=#!%{__python2}=' {} + @@ -496,7 +479,7 @@ mkdir -p third_party/node/linux/node-linux-x64/bin ln -s %{_bindir}/node third_party/node/linux/node-linux-x64/bin/node # Hard code extra version FILE=chrome/common/channel_info_posix.cc -sed -i.orig -e 's/getenv("CHROME_VERSION_EXTRA")/"chromium-vaapi"/' $FILE +sed -i.orig -e 's/getenv("CHROME_VERSION_EXTRA")/"%{name}"/' $FILE #####################################BUILD############################################# %build #export compilar variables @@ -612,9 +595,8 @@ mkdir -p %{buildroot}%{_mandir}/man1 mkdir -p %{buildroot}%{_metainfodir} mkdir -p %{buildroot}%{_datadir}/applications mkdir -p %{buildroot}%{_datadir}/gnome-control-center/default-apps -sed -e "s|@@CHROMIUMDIR@@|%{chromiumdir}|" -e "s|@@BUILDTARGET@@|`cat /etc/redhat-release`|" \ - %{SOURCE10} > chromium-vaapi.sh -install -m 755 chromium-vaapi.sh %{buildroot}%{_bindir}/%{name} +sed -e "s|@@CHROMIUMDIR@@|%{chromiumdir}|" %{SOURCE10} > %{name}.sh +install -m 755 %{name}.sh %{buildroot}%{_bindir}/%{name} install -m 644 %{SOURCE11} %{buildroot}%{_metainfodir} sed -e "s|@@MENUNAME@@|%{name}|g" -e "s|@@PACKAGE@@|%{name}|g" \ chrome/app/resources/manpage.1.in > chrome.1 @@ -656,22 +638,22 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda %files %license LICENSE %doc AUTHORS -%{_bindir}/chromium-vaapi -%{_metainfodir}/chromium-vaapi.appdata.xml -%{_datadir}/applications/chromium-vaapi.desktop -%{_datadir}/gnome-control-center/default-apps/chromium-vaapi.xml -%{_datadir}/icons/hicolor/16x16/apps/chromium-vaapi.png -%{_datadir}/icons/hicolor/22x22/apps/chromium-vaapi.png -%{_datadir}/icons/hicolor/24x24/apps/chromium-vaapi.png -%{_datadir}/icons/hicolor/32x32/apps/chromium-vaapi.png -%{_datadir}/icons/hicolor/32x32/apps/chromium-vaapi.xpm -%{_datadir}/icons/hicolor/48x48/apps/chromium-vaapi.png -%{_datadir}/icons/hicolor/64x64/apps/chromium-vaapi.png -%{_datadir}/icons/hicolor/128x128/apps/chromium-vaapi.png -%{_datadir}/icons/hicolor/256x256/apps/chromium-vaapi.png -%{_mandir}/man1/chromium-vaapi.1.gz +%{_bindir}/%{name} +%{_metainfodir}/%{name}.appdata.xml +%{_datadir}/applications/%{name}.desktop +%{_datadir}/gnome-control-center/default-apps/%{name}.xml +%{_datadir}/icons/hicolor/16x16/apps/%{name}.png +%{_datadir}/icons/hicolor/22x22/apps/%{name}.png +%{_datadir}/icons/hicolor/24x24/apps/%{name}.png +%{_datadir}/icons/hicolor/32x32/apps/%{name}.png +%{_datadir}/icons/hicolor/32x32/apps/%{name}.xpm +%{_datadir}/icons/hicolor/48x48/apps/%{name}.png +%{_datadir}/icons/hicolor/64x64/apps/%{name}.png +%{_datadir}/icons/hicolor/128x128/apps/%{name}.png +%{_datadir}/icons/hicolor/256x256/apps/%{name}.png +%{_mandir}/man1/%{name}.1.gz %dir %{chromiumdir} -%{chromiumdir}/chromium-vaapi +%{chromiumdir}/%{name} %{chromiumdir}/chrome-sandbox %{chromiumdir}/chromedriver %if !%{with system_libicu} @@ -686,6 +668,10 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda %{chromiumdir}/locales/*.pak #########################################changelogs################################################# %changelog +* Tue Feb 19 2019 Akarshan Biswas <akarshanbiswas(a)fedoraproject.org&gt; 72.0.3626.109-1 +- Update to 72.0.3626.109 +- remove ozone patches + * Wed Feb 06 2019 Akarshan Biswas <akarshanbiswas(a)fedoraproject.org&gt; 72.0.3626.81-2 - Rebundle icu for fedora 29 and fedora 28; Need icu version >= 63.1 diff --git a/gn-gold.patch b/gn-gold.patch index 9b010bd..51057f7 100644 --- a/gn-gold.patch +++ b/gn-gold.patch @@ -1,4 +1,4 @@ -From 5f5d6cf6508f4d6ad98c24d73f38755a07ec8da4 Mon Sep 17 00:00:00 2001 +From 09ddf9ea6a9fee9f4e0de871bb58e294bce602c5 Mon Sep 17 00:00:00 2001 From: Akarshan Biswas <akarshan.biswas(a)gmail.com&gt; Date: Tue, 5 Feb 2019 14:46:38 +0530 Subject: [PATCH] Use gold in gn bootstrap @@ -8,17 +8,17 @@ Subject: [PATCH] Use gold in gn bootstrap 1 file changed, 1 insertion(+) diff --git a/tools/gn/build/gen.py b/tools/gn/build/gen.py -index ee4f8e146..3d866df2e 100755 +index 96dafb957..8a995e8eb 100755 --- a/tools/gn/build/gen.py +++ b/tools/gn/build/gen.py -@@ -317,6 +317,7 @@ def WriteGNNinja(path, platform, host, options): +@@ -322,6 +322,7 @@ def WriteGNNinja(path, platform, host, options): ldflags.extend([ '-static-libstdc++', '-Wl,--as-needed', + '-fuse-ld=gold', ]) - libs.extend([ - # These are needed by libc++. + # This is needed by libc++. + libs.append('-ldl') -- 2.20.1 diff --git a/sources b/sources index c03e537..cf0d9eb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ac57ccbec0aceee41101ac1255b3c14b chromium-72.0.3626.81.tar.xz +6cc44806be5e7b41727a04f7e7eb2545 chromium-72.0.3626.109.tar.xz