Add fix_for_system_ffmpeg_ABI.patch

chromium-browser-stable.spec

@@ -23,7 +23,7 @@
 Summary:	A fast web browser based on the Blink engine
 Name:		chromium-browser-stable
 Version:	57.0.2987.110
-Release:	1
+Release:	2
 License:	BSD, LGPL
 Group:		Networking/WWW
 Url:		https://www.chromium.org/Home
@@ -85,6 +85,8 @@ Patch504:	chromium-system-icu-r0.patch
 # vaInitialize failed VA error: unknown libva error
 Patch507:	issue1688073002_40001.diff
 
+Patch600:	fix_for_system_ffmpeg_ABI.patch
+
 Provides:	%{crname} = %{EVRD}
 Conflicts:	chromium-browser-unstable
 Conflicts:	chromium-browser-beta
@@ -276,6 +278,8 @@ members of the Chromium and WebDriver teams.
 %patch507 -p1
 %endif
 
+%patch600 -p1
+
 # files we do not want from upstream source bundles
 rm -rf breakpad/src/processor/testdata/
 rm -rf chrome/app/test_data/dlls/

fix_for_system_ffmpeg_ABI.patch

@@ -0,0 +1,46 @@
+diff -up chromium-48.0.2564.8/media/ffmpeg/ffmpeg_common.h.disable_ffmpeg_api_change chromium-48.0.2564.8/media/ffmpeg/ffmpeg_common.h
+--- chromium-48.0.2564.8/media/ffmpeg/ffmpeg_common.h.disable_ffmpeg_api_change	2015-11-18 13:16:05.867971946 +0100
++++ chromium-48.0.2564.8/media/ffmpeg/ffmpeg_common.h	2015-11-18 13:19:20.130249467 +0100
+@@ -22,18 +22,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 FFmpeg's
+-// BUILD.gn 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,
+-// but the upstream code does not yet compile with it disabled.
+-// (In this case, the fix is replacing the call with a new function.)
+-// In the meantime, we directly disable those warnings in the C file.
+-//#define FF_API_AVPACKET_OLD_API 0
+-
+ // Temporarily disable possible loss of data warning.
+ // TODO(scherkus): fix and upstream the compiler warnings.
+ MSVC_PUSH_DISABLE_WARNING(4244);
+--- chromium-55.0.2873.0/third_party/ffmpeg/BUILD.gn.disable_ffmpeg_api_change	2016-09-28 07:51:54.000000000 +0200
++++ chromium-55.0.2873.0/third_party/ffmpeg/BUILD.gn	2016-10-01 13:44:59.429129847 +0200
+@@ -166,21 +166,6 @@
+     "_XOPEN_SOURCE=600",
+     "PIC",
+ 
+-    # Disable deprecated features that generate spammy warnings.
+-    # media/ffmpeg/ffmpeg_common.h defines these as well and must be kept
+-    # in sync with this file.
+-    "FF_API_CONVERGENCE_DURATION=0",
+-
+-    # Upstream libavcodec/utils.c still uses the deprecated
+-    # av_dup_packet(), avcodec_encode_{audio,video}2(), and
+-    # libavformat/utils.c still accesses the deprecated AVStream.codec,
+-    # causing deprecation warnings.
+-    # The normal fix for such things is to disable the features like setting
+-    # "FF_API_AVPACKET_OLD_API=0", but the upstream code does not yet compile
+-    # with it disabled (in the case of av_dup_packet()), and has no FF_API*
+-    # gate for avcodec_encode_{audio,video}2() or AVStream.codec.  In the
+-    # meantime, we directly disable those warnings locally in the C files.
+-
+   ]
+ 
+   # So we can append below and assume they're defined.