summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorIacopo Isimbaldi2016-12-07 23:17:40 +0100
committerIacopo Isimbaldi2016-12-07 23:18:57 +0100
commit3c8b1877e2156a6c1a473c9089e3651e2e79da1d (patch)
tree987cfc5fb34fb814bce761144f37b490de13281f
parentd8447c79063b37548e353d3a40ac82b0c4abeec8 (diff)
downloadaur-3c8b1877e2156a6c1a473c9089e3651e2e79da1d.tar.gz
Chromaprint 1.4 Fix
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD12
-rw-r--r--chromaprint_1.4_fix.patch29
3 files changed, 41 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 05e84e49f97d..d812ebe96406 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -114,8 +114,10 @@ pkgbase = ffmpeg-full
source = https://ffmpeg.org/releases/ffmpeg-3.2.tar.xz.asc
source = UNREDISTRIBUTABLE.txt
sha256sums = 88f70c1b8cab108f494ecbab5ba302cdb35d59a84cea88008b5fe49be068d5da
+ source = chromaprint_1.4_fix.patch
sha256sums = SKIP
sha256sums = e0c1b126862072a71e18b9580a6b01afc76a54aa6e642d2c413ba0ac9d3010c4
+ sha256sums = 3e078076251aeaf4271a2f17cf3fff0bc49deea8d0217a57f23abd37b571f8a4
pkgname = ffmpeg-full
diff --git a/PKGBUILD b/PKGBUILD
index bd2c88664aa5..9e192c90d80a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -33,11 +33,19 @@ provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
'libswscale.so'
'ffmpeg')
source=(https://ffmpeg.org/releases/ffmpeg-$pkgver.tar.xz{,.asc}
- UNREDISTRIBUTABLE.txt)
+ UNREDISTRIBUTABLE.txt
+ chromaprint_1.4_fix.patch)
validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8') # ffmpeg-devel
sha256sums=('88f70c1b8cab108f494ecbab5ba302cdb35d59a84cea88008b5fe49be068d5da'
'SKIP'
- 'e0c1b126862072a71e18b9580a6b01afc76a54aa6e642d2c413ba0ac9d3010c4')
+ 'e0c1b126862072a71e18b9580a6b01afc76a54aa6e642d2c413ba0ac9d3010c4'
+ '3e078076251aeaf4271a2f17cf3fff0bc49deea8d0217a57f23abd37b571f8a4')
+
+prepare() {
+ cd ${pkgname%-full}-$pkgver
+
+ patch -p1 -i ../chromaprint_1.4_fix.patch
+}
build() {
cd ${pkgname%-full}-$pkgver
diff --git a/chromaprint_1.4_fix.patch b/chromaprint_1.4_fix.patch
new file mode 100644
index 000000000000..e424463d9eb5
--- /dev/null
+++ b/chromaprint_1.4_fix.patch
@@ -0,0 +1,29 @@
+From 581f93f37ef2e7a00662828ed0348d1edb9041fe Mon Sep 17 00:00:00 2001
+From: "Georgi D. Sotirov" <gdsotirov@dir.bg>
+Date: Tue, 6 Dec 2016 21:07:59 +0100
+Subject: [PATCH] lavf/chromaprint: Update for version 1.4
+
+Fixes ticket #5997.
+---
+ libavformat/chromaprint.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/libavformat/chromaprint.c b/libavformat/chromaprint.c
+index 8c9a6c0..4da02be 100644
+--- a/libavformat/chromaprint.c
++++ b/libavformat/chromaprint.c
+@@ -39,7 +39,11 @@ typedef struct ChromaprintMuxContext {
+ int silence_threshold;
+ int algorithm;
+ FingerprintFormat fp_format;
++#if CPR_VERSION_INT >= AV_VERSION_INT(1, 4, 0)
++ ChromaprintContext *ctx;
++#else
+ ChromaprintContext ctx;
++#endif
+ } ChromaprintMuxContext;
+
+ static void cleanup(ChromaprintMuxContext *cpr)
+--
+2.1.4
+