rpms/thunderbird
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'master' of ssh://pkgs.fedoraproject.org/thunderbird

Browse Source
This commit is contained in:
Jan Horak 2015-04-16 11:35:47 +02:00
commit 9e8964c199
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
thunderbird-31.6.0-libvpx-modern.patch Normal file
View File

@ -0,0 +1,25 @@
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
// (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<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);

9
thunderbird.spec
View File

@ -58,7 +58,7 @@
Summary: Mozilla Thunderbird mail/newsgroup client Summary: Mozilla Thunderbird mail/newsgroup client
Name: thunderbird Name: thunderbird
Version: 31.6.0 Version: 31.6.0
Release: 1%{?dist} Release: 2%{?dist}
URL: http://www.mozilla.org/projects/thunderbird/ URL: http://www.mozilla.org/projects/thunderbird/
License: MPLv1.1 or GPLv2+ or LGPLv2+ License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet Group: Applications/Internet
@ -90,6 +90,8 @@ Patch300: xulrunner-24.0-jemalloc-ppc.patch
Patch400: rhbz-966424.patch Patch400: rhbz-966424.patch
Patch401: mozilla-858919.patch Patch401: mozilla-858919.patch
Patch402: rhbz-1014858.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} %if %{official_branding}
# Required by Mozilla Corporation # Required by Mozilla Corporation
@ -182,6 +184,7 @@ cd mozilla
%patch400 -p1 -b .966424 %patch400 -p1 -b .966424
%patch401 -p1 -b .858919 %patch401 -p1 -b .858919
%patch402 -p1 -b .rhbz-1014858 %patch402 -p1 -b .rhbz-1014858
%patch403 -p2 -b .modern
cd .. cd ..
%patch200 -p1 -b .addons %patch200 -p1 -b .addons
@ -530,6 +533,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#=============================================================================== #===============================================================================
%changelog %changelog
* Mon Apr 6 2015 Tom Callaway <spot@fedoraproject.org> - 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 <jhorak@redhat.com> - 31.6.0-1 * Tue Mar 31 2015 Jan Horak <jhorak@redhat.com> - 31.6.0-1
- Update to 31.6.0 - Update to 31.6.0