From 40047ef9a6624fc6fde8a9383fd64cd3fcce1963 Mon Sep 17 00:00:00 2001
From: Omar Vega Ramos <ovruni@gnu.org.pe>
Date: Sun, 13 May 2018 15:45:12 -0500
Subject: libquicktime-1.2.4-18.parabola1: rebuild for ffmpeg 4.0

---
 libre/libquicktime/PKGBUILD | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

(limited to 'libre/libquicktime/PKGBUILD')

diff --git a/libre/libquicktime/PKGBUILD b/libre/libquicktime/PKGBUILD
index 3d7d9a151..5ae2605b5 100644
--- a/libre/libquicktime/PKGBUILD
+++ b/libre/libquicktime/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=libquicktime
 pkgver=1.2.4
-pkgrel=17.parabola1
+pkgrel=18.parabola1
 pkgdesc="A library for reading and writing quicktime files, without nonfree faac support"
 arch=('i686' 'x86_64' 'armv7h')
 license=('GPL')
@@ -17,18 +17,28 @@ depends=('alsa-lib' 'faad2' 'gtk2' 'lame' 'libjpeg-turbo' 'libxaw'
          'libvorbis.so' 'libx264.so')
 makedepends=('mesa-libgl')
 source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz"
-        ffmpeg2.0.patch libquicktime-ffmpeg3.patch)
+        CVE-2016-2399.patch
+        libquicktime-1.2.4-ffmpeg2.patch
+        libquicktime-1.2.4-ffmpeg29.patch
+        libquicktime-1.2.4-ffmpeg4.patch)
 sha256sums=('1c53359c33b31347b4d7b00d3611463fe5e942cae3ec0fefe0d2fd413fd47368'
-            'a1c8415e8e7bc04c81b946b9e3746f7d5ef24819135962280c3a7ddb3f2baa2b'
-            '5513f628866de253031de2761d27c2be3965e90b70d10a494446a96d851c0729')
+            '006c6be761075ca25217fe510e1ec7cfbb6262c3d758c1bd629719072ddb0935'
+            '2c7bb532ea8ac3b0e7a9a76ca6ad41127810529e7f7c2faac6f1e2f7c5c4bb93'
+            'c3a8dfb6bfb69c2b54aeafe3306a8af1fff5a3a06fd05b28725d3ea7688ce2cd'
+            'd4582dc2ed389acd01080690a95643277e43955adcb4058132506c5b437d044f')
 replaces=("${pkgname}-libre" "${pkgname}-parabola")
 conflicts=("${pkgname}-libre" "${pkgname}-parabola")
 
 prepare() {
   cd $pkgname-$pkgver
-  patch -Np1 -i ../ffmpeg2.0.patch
-# Fix build with ffmpeg 3.0 (Gentoo)
-  patch -p1 -i ../libquicktime-ffmpeg3.patch
+  # apply patches from gentoo https://gitweb.gentoo.org/repo/gentoo.git/tree/media-libs/libquicktime/files
+  patch -p1 -i "$srcdir/CVE-2016-2399.patch"
+  patch -p1 -i "$srcdir/libquicktime-1.2.4-ffmpeg2.patch"
+  patch -p1 -i "$srcdir/libquicktime-1.2.4-ffmpeg29.patch"
+  patch -p1 -i "$srcdir/libquicktime-1.2.4-ffmpeg4.patch"
+  for FILE in lqt_ffmpeg.c video.c audio.c ; do
+    sed -i -e "s:CODEC_ID_:AV_&:g" "plugins/ffmpeg/${FILE}"
+  done
 }
 
 build() {
-- 
cgit v1.2.3