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 07:52:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

build fixes for webrtc code with system ffmpeg

Browse source
This commit is contained in:
Tigro 2016-04-19 10:09:02 +03:00
parent 08f46067c5
commit b460c7a6cf
2 changed files with 32 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
chromium-50-system-ffmpeg-3.patch Normal file
View file

@ -0,0 +1,28 @@
diff -up chromium-50.0.2661.11/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc.system-ffmpeg-3 chromium-50.0.2661.11/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc
--- chromium-50.0.2661.11/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc.system-ffmpeg-3 2016-03-03 21:02:35.000000000 +0100
+++ chromium-50.0.2661.11/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc 2016-03-07 02:24:07.937055548 +0100
@@ -15,9 +15,9 @@
#include <limits>
extern "C" {
-#include "third_party/ffmpeg/libavcodec/avcodec.h"
-#include "third_party/ffmpeg/libavformat/avformat.h"
-#include "third_party/ffmpeg/libavutil/imgutils.h"
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
+#include <libavutil/imgutils.h>
} // extern "C"
#include "webrtc/base/checks.h"
diff -up chromium-50.0.2661.11/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h.system-ffmpeg-3 chromium-50.0.2661.11/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h
--- chromium-50.0.2661.11/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h.system-ffmpeg-3 2016-03-03 21:02:35.000000000 +0100
+++ chromium-50.0.2661.11/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h 2016-03-07 02:24:04.729115509 +0100
@@ -15,7 +15,7 @@
#include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
extern "C" {
-#include "third_party/ffmpeg/libavcodec/avcodec.h"
+#include <libavcodec/avcodec.h>
} // extern "C"
#include "webrtc/base/scoped_ptr.h"

5
chromium-browser-stable.spec
View file

@ -10,7 +10,7 @@
%define chromium_system_libs 1
%define clang 1
%define ffmpeg 0
%define ffmpeg 1
%define icu 0
%define libva 0
# disable gtk3 support to avoid
@ -60,6 +60,8 @@ Patch504: chromium-system-icu-r0.patch
# (cjw) Don't disable deprecated APIs in ffmpeg header files, some of which change the ABI.
# From Gentoo: http://mirror.yandex.ru/gentoo-portage/www-client/chromium/files/chromium-system-ffmpeg-r2.patch
Patch505: chromium-system-ffmpeg-r2.patch
# (cjw) fix webrtc build with system ffmpeg
Patch506: chromium-50-system-ffmpeg-3.patch
# fix https://bugs.chromium.org/p/chromium/issues/detail?id=585513
# vaInitialize failed VA error: unknown libva error
Patch507: issue1688073002_40001.diff
@ -304,6 +306,7 @@ find third_party/icu -type f \! -regex '.*\.\(gyp\|gypi\|isolate\)' -delete
%if 0%{?ffmpeg}
%patch505 -p1
%patch506 -p1
%endif
#patch600 -p1