8:48 p.m.
commit 4bca8d3763df185bcb21dd289d46759d6c9654cc
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Fri Jul 22 14:24:09 2016 -0400
actually fix compile against cups 2.2, add widevine compatibility support
chromium-52.0.2743.82-cups22.patch | 11 +++++++++++
chromium-52.0.2743.82-widevinefix.patch | 25 +++++++++++++++++++++++++
chromium.spec | 9 ++++++++-
3 files changed, 44 insertions(+), 1 deletion(-)
---
diff --git a/chromium-52.0.2743.82-cups22.patch b/chromium-52.0.2743.82-cups22.patch
index 63d5116..ac0700a 100644
--- a/chromium-52.0.2743.82-cups22.patch
+++ b/chromium-52.0.2743.82-cups22.patch
@@ -1,3 +1,14 @@
+diff -up chromium-52.0.2743.82/printing/backend/print_backend_cups.cc.cups22
chromium-52.0.2743.82/printing/backend/print_backend_cups.cc
+--- chromium-52.0.2743.82/printing/backend/print_backend_cups.cc.cups22 2016-07-22
09:20:15.794340886 -0400
++++ chromium-52.0.2743.82/printing/backend/print_backend_cups.cc 2016-07-22
09:20:26.338261197 -0400
+@@ -16,6 +16,7 @@
+ #include "base/synchronization/lock.h"
+ #include "base/values.h"
+ #include "printing/backend/cups_helper.h"
++#include <cups/ppd.h>
+ #include "printing/backend/print_backend_consts.h"
+ #include "url/gurl.h"
+
diff -up chromium-52.0.2743.82/printing/BUILD.gn.cups22
chromium-52.0.2743.82/printing/BUILD.gn
--- chromium-52.0.2743.82/printing/BUILD.gn.cups22 2016-07-21 11:27:05.597507544 -0400
+++ chromium-52.0.2743.82/printing/BUILD.gn 2016-07-21 14:36:45.574137758 -0400
diff --git a/chromium-52.0.2743.82-widevinefix.patch
b/chromium-52.0.2743.82-widevinefix.patch
new file mode 100644
index 0000000..86414a6
--- /dev/null
+++ b/chromium-52.0.2743.82-widevinefix.patch
@@ -0,0 +1,25 @@
+diff -up chromium-52.0.2743.82/chrome/common/chrome_content_client.cc.widevinefix
chromium-52.0.2743.82/chrome/common/chrome_content_client.cc
+--- chromium-52.0.2743.82/chrome/common/chrome_content_client.cc.widevinefix 2016-07-22
12:18:49.505235856 -0400
++++ chromium-52.0.2743.82/chrome/common/chrome_content_client.cc 2016-07-22
12:20:04.200789682 -0400
+@@ -203,10 +203,7 @@ void ComputeBuiltInPlugins(std::vector<c
+ widevine_cdm.is_out_of_process = true;
+ widevine_cdm.path = adapter_path;
+ widevine_cdm.name = kWidevineCdmDisplayName;
+- widevine_cdm.description =
+- base::StringPrintf("%s (version: " WIDEVINE_CDM_VERSION_STRING
")",
+- kWidevineCdmDescription);
+- widevine_cdm.version = WIDEVINE_CDM_VERSION_STRING;
++ widevine_cdm.description = kWidevineCdmDescription;
+ content::WebPluginMimeType widevine_cdm_mime_type(
+ kWidevineCdmPluginMimeType, kWidevineCdmPluginExtension,
+ kWidevineCdmPluginMimeTypeDescription);
+@@ -555,8 +552,7 @@ void ChromeContentClient::AddContentDecr
+ // CdmInfo needs |path| to be the actual Widevine library,
+ // not the adapter, so adjust as necessary. It will be in the
+ // same directory as the installed adapter.
+- const base::Version version(WIDEVINE_CDM_VERSION_STRING);
+- DCHECK(version.IsValid());
++ const base::Version version;
+ cdms->push_back(content::CdmInfo(kWidevineCdmType, version, cdm_path,
+ codecs_supported));
+ }
diff --git a/chromium.spec b/chromium.spec
index 90b76ed..37467e1 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -95,6 +95,8 @@ Patch11: chromium-52.0.2723.2-PNGImageDecoder-fix-cast.patch
# Ignore deprecations in cups 2.2
# https://bugs.chromium.org/p/chromium/issues/detail?id=622493
Patch12: chromium-52.0.2743.82-cups22.patch
+# Fix widevine compilation
+Patch13: chromium-52.0.2743.82-widevinefix.patch
### Chromium Tests Patches ###
Patch100: chromium-46.0.2490.86-use_system_opus.patch
@@ -385,6 +387,7 @@ Remote desktop support for google-chrome & chromium.
%patch10 -p1 -b .unbundle-fix
%patch11 -p1 -b .fixcast
%patch12 -p1 -b .cups22
+%patch13 -p1 -b .widevinefix
### Chromium Tests Patches ###
%patch100 -p1 -b .use_system_opus
@@ -583,6 +586,9 @@ export CHROMIUM_BROWSER_GYP_DEFINES="\
-Dremove_webcore_debug_symbols=1 \
-Dlogging_like_official_build=1 \
-Denable_hotwording=0 \
+ -Denable_pepper_cdms=1 \
+ -Denable_webrtc=1 \
+ -Denable_widevine=1 \
%if 0
-Dbuildtype=Official \
%endif
@@ -1391,7 +1397,8 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r
chrome-remote-deskt
%changelog
* Thu Jul 21 2016 Tom Callaway <spot(a)fedoraproject.org> 52.0.2743.82-2
-- try to fix cups 2.2 support again (hackishly)
+- fix cups 2.2 support
+- try to enable widevine compatibility (you still need to get the binary .so files from
chrome)
* Thu Jul 21 2016 Tom Callaway <spot(a)fedoraproject.org> 52.0.2743.82-1
- update to 52.0.2743.82