[mythtv] Fix the build without reverting b9c5f8b2ff9
by Sérgio M. Basto
commit ac5b02012d6e8f4ba4e9d5d84fbd96f50317a832
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Wed Oct 17 16:37:14 2018 +0100
Fix the build without reverting b9c5f8b2ff9
b9c5f8b2ff983343d2545ec87022d18fcf65fe1f.patch | 144 -------------------------
mythtv.spec | 6 +-
2 files changed, 2 insertions(+), 148 deletions(-)
---
diff --git a/mythtv.spec b/mythtv.spec
index f131f92..3690dc9 100644
--- a/mythtv.spec
+++ b/mythtv.spec
@@ -81,7 +81,6 @@ License: GPLv2+ and LGPLv2+ and LGPLv2 and (GPLv2 or QPL) and (GPLv2+ or
URL: http://www.mythtv.org/
Source0: https://github.com/MythTV/%{name}/archive/v%{version}/%{name}-%{version}....
Patch0: https://github.com/MythTV/%{name}/compare/v%{version}..%{shorthash}.patch
-Patch10: b9c5f8b2ff983343d2545ec87022d18fcf65fe1f.patch
################################################################################
@@ -838,7 +837,6 @@ on demand content.
%prep
%setup -q -n %{name}-%{version}
%patch0 -p1
-%patch10 -p1 -R
# Remove compiled python file
#find -name *.pyc -exec rm -f {} \;
@@ -946,13 +944,13 @@ pushd mythplugins
echo "QMAKE_PROJECT_DEPTH = 0" >> settings.pro
find . -name \*.pro \
-exec sed -i -e "s,INCLUDEPATH += .\+/include/mythtv,INCLUDEPATH += $temp%{_includedir}/mythtv," {} \; \
- -exec sed -i -e "s,DEPLIBS = \$\${LIBDIR},DEPLIBS = $temp%{_libdir}," {} \; \
+ -exec sed -i -e "s,DEPLIBS = \$\${SYSROOT}\$\${LIBDIR},DEPLIBS = $temp%{_libdir}," {} \; \
-exec sed -i -e "s,\$\${PREFIX}/include/mythtv,$temp%{_includedir}/mythtv," {} \;
echo "INCLUDEPATH -= \$\${PREFIX}/include" >> settings.pro
echo "INCLUDEPATH -= \$\${SYSROOT}/\$\${PREFIX}/include" >> settings.pro
echo "INCLUDEPATH -= %{_includedir}" >> settings.pro
echo "INCLUDEPATH += $temp%{_includedir}" >> settings.pro
- echo "LIBS *= -L$temp%{_libdir}" >> settings.pro
+# echo "LIBS *= -L$temp%{_libdir}" >> settings.pro
echo "QMAKE_LIBDIR += $temp%{_libdir}" >> targetdep.pro
./configure \
5 years, 4 months
[mythtv] Clean up hacks that no longer affect the builds
by Sérgio M. Basto
commit 8c1dd37f31551b3a9143da7ec8d6c7481f864bb6
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Wed Oct 17 16:34:32 2018 +0100
Clean up hacks that no longer affect the builds
mythtv.spec | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
---
diff --git a/mythtv.spec b/mythtv.spec
index 6afad2a..f131f92 100644
--- a/mythtv.spec
+++ b/mythtv.spec
@@ -856,11 +856,6 @@ EOF
# Drop execute permissions on contrib bits, since they'll be %%doc
find contrib/ -type f -exec chmod -x "{}" \;
-# And drop execute bit on theme html files
- chmod -x themes/default/htmls/*.html
-
-# Nuke Windows and Mac OS X build scripts
- rm -rf contrib/Win32 contrib/OSX
# Put perl bits in the right place and set opt flags
sed -i -e 's#perl Makefile.PL#%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"#' \
@@ -869,10 +864,6 @@ EOF
# Install other source files
cp -a %{SOURCE10} .
cp -a %{SOURCE106} %{SOURCE107} %{SOURCE108} %{SOURCE109} .
-
-# Make sure we use -O2 and not -O3
- sed -i '/speed_cflags=/d' configure
-
popd
#pushd mythplugins
@@ -1019,7 +1010,7 @@ pushd mythplugins
--python=%{__python2} \
--enable-fftw
- make %{?_smp_mflags}
+%make_build
popd
%endif
5 years, 4 months
[gstreamer1-plugins-ugly] rebuild for x264 (rf#5071)
by Rex Dieter
commit 043a19edc0d189079422874fb8e666305f9cd24f
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Wed Nov 7 14:13:32 2018 -0600
rebuild for x264 (rf#5071)
gstreamer1-plugins-ugly.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/gstreamer1-plugins-ugly.spec b/gstreamer1-plugins-ugly.spec
index a325b3a..0d643b2 100644
--- a/gstreamer1-plugins-ugly.spec
+++ b/gstreamer1-plugins-ugly.spec
@@ -3,7 +3,7 @@
Summary: GStreamer 1.0 streaming media framework "ugly" plug-ins
Name: gstreamer1-plugins-ugly
Version: 1.14.4
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPLv2+
Group: Applications/Multimedia
URL: https://gstreamer.freedesktop.org/
@@ -106,6 +106,9 @@ rm -fv %{buildroot}%{_datadir}/gtk-doc/html/%{src_name}-plugins-1.0/*
%changelog
+* Wed Nov 07 2018 Rex Dieter <rdieter(a)fedoraproject.org> - 1.14.4-2
+- rebuild for x264 (rf#5071)
+
* Tue Oct 09 2018 Rex Dieter <rdieter(a)fedoraproject.org> - 1.14.4-1
- 1.14.4
5 years, 4 months
[chromium-vaapi/f28] Merge master: Switch to %%setup from %%autosetup because adding conditions on patch defines is wrong
by hellbanger
commit 96667a4af27658603dfaf48a1136661418106fbf
Author: Akarshan Biswas <akarshan.biswas(a)gmail.com>
Date: Wed Nov 7 19:37:17 2018 +0530
Merge master: Switch to %%setup from %%autosetup because adding conditions on patch defines is wrong
chromium-vaapi.spec | 35 +++++++++++++++++++++++++++--------
llvm-arflags.patch | 26 ++++++++++++++++++++++++++
2 files changed, 53 insertions(+), 8 deletions(-)
---
diff --git a/chromium-vaapi.spec b/chromium-vaapi.spec
index 53162ca..5395239 100644
--- a/chromium-vaapi.spec
+++ b/chromium-vaapi.spec
@@ -70,7 +70,7 @@
##############################Package Definitions######################################
Name: chromium-vaapi
Version: 70.0.3538.77
-Release: 2%{?dist}
+Release: 4%{?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
@@ -103,11 +103,9 @@ Source15: LICENSE
Patch1: enable-vaapi.patch
# Enable support for widevine
Patch2: widevine.patch
-%if %{clang}
#Will use any clang patch here
#Fix breaking builds caused by gcc_ar_wrapper.py from upstream
Patch7: llvm-arflags.patch
-%else
#Gcc patches area.
#Gcc produces way too many warnings. Try to silence some of it.
Patch8: silencegcc.patch
@@ -115,7 +113,6 @@ Patch8: silencegcc.patch
Patch9: chromium-gcc8-r588316.patch
Patch10: chromium-gcc8-r588547.patch
Patch11: chromium-gcc8-r589614.patch
-%endif
# More patches to fix chromium build here
# remove dependency on unrar. That's a nasty code.
Patch50: unrar.patch
@@ -123,10 +120,8 @@ Patch50: unrar.patch
Patch51: py2-bootstrap.patch
# Fix building with system icu
Patch52: chromium-system-icu.patch
-%if 0%{?fedora} >= 30
# Fix chromium build with harfbuzz 2 in rawhide
Patch53: chromium-harfbuzz2.patch
-%endif
# Let's brand chromium!
Patch54: brand.patch
# This build should be only available to amd64
@@ -209,7 +204,25 @@ Recommends: libva-intel-driver%{?_isa}
chromium-vaapi is an open-source web browser, powered by WebKit (Blink)
############################################PREP###########################################################
%prep
-%autosetup -n chromium-%{version} -p1
+%setup -q -n chromium-%{version}
+## Apply patches here ##
+%patch1 -p1 -b .vaapi
+%patch2 -p1 -b .widevine
+%if %{clang}
+%patch7 -p1 -b .llvmarflags
+%else
+%patch8 -p1 -b .silencegcc
+%patch9 -p1 -b .r588316
+%patch10 -p1 -b .r588547
+%patch11 -p1 -b .r589614
+%endif
+%patch50 -p1 -b .unrar
+%patch51 -p1 -b .py2boot
+%patch52 -p1 -b .icu
+%if 0%{?fedora} >= 30
+%patch53 -p1 -b .harfbuzz2
+%endif
+%patch54 -p1 -b .brand
#Let's change the default shebang of python files.
find -depth -type f -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(python\|env python\)[23]\?=#!%{__python2}=' {} +
./build/linux/unbundle/remove_bundled_libraries.py --do-remove \
@@ -631,7 +644,13 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda
%{chromiumdir}/locales/*.pak
#########################################changelogs#################################################
%changelog
-* Wed Nov 07 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 70.0.3538.77-2
+* Wed Nov 07 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 70.0.3538.77-4
+- Replace %%autosetup with %%setup and fix spec file because applying condition on patch defines is wrong.
+
+* Wed Nov 07 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 70.0.3538.77-3
+- Add a patch to fix building on rawhide with harfbuzz2
+
+* Tue Nov 06 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 70.0.3538.77-2
- Use correct branding in chromium
- update vaapi patch
diff --git a/llvm-arflags.patch b/llvm-arflags.patch
new file mode 100644
index 0000000..40bc529
--- /dev/null
+++ b/llvm-arflags.patch
@@ -0,0 +1,26 @@
+diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
+index 08939c54483d..a7008d7278b8 100644
+--- a/build/config/compiler/BUILD.gn
++++ b/build/config/compiler/BUILD.gn
+@@ -1688,7 +1688,7 @@ config("thin_archive") {
+ # have a "thin archive" mode (it does accept -T, but it means truncating
+ # archive names to 16 characters, which is not what we want).
+ if ((is_posix && !is_nacl && !is_mac && !is_ios) || is_fuchsia) {
+- arflags = [ "-T" ]
++ arflags = [ "T" ]
+ }
+ }
+
+diff --git a/build/toolchain/gcc_toolchain.gni b/build/toolchain/gcc_toolchain.gni
+index e7c88708c366..bdb8ab4d36a0 100644
+--- a/build/toolchain/gcc_toolchain.gni
++++ b/build/toolchain/gcc_toolchain.gni
+@@ -336,7 +336,7 @@ template("gcc_toolchain") {
+ } else {
+ rspfile = "{{output}}.rsp"
+ rspfile_content = "{{inputs}}"
+- command = "\"$ar\" {{arflags}} -r -c -s -D {{output}} @\"$rspfile\""
++ command = "\"$ar\" rcsD{{arflags}} {{output}} @\"$rspfile\""
+ }
+
+ # Remove the output file first so that ar doesn't try to modify the
5 years, 4 months
[chromium-vaapi/f29] Merge master: Switch to %%setup from %%autosetup because adding conditions on patch defines is wrong
by hellbanger
commit 50bd050b9d8daa445e2f9870d76b456d7c028c1c
Author: Akarshan Biswas <akarshan.biswas(a)gmail.com>
Date: Wed Nov 7 19:33:26 2018 +0530
Merge master: Switch to %%setup from %%autosetup because adding conditions on patch defines is wrong
chromium-vaapi.spec | 35 +++++++++++++++++++++++++++--------
llvm-arflags.patch | 26 ++++++++++++++++++++++++++
2 files changed, 53 insertions(+), 8 deletions(-)
---
diff --git a/chromium-vaapi.spec b/chromium-vaapi.spec
index 53162ca..5395239 100644
--- a/chromium-vaapi.spec
+++ b/chromium-vaapi.spec
@@ -70,7 +70,7 @@
##############################Package Definitions######################################
Name: chromium-vaapi
Version: 70.0.3538.77
-Release: 2%{?dist}
+Release: 4%{?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
@@ -103,11 +103,9 @@ Source15: LICENSE
Patch1: enable-vaapi.patch
# Enable support for widevine
Patch2: widevine.patch
-%if %{clang}
#Will use any clang patch here
#Fix breaking builds caused by gcc_ar_wrapper.py from upstream
Patch7: llvm-arflags.patch
-%else
#Gcc patches area.
#Gcc produces way too many warnings. Try to silence some of it.
Patch8: silencegcc.patch
@@ -115,7 +113,6 @@ Patch8: silencegcc.patch
Patch9: chromium-gcc8-r588316.patch
Patch10: chromium-gcc8-r588547.patch
Patch11: chromium-gcc8-r589614.patch
-%endif
# More patches to fix chromium build here
# remove dependency on unrar. That's a nasty code.
Patch50: unrar.patch
@@ -123,10 +120,8 @@ Patch50: unrar.patch
Patch51: py2-bootstrap.patch
# Fix building with system icu
Patch52: chromium-system-icu.patch
-%if 0%{?fedora} >= 30
# Fix chromium build with harfbuzz 2 in rawhide
Patch53: chromium-harfbuzz2.patch
-%endif
# Let's brand chromium!
Patch54: brand.patch
# This build should be only available to amd64
@@ -209,7 +204,25 @@ Recommends: libva-intel-driver%{?_isa}
chromium-vaapi is an open-source web browser, powered by WebKit (Blink)
############################################PREP###########################################################
%prep
-%autosetup -n chromium-%{version} -p1
+%setup -q -n chromium-%{version}
+## Apply patches here ##
+%patch1 -p1 -b .vaapi
+%patch2 -p1 -b .widevine
+%if %{clang}
+%patch7 -p1 -b .llvmarflags
+%else
+%patch8 -p1 -b .silencegcc
+%patch9 -p1 -b .r588316
+%patch10 -p1 -b .r588547
+%patch11 -p1 -b .r589614
+%endif
+%patch50 -p1 -b .unrar
+%patch51 -p1 -b .py2boot
+%patch52 -p1 -b .icu
+%if 0%{?fedora} >= 30
+%patch53 -p1 -b .harfbuzz2
+%endif
+%patch54 -p1 -b .brand
#Let's change the default shebang of python files.
find -depth -type f -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(python\|env python\)[23]\?=#!%{__python2}=' {} +
./build/linux/unbundle/remove_bundled_libraries.py --do-remove \
@@ -631,7 +644,13 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda
%{chromiumdir}/locales/*.pak
#########################################changelogs#################################################
%changelog
-* Wed Nov 07 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 70.0.3538.77-2
+* Wed Nov 07 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 70.0.3538.77-4
+- Replace %%autosetup with %%setup and fix spec file because applying condition on patch defines is wrong.
+
+* Wed Nov 07 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 70.0.3538.77-3
+- Add a patch to fix building on rawhide with harfbuzz2
+
+* Tue Nov 06 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 70.0.3538.77-2
- Use correct branding in chromium
- update vaapi patch
diff --git a/llvm-arflags.patch b/llvm-arflags.patch
new file mode 100644
index 0000000..40bc529
--- /dev/null
+++ b/llvm-arflags.patch
@@ -0,0 +1,26 @@
+diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
+index 08939c54483d..a7008d7278b8 100644
+--- a/build/config/compiler/BUILD.gn
++++ b/build/config/compiler/BUILD.gn
+@@ -1688,7 +1688,7 @@ config("thin_archive") {
+ # have a "thin archive" mode (it does accept -T, but it means truncating
+ # archive names to 16 characters, which is not what we want).
+ if ((is_posix && !is_nacl && !is_mac && !is_ios) || is_fuchsia) {
+- arflags = [ "-T" ]
++ arflags = [ "T" ]
+ }
+ }
+
+diff --git a/build/toolchain/gcc_toolchain.gni b/build/toolchain/gcc_toolchain.gni
+index e7c88708c366..bdb8ab4d36a0 100644
+--- a/build/toolchain/gcc_toolchain.gni
++++ b/build/toolchain/gcc_toolchain.gni
+@@ -336,7 +336,7 @@ template("gcc_toolchain") {
+ } else {
+ rspfile = "{{output}}.rsp"
+ rspfile_content = "{{inputs}}"
+- command = "\"$ar\" {{arflags}} -r -c -s -D {{output}} @\"$rspfile\""
++ command = "\"$ar\" rcsD{{arflags}} {{output}} @\"$rspfile\""
+ }
+
+ # Remove the output file first so that ar doesn't try to modify the
5 years, 4 months
[chromium-vaapi] Switch to %%setup from %%autosetup because adding conditions on patch defines is wrong
by hellbanger
commit 198824687d5270c7260e463fac7894961e7e1c24
Author: Akarshan Biswas <akarshan.biswas(a)gmail.com>
Date: Wed Nov 7 19:25:09 2018 +0530
Switch to %%setup from %%autosetup because adding conditions on patch defines is wrong
chromium-vaapi.spec | 30 +++++++++++++++++++++++-------
llvm-arflags.patch | 26 ++++++++++++++++++++++++++
2 files changed, 49 insertions(+), 7 deletions(-)
---
diff --git a/chromium-vaapi.spec b/chromium-vaapi.spec
index b63518c..5395239 100644
--- a/chromium-vaapi.spec
+++ b/chromium-vaapi.spec
@@ -70,7 +70,7 @@
##############################Package Definitions######################################
Name: chromium-vaapi
Version: 70.0.3538.77
-Release: 3%{?dist}
+Release: 4%{?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
@@ -103,11 +103,9 @@ Source15: LICENSE
Patch1: enable-vaapi.patch
# Enable support for widevine
Patch2: widevine.patch
-%if %{clang}
#Will use any clang patch here
#Fix breaking builds caused by gcc_ar_wrapper.py from upstream
Patch7: llvm-arflags.patch
-%else
#Gcc patches area.
#Gcc produces way too many warnings. Try to silence some of it.
Patch8: silencegcc.patch
@@ -115,7 +113,6 @@ Patch8: silencegcc.patch
Patch9: chromium-gcc8-r588316.patch
Patch10: chromium-gcc8-r588547.patch
Patch11: chromium-gcc8-r589614.patch
-%endif
# More patches to fix chromium build here
# remove dependency on unrar. That's a nasty code.
Patch50: unrar.patch
@@ -123,10 +120,8 @@ Patch50: unrar.patch
Patch51: py2-bootstrap.patch
# Fix building with system icu
Patch52: chromium-system-icu.patch
-%if 0%{?fedora} >= 30
# Fix chromium build with harfbuzz 2 in rawhide
Patch53: chromium-harfbuzz2.patch
-%endif
# Let's brand chromium!
Patch54: brand.patch
# This build should be only available to amd64
@@ -209,7 +204,25 @@ Recommends: libva-intel-driver%{?_isa}
chromium-vaapi is an open-source web browser, powered by WebKit (Blink)
############################################PREP###########################################################
%prep
-%autosetup -n chromium-%{version} -p1
+%setup -q -n chromium-%{version}
+## Apply patches here ##
+%patch1 -p1 -b .vaapi
+%patch2 -p1 -b .widevine
+%if %{clang}
+%patch7 -p1 -b .llvmarflags
+%else
+%patch8 -p1 -b .silencegcc
+%patch9 -p1 -b .r588316
+%patch10 -p1 -b .r588547
+%patch11 -p1 -b .r589614
+%endif
+%patch50 -p1 -b .unrar
+%patch51 -p1 -b .py2boot
+%patch52 -p1 -b .icu
+%if 0%{?fedora} >= 30
+%patch53 -p1 -b .harfbuzz2
+%endif
+%patch54 -p1 -b .brand
#Let's change the default shebang of python files.
find -depth -type f -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(python\|env python\)[23]\?=#!%{__python2}=' {} +
./build/linux/unbundle/remove_bundled_libraries.py --do-remove \
@@ -631,6 +644,9 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda
%{chromiumdir}/locales/*.pak
#########################################changelogs#################################################
%changelog
+* Wed Nov 07 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 70.0.3538.77-4
+- Replace %%autosetup with %%setup and fix spec file because applying condition on patch defines is wrong.
+
* Wed Nov 07 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 70.0.3538.77-3
- Add a patch to fix building on rawhide with harfbuzz2
diff --git a/llvm-arflags.patch b/llvm-arflags.patch
new file mode 100644
index 0000000..40bc529
--- /dev/null
+++ b/llvm-arflags.patch
@@ -0,0 +1,26 @@
+diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
+index 08939c54483d..a7008d7278b8 100644
+--- a/build/config/compiler/BUILD.gn
++++ b/build/config/compiler/BUILD.gn
+@@ -1688,7 +1688,7 @@ config("thin_archive") {
+ # have a "thin archive" mode (it does accept -T, but it means truncating
+ # archive names to 16 characters, which is not what we want).
+ if ((is_posix && !is_nacl && !is_mac && !is_ios) || is_fuchsia) {
+- arflags = [ "-T" ]
++ arflags = [ "T" ]
+ }
+ }
+
+diff --git a/build/toolchain/gcc_toolchain.gni b/build/toolchain/gcc_toolchain.gni
+index e7c88708c366..bdb8ab4d36a0 100644
+--- a/build/toolchain/gcc_toolchain.gni
++++ b/build/toolchain/gcc_toolchain.gni
+@@ -336,7 +336,7 @@ template("gcc_toolchain") {
+ } else {
+ rspfile = "{{output}}.rsp"
+ rspfile_content = "{{inputs}}"
+- command = "\"$ar\" {{arflags}} -r -c -s -D {{output}} @\"$rspfile\""
++ command = "\"$ar\" rcsD{{arflags}} {{output}} @\"$rspfile\""
+ }
+
+ # Remove the output file first so that ar doesn't try to modify the
5 years, 4 months
[chromium-freeworld] AUTO IMPORT FEDORA:70.0.3538.77; No. of merged commits:2
by hellbanger
commit 82e0b903bb3623e1906b3c877d4db61bbb47ef48
Author: Akarshan Biswas <akarshan.biswas(a)gmail.com>
Date: Wed Nov 7 17:06:24 2018 +0530
AUTO IMPORT FEDORA:70.0.3538.77; No. of merged commits:2
...m-70.0.3538.77-aarch64-arch-want-new-stat.patch | 12 ++++
chromium-70.0.3538.77-harfbuzz2-fix.patch | 80 ++++++++++++++++++++++
chromium-freeworld.spec | 15 +++-
sources | 2 +-
4 files changed, 107 insertions(+), 2 deletions(-)
---
diff --git a/chromium-70.0.3538.77-aarch64-arch-want-new-stat.patch b/chromium-70.0.3538.77-aarch64-arch-want-new-stat.patch
new file mode 100644
index 0000000..ccecfcb
--- /dev/null
+++ b/chromium-70.0.3538.77-aarch64-arch-want-new-stat.patch
@@ -0,0 +1,12 @@
+diff -up chromium-70.0.3538.77/sandbox/linux/system_headers/arm64_linux_syscalls.h.aarch64-new-stat chromium-70.0.3538.77/sandbox/linux/system_headers/arm64_linux_syscalls.h
+--- chromium-70.0.3538.77/sandbox/linux/system_headers/arm64_linux_syscalls.h.aarch64-new-stat 2018-11-06 13:27:05.118766581 -0500
++++ chromium-70.0.3538.77/sandbox/linux/system_headers/arm64_linux_syscalls.h 2018-11-06 13:27:34.575204504 -0500
+@@ -5,6 +5,8 @@
+ #ifndef SANDBOX_LINUX_SYSTEM_HEADERS_ARM64_LINUX_SYSCALLS_H_
+ #define SANDBOX_LINUX_SYSTEM_HEADERS_ARM64_LINUX_SYSCALLS_H_
+
++#define __ARCH_WANT_NEW_STAT
++
+ #include <asm-generic/unistd.h>
+
+ #if !defined(__NR_io_setup)
diff --git a/chromium-70.0.3538.77-harfbuzz2-fix.patch b/chromium-70.0.3538.77-harfbuzz2-fix.patch
new file mode 100644
index 0000000..2d5602d
--- /dev/null
+++ b/chromium-70.0.3538.77-harfbuzz2-fix.patch
@@ -0,0 +1,80 @@
+From 7ae38170a117e909bb28e1470842b68de3501197 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppymaster(a)gmail.com>
+Date: Sun, 21 Oct 2018 10:06:53 -0400
+Subject: [PATCH] blink: add 'const' modifier for harfbuzz hb_codepoint_t
+ pointers
+
+This resolves a build failure against harfbuzz 2.0.
+
+Based on a patch by Alexandre Fierreira.
+
+Bug: https://bugs.gentoo.org/669034
+---
+ .../renderer/platform/fonts/shaping/harfbuzz_face.cc | 2 +-
+ .../renderer/platform/fonts/skia/skia_text_metrics.cc | 9 +++++++--
+ .../renderer/platform/fonts/skia/skia_text_metrics.h | 2 +-
+ 3 files changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc b/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc
+index 8e7d91ca371f..e279a5876cb3 100644
+--- a/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc
++++ b/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc
+@@ -139,7 +139,7 @@ static hb_position_t HarfBuzzGetGlyphHorizontalAdvance(hb_font_t* hb_font,
+ static void HarfBuzzGetGlyphHorizontalAdvances(hb_font_t* font,
+ void* font_data,
+ unsigned count,
+- hb_codepoint_t* first_glyph,
++ const hb_codepoint_t* first_glyph,
+ unsigned int glyph_stride,
+ hb_position_t* first_advance,
+ unsigned int advance_stride,
+diff --git a/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc b/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc
+index 77ec6209fab9..9f9070921448 100644
+--- a/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc
++++ b/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc
+@@ -18,6 +18,11 @@ T* advance_by_byte_size(T* p, unsigned byte_size) {
+ return reinterpret_cast<T*>(reinterpret_cast<uint8_t*>(p) + byte_size);
+ }
+
++template <class T>
++T* advance_by_byte_size_const(T* p, unsigned byte_size) {
++ return reinterpret_cast<T*>(reinterpret_cast<const uint8_t*>(p) + byte_size);
++}
++
+ } // namespace
+
+ SkiaTextMetrics::SkiaTextMetrics(const SkPaint* paint) : paint_(paint) {
+@@ -39,7 +44,7 @@ void SkiaTextMetrics::GetGlyphWidthForHarfBuzz(hb_codepoint_t codepoint,
+ }
+
+ void SkiaTextMetrics::GetGlyphWidthForHarfBuzz(unsigned count,
+- hb_codepoint_t* glyphs,
++ const hb_codepoint_t* glyphs,
+ unsigned glyph_stride,
+ hb_position_t* advances,
+ unsigned advance_stride) {
+@@ -48,7 +53,7 @@ void SkiaTextMetrics::GetGlyphWidthForHarfBuzz(unsigned count,
+ // array that copy them to a regular array.
+ Vector<Glyph, 256> glyph_array(count);
+ for (unsigned i = 0; i < count;
+- i++, glyphs = advance_by_byte_size(glyphs, glyph_stride)) {
++ i++, glyphs = advance_by_byte_size_const(glyphs, glyph_stride)) {
+ glyph_array[i] = *glyphs;
+ }
+ Vector<SkScalar, 256> sk_width_array(count);
+diff --git a/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h b/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h
+index 787d8af0375a..3bc4407c641b 100644
+--- a/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h
++++ b/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h
+@@ -19,7 +19,7 @@ class SkiaTextMetrics final {
+
+ void GetGlyphWidthForHarfBuzz(hb_codepoint_t, hb_position_t* width);
+ void GetGlyphWidthForHarfBuzz(unsigned count,
+- hb_codepoint_t* first_glyph,
++ const hb_codepoint_t* first_glyph,
+ unsigned glyph_stride,
+ hb_position_t* first_advance,
+ unsigned advance_stride);
+--
+2.19.1
+
diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec
index b348a4b..d0d2b69 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.spec
@@ -146,7 +146,7 @@ Name: chromium%{chromium_channel}%{?freeworld:-freeworld}
Name: chromium%{chromium_channel}
%endif
Version: %{majorversion}.0.3538.77
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A WebKit (Blink) powered web browser
Url: http://www.chromium.org/Home
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)
@@ -283,6 +283,11 @@ Patch115: chromium-gcc8-r589614.patch
Patch116: chromium-gcc8-r591015.patch
# Disable fontconfig cache magic that breaks remoting
Patch117: chromium-70.0.3538.67-disable-fontconfig-cache-magic.patch
+# Fix build against harfbuzz2
+Patch118: chromium-70.0.3538.77-harfbuzz2-fix.patch
+# Fix aarch64 build against latest linux kernel headers
+Patch119: chromium-70.0.3538.77-aarch64-arch-want-new-stat.patch
+
# Use chromium-latest.py to generate clean tarball from released build tarballs, found here:
# http://build.chromium.org/buildbot/official/
@@ -824,6 +829,11 @@ udev.
%patch115 -p1 -b .r589614
%patch116 -p1 -b .r591015
%patch117 -p1 -b .nofc
+%if 0%{?fedora} >= 30
+%patch118 -p1 -b .harfbuzz2
+%endif
+%patch119 -p1 -b .aarch64-new-stat
+
# Change shebang in all relevant files in this directory and all subdirectories
# See `man find` for how the `-exec command {} +` syntax works
@@ -1790,6 +1800,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%changelog
+* Tue Nov 6 2018 Tom Callaway <spot(a)fedoraproject.org> - 70.0.3538.77-3
+- fix build with harfbuzz2 in rawhide
+
* Mon Nov 5 2018 Tom Callaway <spot(a)fedoraproject.org> - 70.0.3538.77-2
- drop jumbo_file_merge_limit to 8 to (hopefully) avoid OOMs on aarch64
diff --git a/sources b/sources
index d065a85..169ca25 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
a246a9c95308d8918db963731e553e70 chromium-70.0.3538.77.tar.xz
-ab69a5aedf20b83acbec195b42673cbf depot_tools.git-master.tar.gz
+4ba7b1e4ac89bc630809feac7a275d39 depot_tools.git-master.tar.gz
4d610887ff4d445cbc639aae7828d139 gelasio.zip
314394b29c1d15a73c3f00316003810a MuktiNarrow-0.94.tar.bz2
da72b7ad3a595d0140ceba60e867b9b7 Ahem.ttf
5 years, 4 months
[chromium-vaapi] Add a patch to fix building with harfbuzz2 on rawhide
by hellbanger
commit d6f0043fec579ffc8a26dae855af7d560ae570f6
Author: Akarshan Biswas <akarshan.biswas(a)gmail.com>
Date: Wed Nov 7 17:00:18 2018 +0530
Add a patch to fix building with harfbuzz2 on rawhide
chromium-vaapi.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/chromium-vaapi.spec b/chromium-vaapi.spec
index 53162ca..b63518c 100644
--- a/chromium-vaapi.spec
+++ b/chromium-vaapi.spec
@@ -70,7 +70,7 @@
##############################Package Definitions######################################
Name: chromium-vaapi
Version: 70.0.3538.77
-Release: 2%{?dist}
+Release: 3%{?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
@@ -631,7 +631,10 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda
%{chromiumdir}/locales/*.pak
#########################################changelogs#################################################
%changelog
-* Wed Nov 07 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 70.0.3538.77-2
+* Wed Nov 07 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 70.0.3538.77-3
+- Add a patch to fix building on rawhide with harfbuzz2
+
+* Tue Nov 06 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 70.0.3538.77-2
- Use correct branding in chromium
- update vaapi patch
5 years, 4 months
[chromium-vaapi/f28] Re brand chromium-vaapi and update vaapi patch
by hellbanger
commit 0a5b93c3da48ff7ee32b8c0341f8786f2776f9d9
Author: Akarshan Biswas <akarshan.biswas(a)gmail.com>
Date: Wed Nov 7 16:35:02 2018 +0530
Re brand chromium-vaapi and update vaapi patch
Signed-off-by: Akarshan Biswas <akarshan.biswas(a)gmail.com>
brand.patch | 25 +++++++++
chromium-harfbuzz2.patch | 80 +++++++++++++++++++++++++++
chromium-vaapi.spec | 14 ++++-
enable-vaapi.patch | 139 +++++++++++++++++++++++++++++------------------
4 files changed, 204 insertions(+), 54 deletions(-)
---
diff --git a/brand.patch b/brand.patch
new file mode 100644
index 0000000..002c423
--- /dev/null
+++ b/brand.patch
@@ -0,0 +1,25 @@
+From bfff7b95bb4d9ff20a3a67191dfffe25334f9dca Mon Sep 17 00:00:00 2001
+From: Akarshan Biswas <akarshan.biswas(a)gmail.com>
+Date: Wed, 7 Nov 2018 16:29:01 +0530
+Subject: [PATCH] Let's brand chromium-vaapi
+
+---
+ components/version_ui_strings.grdp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/components/version_ui_strings.grdp b/components/version_ui_strings.grdp
+index 6278a8a38..1611b4c80 100644
+--- a/components/version_ui_strings.grdp
++++ b/components/version_ui_strings.grdp
+@@ -7,7 +7,7 @@
+ Official Build
+ </message>
+ <message name="IDS_VERSION_UI_UNOFFICIAL" desc="unofficial build on the about:version page">
+- Developer Build
++ RPMFusion Build
+ </message>
+ <message name="IDS_VERSION_UI_32BIT" desc="32-bit on the chrome://version page">
+ (32-bit)
+--
+2.19.1
+
diff --git a/chromium-harfbuzz2.patch b/chromium-harfbuzz2.patch
new file mode 100644
index 0000000..2d5602d
--- /dev/null
+++ b/chromium-harfbuzz2.patch
@@ -0,0 +1,80 @@
+From 7ae38170a117e909bb28e1470842b68de3501197 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppymaster(a)gmail.com>
+Date: Sun, 21 Oct 2018 10:06:53 -0400
+Subject: [PATCH] blink: add 'const' modifier for harfbuzz hb_codepoint_t
+ pointers
+
+This resolves a build failure against harfbuzz 2.0.
+
+Based on a patch by Alexandre Fierreira.
+
+Bug: https://bugs.gentoo.org/669034
+---
+ .../renderer/platform/fonts/shaping/harfbuzz_face.cc | 2 +-
+ .../renderer/platform/fonts/skia/skia_text_metrics.cc | 9 +++++++--
+ .../renderer/platform/fonts/skia/skia_text_metrics.h | 2 +-
+ 3 files changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc b/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc
+index 8e7d91ca371f..e279a5876cb3 100644
+--- a/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc
++++ b/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc
+@@ -139,7 +139,7 @@ static hb_position_t HarfBuzzGetGlyphHorizontalAdvance(hb_font_t* hb_font,
+ static void HarfBuzzGetGlyphHorizontalAdvances(hb_font_t* font,
+ void* font_data,
+ unsigned count,
+- hb_codepoint_t* first_glyph,
++ const hb_codepoint_t* first_glyph,
+ unsigned int glyph_stride,
+ hb_position_t* first_advance,
+ unsigned int advance_stride,
+diff --git a/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc b/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc
+index 77ec6209fab9..9f9070921448 100644
+--- a/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc
++++ b/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc
+@@ -18,6 +18,11 @@ T* advance_by_byte_size(T* p, unsigned byte_size) {
+ return reinterpret_cast<T*>(reinterpret_cast<uint8_t*>(p) + byte_size);
+ }
+
++template <class T>
++T* advance_by_byte_size_const(T* p, unsigned byte_size) {
++ return reinterpret_cast<T*>(reinterpret_cast<const uint8_t*>(p) + byte_size);
++}
++
+ } // namespace
+
+ SkiaTextMetrics::SkiaTextMetrics(const SkPaint* paint) : paint_(paint) {
+@@ -39,7 +44,7 @@ void SkiaTextMetrics::GetGlyphWidthForHarfBuzz(hb_codepoint_t codepoint,
+ }
+
+ void SkiaTextMetrics::GetGlyphWidthForHarfBuzz(unsigned count,
+- hb_codepoint_t* glyphs,
++ const hb_codepoint_t* glyphs,
+ unsigned glyph_stride,
+ hb_position_t* advances,
+ unsigned advance_stride) {
+@@ -48,7 +53,7 @@ void SkiaTextMetrics::GetGlyphWidthForHarfBuzz(unsigned count,
+ // array that copy them to a regular array.
+ Vector<Glyph, 256> glyph_array(count);
+ for (unsigned i = 0; i < count;
+- i++, glyphs = advance_by_byte_size(glyphs, glyph_stride)) {
++ i++, glyphs = advance_by_byte_size_const(glyphs, glyph_stride)) {
+ glyph_array[i] = *glyphs;
+ }
+ Vector<SkScalar, 256> sk_width_array(count);
+diff --git a/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h b/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h
+index 787d8af0375a..3bc4407c641b 100644
+--- a/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h
++++ b/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h
+@@ -19,7 +19,7 @@ class SkiaTextMetrics final {
+
+ void GetGlyphWidthForHarfBuzz(hb_codepoint_t, hb_position_t* width);
+ void GetGlyphWidthForHarfBuzz(unsigned count,
+- hb_codepoint_t* first_glyph,
++ const hb_codepoint_t* first_glyph,
+ unsigned glyph_stride,
+ hb_position_t* first_advance,
+ unsigned advance_stride);
+--
+2.19.1
+
diff --git a/chromium-vaapi.spec b/chromium-vaapi.spec
index 95aff15..53162ca 100644
--- a/chromium-vaapi.spec
+++ b/chromium-vaapi.spec
@@ -70,7 +70,7 @@
##############################Package Definitions######################################
Name: chromium-vaapi
Version: 70.0.3538.77
-Release: 1%{?dist}
+Release: 2%{?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
@@ -123,6 +123,12 @@ Patch50: unrar.patch
Patch51: py2-bootstrap.patch
# Fix building with system icu
Patch52: chromium-system-icu.patch
+%if 0%{?fedora} >= 30
+# Fix chromium build with harfbuzz 2 in rawhide
+Patch53: chromium-harfbuzz2.patch
+%endif
+# Let's brand chromium!
+Patch54: brand.patch
# This build should be only available to amd64
ExclusiveArch: x86_64
########################################################################################
@@ -437,7 +443,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 Fedora Project"/' $FILE
+sed -i.orig -e 's/getenv("CHROME_VERSION_EXTRA")/"chromium-vaapi"/' $FILE
#####################################BUILD#############################################
%build
#export compilar variables
@@ -625,6 +631,10 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda
%{chromiumdir}/locales/*.pak
#########################################changelogs#################################################
%changelog
+* Wed Nov 07 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 70.0.3538.77-2
+- Use correct branding in chromium
+- update vaapi patch
+
* Fri Oct 26 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 70.0.3538.77-1
- Update to 70.0.3538.77
- Add a patch to fix building with system libicu
diff --git a/enable-vaapi.patch b/enable-vaapi.patch
index 2cb451e..6211000 100644
--- a/enable-vaapi.patch
+++ b/enable-vaapi.patch
@@ -1,46 +1,25 @@
-From a4d39ad4677cbc83c5e32a205d25c27beb84e13c Mon Sep 17 00:00:00 2001
-From: Akarshan Biswas <hellbanger(a)ga-lmt-s2.biswasab.org>
-Date: Fri, 19 Oct 2018 19:19:44 +0530
-Subject: [PATCH] Enable hardware video decoding and encoding using libva vaapi
+From 9eef10b939b9eee6e7bb58c4ca3a8e119df518c1 Mon Sep 17 00:00:00 2001
+From: Akarshan Biswas <akarshan.biswas(a)gmail.com>
+Date: Sun, 4 Nov 2018 20:26:54 +0530
+Subject: [PATCH] Enable vaapi on Linux
+
---
- chrome/browser/about_flags.cc | 14 +++++++-------
- chrome/browser/flag_descriptions.cc | 6 +++---
- chrome/browser/flag_descriptions.h | 8 ++++++--
+ chrome/browser/about_flags.cc | 14 +++++++------
+ chrome/browser/flag_descriptions.cc | 22 +++++++++++++-------
+ chrome/browser/flag_descriptions.h | 16 +++++++++-----
components/viz/service/main/viz_main_impl.cc | 2 +-
- content/gpu/BUILD.gn | 5 +++++
+ content/gpu/BUILD.gn | 6 ++++++
content/gpu/gpu_main.cc | 4 ++--
- gpu/config/software_rendering_list.json | 11 -----------
+ gpu/config/software_rendering_list.json | 11 ----------
media/base/media_switches.cc | 2 +-
media/filters/BUILD.gn | 3 ++-
media/gpu/BUILD.gn | 7 +++++++
- 10 files changed, 34 insertions(+), 28 deletions(-)
+ 10 files changed, 52 insertions(+), 35 deletions(-)
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
-index d029d0648..942f3627b 100644
+index d029d0648..39df8d6cf 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
-@@ -1386,18 +1386,18 @@ const FeatureEntry kFeatureEntries[] = {
- flag_descriptions::kUiPartialSwapDescription, kOsAll,
- SINGLE_DISABLE_VALUE_TYPE(switches::kUIDisablePartialSwap)},
- {"disable-webrtc-hw-decoding", flag_descriptions::kWebrtcHwDecodingName,
-- flag_descriptions::kWebrtcHwDecodingDescription, kOsAndroid | kOsCrOS,
-+ flag_descriptions::kWebrtcHwDecodingDescription, kOsAndroid | kOsCrOS | kOsLinux,
- SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWDecoding)},
- {"disable-webrtc-hw-encoding", flag_descriptions::kWebrtcHwEncodingName,
- flag_descriptions::kWebrtcHwEncodingDescription, kOsAndroid | kOsCrOS,
- SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWEncoding)},
- {"enable-webrtc-hw-h264-encoding",
- flag_descriptions::kWebrtcHwH264EncodingName,
-- flag_descriptions::kWebrtcHwH264EncodingDescription, kOsAndroid | kOsCrOS,
-+ flag_descriptions::kWebrtcHwH264EncodingDescription, kOsAndroid | kOsCrOS | kOsLinux,
- FEATURE_VALUE_TYPE(features::kWebRtcHWH264Encoding)},
- {"enable-webrtc-hw-vp8-encoding",
- flag_descriptions::kWebrtcHwVP8EncodingName,
-- flag_descriptions::kWebrtcHwVP8EncodingDescription, kOsAndroid | kOsCrOS,
-+ flag_descriptions::kWebrtcHwVP8EncodingDescription, kOsAndroid | kOsCrOS | kOsLinux,
- FEATURE_VALUE_TYPE(features::kWebRtcHWVP8Encoding)},
- #if !defined(OS_ANDROID)
- {"enable-webrtc-remote-event-log",
@@ -1775,7 +1775,7 @@ const FeatureEntry kFeatureEntries[] = {
"disable-accelerated-video-decode",
flag_descriptions::kAcceleratedVideoDecodeName,
@@ -66,8 +45,25 @@ index d029d0648..942f3627b 100644
{"v8-cache-options", flag_descriptions::kV8CacheOptionsName,
flag_descriptions::kV8CacheOptionsDescription, kOsAll,
MULTI_VALUE_TYPE(kV8CacheOptionsChoices)},
+@@ -4444,12 +4444,14 @@ const FeatureEntry kFeatureEntries[] = {
+ "AutofillDropdownLayout")},
+ #endif // OS_ANDROID
+
+-#if defined(OS_CHROMEOS)
++#if defined(OS_CHROMEOS) || defined(OS_LINUX)
+ {"enable-vaapi-jpeg-image-decode-acceleration",
+ flag_descriptions::kVaapiJpegImageDecodeAccelerationName,
+- flag_descriptions::kVaapiJpegImageDecodeAccelerationDescription, kOsCrOS,
++ flag_descriptions::kVaapiJpegImageDecodeAccelerationDescription, kOsCrOS | kOsLinux,
+ FEATURE_VALUE_TYPE(features::kVaapiJpegImageDecodeAcceleration)},
++#endif
+
++#if defined(OS_CHROMEOS)
+ {"enable-home-launcher-gestures",
+ flag_descriptions::kEnableHomeLauncherGesturesName,
+ flag_descriptions::kEnableHomeLauncherGesturesDescription, kOsCrOS,
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
-index 0cb812619..b53567008 100644
+index 0cb812619..df8ecb24e 100644
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -3053,9 +3053,9 @@ const char kTextSuggestionsTouchBarDescription[] =
@@ -75,46 +71,84 @@ index 0cb812619..b53567008 100644
#endif
-// Chrome OS -------------------------------------------------------------------
-+// Chrome OS and Linux-------------------------------------------------------------------
++// Chrome OS and Linux -------------------------------------------------------------------
-#if defined(OS_CHROMEOS)
+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
const char kAcceleratedMjpegDecodeName[] =
"Hardware-accelerated mjpeg decode for captured frame";
-@@ -3595,7 +3595,7 @@ const char kZipArchiverUnpackerName[] = "ZIP archiver - Unpacker";
- const char kZipArchiverUnpackerDescription[] =
- "Enable or disable the ability to unpack archives in incognito mode";
-
--#endif // defined(OS_CHROMEOS)
-+#endif // defined(OS_CHROMEOS) defined(OS_LINUX)
+@@ -3063,6 +3063,18 @@ const char kAcceleratedMjpegDecodeDescription[] =
+ "Enable hardware-accelerated mjpeg decode for captured frame where "
+ "available.";
- // Random platform combinations -----------------------------------------------
++const char kVaapiJpegImageDecodeAccelerationName[] =
++ "VA-API JPEG decode acceleration for images";
++const char kVaapiJpegImageDecodeAccelerationDescription[] =
++ "Enable or disable decode acceleration of JPEG images (as opposed to camera"
++ " captures) using the VA-API.";
++
++#endif // defined(OS_CHROMEOS) defined(OS_LINUX) and !defined(OS_ANDROID)
++
++// Only Chrome OS ------------------------------------------------------
++
++#if defined(OS_CHROMEOS)
++
+ const char kAllowTouchpadThreeFingerClickName[] = "Touchpad three-finger-click";
+ const char kAllowTouchpadThreeFingerClickDescription[] =
+ "Enables touchpad three-finger-click as middle button.";
+@@ -3564,12 +3576,6 @@ const char kUseMonitorColorSpaceDescription[] =
+ "Enables Chrome to use the color space information provided by the monitor"
+ " instead of the default sRGB color space.";
+-const char kVaapiJpegImageDecodeAccelerationName[] =
+- "VA-API JPEG decode acceleration for images";
+-const char kVaapiJpegImageDecodeAccelerationDescription[] =
+- "Enable or disable decode acceleration of JPEG images (as opposed to camera"
+- " captures) using the VA-API.";
+-
+ const char kVideoPlayerChromecastSupportName[] =
+ "Experimental Chromecast support for Video Player";
+ const char kVideoPlayerChromecastSupportDescription[] =
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
-index b3c5e5691..3306c5a27 100644
+index b3c5e5691..14d7e33e9 100644
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
-@@ -1846,13 +1846,17 @@ extern const char kPermissionPromptPersistenceToggleDescription[];
+@@ -1846,13 +1846,22 @@ extern const char kPermissionPromptPersistenceToggleDescription[];
#endif // defined(OS_MACOSX)
-// Chrome OS ------------------------------------------------------------------
++// Chrome OS and Linux ------------------------------------------------------------------
-#if defined(OS_CHROMEOS)
-+
-+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
++#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
extern const char kAcceleratedMjpegDecodeName[];
extern const char kAcceleratedMjpegDecodeDescription[];
++extern const char kVaapiJpegImageDecodeAccelerationName[];
++extern const char kVaapiJpegImageDecodeAccelerationDescription[];
++
+#endif
-+// Only Chrome OS ------------------------------------------------------------------
++
++// Chrome OS ----------------------------------------------------------------------
++
+#if defined(OS_CHROMEOS)
+
extern const char kAllowTouchpadThreeFingerClickName[];
extern const char kAllowTouchpadThreeFingerClickDescription[];
+@@ -2158,9 +2167,6 @@ extern const char kUseMashDescription[];
+ extern const char kUseMonitorColorSpaceName[];
+ extern const char kUseMonitorColorSpaceDescription[];
+
+-extern const char kVaapiJpegImageDecodeAccelerationName[];
+-extern const char kVaapiJpegImageDecodeAccelerationDescription[];
+-
+ extern const char kVideoPlayerChromecastSupportName[];
+ extern const char kVideoPlayerChromecastSupportDescription[];
+
diff --git a/components/viz/service/main/viz_main_impl.cc b/components/viz/service/main/viz_main_impl.cc
index 2196abef4..b4e0a1ae1 100644
--- a/components/viz/service/main/viz_main_impl.cc
@@ -129,7 +163,7 @@ index 2196abef4..b4e0a1ae1 100644
// type of process.
thread_options.priority = base::ThreadPriority::DISPLAY;
diff --git a/content/gpu/BUILD.gn b/content/gpu/BUILD.gn
-index 8974e441d..24b7acd3d 100644
+index 8974e441d..d7eba85a9 100644
--- a/content/gpu/BUILD.gn
+++ b/content/gpu/BUILD.gn
@@ -6,6 +6,7 @@ import("//build/config/jumbo.gni")
@@ -140,13 +174,14 @@ index 8974e441d..24b7acd3d 100644
import("//ui/ozone/ozone.gni")
# See //content/BUILD.gn for how this works.
-@@ -134,4 +135,8 @@ target(link_target_type, "gpu_sources") {
+@@ -134,4 +135,9 @@ target(link_target_type, "gpu_sources") {
(!is_chromecast || is_cast_desktop_build)) {
configs += [ "//build/config/linux/dri" ]
}
-+ # Use vaapi on desktop Linux builds when use_vaapi is set
++
++ # Use vaapi on desktop Linux builds when use_vaapi is set
+ if (is_desktop_linux && use_vaapi) {
-+ public_configs = [ "//media/gpu:libva_config" ]
++ public_configs = [ "//media/gpu:libva_config" ]
+ }
}
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
@@ -253,5 +288,5 @@ index 9ef4730a4..0c3a06c24 100644
}
--
-2.17.2
+2.19.1
5 years, 4 months