spot pushed to xulrunner (master). "stop using old compat defines"
notifications at fedoraproject.org
notifications at fedoraproject.org
Tue Apr 7 19:17:50 UTC 2015
>From f0c48f3d46ef01eed03dec583e0f4fd1810fd8aa Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot at fedoraproject.org>
Date: Tue, 7 Apr 2015 15:17:40 -0400
Subject: stop using old compat defines
diff --git a/xulrunner-33.0-libvpx-modern.patch b/xulrunner-33.0-libvpx-modern.patch
new file mode 100644
index 0000000..52d1839
--- /dev/null
+++ b/xulrunner-33.0-libvpx-modern.patch
@@ -0,0 +1,12 @@
+diff -up xulrunner-33.0/mozilla-release/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc.modern xulrunner-33.0/mozilla-release/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
+--- xulrunner-33.0/mozilla-release/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc.modern 2015-04-07 15:12:34.710923016 -0400
++++ xulrunner-33.0/mozilla-release/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc 2015-04-07 15:12:48.278838658 -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)) {
diff --git a/xulrunner.spec b/xulrunner.spec
index fd79c9d..09a5155 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -102,6 +102,7 @@ Patch200: mozilla-193-pkgconfig.patch
# Unable to install addons from https pages
Patch204: rhbz-966424.patch
Patch207: firefox-baseline-disable.patch
+Patch208: xulrunner-33.0-libvpx-modern.patch
# Upstream patches
Patch300: mozilla-1042889.patch
@@ -245,6 +246,7 @@ cd %{tarballdir}
%ifarch %{ix86}
%patch207 -p2 -b .baseline
%endif
+%patch208 -p2 -b .modern
# Upstream patches
%patch300 -p1 -b .1042889
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/xulrunner.git/commit/?h=master&id=f0c48f3d46ef01eed03dec583e0f4fd1810fd8aa
More information about the scm-commits
mailing list