From 27e96d2f43410a94a8a588022da4c963c1fd76e2 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 6 Apr 2015 16:32:04 -0400 Subject: [PATCH 1/3] rebuild for libvpx 1.4.0 --- thunderbird.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/thunderbird.spec b/thunderbird.spec index a5bd536..6789d55 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -58,7 +58,7 @@ Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird Version: 31.6.0 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -508,6 +508,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog +* Mon Apr 6 2015 Tom Callaway - 31.6.0-2 +- rebuild for libvpx 1.4.0 + * Tue Mar 31 2015 Jan Horak - 31.6.0-1 - Update to 31.6.0 From 56fe0df40508cafee443970531d97b2e052bf1aa Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 7 Apr 2015 14:33:55 -0400 Subject: [PATCH 2/3] rebuild for libvpx 1.4.0 --- thunderbird-31.6.0-libvpx-modern.patch | 25 +++++++++++++++++++++++++ thunderbird.spec | 4 ++++ 2 files changed, 29 insertions(+) create mode 100644 thunderbird-31.6.0-libvpx-modern.patch diff --git a/thunderbird-31.6.0-libvpx-modern.patch b/thunderbird-31.6.0-libvpx-modern.patch new file mode 100644 index 0000000..1aad63c --- /dev/null +++ b/thunderbird-31.6.0-libvpx-modern.patch @@ -0,0 +1,25 @@ +diff -up thunderbird-31.6.0/comm-esr31/mozilla/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc.modern thunderbird-31.6.0/comm-esr31/mozilla/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc +--- thunderbird-31.6.0/comm-esr31/mozilla/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc.modern 2015-04-07 14:30:05.525960513 -0400 ++++ thunderbird-31.6.0/comm-esr31/mozilla/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc 2015-04-07 14:32:22.478199058 -0400 +@@ -180,7 +180,7 @@ int VP8EncoderImpl::InitEncode(const Vid + // 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 I420Vid + } + // 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(input_image.buffer(kYPlane)); +- raw_->planes[PLANE_U] = const_cast(input_image.buffer(kUPlane)); +- raw_->planes[PLANE_V] = const_cast(input_image.buffer(kVPlane)); ++ raw_->planes[VPX_PLANE_Y] = const_cast(input_image.buffer(kYPlane)); ++ raw_->planes[VPX_PLANE_U] = const_cast(input_image.buffer(kUPlane)); ++ raw_->planes[VPX_PLANE_V] = const_cast(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/thunderbird.spec b/thunderbird.spec index 6789d55..89f34d7 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -90,6 +90,8 @@ Patch300: xulrunner-24.0-jemalloc-ppc.patch Patch400: rhbz-966424.patch Patch401: mozilla-858919.patch Patch402: rhbz-1014858.patch +# libvpx no longer has compat defines, use the current ones +Patch403: thunderbird-31.6.0-libvpx-modern.patch %if %{official_branding} # Required by Mozilla Corporation @@ -182,6 +184,7 @@ cd mozilla %patch400 -p1 -b .966424 %patch401 -p1 -b .858919 %patch402 -p1 -b .rhbz-1014858 +%patch403 -p1 -b .modern cd .. %patch200 -p1 -b .addons @@ -510,6 +513,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog * Mon Apr 6 2015 Tom Callaway - 31.6.0-2 - rebuild for libvpx 1.4.0 +- stop using compat defines, they went away in libvpx 1.4.0 * Tue Mar 31 2015 Jan Horak - 31.6.0-1 - Update to 31.6.0 From 1122c927b7bfed8f173194b470ab9ae73a98a062 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 7 Apr 2015 14:55:11 -0400 Subject: [PATCH 3/3] fix patch --- thunderbird-31.6.0-libvpx-modern.patch | 6 +++--- thunderbird.spec | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/thunderbird-31.6.0-libvpx-modern.patch b/thunderbird-31.6.0-libvpx-modern.patch index 1aad63c..f6c6431 100644 --- a/thunderbird-31.6.0-libvpx-modern.patch +++ b/thunderbird-31.6.0-libvpx-modern.patch @@ -1,6 +1,6 @@ -diff -up thunderbird-31.6.0/comm-esr31/mozilla/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc.modern thunderbird-31.6.0/comm-esr31/mozilla/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc ---- thunderbird-31.6.0/comm-esr31/mozilla/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc.modern 2015-04-07 14:30:05.525960513 -0400 -+++ thunderbird-31.6.0/comm-esr31/mozilla/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc 2015-04-07 14:32:22.478199058 -0400 +diff -up comm-esr31/mozilla/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc.modern comm-esr31/mozilla/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc +--- comm-esr31/mozilla/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc.modern 2015-04-07 14:30:05.525960513 -0400 ++++ comm-esr31/mozilla/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc 2015-04-07 14:32:22.478199058 -0400 @@ -180,7 +180,7 @@ int VP8EncoderImpl::InitEncode(const Vid // 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 diff --git a/thunderbird.spec b/thunderbird.spec index 89f34d7..3f65636 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -184,7 +184,7 @@ cd mozilla %patch400 -p1 -b .966424 %patch401 -p1 -b .858919 %patch402 -p1 -b .rhbz-1014858 -%patch403 -p1 -b .modern +%patch403 -p2 -b .modern cd .. %patch200 -p1 -b .addons