Djam/chromium-browser-stable-slava86
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/chromium-browser-stable-slava86.git synced 2025-02-24 16:02:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

update to 40.0.2214.115. Build with widevinecdm plugin support

Browse source
This commit is contained in:
Tigro 2015-02-24 13:58:29 +03:00
parent 3f7539a5f6
commit 830031c751
3 changed files with 51 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.abf.yml
View file

@ -3,4 +3,4 @@ sources:
gn-binaries.tar.xz: 312d6a6addabeed98f3357d34dbc87ccfd43026b
depot_tools.tar.xz: 082b7f9a4dfa7eb03900755b4866aef2d73543a5
new-system-icons.tar.xz: 89339b8b3b05359a8745ed7968fe148902a2fa28
chromium-40.0.2214.91.tar.xz: b51e1b817b8273891a3e82057f714a839d46e124
chromium-40.0.2214.115.tar.xz: b009e6f8ab7e9c1978e0822502f08d83574ad866

20
chromium-browser-stable.spec
View file

@ -7,7 +7,7 @@
%define chromium_system_libs 0
Name: chromium-browser-stable
Version: 40.0.2214.111
Version: 40.0.2214.115
Release: 1
Summary: A fast webkit-based web browser
Group: Networking/WWW
@ -39,6 +39,8 @@ Patch100: arm-webrtc-fix.patch
Patch101: chromium-arm-r0.patch
Patch102: skia.patch
Patch200: chromium-widevine.patch
Provides: %{crname}
Conflicts: chromium-browser-unstable
Conflicts: chromium-browser-beta
@ -59,8 +61,11 @@ BuildRequires: pkgconfig(opus) pkgconfig(libwebp) pkgconfig(minizip)
BuildRequires: pkgconfig(libexif) cap-devel
BuildRequires: pkgconfig(gconf-2.0)
BuildRequires: chromium-widevinecdm-plugin
Suggests: chromium-browser-pepper-flash
Suggests: chromium-browser-pdf-plugin
Suggests: chromium-widevinecdm-plugin
ExclusiveArch: i586 x86_64 armv7l
@ -119,6 +124,19 @@ members of the Chromium and WebDriver teams.
%patch101 -p0
%patch102 -p0
%patch200 -p1
# build with widevine support
WIDEVINE_VERSION=$(rpm -q chromium-widevinecdm-plugin --qf %%{version})
sed -i "s/@WIDEVINE_VERSION@/$WIDEVINE_VERSION/g" third_party/widevine/cdm/widevine_cdm_version.h
WIDEVINE_SUPPORTED_ARCHS="x64 ia32"
for arch in $WIDEVINE_SUPPORTED_ARCHS; do
mkdir -p third_party/widevine/cdm/linux/$arch
cp %{_libdir}/chromium-browser/libwidevinecdm.so third_party/widevine/cdm/widevine_cdm_*.h third_party/widevine/cdm/linux/$arch/
done
# Hard code extra version
FILE=chrome/common/chrome_version_info_posix.cc
sed -i.orig -e 's/getenv("CHROME_VERSION_EXTRA")/"%{product_vendor} %{product_version}"/' $FILE

31
chromium-widevine.patch Normal file
View file

@ -0,0 +1,31 @@
--- chromium-39.0.2171.95/third_party/widevine/cdm/widevine_cdm_version.h.orig 2014-12-10 05:36:13.000000000 +0100
+++ chromium-39.0.2171.95/third_party/widevine/cdm/widevine_cdm_version.h 2014-12-28 20:47:39.080795240 +0100
@@ -14,4 +14,8 @@
// - WIDEVINE_CDM_VERSION_STRING (with the version of the CDM that's available
// as a string, e.g., "1.0.123.456").
+#include "third_party/widevine/cdm/widevine_cdm_common.h"
+#define WIDEVINE_CDM_AVAILABLE
+#define WIDEVINE_CDM_VERSION_STRING "@WIDEVINE_VERSION@"
+
#endif // WIDEVINE_CDM_VERSION_H_
--- chromium-39.0.2171.95/third_party/widevine/cdm/widevine_cdm.gyp.orig 2014-12-10 05:54:35.000000000 +0100
+++ chromium-39.0.2171.95/third_party/widevine/cdm/widevine_cdm.gyp 2014-12-28 20:50:48.163269989 +0100
@@ -7,7 +7,7 @@
'widevine_cdm_version_h_file%': 'widevine_cdm_version.h',
'widevine_cdm_binary_files%': [],
'conditions': [
- [ 'branding == "Chrome"', {
+ [ 'branding == "Chromium"', {
'conditions': [
[ 'chromeos == 1', {
'widevine_cdm_version_h_file%':
@@ -54,7 +54,7 @@
'target_name': 'widevinecdmadapter',
'type': 'none',
'conditions': [
- [ 'branding == "Chrome" and enable_pepper_cdms==1', {
+ [ 'branding == "Chromium" and enable_pepper_cdms==1', {
'dependencies': [
'<(DEPTH)/ppapi/ppapi.gyp:ppapi_cpp',
'<(DEPTH)/media/media_cdm_adapter.gyp:cdmadapter',