[arch-commits] Commit in qt5-webengine/kde-unstable (2 files)

[Antonio Rojas]

    Date: Wednesday, May 9, 2018 @ 10:49:41
  Author: arojas
Revision: 323603

ffmpeg 4.0 rebuild

Added:
  qt5-webengine/kde-unstable/qtwebengine-ffmpeg4.patch
Modified:
  qt5-webengine/kde-unstable/PKGBUILD

---------------------------+
 PKGBUILD                  |   10 ++++++----
 qtwebengine-ffmpeg4.patch |   13 +++++++++++++
 2 files changed, 19 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-09 10:49:19 UTC (rev 323602)
+++ PKGBUILD	2018-05-09 10:49:41 UTC (rev 323603)
@@ -5,7 +5,7 @@
 pkgname=qt5-webengine
 _qtver=5.11.0-rc
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url='http://qt-project.org/'
 license=('LGPL3' 'LGPL2.1' 'BSD')
@@ -16,10 +16,11 @@
 groups=('qt' 'qt5')
 _pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}"
 source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
-         qtwebengine-harmony.patch qtwebengine-gcc8.patch)
+         qtwebengine-harmony.patch qtwebengine-gcc8.patch qtwebengine-ffmpeg4.patch)
 sha256sums=('09e98c35d09fb8eac6c9d5ddfc6a812d0fe057a55a6c60cb228315e944608084'
             'feca54ab09ac0fc9d0626770a6b899a6ac5a12173c7d0c1005bc3964ec83e7b3'
-            '7f84891ef1ac9b7943ac5b92f2df8caf0c24c3695bdc6296926b581a87c0e856')
+            '7f84891ef1ac9b7943ac5b92f2df8caf0c24c3695bdc6296926b581a87c0e856'
+            '4a831d89fb0d6a6ced23115ced71e60513ce279fba4bd493178842647948f510')
 
 prepare() {
   mkdir -p build
@@ -32,10 +33,11 @@
 
   # FreeType 2.8.1
   patch -Np1 -i ../qtwebengine-harmony.patch
-
   # Fix build with gcc8 (Fedora)
   cd src/3rdparty/chromium
   patch -p1 -i "$srcdir"/qtwebengine-gcc8.patch
+  # Fix build with ffmpeg 4
+  patch -p2 -i "$srcdir"/qtwebengine-ffmpeg4.patch
 }
 
 build() {

Added: qtwebengine-ffmpeg4.patch
===================================================================
--- qtwebengine-ffmpeg4.patch	                        (rev 0)
+++ qtwebengine-ffmpeg4.patch	2018-05-09 10:49:41 UTC (rev 323603)
@@ -0,0 +1,13 @@
+diff --git a/chromium/media/base/decoder_buffer.h b/chromium/media/base/decoder_buffer.h
+index 0341e5784f..60ffba708b 100644
+--- a/chromium/media/base/decoder_buffer.h
++++ b/chromium/media/base/decoder_buffer.h
+@@ -37,7 +37,7 @@ class MEDIA_EXPORT DecoderBuffer
+     : public base::RefCountedThreadSafe<DecoderBuffer> {
+  public:
+   enum {
+-    kPaddingSize = 32,
++    kPaddingSize = 64,
+ #if defined(ARCH_CPU_ARM_FAMILY)
+     kAlignmentSize = 16
+ #else