[packages/chromium-browser: 1/6] up to 48.0.2564.71

[glen]

commit 4b9e3d7a676061659028f7fd13681fceda795a72
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Jan 18 19:03:57 2016 +0200

    up to 48.0.2564.71

 chromium-browser.spec | 12 ++++++------
 system-ffmpeg.patch   | 24 ++++++++++--------------
 2 files changed, 16 insertions(+), 20 deletions(-)
---
diff --git a/chromium-browser.spec b/chromium-browser.spec
index 66c7495..5c27f85 100644
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -72,9 +72,9 @@
 # - http://code.google.com/p/chromium/wiki/LinuxBuildInstructionsPrerequisites
 # - to look for new tarball, use update-source.sh script
 
-%define		branch		47.0.2526
-%define		basever		73
-#define		patchver	130
+%define		branch		48.0.2564
+%define		basever		71
+#define		patchver	106
 %define		gyp_rev	1014
 Summary:	A WebKit powered web browser
 Name:		chromium-browser
@@ -86,11 +86,11 @@ Version:	%{branch}.%{basever}
 Release:	1
 License:	BSD%{!?with_system_ffmpeg:, LGPL v2+ (ffmpeg)}
 Group:		X11/Applications/Networking
-Source0:	http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{branch}.%{basever}.tar.xz
-# Source0-md5:	54a013e6b0ea5b6ecacbf283844f962a
+Source0:	http://carme.pld-linux.org/~glen/chromium-browser/src/beta/%{name}-%{branch}.%{basever}.tar.gz
+# Source0-md5:	844d4fcac643e8124ac0ad3ce9df2d75
 %if "%{?patchver}" != ""
 Patch0:		http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{version}.patch.xz
-# Patch0-md5:	e62038af53ab3be30a4b75eaf20d0e4b
+# Patch0-md5:	214631f58aae3e9d9ca0795240a95def
 %endif
 Source1:	%{name}.default
 Source2:	%{name}.sh
diff --git a/system-ffmpeg.patch b/system-ffmpeg.patch
index 667e0ec..c9f6ce0 100644
--- a/system-ffmpeg.patch
+++ b/system-ffmpeg.patch
@@ -1,21 +1,17 @@
-diff --git a/media/ffmpeg/ffmpeg_common.h b/media/ffmpeg/ffmpeg_common.h
-index 677bd76..23a21f8 100644
---- a/media/ffmpeg/ffmpeg_common.h
-+++ b/media/ffmpeg/ffmpeg_common.h
-@@ -19,20 +19,12 @@
+--- a/media/ffmpeg/ffmpeg_common.h	2015-11-27 12:01:56.155462264 +0000
++++ b/media/ffmpeg/ffmpeg_common.h	2015-11-27 12:03:03.348846300 +0000
+@@ -19,10 +19,6 @@
  
  // Include FFmpeg header files.
  extern "C" {
 -// Disable deprecated features which result in spammy compile warnings.  This
--// list of defines must mirror those in the 'defines' section of the ffmpeg.gyp
--// file or the headers below will generate different structures.
--#define FF_API_PIX_FMT_DESC 0
--#define FF_API_OLD_DECODE_AUDIO 0
--#define FF_API_DESTRUCT_PACKET 0
--#define FF_API_GET_BUFFER 0
- 
- // Temporarily disable possible loss of data warning.
- // TODO(scherkus): fix and upstream the compiler warnings.
+-// list of defines must mirror those in the 'defines' section of BUILD.gn file &
+-// ffmpeg.gyp file or the headers below will generate different structures!
+-#define FF_API_CONVERGENCE_DURATION 0
+ // Upstream libavcodec/utils.c still uses the deprecated
+ // av_dup_packet(), causing deprecation warnings.
+ // The normal fix for such things is to disable the feature as below,
+@@ -36,7 +32,6 @@
  MSVC_PUSH_DISABLE_WARNING(4244);
  #include <libavcodec/avcodec.h>
  #include <libavformat/avformat.h>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/chromium-browser.git/commitdiff/a3d9a27b7d8d4c89c88776e9c56d843f757e0559