[Pkg-chromium-commit] [pkg-chromium] 01/01: release 47.0.2526.80-1

[Michael Gilbert]

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

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

commit 4f8dc93beee5de560f0cef36856d73a03c7507b1
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Sun Dec 13 04:27:57 2015 +0000

    release 47.0.2526.80-1
---
 debian/changelog                   | 15 +++++++++++++++
 debian/control                     |  1 -
 debian/patches/series              |  2 +-
 debian/patches/system/ffmpeg.patch | 14 +++++++++++++-
 4 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fccdb57..1b849fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+chromium-browser (47.0.2526.80-1) unstable; urgency=medium
+
+  * New upstream stable release:
+    - Multiple vulnerabilities fixed in libv8 4.7.80.23.
+    - CVE-2015-6788: Type confusion in extensions. Credit to anonymous.
+    - CVE-2015-6789: Use-after-free in Blink. Credit to cloudfuzzer.
+    - CVE-2015-6790: Escaping issue in saved pages. Credit to Inti De
+      Ceukelaire.
+    - CVE-2015-6791: Various fixes from internal audits, fuzzing and other
+      initiatives.
+  * Add support for ffmpeg 2.9 (closes: #803806).
+  * Disable accelerated video decoding (closes: #804901).
+
+ -- Michael Gilbert <mgilbert at debian.org>  Sat, 12 Dec 2015 22:37:45 +0000
+
 chromium-browser (47.0.2526.73-1) unstable; urgency=medium
 
   * New upstream stable release:
diff --git a/debian/control b/debian/control
index 938fa52..5172532 100644
--- a/debian/control
+++ b/debian/control
@@ -35,7 +35,6 @@ Build-Depends:
  mesa-common-dev,
  libgtk2.0-dev,
  libglib2.0-dev,
- libva-dev,
  libxt-dev,
  libre2-dev,
  libpng-dev,
diff --git a/debian/patches/series b/debian/patches/series
index 50c596e..a4ffd17 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,7 +13,7 @@ chromedriver-revision.patch
 
 system/nspr.patch
 system/clang.patch
-system/vaapi.patch
+# system/vaapi.patch
 system/ffmpeg.patch
 
 webui.patch
diff --git a/debian/patches/system/ffmpeg.patch b/debian/patches/system/ffmpeg.patch
index adb366d..6360535 100644
--- a/debian/patches/system/ffmpeg.patch
+++ b/debian/patches/system/ffmpeg.patch
@@ -30,7 +30,19 @@ Last-Update: <2015-07-26>
  #include <libavutil/imgutils.h>
 --- a/media/filters/ffmpeg_demuxer.cc
 +++ b/media/filters/ffmpeg_demuxer.cc
-@@ -1013,24 +1013,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone
+@@ -861,7 +861,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());
+@@ -1013,24 +1017,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone
    // If no estimate is found, the stream entry will be kInfiniteDuration().
    std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams,
                                                      kInfiniteDuration());

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