[Pkg-chromium-commit] [pkg-chromium] 01/04: release 50.0.2661.75-2

Michael Gilbert mgilbert at moszumanska.debian.org
Sun May 29 19:36:48 UTC 2016


This is an automated email from the git hooks/post-receive script.

mgilbert pushed a commit to branch master
in repository pkg-chromium.

commit c260d54411b2a4169a8627de28af2c9e2f09b4dd
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Sat Apr 30 03:39:18 2016 +0000

    release 50.0.2661.75-2
---
 debian/changelog                   |   7 ++
 debian/control                     |   2 +-
 debian/patches/system/ffmpeg.patch | 165 +++++++++++++++++++++++++++++++++----
 3 files changed, 159 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9c85799..a7ab4d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+chromium-browser (50.0.2661.75-2) unstable; urgency=medium
+
+  * Fix problem with linking to ffmpeg (closes: #821154).
+    - Thanks to Sebastian Ramacher.
+
+ -- Michael Gilbert <mgilbert at debian.org>  Sat, 23 Apr 2016 00:55:40 +0000
+
 chromium-browser (50.0.2661.75-1) unstable; urgency=medium
 
   * New upstream stable release:
diff --git a/debian/control b/debian/control
index 1cff0a4..947d34a 100644
--- a/debian/control
+++ b/debian/control
@@ -61,7 +61,7 @@ Build-Depends:
  libsnappy-dev,
  libgconf2-dev,
  libavutil-dev,
- libavcodec-dev,
+ libavcodec-dev (>= 7:3.0),
  libavformat-dev,
  libasound2-dev,
  libsqlite3-dev,
diff --git a/debian/patches/system/ffmpeg.patch b/debian/patches/system/ffmpeg.patch
index a0450d2..3ca8f91 100644
--- a/debian/patches/system/ffmpeg.patch
+++ b/debian/patches/system/ffmpeg.patch
@@ -7,7 +7,7 @@ Last-Update: <2015-07-26>
 
 --- a/media/ffmpeg/ffmpeg_common.h
 +++ b/media/ffmpeg/ffmpeg_common.h
-@@ -38,7 +38,6 @@ extern "C" {
+@@ -38,7 +38,6 @@
  MSVC_PUSH_DISABLE_WARNING(4244);
  #include <libavcodec/avcodec.h>
  #include <libavformat/avformat.h>
@@ -17,19 +17,7 @@ Last-Update: <2015-07-26>
  #include <libavutil/imgutils.h>
 --- a/media/filters/ffmpeg_demuxer.cc
 +++ b/media/filters/ffmpeg_demuxer.cc
-@@ -874,7 +874,11 @@ void FFmpegDemuxer::Initialize(DemuxerHo
-   // this does not increase the amount of data downloaded.  The default value
-   // is 5 AV_TIME_BASE units (1 second each), which prevents some oddly muxed
-   // streams from being detected properly; this value was chosen arbitrarily.
-+#if LIBAVCODEC_VERSION_MAJOR < 57
-+  format_context->max_analyze_duration2 = 60 * AV_TIME_BASE;
-+#else
-   format_context->max_analyze_duration = 60 * AV_TIME_BASE;
-+#endif
- 
-   // Open the AVFormatContext using our glue layer.
-   CHECK(blocking_thread_.Start());
-@@ -1034,24 +1038,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone
+@@ -1034,24 +1038,6 @@
    // If no estimate is found, the stream entry will be kInfiniteDuration().
    std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams,
                                                      kInfiniteDuration());
@@ -176,3 +164,152 @@ Last-Update: <2015-07-26>
                  '../third_party/mesa/mesa.gyp:osmesa',
                ],
              }],
+--- a/third_party/webrtc/modules/video_coding/codecs/h264/h264.gypi
++++ b/third_party/webrtc/modules/video_coding/codecs/h264/h264.gypi
+@@ -38,7 +38,7 @@
+             }],
+           ],
+           'dependencies': [
+-            '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
++            '<(DEPTH)/build/linux/unbundle/ffmpeg.gyp:ffmpeg',
+             '<(DEPTH)/third_party/openh264/openh264.gyp:openh264_encoder',
+             '<(webrtc_root)/common_video/common_video.gyp:common_video',
+           ],
+--- a/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc
++++ b/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc
+@@ -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"
+--- a/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h
++++ b/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h
+@@ -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"
+--- a/tools/gyp/tools/emacs/testdata/media.gyp
++++ b/tools/gyp/tools/emacs/testdata/media.gyp
+@@ -299,7 +299,7 @@
+         # and exclude the sources which depend on ffmpeg.
+         ['OS != "android"', {
+           'dependencies': [
+-            '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
++            '../build/linux/unbundle/ffmpeg.gyp:ffmpeg',
+           ],
+         }],
+         ['OS == "android"', {
+@@ -721,7 +721,7 @@
+         }],
+         ['OS != "android"', {
+           'dependencies': [
+-            '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
++            '../build/linux/unbundle/ffmpeg.gyp:ffmpeg',
+           ],
+         }],
+         ['OS == "android"', {
+@@ -1022,7 +1022,7 @@
+             '../base/base.gyp:test_support_base',
+             '../base/base.gyp:test_support_perf',
+             '../testing/gtest.gyp:gtest',
+-            '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
++            '../build/linux/unbundle/ffmpeg.gyp:ffmpeg',
+           ],
+           'sources': [
+             'ffmpeg/ffmpeg_unittest.cc',
+@@ -1055,7 +1055,7 @@
+             '../base/base.gyp:test_support_base',
+             '../testing/gmock.gyp:gmock',
+             '../testing/gtest.gyp:gtest',
+-            '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
++            '../build/linux/unbundle/ffmpeg.gyp:ffmpeg',
+           ],
+           'sources': [
+             'base/test_data_util.cc',
+@@ -1081,7 +1081,7 @@
+           'dependencies': [
+             'media',
+             '../base/base.gyp:base',
+-            '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
++            '../build/linux/unbundle/ffmpeg.gyp:ffmpeg',
+           ],
+           'sources': [
+             'test/ffmpeg_tests/ffmpeg_tests.cc',
+@@ -1093,7 +1093,7 @@
+           'dependencies': [
+             'media',
+             '../base/base.gyp:base',
+-            '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
++            '../build/linux/unbundle/ffmpeg.gyp:ffmpeg',
+           ],
+           'sources': [
+             'tools/media_bench/media_bench.cc',
+--- a/tools/gyp/tools/emacs/testdata/media.gyp.fontified
++++ b/tools/gyp/tools/emacs/testdata/media.gyp.fontified
+@@ -300,7 +300,7 @@
+         # and exclude the sources which depend on ffmpeg.
+         ['OS != \"android\"', {
+           'dependencies': [
+-            '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
++            '../build/linux/unbundle/ffmpeg.gyp:ffmpeg',
+           ],
+         }],
+         ['OS == \"android\"', {
+@@ -722,7 +722,7 @@
+         }],
+         ['OS != \"android\"', {
+           'dependencies': [
+-            '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
++            '../build/linux/unbundle/ffmpeg.gyp:ffmpeg',
+           ],
+         }],
+         ['OS == \"android\"', {
+@@ -1023,7 +1023,7 @@
+             '../base/base.gyp:test_support_base',
+             '../base/base.gyp:test_support_perf',
+             '../testing/gtest.gyp:gtest',
+-            '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
++            '../build/linux/unbundle/ffmpeg.gyp:ffmpeg',
+           ],
+           'sources': [
+             'ffmpeg/ffmpeg_unittest.cc',
+@@ -1056,7 +1056,7 @@
+             '../base/base.gyp:test_support_base',
+             '../testing/gmock.gyp:gmock',
+             '../testing/gtest.gyp:gtest',
+-            '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
++            '../build/linux/unbundle/ffmpeg.gyp:ffmpeg',
+           ],
+           'sources': [
+             'base/test_data_util.cc',
+@@ -1082,7 +1082,7 @@
+           'dependencies': [
+             'media',
+             '../base/base.gyp:base',
+-            '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
++            '../build/linux/unbundle/ffmpeg.gyp:ffmpeg',
+           ],
+           'sources': [
+             'test/ffmpeg_tests/ffmpeg_tests.cc',
+@@ -1094,7 +1094,7 @@
+           'dependencies': [
+             'media',
+             '../base/base.gyp:base',
+-            '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
++            '../build/linux/unbundle/ffmpeg.gyp:ffmpeg',
+           ],
+           'sources': [
+             'tools/media_bench/media_bench.cc',

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-chromium/pkg-chromium.git



More information about the Pkg-chromium-commit mailing list