tags 785429 +patch +pending
thanks
Hello Emilio,
On Sat, May 16, 2015 at 08:55:38AM +0200, Emilio Pozuelo Monfort wrote:
> Package: icedove
> Version: 31.6.0-1
> Severity: serious
>
> On a binNMU for the libvpx transition, your package failed to build with:
> ... [cut]
> See
> https://buildd.debian.org/status/fetch.php?pkg=icedove&arch=amd64&ver=31.6.0-1%2Bb1&stamp=1431713936
>
> These constants are now called VPX_*.
thanks for pointing to the fix. I created a patch and added to this
mail which hopefully works on all plaforms. Localy it works on amd64.
Christoph is planning to upload the new released version 31.7.0 after the
weekend to unstable, stable-security and old-stable-security..
Regards
Carsten
>From 499b1981ae7eae1b252a4c141d91e3ee164ca376 Mon Sep 17 00:00:00 2001
From: Carsten Schoenert <c.schoen...@t-online.de>
Date: Sat, 16 May 2015 20:04:35 +0200
Subject: [PATCH] rebuild patch queue from patch-queue branch
added patches:
debian-hacks/vp8_impl.cc-backporting-naming-for-constants.patch
Closes: #785429
---
..._impl.cc-backporting-naming-for-constants.patch | 36 ++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 37 insertions(+)
create mode 100644 debian/patches/debian-hacks/vp8_impl.cc-backporting-naming-for-constants.patch
diff --git a/debian/patches/debian-hacks/vp8_impl.cc-backporting-naming-for-constants.patch b/debian/patches/debian-hacks/vp8_impl.cc-backporting-naming-for-constants.patch
new file mode 100644
index 0000000..24d49f8
--- /dev/null
+++ b/debian/patches/debian-hacks/vp8_impl.cc-backporting-naming-for-constants.patch
@@ -0,0 +1,36 @@
+From: Carsten Schoenert <c.schoen...@t-online.de>
+Date: Sat, 16 May 2015 20:00:30 +0200
+Subject: vp8_impl.cc: backporting naming for constants
+
+The libvpx package 1.4.0 brings new names for various constants. To
+build against the libvpx some few constants have to be renamed.
+---
+ .../trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/mozilla/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc b/mozilla/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
+index 86591a2..dd50494 100644
+--- a/mozilla/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
++++ b/mozilla/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
+@@ -180,7 +180,7 @@ int VP8EncoderImpl::InitEncode(const VideoCodec* inst,
+ // Creating a wrapper to the image - setting image data to NULL. Actual
+ // pointer will be set in encode. Setting align to 1, as it is meaningless
+ // (actual memory is not allocated).
+- raw_ = vpx_img_wrap(NULL, IMG_FMT_I420, codec_.width, codec_.height,
++ raw_ = vpx_img_wrap(NULL, VPX_IMG_FMT_I420, codec_.width, codec_.height,
+ 1, NULL);
+ // populate encoder configuration with default values
+ if (vpx_codec_enc_config_default(vpx_codec_vp8_cx(), config_, 0)) {
+@@ -349,9 +349,9 @@ int VP8EncoderImpl::Encode(const I420VideoFrame& input_image,
+ }
+ // Image in vpx_image_t format.
+ // Input image is const. VP8's raw image is not defined as const.
+- raw_->planes[PLANE_Y] = const_cast<uint8_t*>(input_image.buffer(kYPlane));
+- raw_->planes[PLANE_U] = const_cast<uint8_t*>(input_image.buffer(kUPlane));
+- raw_->planes[PLANE_V] = const_cast<uint8_t*>(input_image.buffer(kVPlane));
++ raw_->planes[VPX_PLANE_Y] = const_cast<uint8_t*>(input_image.buffer(kYPlane));
++ raw_->planes[VPX_PLANE_U] = const_cast<uint8_t*>(input_image.buffer(kUPlane));
++ raw_->planes[VPX_PLANE_V] = const_cast<uint8_t*>(input_image.buffer(kVPlane));
+ // TODO(mikhal): Stride should be set in initialization.
+ raw_->stride[VPX_PLANE_Y] = input_image.stride(kYPlane);
+ raw_->stride[VPX_PLANE_U] = input_image.stride(kUPlane);
diff --git a/debian/patches/series b/debian/patches/series
index af9ee96..2492b63 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -43,3 +43,4 @@ porting-powerpcspe/FTBFS-powerpcspe-disable-AltiVec-instructions.patch
iceowl/adjust-calendar-google-provider-to-Google-Calendar-A.patch
iceowl/get-rid-of-subdir-shim-in-gdata-provider.patch
porting/ppc-fix-divide-page-size-in-jemalloc.patch
+debian-hacks/vp8_impl.cc-backporting-naming-for-constants.patch
--
2.1.4
