Chromaprint 1.4 Fix

This commit is contained in:
Iacopo Isimbaldi
2016-12-07 23:17:40 +01:00
parent d8447c7906
commit 3c8b1877e2
3 changed files with 41 additions and 2 deletions
+2
View File
@@ -114,8 +114,10 @@ pkgbase = ffmpeg-full
source = https://ffmpeg.org/releases/ffmpeg-3.2.tar.xz.asc source = https://ffmpeg.org/releases/ffmpeg-3.2.tar.xz.asc
source = UNREDISTRIBUTABLE.txt source = UNREDISTRIBUTABLE.txt
sha256sums = 88f70c1b8cab108f494ecbab5ba302cdb35d59a84cea88008b5fe49be068d5da sha256sums = 88f70c1b8cab108f494ecbab5ba302cdb35d59a84cea88008b5fe49be068d5da
source = chromaprint_1.4_fix.patch
sha256sums = SKIP sha256sums = SKIP
sha256sums = e0c1b126862072a71e18b9580a6b01afc76a54aa6e642d2c413ba0ac9d3010c4 sha256sums = e0c1b126862072a71e18b9580a6b01afc76a54aa6e642d2c413ba0ac9d3010c4
sha256sums = 3e078076251aeaf4271a2f17cf3fff0bc49deea8d0217a57f23abd37b571f8a4
pkgname = ffmpeg-full pkgname = ffmpeg-full
+10 -2
View File
@@ -33,11 +33,19 @@ provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
'libswscale.so' 'libswscale.so'
'ffmpeg') 'ffmpeg')
source=(https://ffmpeg.org/releases/ffmpeg-$pkgver.tar.xz{,.asc} source=(https://ffmpeg.org/releases/ffmpeg-$pkgver.tar.xz{,.asc}
UNREDISTRIBUTABLE.txt) UNREDISTRIBUTABLE.txt
chromaprint_1.4_fix.patch)
validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8') # ffmpeg-devel validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8') # ffmpeg-devel
sha256sums=('88f70c1b8cab108f494ecbab5ba302cdb35d59a84cea88008b5fe49be068d5da' sha256sums=('88f70c1b8cab108f494ecbab5ba302cdb35d59a84cea88008b5fe49be068d5da'
'SKIP' 'SKIP'
'e0c1b126862072a71e18b9580a6b01afc76a54aa6e642d2c413ba0ac9d3010c4') 'e0c1b126862072a71e18b9580a6b01afc76a54aa6e642d2c413ba0ac9d3010c4'
'3e078076251aeaf4271a2f17cf3fff0bc49deea8d0217a57f23abd37b571f8a4')
prepare() {
cd ${pkgname%-full}-$pkgver
patch -p1 -i ../chromaprint_1.4_fix.patch
}
build() { build() {
cd ${pkgname%-full}-$pkgver cd ${pkgname%-full}-$pkgver
+29
View File
@@ -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