Miroirs/slackbuilds_ponce
1
0
Fork 0
mirror of https://github.com/Ponce/slackbuilds synced 2024-11-21 19:42:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

audio/mixxx: Add upstream patch for the newer chromaprint.

Browse source 
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
This commit is contained in:
Matteo Bernardini 2017-01-12 18:42:35 +01:00 committed by Willy Sudiarto Raharjo
parent 4c2d777311
commit 575b7a1120
No known key found for this signature in database
GPG key ID: 887B8374D7333381
2 changed files with 48 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
audio/mixxx/chromaprint-1.4.patch Normal file
View file

@ -0,0 +1,44 @@
Description: chromaprint 1.4 compatibility
Origin: upstream,
https://github.com/mixxxdj/mixxx/commit/71f3e5d0adb5116a23f9163b045f3419b9056a08,
https://github.com/mixxxdj/mixxx/commit/830e864384ee1c96272997ee3f1dae4f71b28f3e,
https://github.com/mixxxdj/mixxx/commit/c5b4368fd228feee28af4fb32ab6fbfd3f29f212
Last-Update: 2017-01-11
--- mixxx-2.0.0~dfsg.orig/src/musicbrainz/chromaprinter.cpp
+++ mixxx-2.0.0~dfsg/src/musicbrainz/chromaprinter.cpp
@@ -5,6 +5,19 @@
#include "musicbrainz/chromaprinter.h"
#include "soundsourceproxy.h"
+namespace
+{
+ // Type declarations of *fprint and *encoded pointers need to account for Chromaprint API version
+ // (void* -> uint32_t*) and (void* -> char*) changed in versions v1.4.0 or later -- alyptik 12/2016
+ #if (CHROMAPRINT_VERSION_MINOR > 3) || (CHROMAPRINT_VERSION_MAJOR > 1)
+ typedef uint32_t* uint32_p;
+ typedef char* char_p;
+ #else
+ typedef void* uint32_p;
+ typedef void* char_p;
+ #endif
+}
+
ChromaPrinter::ChromaPrinter(QObject* parent)
: QObject(parent) {
}
@@ -57,12 +70,12 @@ QString ChromaPrinter::calcFingerPrint(c
}
chromaprint_finish(ctx);
- void* fprint = NULL;
+ uint32_p fprint = NULL;
int size = 0;
int ret = chromaprint_get_raw_fingerprint(ctx, &fprint, &size);
QByteArray fingerprint;
if (ret == 1) {
- void* encoded = NULL;
+ char_p encoded = NULL;
int encoded_size = 0;
chromaprint_encode_fingerprint(fprint, size,
CHROMAPRINT_ALGORITHM_DEFAULT,

5
audio/mixxx/mixxx.SlackBuild
View file

@ -24,7 +24,7 @@
PRGNAM=mixxx PRGNAM=mixxx
VERSION=${VERSION:-2.0.0} VERSION=${VERSION:-2.0.0}
BUILD=${BUILD:-1} BUILD=${BUILD:-2}
TAG=${TAG:-_SBo} TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then if [ -z "$ARCH" ]; then
@ -71,6 +71,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \; -exec chmod 644 {} \;
# Upstream patch for the newer chromaprint
patch -p1 < $CWD/chromaprint-1.4.patch
# Fix library installation path # Fix library installation path
sed -i "s|'lib'|'lib$LIBDIRSUFFIX'|" build/depends.py src/SConscript || exit 1 sed -i "s|'lib'|'lib$LIBDIRSUFFIX'|" build/depends.py src/SConscript || exit 1
sed -i "s|usr/lib|usr/lib$LIBDIRSUFFIX|" src/SConscript || exit 1 sed -i "s|usr/lib|usr/lib$LIBDIRSUFFIX|" src/SConscript || exit 1