mixxx: update to 2.2.0.

This commit is contained in:
John 2018-12-25 20:13:54 +01:00 committed by maxice8
parent 3ee6d2cac6
commit e3c180d760
2 changed files with 5 additions and 32 deletions

View file

@ -1,29 +0,0 @@
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
--- src/musicbrainz/chromaprinter.cpp
+++ 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) {
}

View file

@ -1,6 +1,6 @@
# Template file for 'mixxx'
pkgname=mixxx
version=2.1.4
version=2.2.0
revision=1
wrksrc="mixxx-release-${version}"
build_style=scons
@ -9,14 +9,14 @@ makedepends="chromaprint-devel faad2-devel ffmpeg-devel fftw-devel glu-devel
libid3tag-devel libmad-devel libmp4v2-devel libshout-devel libusb-devel
opusfile-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
vamp-plugin-sdk-devel"
vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel"
depends="qt5-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="Enno Boland <gottox@voidlinux.eu>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/release-${version}.tar.gz"
checksum=5d99f4f9ae61a3b5f0afc4029d150debc09af954563959998f32633875a63043
checksum=03c819a55b1abee778c02d2ad889246c9ead9dd2948572a711b2aa94e4839faf
_scons_args="shoutcast=1 faad=1 tuned=0 prefix=/usr qt5=1 qtdir=/usr/include/qt5"
nocross=https://build.voidlinux.eu/builders/armv7l_builder/builds/7882/steps/shell_3/logs/stdio
@ -40,6 +40,8 @@ do_build() {
-e 's/vcs_revision = .*/vcs_revision = "'$version'"/' \
src/SConscript
sed -i -e 's/vamp-plugin-sdk/vamp-sdk/g' build/features.py vamp-plugins/SConscript
MAKEFLAGS="${makejobs}" scons ${makejobs} ${_scons_args}
}