Architecture specific change in rpms/chromium.git
by githook-noreply@fedoraproject.org
The package rpms/chromium.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/chromium.git/commit/?id=5b7a05d1c...
https://src.fedoraproject.org/cgit/rpms/chromium.git/commit/?id=df52619fe...
https://src.fedoraproject.org/cgit/rpms/chromium.git/commit/?id=c0e2de984...
https://src.fedoraproject.org/cgit/rpms/chromium.git/commit/?id=564a7a52e...
https://src.fedoraproject.org/cgit/rpms/chromium.git/commit/?id=9aa1f230c....
Change:
-%ifarch aarch64
+%ifarch aarch64
-%ifarch aarch64
+%ifarch aarch64
+%ifarch i686 aarch64
Thanks.
Full change:
============
commit 5b7a05d1c579fb881c86dadf44cd07a99ccc93dc
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Fri Aug 21 14:15:39 2020 -0400
more clearkey fixups
diff --git a/chromium-84.0.4147.125-aarch64-clearkeycdm-binutils-workaround.patch b/chromium-84.0.4147.125-aarch64-clearkeycdm-binutils-workaround.patch
new file mode 100644
index 0000000..778062c
--- /dev/null
+++ b/chromium-84.0.4147.125-aarch64-clearkeycdm-binutils-workaround.patch
@@ -0,0 +1,13 @@
+diff -up chromium-84.0.4147.125/third_party/ffmpeg/libavcodec/aarch64/videodsp.S.fixme chromium-84.0.4147.125/third_party/ffmpeg/libavcodec/aarch64/videodsp.S
+--- chromium-84.0.4147.125/third_party/ffmpeg/libavcodec/aarch64/videodsp.S.fixme 2020-08-21 15:49:55.565746419 +0000
++++ chromium-84.0.4147.125/third_party/ffmpeg/libavcodec/aarch64/videodsp.S 2020-08-21 15:50:55.592152015 +0000
+@@ -23,6 +23,8 @@ function ff_prefetch_aarch64, export=1
+ prfm pldl1strm, [x0]
+ prfm pldl1strm, [x0, x1]
+ add x0, x0, x1, lsl #1
+- b.gt X(ff_prefetch_aarch64)
++ b.le 1f
++ b X(ff_prefetch_aarch64)
++ 1:
+ ret
+ endfunc
diff --git a/chromium.spec b/chromium.spec
index f3d3ca5..7bc0267 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -28,11 +28,6 @@
# 2020-08-20: F33+ aarch64 has a binutils bug trying to link clear_key_cdm
# https://bugzilla.redhat.com/show_bug.cgi?id=1869884
%global build_clear_key_cdm 1
-%if 0%{?fedora} >= 33
-%ifarch aarch64
-%global build_clear_key_cdm 0
-%endif
-%endif
# Since no one liked replacing just the media components, we do not build shared anymore.
%global shared 0
@@ -306,6 +301,8 @@ Patch88: chromium-84.0.4147.105-gn-gcc-cleanup.patch
Patch89: chromium-84.0.4147.125-remoting-cstring.patch
# Apply fix_textrels hack for i686 (even without lld)
Patch90: chromium-84.0.4147.125-i686-fix_textrels.patch
+# Work around binutils bug in aarch64 (F33+)
+Patch91: chromium-84.0.4147.125-aarch64-clearkeycdm-binutils-workaround.patch
# Use lstdc++ on EPEL7 only
Patch101: chromium-75.0.3770.100-epel7-stdc++.patch
@@ -926,6 +923,7 @@ udev.
%patch88 -p1 -b .gn-gcc-cleanup
%patch89 -p1 -b .remoting-cstring
%patch90 -p1 -b .i686-textrels
+%patch91 -p1 -b .aarch64-clearkeycdm-binutils-workaround
# Fedora branded user agent
%if 0%{?fedora}
@@ -1566,7 +1564,15 @@ rm -rf %{buildroot}
cp -a xdg-mime xdg-settings %{buildroot}%{chromium_path}
cp -a MEIPreload %{buildroot}%{chromium_path}
%if %{build_clear_key_cdm}
- cp -a libclearkeycdm.so %{buildroot}%{chromium_path}
+ %ifarch i686
+ cp -a ClearKeyCdm/_platform_specific/linux_x86/libclearkeycdm.so %{buildroot}%{chromium_path}
+ %else
+ %ifarch x86_64
+ cp -a ClearKeyCdm/_platform_specific/linux_x64/libclearkeycdm.so %{buildroot}%{chromium_path}
+ %else
+ cp -a libclearkeycdm.so %{buildroot}%{chromium_path}
+ %endif
+ %endif
%endif
%if 0%{?shared}
commit 9854e97374c123a1ee58dca229f4eb850ed3cd7a
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Thu Aug 20 10:57:59 2020 -0400
update swiftshader llvm ver
diff --git a/chromium.spec b/chromium.spec
index 71ec0db..f3d3ca5 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -1311,7 +1311,7 @@ build/linux/unbundle/remove_bundled_libraries.py \
'third_party/swiftshader' \
'third_party/swiftshader/third_party/astc-encoder' \
'third_party/swiftshader/third_party/llvm-subzero' \
- 'third_party/swiftshader/third_party/llvm-7.0' \
+ 'third_party/swiftshader/third_party/llvm-10.0' \
'third_party/swiftshader/third_party/marl' \
'third_party/swiftshader/third_party/subzero' \
'third_party/swiftshader/third_party/SPIRV-Headers' \
commit df52619fe5fb51463367eeaf10a1846e66bc8c42
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Thu Aug 20 10:43:18 2020 -0400
chromium-84.0.4147.135 and clearkey dancing
diff --git a/chromium.spec b/chromium.spec
index bd4d3b9..71ec0db 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -25,6 +25,15 @@
# Practically, no. But it's here in case we do.
%global use_gold 0
+# 2020-08-20: F33+ aarch64 has a binutils bug trying to link clear_key_cdm
+# https://bugzilla.redhat.com/show_bug.cgi?id=1869884
+%global build_clear_key_cdm 1
+%if 0%{?fedora} >= 33
+%ifarch aarch64
+%global build_clear_key_cdm 0
+%endif
+%endif
+
# Since no one liked replacing just the media components, we do not build shared anymore.
%global shared 0
@@ -168,8 +177,8 @@ Name: chromium%{chromium_channel}%{nsuffix}
%else
Name: chromium%{chromium_channel}
%endif
-Version: %{majorversion}.0.4147.125
-Release: 2%{?dist}
+Version: %{majorversion}.0.4147.135
+Release: 1%{?dist}
%if %{?freeworld}
%if %{?shared}
# chromium-libs-media-freeworld
@@ -1493,7 +1502,9 @@ echo
%build_target %{builddir} chrome
%build_target %{builddir} chrome_sandbox
%build_target %{builddir} chromedriver
+%if %{build_clear_key_cdm}
%build_target %{builddir} clear_key_cdm
+%endif
%build_target %{builddir} policy_templates
%if %{build_remoting}
@@ -1554,6 +1565,10 @@ rm -rf %{buildroot}
cp -a v8_context_snapshot.bin %{buildroot}%{chromium_path}
cp -a xdg-mime xdg-settings %{buildroot}%{chromium_path}
cp -a MEIPreload %{buildroot}%{chromium_path}
+ %if %{build_clear_key_cdm}
+ cp -a libclearkeycdm.so %{buildroot}%{chromium_path}
+ %endif
+
%if 0%{?shared}
cp -a lib*.so* %{buildroot}%{chromium_path}
# cp -p %%{buildroot}%{chromium_path}/libwidevinecdm.so{,.fedora}
@@ -1785,6 +1800,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%if %{build_headless}
%{chromium_path}/headless_lib.pak
%endif
+%if %{build_clear_key_cdm}
+%{chromium_path}/libclearkeycdm.so
+%endif
# %%{chromium_path}/mus_app_resources_*.pak
%if 0
%{chromium_path}/pyproto/
@@ -1903,6 +1921,12 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%changelog
+* Thu Aug 20 2020 Tom Callaway <spot(a)fedoraproject.org> - 84.0.4147.135-1
+- update to 84.0.4147.135
+- conditionalize build_clear_key_cdm
+- disable build_clear_key_cdm on F33+ aarch64 until binutils bug is fixed
+- properly install libclearkeycdm.so everywhere else (whoops)
+
* Mon Aug 17 2020 Tom Callaway <spot(a)fedoraproject.org> - 84.0.4147.125-2
- force fix_textrels fix in ffmpeg for i686 (even without lld)
diff --git a/sources b/sources
index f19f7d2..cf6329f 100644
--- a/sources
+++ b/sources
@@ -18,4 +18,4 @@ SHA512 (Ahem.ttf) = aeb64b10ab9c87860714cb60b4900254b13dc52c51319256a1a3722c8820
SHA512 (node-v10.15.3-linux-x64.tar.gz) = 5eb544ef706562981340a82acc79e2162c6a3e4049b4a95f69ce353ee5b0f929c60b1fc457e8249b3fb0696f82fc28c5f543f5947db19fae4e9d5c21b906bb20
SHA512 (xcb-proto-1.14.tar.xz) = de66d568163b6da2be9d6c59984f3afa3acd119a781378638045fd68018665ef5c9af98f024e9962ba3eb7c7a4d85c27ba70ffafceb2324ccc6940f34de16690
SHA512 (depot_tools.git-master.tar.gz) = dc323888812b66cc92c53a24a8a58ccf9e2961be67aa21852bd091b8b49569071f06ae9104cb58950e6253ac3a29f0db0663e9f35ef2b1ea28696efb38b42708
-SHA512 (chromium-84.0.4147.125-clean.tar.xz) = 27ae5a6307e550f7cc431017e4336efea9e81808fd6e7ec2a1f3eada3c2eb84204ffb3ced11eb3fbf48e1d4407899aca9034da1e153609dd01ed57ab0e3fd448
+SHA512 (chromium-84.0.4147.135-clean.tar.xz) = a33c2717e3ef405ed2ba545d06137b7f88aa54872f3d846a7954562e7fe984132d6866bbdc72b2bff8b3d0fdbb124a395e429777af3b3e05210dcceb24e53c1f
commit c0e2de984a1fb4c7622766e39563341e1c5d24b1
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Mon Aug 17 12:35:12 2020 -0400
gold did not help anything
diff --git a/chromium.spec b/chromium.spec
index d047da6..bd4d3b9 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -22,12 +22,8 @@
%global use_vaapi 1
# Seems like we might need this sometimes
+# Practically, no. But it's here in case we do.
%global use_gold 0
-%if 0%{?fedora} >= 33
-%ifarch aarch64
-%global use_gold 1
-%endif
-%endif
# Since no one liked replacing just the media components, we do not build shared anymore.
%global shared 0
@@ -1908,7 +1904,6 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%changelog
* Mon Aug 17 2020 Tom Callaway <spot(a)fedoraproject.org> - 84.0.4147.125-2
-- try to link with gold on aarch64 (on F33+)
- force fix_textrels fix in ffmpeg for i686 (even without lld)
* Mon Aug 10 2020 Tom Callaway <spot(a)fedoraproject.org> - 84.0.4147.125-1
commit 564a7a52ea75feb407014dd6623952c89b4e2bff
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Mon Aug 17 09:39:18 2020 -0400
do not use gold on i686
diff --git a/chromium.spec b/chromium.spec
index 2b7ddb1..d047da6 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -24,7 +24,7 @@
# Seems like we might need this sometimes
%global use_gold 0
%if 0%{?fedora} >= 33
-%ifarch i686 aarch64
+%ifarch aarch64
%global use_gold 1
%endif
%endif
commit a0593985326592b21fa72f6b48662994a6c14898
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Mon Aug 17 09:38:01 2020 -0400
try gold only on aarch64, force fix_textrels fix in ffmpeg for i686 (even without lld)
diff --git a/chromium-84.0.4147.125-i686-fix_textrels.patch b/chromium-84.0.4147.125-i686-fix_textrels.patch
new file mode 100644
index 0000000..e0fd5ec
--- /dev/null
+++ b/chromium-84.0.4147.125-i686-fix_textrels.patch
@@ -0,0 +1,12 @@
+diff -up chromium-84.0.4147.125/third_party/ffmpeg/BUILD.gn.i686-textrels chromium-84.0.4147.125/third_party/ffmpeg/BUILD.gn
+--- chromium-84.0.4147.125/third_party/ffmpeg/BUILD.gn.i686-textrels 2020-08-17 09:33:53.153653741 -0400
++++ chromium-84.0.4147.125/third_party/ffmpeg/BUILD.gn 2020-08-17 09:34:25.099564669 -0400
+@@ -68,7 +68,7 @@ if (has_nasm_deps) {
+ }
+
+ # See comments on fix_textrels config.
+- if (use_lld && current_cpu == "x86" && !is_win) {
++ if (current_cpu == "x86" && !is_win) {
+ all_dependent_configs = [ ":fix_textrels" ]
+ }
+ }
diff --git a/chromium.spec b/chromium.spec
index 0730f98..2b7ddb1 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -299,6 +299,8 @@ Patch87: chromium-quiche-invalid-offsetof.patch
Patch88: chromium-84.0.4147.105-gn-gcc-cleanup.patch
# Fix missing cstring in remoting code
Patch89: chromium-84.0.4147.125-remoting-cstring.patch
+# Apply fix_textrels hack for i686 (even without lld)
+Patch90: chromium-84.0.4147.125-i686-fix_textrels.patch
# Use lstdc++ on EPEL7 only
Patch101: chromium-75.0.3770.100-epel7-stdc++.patch
@@ -918,6 +920,7 @@ udev.
%patch87 -p1 -b .quiche-invalid-offset
%patch88 -p1 -b .gn-gcc-cleanup
%patch89 -p1 -b .remoting-cstring
+%patch90 -p1 -b .i686-textrels
# Fedora branded user agent
%if 0%{?fedora}
@@ -1905,7 +1908,8 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%changelog
* Mon Aug 17 2020 Tom Callaway <spot(a)fedoraproject.org> - 84.0.4147.125-2
-- try to link with gold on i686/aarch64 (on F33+)
+- try to link with gold on aarch64 (on F33+)
+- force fix_textrels fix in ffmpeg for i686 (even without lld)
* Mon Aug 10 2020 Tom Callaway <spot(a)fedoraproject.org> - 84.0.4147.125-1
- update to 84.0.4147.125
commit e9424cdec426ad5790c292cdc18ff33d894896bb
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Mon Aug 17 09:04:29 2020 -0400
close conditional again
diff --git a/chromium.spec b/chromium.spec
index ee3ba7a..0730f98 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -1044,6 +1044,7 @@ CHROMIUM_CORE_GN_DEFINES+=' is_clang=false use_sysroot=false fieldtrial_testing_
CHROMIUM_CORE_GN_DEFINES+=' use_gold=true'
%else
CHROMIUM_CORE_GN_DEFINES+=' use_gold=false'
+%endif
%if %{freeworld}
CHROMIUM_CORE_GN_DEFINES+=' ffmpeg_branding="ChromeOS" proprietary_codecs=true'
commit f9baff2741cf4a660fdec3b75354e2946cdb17b9
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Mon Aug 17 09:02:50 2020 -0400
close conditional
diff --git a/chromium.spec b/chromium.spec
index a5a1e21..ee3ba7a 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -27,6 +27,7 @@
%ifarch i686 aarch64
%global use_gold 1
%endif
+%endif
# Since no one liked replacing just the media components, we do not build shared anymore.
%global shared 0
commit 9aa1f230c3b18fad73940b9fdef8e692eb39bbee
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Mon Aug 17 09:02:13 2020 -0400
try to link with gold on i686/aarch64 (on F33+)
diff --git a/chromium.spec b/chromium.spec
index 2da977d..a5a1e21 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -21,6 +21,13 @@
# We'd like to always have this on.
%global use_vaapi 1
+# Seems like we might need this sometimes
+%global use_gold 0
+%if 0%{?fedora} >= 33
+%ifarch i686 aarch64
+%global use_gold 1
+%endif
+
# Since no one liked replacing just the media components, we do not build shared anymore.
%global shared 0
@@ -165,7 +172,7 @@ Name: chromium%{chromium_channel}%{nsuffix}
Name: chromium%{chromium_channel}
%endif
Version: %{majorversion}.0.4147.125
-Release: 1%{?dist}
+Release: 2%{?dist}
%if %{?freeworld}
%if %{?shared}
# chromium-libs-media-freeworld
@@ -1031,7 +1038,12 @@ CHROMIUM_CORE_GN_DEFINES+=' is_debug=false'
CHROMIUM_CORE_GN_DEFINES+=' system_libdir="lib64"'
%endif
CHROMIUM_CORE_GN_DEFINES+=' google_api_key="%{api_key}" google_default_client_id="%{default_client_id}" google_default_client_secret="%{default_client_secret}"'
-CHROMIUM_CORE_GN_DEFINES+=' is_clang=false use_sysroot=false use_gold=false fieldtrial_testing_like_official_build=true use_lld=false rtc_enable_symbol_export=true'
+CHROMIUM_CORE_GN_DEFINES+=' is_clang=false use_sysroot=false fieldtrial_testing_like_official_build=true use_lld=false rtc_enable_symbol_export=true'
+%if %{use_gold}
+CHROMIUM_CORE_GN_DEFINES+=' use_gold=true'
+%else
+CHROMIUM_CORE_GN_DEFINES+=' use_gold=false'
+
%if %{freeworld}
CHROMIUM_CORE_GN_DEFINES+=' ffmpeg_branding="ChromeOS" proprietary_codecs=true'
%else
@@ -1890,6 +1902,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%changelog
+* Mon Aug 17 2020 Tom Callaway <spot(a)fedoraproject.org> - 84.0.4147.125-2
+- try to link with gold on i686/aarch64 (on F33+)
+
* Mon Aug 10 2020 Tom Callaway <spot(a)fedoraproject.org> - 84.0.4147.125-1
- update to 84.0.4147.125
3 years, 8 months
Architecture specific change in rpms/chromium.git
by githook-noreply@fedoraproject.org
The package rpms/chromium.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/chromium.git/commit/?id=5b7a05d1c...
https://src.fedoraproject.org/cgit/rpms/chromium.git/commit/?id=df52619fe...
https://src.fedoraproject.org/cgit/rpms/chromium.git/commit/?id=c0e2de984...
https://src.fedoraproject.org/cgit/rpms/chromium.git/commit/?id=564a7a52e...
https://src.fedoraproject.org/cgit/rpms/chromium.git/commit/?id=9aa1f230c....
Change:
-%ifarch aarch64
+%ifarch aarch64
-%ifarch aarch64
+%ifarch aarch64
+%ifarch i686 aarch64
Thanks.
Full change:
============
commit 5b7a05d1c579fb881c86dadf44cd07a99ccc93dc
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Fri Aug 21 14:15:39 2020 -0400
more clearkey fixups
diff --git a/chromium-84.0.4147.125-aarch64-clearkeycdm-binutils-workaround.patch b/chromium-84.0.4147.125-aarch64-clearkeycdm-binutils-workaround.patch
new file mode 100644
index 0000000..778062c
--- /dev/null
+++ b/chromium-84.0.4147.125-aarch64-clearkeycdm-binutils-workaround.patch
@@ -0,0 +1,13 @@
+diff -up chromium-84.0.4147.125/third_party/ffmpeg/libavcodec/aarch64/videodsp.S.fixme chromium-84.0.4147.125/third_party/ffmpeg/libavcodec/aarch64/videodsp.S
+--- chromium-84.0.4147.125/third_party/ffmpeg/libavcodec/aarch64/videodsp.S.fixme 2020-08-21 15:49:55.565746419 +0000
++++ chromium-84.0.4147.125/third_party/ffmpeg/libavcodec/aarch64/videodsp.S 2020-08-21 15:50:55.592152015 +0000
+@@ -23,6 +23,8 @@ function ff_prefetch_aarch64, export=1
+ prfm pldl1strm, [x0]
+ prfm pldl1strm, [x0, x1]
+ add x0, x0, x1, lsl #1
+- b.gt X(ff_prefetch_aarch64)
++ b.le 1f
++ b X(ff_prefetch_aarch64)
++ 1:
+ ret
+ endfunc
diff --git a/chromium.spec b/chromium.spec
index f3d3ca5..7bc0267 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -28,11 +28,6 @@
# 2020-08-20: F33+ aarch64 has a binutils bug trying to link clear_key_cdm
# https://bugzilla.redhat.com/show_bug.cgi?id=1869884
%global build_clear_key_cdm 1
-%if 0%{?fedora} >= 33
-%ifarch aarch64
-%global build_clear_key_cdm 0
-%endif
-%endif
# Since no one liked replacing just the media components, we do not build shared anymore.
%global shared 0
@@ -306,6 +301,8 @@ Patch88: chromium-84.0.4147.105-gn-gcc-cleanup.patch
Patch89: chromium-84.0.4147.125-remoting-cstring.patch
# Apply fix_textrels hack for i686 (even without lld)
Patch90: chromium-84.0.4147.125-i686-fix_textrels.patch
+# Work around binutils bug in aarch64 (F33+)
+Patch91: chromium-84.0.4147.125-aarch64-clearkeycdm-binutils-workaround.patch
# Use lstdc++ on EPEL7 only
Patch101: chromium-75.0.3770.100-epel7-stdc++.patch
@@ -926,6 +923,7 @@ udev.
%patch88 -p1 -b .gn-gcc-cleanup
%patch89 -p1 -b .remoting-cstring
%patch90 -p1 -b .i686-textrels
+%patch91 -p1 -b .aarch64-clearkeycdm-binutils-workaround
# Fedora branded user agent
%if 0%{?fedora}
@@ -1566,7 +1564,15 @@ rm -rf %{buildroot}
cp -a xdg-mime xdg-settings %{buildroot}%{chromium_path}
cp -a MEIPreload %{buildroot}%{chromium_path}
%if %{build_clear_key_cdm}
- cp -a libclearkeycdm.so %{buildroot}%{chromium_path}
+ %ifarch i686
+ cp -a ClearKeyCdm/_platform_specific/linux_x86/libclearkeycdm.so %{buildroot}%{chromium_path}
+ %else
+ %ifarch x86_64
+ cp -a ClearKeyCdm/_platform_specific/linux_x64/libclearkeycdm.so %{buildroot}%{chromium_path}
+ %else
+ cp -a libclearkeycdm.so %{buildroot}%{chromium_path}
+ %endif
+ %endif
%endif
%if 0%{?shared}
commit 9854e97374c123a1ee58dca229f4eb850ed3cd7a
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Thu Aug 20 10:57:59 2020 -0400
update swiftshader llvm ver
diff --git a/chromium.spec b/chromium.spec
index 71ec0db..f3d3ca5 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -1311,7 +1311,7 @@ build/linux/unbundle/remove_bundled_libraries.py \
'third_party/swiftshader' \
'third_party/swiftshader/third_party/astc-encoder' \
'third_party/swiftshader/third_party/llvm-subzero' \
- 'third_party/swiftshader/third_party/llvm-7.0' \
+ 'third_party/swiftshader/third_party/llvm-10.0' \
'third_party/swiftshader/third_party/marl' \
'third_party/swiftshader/third_party/subzero' \
'third_party/swiftshader/third_party/SPIRV-Headers' \
commit df52619fe5fb51463367eeaf10a1846e66bc8c42
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Thu Aug 20 10:43:18 2020 -0400
chromium-84.0.4147.135 and clearkey dancing
diff --git a/chromium.spec b/chromium.spec
index bd4d3b9..71ec0db 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -25,6 +25,15 @@
# Practically, no. But it's here in case we do.
%global use_gold 0
+# 2020-08-20: F33+ aarch64 has a binutils bug trying to link clear_key_cdm
+# https://bugzilla.redhat.com/show_bug.cgi?id=1869884
+%global build_clear_key_cdm 1
+%if 0%{?fedora} >= 33
+%ifarch aarch64
+%global build_clear_key_cdm 0
+%endif
+%endif
+
# Since no one liked replacing just the media components, we do not build shared anymore.
%global shared 0
@@ -168,8 +177,8 @@ Name: chromium%{chromium_channel}%{nsuffix}
%else
Name: chromium%{chromium_channel}
%endif
-Version: %{majorversion}.0.4147.125
-Release: 2%{?dist}
+Version: %{majorversion}.0.4147.135
+Release: 1%{?dist}
%if %{?freeworld}
%if %{?shared}
# chromium-libs-media-freeworld
@@ -1493,7 +1502,9 @@ echo
%build_target %{builddir} chrome
%build_target %{builddir} chrome_sandbox
%build_target %{builddir} chromedriver
+%if %{build_clear_key_cdm}
%build_target %{builddir} clear_key_cdm
+%endif
%build_target %{builddir} policy_templates
%if %{build_remoting}
@@ -1554,6 +1565,10 @@ rm -rf %{buildroot}
cp -a v8_context_snapshot.bin %{buildroot}%{chromium_path}
cp -a xdg-mime xdg-settings %{buildroot}%{chromium_path}
cp -a MEIPreload %{buildroot}%{chromium_path}
+ %if %{build_clear_key_cdm}
+ cp -a libclearkeycdm.so %{buildroot}%{chromium_path}
+ %endif
+
%if 0%{?shared}
cp -a lib*.so* %{buildroot}%{chromium_path}
# cp -p %%{buildroot}%{chromium_path}/libwidevinecdm.so{,.fedora}
@@ -1785,6 +1800,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%if %{build_headless}
%{chromium_path}/headless_lib.pak
%endif
+%if %{build_clear_key_cdm}
+%{chromium_path}/libclearkeycdm.so
+%endif
# %%{chromium_path}/mus_app_resources_*.pak
%if 0
%{chromium_path}/pyproto/
@@ -1903,6 +1921,12 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%changelog
+* Thu Aug 20 2020 Tom Callaway <spot(a)fedoraproject.org> - 84.0.4147.135-1
+- update to 84.0.4147.135
+- conditionalize build_clear_key_cdm
+- disable build_clear_key_cdm on F33+ aarch64 until binutils bug is fixed
+- properly install libclearkeycdm.so everywhere else (whoops)
+
* Mon Aug 17 2020 Tom Callaway <spot(a)fedoraproject.org> - 84.0.4147.125-2
- force fix_textrels fix in ffmpeg for i686 (even without lld)
diff --git a/sources b/sources
index f19f7d2..cf6329f 100644
--- a/sources
+++ b/sources
@@ -18,4 +18,4 @@ SHA512 (Ahem.ttf) = aeb64b10ab9c87860714cb60b4900254b13dc52c51319256a1a3722c8820
SHA512 (node-v10.15.3-linux-x64.tar.gz) = 5eb544ef706562981340a82acc79e2162c6a3e4049b4a95f69ce353ee5b0f929c60b1fc457e8249b3fb0696f82fc28c5f543f5947db19fae4e9d5c21b906bb20
SHA512 (xcb-proto-1.14.tar.xz) = de66d568163b6da2be9d6c59984f3afa3acd119a781378638045fd68018665ef5c9af98f024e9962ba3eb7c7a4d85c27ba70ffafceb2324ccc6940f34de16690
SHA512 (depot_tools.git-master.tar.gz) = dc323888812b66cc92c53a24a8a58ccf9e2961be67aa21852bd091b8b49569071f06ae9104cb58950e6253ac3a29f0db0663e9f35ef2b1ea28696efb38b42708
-SHA512 (chromium-84.0.4147.125-clean.tar.xz) = 27ae5a6307e550f7cc431017e4336efea9e81808fd6e7ec2a1f3eada3c2eb84204ffb3ced11eb3fbf48e1d4407899aca9034da1e153609dd01ed57ab0e3fd448
+SHA512 (chromium-84.0.4147.135-clean.tar.xz) = a33c2717e3ef405ed2ba545d06137b7f88aa54872f3d846a7954562e7fe984132d6866bbdc72b2bff8b3d0fdbb124a395e429777af3b3e05210dcceb24e53c1f
commit c0e2de984a1fb4c7622766e39563341e1c5d24b1
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Mon Aug 17 12:35:12 2020 -0400
gold did not help anything
diff --git a/chromium.spec b/chromium.spec
index d047da6..bd4d3b9 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -22,12 +22,8 @@
%global use_vaapi 1
# Seems like we might need this sometimes
+# Practically, no. But it's here in case we do.
%global use_gold 0
-%if 0%{?fedora} >= 33
-%ifarch aarch64
-%global use_gold 1
-%endif
-%endif
# Since no one liked replacing just the media components, we do not build shared anymore.
%global shared 0
@@ -1908,7 +1904,6 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%changelog
* Mon Aug 17 2020 Tom Callaway <spot(a)fedoraproject.org> - 84.0.4147.125-2
-- try to link with gold on aarch64 (on F33+)
- force fix_textrels fix in ffmpeg for i686 (even without lld)
* Mon Aug 10 2020 Tom Callaway <spot(a)fedoraproject.org> - 84.0.4147.125-1
commit 564a7a52ea75feb407014dd6623952c89b4e2bff
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Mon Aug 17 09:39:18 2020 -0400
do not use gold on i686
diff --git a/chromium.spec b/chromium.spec
index 2b7ddb1..d047da6 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -24,7 +24,7 @@
# Seems like we might need this sometimes
%global use_gold 0
%if 0%{?fedora} >= 33
-%ifarch i686 aarch64
+%ifarch aarch64
%global use_gold 1
%endif
%endif
commit a0593985326592b21fa72f6b48662994a6c14898
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Mon Aug 17 09:38:01 2020 -0400
try gold only on aarch64, force fix_textrels fix in ffmpeg for i686 (even without lld)
diff --git a/chromium-84.0.4147.125-i686-fix_textrels.patch b/chromium-84.0.4147.125-i686-fix_textrels.patch
new file mode 100644
index 0000000..e0fd5ec
--- /dev/null
+++ b/chromium-84.0.4147.125-i686-fix_textrels.patch
@@ -0,0 +1,12 @@
+diff -up chromium-84.0.4147.125/third_party/ffmpeg/BUILD.gn.i686-textrels chromium-84.0.4147.125/third_party/ffmpeg/BUILD.gn
+--- chromium-84.0.4147.125/third_party/ffmpeg/BUILD.gn.i686-textrels 2020-08-17 09:33:53.153653741 -0400
++++ chromium-84.0.4147.125/third_party/ffmpeg/BUILD.gn 2020-08-17 09:34:25.099564669 -0400
+@@ -68,7 +68,7 @@ if (has_nasm_deps) {
+ }
+
+ # See comments on fix_textrels config.
+- if (use_lld && current_cpu == "x86" && !is_win) {
++ if (current_cpu == "x86" && !is_win) {
+ all_dependent_configs = [ ":fix_textrels" ]
+ }
+ }
diff --git a/chromium.spec b/chromium.spec
index 0730f98..2b7ddb1 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -299,6 +299,8 @@ Patch87: chromium-quiche-invalid-offsetof.patch
Patch88: chromium-84.0.4147.105-gn-gcc-cleanup.patch
# Fix missing cstring in remoting code
Patch89: chromium-84.0.4147.125-remoting-cstring.patch
+# Apply fix_textrels hack for i686 (even without lld)
+Patch90: chromium-84.0.4147.125-i686-fix_textrels.patch
# Use lstdc++ on EPEL7 only
Patch101: chromium-75.0.3770.100-epel7-stdc++.patch
@@ -918,6 +920,7 @@ udev.
%patch87 -p1 -b .quiche-invalid-offset
%patch88 -p1 -b .gn-gcc-cleanup
%patch89 -p1 -b .remoting-cstring
+%patch90 -p1 -b .i686-textrels
# Fedora branded user agent
%if 0%{?fedora}
@@ -1905,7 +1908,8 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%changelog
* Mon Aug 17 2020 Tom Callaway <spot(a)fedoraproject.org> - 84.0.4147.125-2
-- try to link with gold on i686/aarch64 (on F33+)
+- try to link with gold on aarch64 (on F33+)
+- force fix_textrels fix in ffmpeg for i686 (even without lld)
* Mon Aug 10 2020 Tom Callaway <spot(a)fedoraproject.org> - 84.0.4147.125-1
- update to 84.0.4147.125
commit e9424cdec426ad5790c292cdc18ff33d894896bb
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Mon Aug 17 09:04:29 2020 -0400
close conditional again
diff --git a/chromium.spec b/chromium.spec
index ee3ba7a..0730f98 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -1044,6 +1044,7 @@ CHROMIUM_CORE_GN_DEFINES+=' is_clang=false use_sysroot=false fieldtrial_testing_
CHROMIUM_CORE_GN_DEFINES+=' use_gold=true'
%else
CHROMIUM_CORE_GN_DEFINES+=' use_gold=false'
+%endif
%if %{freeworld}
CHROMIUM_CORE_GN_DEFINES+=' ffmpeg_branding="ChromeOS" proprietary_codecs=true'
commit f9baff2741cf4a660fdec3b75354e2946cdb17b9
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Mon Aug 17 09:02:50 2020 -0400
close conditional
diff --git a/chromium.spec b/chromium.spec
index a5a1e21..ee3ba7a 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -27,6 +27,7 @@
%ifarch i686 aarch64
%global use_gold 1
%endif
+%endif
# Since no one liked replacing just the media components, we do not build shared anymore.
%global shared 0
commit 9aa1f230c3b18fad73940b9fdef8e692eb39bbee
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Mon Aug 17 09:02:13 2020 -0400
try to link with gold on i686/aarch64 (on F33+)
diff --git a/chromium.spec b/chromium.spec
index 2da977d..a5a1e21 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -21,6 +21,13 @@
# We'd like to always have this on.
%global use_vaapi 1
+# Seems like we might need this sometimes
+%global use_gold 0
+%if 0%{?fedora} >= 33
+%ifarch i686 aarch64
+%global use_gold 1
+%endif
+
# Since no one liked replacing just the media components, we do not build shared anymore.
%global shared 0
@@ -165,7 +172,7 @@ Name: chromium%{chromium_channel}%{nsuffix}
Name: chromium%{chromium_channel}
%endif
Version: %{majorversion}.0.4147.125
-Release: 1%{?dist}
+Release: 2%{?dist}
%if %{?freeworld}
%if %{?shared}
# chromium-libs-media-freeworld
@@ -1031,7 +1038,12 @@ CHROMIUM_CORE_GN_DEFINES+=' is_debug=false'
CHROMIUM_CORE_GN_DEFINES+=' system_libdir="lib64"'
%endif
CHROMIUM_CORE_GN_DEFINES+=' google_api_key="%{api_key}" google_default_client_id="%{default_client_id}" google_default_client_secret="%{default_client_secret}"'
-CHROMIUM_CORE_GN_DEFINES+=' is_clang=false use_sysroot=false use_gold=false fieldtrial_testing_like_official_build=true use_lld=false rtc_enable_symbol_export=true'
+CHROMIUM_CORE_GN_DEFINES+=' is_clang=false use_sysroot=false fieldtrial_testing_like_official_build=true use_lld=false rtc_enable_symbol_export=true'
+%if %{use_gold}
+CHROMIUM_CORE_GN_DEFINES+=' use_gold=true'
+%else
+CHROMIUM_CORE_GN_DEFINES+=' use_gold=false'
+
%if %{freeworld}
CHROMIUM_CORE_GN_DEFINES+=' ffmpeg_branding="ChromeOS" proprietary_codecs=true'
%else
@@ -1890,6 +1902,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%changelog
+* Mon Aug 17 2020 Tom Callaway <spot(a)fedoraproject.org> - 84.0.4147.125-2
+- try to link with gold on i686/aarch64 (on F33+)
+
* Mon Aug 10 2020 Tom Callaway <spot(a)fedoraproject.org> - 84.0.4147.125-1
- update to 84.0.4147.125
3 years, 8 months
Architecture specific change in rpms/chromium.git
by githook-noreply@fedoraproject.org
The package rpms/chromium.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/chromium.git/commit/?id=5b7a05d1c...
https://src.fedoraproject.org/cgit/rpms/chromium.git/commit/?id=df52619fe...
https://src.fedoraproject.org/cgit/rpms/chromium.git/commit/?id=c0e2de984...
https://src.fedoraproject.org/cgit/rpms/chromium.git/commit/?id=564a7a52e...
https://src.fedoraproject.org/cgit/rpms/chromium.git/commit/?id=9aa1f230c....
Change:
-%ifarch aarch64
+%ifarch aarch64
-%ifarch aarch64
+%ifarch aarch64
+%ifarch i686 aarch64
Thanks.
Full change:
============
commit 5b7a05d1c579fb881c86dadf44cd07a99ccc93dc
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Fri Aug 21 14:15:39 2020 -0400
more clearkey fixups
diff --git a/chromium-84.0.4147.125-aarch64-clearkeycdm-binutils-workaround.patch b/chromium-84.0.4147.125-aarch64-clearkeycdm-binutils-workaround.patch
new file mode 100644
index 0000000..778062c
--- /dev/null
+++ b/chromium-84.0.4147.125-aarch64-clearkeycdm-binutils-workaround.patch
@@ -0,0 +1,13 @@
+diff -up chromium-84.0.4147.125/third_party/ffmpeg/libavcodec/aarch64/videodsp.S.fixme chromium-84.0.4147.125/third_party/ffmpeg/libavcodec/aarch64/videodsp.S
+--- chromium-84.0.4147.125/third_party/ffmpeg/libavcodec/aarch64/videodsp.S.fixme 2020-08-21 15:49:55.565746419 +0000
++++ chromium-84.0.4147.125/third_party/ffmpeg/libavcodec/aarch64/videodsp.S 2020-08-21 15:50:55.592152015 +0000
+@@ -23,6 +23,8 @@ function ff_prefetch_aarch64, export=1
+ prfm pldl1strm, [x0]
+ prfm pldl1strm, [x0, x1]
+ add x0, x0, x1, lsl #1
+- b.gt X(ff_prefetch_aarch64)
++ b.le 1f
++ b X(ff_prefetch_aarch64)
++ 1:
+ ret
+ endfunc
diff --git a/chromium.spec b/chromium.spec
index f3d3ca5..7bc0267 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -28,11 +28,6 @@
# 2020-08-20: F33+ aarch64 has a binutils bug trying to link clear_key_cdm
# https://bugzilla.redhat.com/show_bug.cgi?id=1869884
%global build_clear_key_cdm 1
-%if 0%{?fedora} >= 33
-%ifarch aarch64
-%global build_clear_key_cdm 0
-%endif
-%endif
# Since no one liked replacing just the media components, we do not build shared anymore.
%global shared 0
@@ -306,6 +301,8 @@ Patch88: chromium-84.0.4147.105-gn-gcc-cleanup.patch
Patch89: chromium-84.0.4147.125-remoting-cstring.patch
# Apply fix_textrels hack for i686 (even without lld)
Patch90: chromium-84.0.4147.125-i686-fix_textrels.patch
+# Work around binutils bug in aarch64 (F33+)
+Patch91: chromium-84.0.4147.125-aarch64-clearkeycdm-binutils-workaround.patch
# Use lstdc++ on EPEL7 only
Patch101: chromium-75.0.3770.100-epel7-stdc++.patch
@@ -926,6 +923,7 @@ udev.
%patch88 -p1 -b .gn-gcc-cleanup
%patch89 -p1 -b .remoting-cstring
%patch90 -p1 -b .i686-textrels
+%patch91 -p1 -b .aarch64-clearkeycdm-binutils-workaround
# Fedora branded user agent
%if 0%{?fedora}
@@ -1566,7 +1564,15 @@ rm -rf %{buildroot}
cp -a xdg-mime xdg-settings %{buildroot}%{chromium_path}
cp -a MEIPreload %{buildroot}%{chromium_path}
%if %{build_clear_key_cdm}
- cp -a libclearkeycdm.so %{buildroot}%{chromium_path}
+ %ifarch i686
+ cp -a ClearKeyCdm/_platform_specific/linux_x86/libclearkeycdm.so %{buildroot}%{chromium_path}
+ %else
+ %ifarch x86_64
+ cp -a ClearKeyCdm/_platform_specific/linux_x64/libclearkeycdm.so %{buildroot}%{chromium_path}
+ %else
+ cp -a libclearkeycdm.so %{buildroot}%{chromium_path}
+ %endif
+ %endif
%endif
%if 0%{?shared}
commit 9854e97374c123a1ee58dca229f4eb850ed3cd7a
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Thu Aug 20 10:57:59 2020 -0400
update swiftshader llvm ver
diff --git a/chromium.spec b/chromium.spec
index 71ec0db..f3d3ca5 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -1311,7 +1311,7 @@ build/linux/unbundle/remove_bundled_libraries.py \
'third_party/swiftshader' \
'third_party/swiftshader/third_party/astc-encoder' \
'third_party/swiftshader/third_party/llvm-subzero' \
- 'third_party/swiftshader/third_party/llvm-7.0' \
+ 'third_party/swiftshader/third_party/llvm-10.0' \
'third_party/swiftshader/third_party/marl' \
'third_party/swiftshader/third_party/subzero' \
'third_party/swiftshader/third_party/SPIRV-Headers' \
commit df52619fe5fb51463367eeaf10a1846e66bc8c42
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Thu Aug 20 10:43:18 2020 -0400
chromium-84.0.4147.135 and clearkey dancing
diff --git a/chromium.spec b/chromium.spec
index bd4d3b9..71ec0db 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -25,6 +25,15 @@
# Practically, no. But it's here in case we do.
%global use_gold 0
+# 2020-08-20: F33+ aarch64 has a binutils bug trying to link clear_key_cdm
+# https://bugzilla.redhat.com/show_bug.cgi?id=1869884
+%global build_clear_key_cdm 1
+%if 0%{?fedora} >= 33
+%ifarch aarch64
+%global build_clear_key_cdm 0
+%endif
+%endif
+
# Since no one liked replacing just the media components, we do not build shared anymore.
%global shared 0
@@ -168,8 +177,8 @@ Name: chromium%{chromium_channel}%{nsuffix}
%else
Name: chromium%{chromium_channel}
%endif
-Version: %{majorversion}.0.4147.125
-Release: 2%{?dist}
+Version: %{majorversion}.0.4147.135
+Release: 1%{?dist}
%if %{?freeworld}
%if %{?shared}
# chromium-libs-media-freeworld
@@ -1493,7 +1502,9 @@ echo
%build_target %{builddir} chrome
%build_target %{builddir} chrome_sandbox
%build_target %{builddir} chromedriver
+%if %{build_clear_key_cdm}
%build_target %{builddir} clear_key_cdm
+%endif
%build_target %{builddir} policy_templates
%if %{build_remoting}
@@ -1554,6 +1565,10 @@ rm -rf %{buildroot}
cp -a v8_context_snapshot.bin %{buildroot}%{chromium_path}
cp -a xdg-mime xdg-settings %{buildroot}%{chromium_path}
cp -a MEIPreload %{buildroot}%{chromium_path}
+ %if %{build_clear_key_cdm}
+ cp -a libclearkeycdm.so %{buildroot}%{chromium_path}
+ %endif
+
%if 0%{?shared}
cp -a lib*.so* %{buildroot}%{chromium_path}
# cp -p %%{buildroot}%{chromium_path}/libwidevinecdm.so{,.fedora}
@@ -1785,6 +1800,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%if %{build_headless}
%{chromium_path}/headless_lib.pak
%endif
+%if %{build_clear_key_cdm}
+%{chromium_path}/libclearkeycdm.so
+%endif
# %%{chromium_path}/mus_app_resources_*.pak
%if 0
%{chromium_path}/pyproto/
@@ -1903,6 +1921,12 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%changelog
+* Thu Aug 20 2020 Tom Callaway <spot(a)fedoraproject.org> - 84.0.4147.135-1
+- update to 84.0.4147.135
+- conditionalize build_clear_key_cdm
+- disable build_clear_key_cdm on F33+ aarch64 until binutils bug is fixed
+- properly install libclearkeycdm.so everywhere else (whoops)
+
* Mon Aug 17 2020 Tom Callaway <spot(a)fedoraproject.org> - 84.0.4147.125-2
- force fix_textrels fix in ffmpeg for i686 (even without lld)
diff --git a/sources b/sources
index f19f7d2..cf6329f 100644
--- a/sources
+++ b/sources
@@ -18,4 +18,4 @@ SHA512 (Ahem.ttf) = aeb64b10ab9c87860714cb60b4900254b13dc52c51319256a1a3722c8820
SHA512 (node-v10.15.3-linux-x64.tar.gz) = 5eb544ef706562981340a82acc79e2162c6a3e4049b4a95f69ce353ee5b0f929c60b1fc457e8249b3fb0696f82fc28c5f543f5947db19fae4e9d5c21b906bb20
SHA512 (xcb-proto-1.14.tar.xz) = de66d568163b6da2be9d6c59984f3afa3acd119a781378638045fd68018665ef5c9af98f024e9962ba3eb7c7a4d85c27ba70ffafceb2324ccc6940f34de16690
SHA512 (depot_tools.git-master.tar.gz) = dc323888812b66cc92c53a24a8a58ccf9e2961be67aa21852bd091b8b49569071f06ae9104cb58950e6253ac3a29f0db0663e9f35ef2b1ea28696efb38b42708
-SHA512 (chromium-84.0.4147.125-clean.tar.xz) = 27ae5a6307e550f7cc431017e4336efea9e81808fd6e7ec2a1f3eada3c2eb84204ffb3ced11eb3fbf48e1d4407899aca9034da1e153609dd01ed57ab0e3fd448
+SHA512 (chromium-84.0.4147.135-clean.tar.xz) = a33c2717e3ef405ed2ba545d06137b7f88aa54872f3d846a7954562e7fe984132d6866bbdc72b2bff8b3d0fdbb124a395e429777af3b3e05210dcceb24e53c1f
commit c0e2de984a1fb4c7622766e39563341e1c5d24b1
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Mon Aug 17 12:35:12 2020 -0400
gold did not help anything
diff --git a/chromium.spec b/chromium.spec
index d047da6..bd4d3b9 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -22,12 +22,8 @@
%global use_vaapi 1
# Seems like we might need this sometimes
+# Practically, no. But it's here in case we do.
%global use_gold 0
-%if 0%{?fedora} >= 33
-%ifarch aarch64
-%global use_gold 1
-%endif
-%endif
# Since no one liked replacing just the media components, we do not build shared anymore.
%global shared 0
@@ -1908,7 +1904,6 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%changelog
* Mon Aug 17 2020 Tom Callaway <spot(a)fedoraproject.org> - 84.0.4147.125-2
-- try to link with gold on aarch64 (on F33+)
- force fix_textrels fix in ffmpeg for i686 (even without lld)
* Mon Aug 10 2020 Tom Callaway <spot(a)fedoraproject.org> - 84.0.4147.125-1
commit 564a7a52ea75feb407014dd6623952c89b4e2bff
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Mon Aug 17 09:39:18 2020 -0400
do not use gold on i686
diff --git a/chromium.spec b/chromium.spec
index 2b7ddb1..d047da6 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -24,7 +24,7 @@
# Seems like we might need this sometimes
%global use_gold 0
%if 0%{?fedora} >= 33
-%ifarch i686 aarch64
+%ifarch aarch64
%global use_gold 1
%endif
%endif
commit a0593985326592b21fa72f6b48662994a6c14898
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Mon Aug 17 09:38:01 2020 -0400
try gold only on aarch64, force fix_textrels fix in ffmpeg for i686 (even without lld)
diff --git a/chromium-84.0.4147.125-i686-fix_textrels.patch b/chromium-84.0.4147.125-i686-fix_textrels.patch
new file mode 100644
index 0000000..e0fd5ec
--- /dev/null
+++ b/chromium-84.0.4147.125-i686-fix_textrels.patch
@@ -0,0 +1,12 @@
+diff -up chromium-84.0.4147.125/third_party/ffmpeg/BUILD.gn.i686-textrels chromium-84.0.4147.125/third_party/ffmpeg/BUILD.gn
+--- chromium-84.0.4147.125/third_party/ffmpeg/BUILD.gn.i686-textrels 2020-08-17 09:33:53.153653741 -0400
++++ chromium-84.0.4147.125/third_party/ffmpeg/BUILD.gn 2020-08-17 09:34:25.099564669 -0400
+@@ -68,7 +68,7 @@ if (has_nasm_deps) {
+ }
+
+ # See comments on fix_textrels config.
+- if (use_lld && current_cpu == "x86" && !is_win) {
++ if (current_cpu == "x86" && !is_win) {
+ all_dependent_configs = [ ":fix_textrels" ]
+ }
+ }
diff --git a/chromium.spec b/chromium.spec
index 0730f98..2b7ddb1 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -299,6 +299,8 @@ Patch87: chromium-quiche-invalid-offsetof.patch
Patch88: chromium-84.0.4147.105-gn-gcc-cleanup.patch
# Fix missing cstring in remoting code
Patch89: chromium-84.0.4147.125-remoting-cstring.patch
+# Apply fix_textrels hack for i686 (even without lld)
+Patch90: chromium-84.0.4147.125-i686-fix_textrels.patch
# Use lstdc++ on EPEL7 only
Patch101: chromium-75.0.3770.100-epel7-stdc++.patch
@@ -918,6 +920,7 @@ udev.
%patch87 -p1 -b .quiche-invalid-offset
%patch88 -p1 -b .gn-gcc-cleanup
%patch89 -p1 -b .remoting-cstring
+%patch90 -p1 -b .i686-textrels
# Fedora branded user agent
%if 0%{?fedora}
@@ -1905,7 +1908,8 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%changelog
* Mon Aug 17 2020 Tom Callaway <spot(a)fedoraproject.org> - 84.0.4147.125-2
-- try to link with gold on i686/aarch64 (on F33+)
+- try to link with gold on aarch64 (on F33+)
+- force fix_textrels fix in ffmpeg for i686 (even without lld)
* Mon Aug 10 2020 Tom Callaway <spot(a)fedoraproject.org> - 84.0.4147.125-1
- update to 84.0.4147.125
commit e9424cdec426ad5790c292cdc18ff33d894896bb
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Mon Aug 17 09:04:29 2020 -0400
close conditional again
diff --git a/chromium.spec b/chromium.spec
index ee3ba7a..0730f98 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -1044,6 +1044,7 @@ CHROMIUM_CORE_GN_DEFINES+=' is_clang=false use_sysroot=false fieldtrial_testing_
CHROMIUM_CORE_GN_DEFINES+=' use_gold=true'
%else
CHROMIUM_CORE_GN_DEFINES+=' use_gold=false'
+%endif
%if %{freeworld}
CHROMIUM_CORE_GN_DEFINES+=' ffmpeg_branding="ChromeOS" proprietary_codecs=true'
commit f9baff2741cf4a660fdec3b75354e2946cdb17b9
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Mon Aug 17 09:02:50 2020 -0400
close conditional
diff --git a/chromium.spec b/chromium.spec
index a5a1e21..ee3ba7a 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -27,6 +27,7 @@
%ifarch i686 aarch64
%global use_gold 1
%endif
+%endif
# Since no one liked replacing just the media components, we do not build shared anymore.
%global shared 0
commit 9aa1f230c3b18fad73940b9fdef8e692eb39bbee
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Mon Aug 17 09:02:13 2020 -0400
try to link with gold on i686/aarch64 (on F33+)
diff --git a/chromium.spec b/chromium.spec
index 2da977d..a5a1e21 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -21,6 +21,13 @@
# We'd like to always have this on.
%global use_vaapi 1
+# Seems like we might need this sometimes
+%global use_gold 0
+%if 0%{?fedora} >= 33
+%ifarch i686 aarch64
+%global use_gold 1
+%endif
+
# Since no one liked replacing just the media components, we do not build shared anymore.
%global shared 0
@@ -165,7 +172,7 @@ Name: chromium%{chromium_channel}%{nsuffix}
Name: chromium%{chromium_channel}
%endif
Version: %{majorversion}.0.4147.125
-Release: 1%{?dist}
+Release: 2%{?dist}
%if %{?freeworld}
%if %{?shared}
# chromium-libs-media-freeworld
@@ -1031,7 +1038,12 @@ CHROMIUM_CORE_GN_DEFINES+=' is_debug=false'
CHROMIUM_CORE_GN_DEFINES+=' system_libdir="lib64"'
%endif
CHROMIUM_CORE_GN_DEFINES+=' google_api_key="%{api_key}" google_default_client_id="%{default_client_id}" google_default_client_secret="%{default_client_secret}"'
-CHROMIUM_CORE_GN_DEFINES+=' is_clang=false use_sysroot=false use_gold=false fieldtrial_testing_like_official_build=true use_lld=false rtc_enable_symbol_export=true'
+CHROMIUM_CORE_GN_DEFINES+=' is_clang=false use_sysroot=false fieldtrial_testing_like_official_build=true use_lld=false rtc_enable_symbol_export=true'
+%if %{use_gold}
+CHROMIUM_CORE_GN_DEFINES+=' use_gold=true'
+%else
+CHROMIUM_CORE_GN_DEFINES+=' use_gold=false'
+
%if %{freeworld}
CHROMIUM_CORE_GN_DEFINES+=' ffmpeg_branding="ChromeOS" proprietary_codecs=true'
%else
@@ -1890,6 +1902,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%changelog
+* Mon Aug 17 2020 Tom Callaway <spot(a)fedoraproject.org> - 84.0.4147.125-2
+- try to link with gold on i686/aarch64 (on F33+)
+
* Mon Aug 10 2020 Tom Callaway <spot(a)fedoraproject.org> - 84.0.4147.125-1
- update to 84.0.4147.125
3 years, 8 months
Architecture specific change in rpms/utox.git
by githook-noreply@fedoraproject.org
The package rpms/utox.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/utox.git/commit/?id=144e63fcda2b1....
Change:
+%ifnarch %{arm}
Thanks.
Full change:
============
commit 144e63fcda2b16e6cabb9cfe999bf4eec702b227
Author: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Mon Aug 24 16:33:42 2020 +0200
Disable tests on arm
Signed-off-by: Robert-André Mauchin <zebob.m(a)gmail.com>
diff --git a/utox.spec b/utox.spec
index f907fdd..b5f3dbf 100644
--- a/utox.spec
+++ b/utox.spec
@@ -52,7 +52,10 @@ install -Dp -m 644 %{SOURCE1} %{buildroot}/%{_datadir}/metainfo/%{name}.appdata.
rm -rf %{buildroot}/%{_datadir}/icons/hicolor/14x14
%check
+# Test "chrono" fails on armv7l
+%ifnarch %{arm}
%ctest
+%endif
desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}.appdata.xml
3 years, 8 months
Architecture specific change in rpms/utox.git
by githook-noreply@fedoraproject.org
The package rpms/utox.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/utox.git/commit/?id=144e63fcda2b1....
Change:
+%ifnarch %{arm}
Thanks.
Full change:
============
commit 144e63fcda2b16e6cabb9cfe999bf4eec702b227
Author: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Mon Aug 24 16:33:42 2020 +0200
Disable tests on arm
Signed-off-by: Robert-André Mauchin <zebob.m(a)gmail.com>
diff --git a/utox.spec b/utox.spec
index f907fdd..b5f3dbf 100644
--- a/utox.spec
+++ b/utox.spec
@@ -52,7 +52,10 @@ install -Dp -m 644 %{SOURCE1} %{buildroot}/%{_datadir}/metainfo/%{name}.appdata.
rm -rf %{buildroot}/%{_datadir}/icons/hicolor/14x14
%check
+# Test "chrono" fails on armv7l
+%ifnarch %{arm}
%ctest
+%endif
desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}.appdata.xml
3 years, 8 months
Architecture specific change in rpms/clevis-pin-tpm2.git
by githook-noreply@fedoraproject.org
The package rpms/clevis-pin-tpm2.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/clevis-pin-tpm2.git/commit/?id=13....
Change:
+ExcludeArch: s390x %{power64}
Thanks.
Full change:
============
commit 137e4ced8a0ec4d0d0f2a73ab28742f65c5001db
Author: Peter Robinson <pbrobinson(a)gmail.com>
Date: Mon Aug 24 11:37:44 2020 +0100
Initial import
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e704b1e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/clevis-pin-tpm2-*.tar.gz
diff --git a/clevis-pin-tpm2.spec b/clevis-pin-tpm2.spec
new file mode 100644
index 0000000..1eee2c3
--- /dev/null
+++ b/clevis-pin-tpm2.spec
@@ -0,0 +1,55 @@
+# Generated by rust2rpm
+%bcond_without check
+%global __cargo_skip_build 0
+%global __cargo_is_lib() false
+
+Name: clevis-pin-tpm2
+Version: 0.1.2
+Release: 1%{?dist}
+Summary: Clevis PIN for unlocking with TPM2 supporting Authorized Policies
+
+License: EUPL 1.2
+URL: https://github.com/fedora-iot/clevis-pin-tpm2/
+Source: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
+
+ExclusiveArch: %{rust_arches}
+# RHBZ 1869980
+ExcludeArch: s390x %{power64}
+
+BuildRequires: rust-packaging
+Requires: clevis
+
+%description
+%{summary}.
+
+%prep
+%autosetup -p1
+%cargo_prep
+
+%generate_buildrequires
+%cargo_generate_buildrequires
+
+%build
+%cargo_build
+
+%install
+%cargo_install
+
+%if %{with check}
+%check
+%cargo_test -- -- --skip real_ --skip loop_ --skip travis_
+%endif
+
+%files
+%license LICENSE
+%{_bindir}/clevis-pin-tpm2
+
+%changelog
+* Fri Aug 21 2020 Peter Robinson <pbrobinson(a)fedoraproject.org> - 0.1.2-1
+- Update to 0.1.2
+
+* Thu Aug 13 2020 Peter Robinson <pbrobinson(a)fedoraproject.org> - 0.1.1-1
+- Update to 0.1.1
+
+* Mon Aug 3 2020 Peter Robinson <pbrobinson(a)fedoraproject.org> 0.0.1-1
+- Initial release
diff --git a/sources b/sources
new file mode 100644
index 0000000..23fa70e
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (clevis-pin-tpm2-0.1.2.tar.gz) = c23983c38ea25e05c489fd6a41d00b4f3b75274edbc3fbb477d72e80d6e944fcb5e34eed99294c2b4d71bee6ccd06c71c061fb4e825cf1a22085117015942b82
3 years, 8 months
Architecture specific change in rpms/firefox.git
by githook-noreply@fedoraproject.org
The package rpms/firefox.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/firefox.git/commit/?id=706efcc2e9....
Change:
+%ifarch x86_64
Thanks.
Full change:
============
commit 706efcc2e9da11fc457669a5c939dade1b09f5d9
Author: Martin Stransky <stransky(a)redhat.com>
Date: Mon Aug 24 11:03:04 2020 +0200
Disabled PGO on aarch64 builds due to linking errors
diff --git a/firefox.spec b/firefox.spec
index aa2e672..c9443bc 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -35,7 +35,7 @@ ExcludeArch: s390x
# Build PGO+LTO on x86_64 and aarch64 only due to build issues
# on other arches.
%global build_with_pgo 0
-%ifarch x86_64 aarch64
+%ifarch x86_64
%if %{release_build}
%global build_with_pgo 1
%endif
3 years, 8 months
Architecture specific change in rpms/firefox.git
by githook-noreply@fedoraproject.org
The package rpms/firefox.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/firefox.git/commit/?id=706efcc2e9....
Change:
+%ifarch x86_64
Thanks.
Full change:
============
commit 706efcc2e9da11fc457669a5c939dade1b09f5d9
Author: Martin Stransky <stransky(a)redhat.com>
Date: Mon Aug 24 11:03:04 2020 +0200
Disabled PGO on aarch64 builds due to linking errors
diff --git a/firefox.spec b/firefox.spec
index aa2e672..c9443bc 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -35,7 +35,7 @@ ExcludeArch: s390x
# Build PGO+LTO on x86_64 and aarch64 only due to build issues
# on other arches.
%global build_with_pgo 0
-%ifarch x86_64 aarch64
+%ifarch x86_64
%if %{release_build}
%global build_with_pgo 1
%endif
3 years, 8 months
Architecture specific change in rpms/firefox.git
by githook-noreply@fedoraproject.org
The package rpms/firefox.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/firefox.git/commit/?id=706efcc2e9....
Change:
+%ifarch x86_64
Thanks.
Full change:
============
commit 706efcc2e9da11fc457669a5c939dade1b09f5d9
Author: Martin Stransky <stransky(a)redhat.com>
Date: Mon Aug 24 11:03:04 2020 +0200
Disabled PGO on aarch64 builds due to linking errors
diff --git a/firefox.spec b/firefox.spec
index aa2e672..c9443bc 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -35,7 +35,7 @@ ExcludeArch: s390x
# Build PGO+LTO on x86_64 and aarch64 only due to build issues
# on other arches.
%global build_with_pgo 0
-%ifarch x86_64 aarch64
+%ifarch x86_64
%if %{release_build}
%global build_with_pgo 1
%endif
3 years, 8 months
Architecture specific change in rpms/firefox.git
by githook-noreply@fedoraproject.org
The package rpms/firefox.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/firefox.git/commit/?id=706efcc2e9....
Change:
+%ifarch x86_64
Thanks.
Full change:
============
commit 706efcc2e9da11fc457669a5c939dade1b09f5d9
Author: Martin Stransky <stransky(a)redhat.com>
Date: Mon Aug 24 11:03:04 2020 +0200
Disabled PGO on aarch64 builds due to linking errors
diff --git a/firefox.spec b/firefox.spec
index aa2e672..c9443bc 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -35,7 +35,7 @@ ExcludeArch: s390x
# Build PGO+LTO on x86_64 and aarch64 only due to build issues
# on other arches.
%global build_with_pgo 0
-%ifarch x86_64 aarch64
+%ifarch x86_64
%if %{release_build}
%global build_with_pgo 1
%endif
3 years, 8 months