chromium-84.0.4147.135 and clearkey dancing

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
+Version:	%{majorversion}.0.4147.135
-Release:	2%{?dist}
+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@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@fedoraproject.org> - 84.0.4147.125-2
 - force fix_textrels fix in ffmpeg for i686 (even without lld)
 

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