[arch-commits] Commit in bluegriffon/trunk (PKGBUILD libvpx_1.4.patch)

[Fabio Castelli]

    Date: Sunday, April 19, 2015 @ 00:59:21
  Author: muflone
Revision: 131653

upgpkg: bluegriffon 1.7.2-2

Added:
  bluegriffon/trunk/libvpx_1.4.patch
Modified:
  bluegriffon/trunk/PKGBUILD

------------------+
 PKGBUILD         |   21 +++++++++++++--------
 libvpx_1.4.patch |   25 +++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-04-18 21:23:55 UTC (rev 131652)
+++ PKGBUILD	2015-04-18 22:59:21 UTC (rev 131653)
@@ -5,7 +5,7 @@
 pkgname=bluegriffon
 pkgver=1.7.2
 _mozilla_ver=9db46ddfb517
-pkgrel=1
+pkgrel=2
 pkgdesc="The next-generation Web Editor based on the rendering engine of Firefox"
 arch=('i686' 'x86_64')
 url="http://bluegriffon.org/"
@@ -20,13 +20,15 @@
         "http://hg.mozilla.org/mozilla-central/archive/${_mozilla_ver}.tar.bz2"
         "mozconfig"
         "bluegriffon.desktop"
-        "freetype.patch")
-md5sums=('SKIP'
-         'SKIP'
-         'ced0be4498f9b29b68148af38bdd2f6d'
-         '7a39b0d261604c50d314acb115fc17fe'
-         'b508d3a028380595d25c8039a217768b'
-         'f19745a7e94053a5252e35f6cbf7b94f')
+        "freetype.patch"
+        "libvpx_1.4.patch")
+sha256sums=('SKIP'
+            'SKIP'
+            '427814daeb87605eb94a3ed64b05383b0dcbe76a742efa845fb29722fcb2737f'
+            '02d87cb754fd6532bf78d461e822b271ae135df27afd1f48d1978aa0372840b1'
+            '882133b77840356985a81e496b4ddc443f8f33c068cfb7ef0858497820adcfff'
+            '431c97f6b6d0c10d026e2d6d848e7c1bb0a7a55912199909f17ce485a8dc484e'
+            '4a5aa3dc46a6e6a0344e703ade97842935337d4304751f8073b365b44b3162bc')
 
 prepare() {
   cd "${srcdir}/mozilla-central-${_mozilla_ver}"
@@ -42,6 +44,9 @@
   # Fix build with freetype 2.5
   patch -Np1 -i ../freetype.patch
 
+  # Fix build with libvpx >= 1.4
+  patch -Np1 -i ../libvpx_1.4.patch
+
   # python2 fix
   find . -name \*.py -exec sed -i 's@^#.*python$@#!/usr/bin/python2@' '{}' \;
 }

Added: libvpx_1.4.patch
===================================================================
--- libvpx_1.4.patch	                        (rev 0)
+++ libvpx_1.4.patch	2015-04-18 22:59:21 UTC (rev 131653)
@@ -0,0 +1,25 @@
+diff -Naur mozilla-central-9db46ddfb517.orig/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc mozilla-central-9db46ddfb517/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
+--- mozilla-central-9db46ddfb517.orig/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc	2013-04-09 21:29:13.000000000 +0200
++++ mozilla-central-9db46ddfb517/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc	2015-04-18 20:20:47.298270190 +0200
+@@ -178,7 +178,7 @@
+   // 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)) {
+@@ -352,9 +352,9 @@
+   }
+   // 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);