diff --git a/srcpkgs/mixxx/patches/0007-fix_gcc6_issue.patch b/srcpkgs/mixxx/patches/0007-fix_gcc6_issue.patch deleted file mode 100644 index 7cd7d2bc98b..00000000000 --- a/srcpkgs/mixxx/patches/0007-fix_gcc6_issue.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: "Matteo F. Vescovi" -Date: Mon, 25 Jul 2016 22:17:43 +0200 -Subject: fix_gcc6_issue - ---- - src/util/math.h | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/src/util/math.h b/src/util/math.h -index 018335e..85971d1 100644 ---- src/util/math.h -+++ src/util/math.h -@@ -3,8 +3,20 @@ - - // Causes MSVC to define M_PI and friends. - // http://msdn.microsoft.com/en-us/library/4hwaceh6.aspx -+// Our SConscript defines this but check anyway. -+#ifdef __WINDOWS__ -+#ifndef _USE_MATH_DEFINES - #define _USE_MATH_DEFINES -+#endif -+#endif -+ -+#include - #include -+// Note: Because of our fpclassify hack, we actualy need to inlude both, -+// the c and the c++ version of the math header. -+// From GCC 6.1.1 math.h depends on cmath, which failes to compile if included -+// after our fpclassify hack -+ - #include - - #include "util/assert.h" diff --git a/srcpkgs/mixxx/patches/0008-chromaprint-1.4.patch b/srcpkgs/mixxx/patches/0008-chromaprint-1.4.patch index 367520497ea..15a6947fd45 100644 --- a/srcpkgs/mixxx/patches/0008-chromaprint-1.4.patch +++ b/srcpkgs/mixxx/patches/0008-chromaprint-1.4.patch @@ -27,18 +27,3 @@ Last-Update: 2017-01-11 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, diff --git a/srcpkgs/mixxx/patches/arm-machine.patch b/srcpkgs/mixxx/patches/arm-machine.patch deleted file mode 100644 index 798a00a624b..00000000000 --- a/srcpkgs/mixxx/patches/arm-machine.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- build/mixxx.py.orig 2014-08-27 20:20:09.652848211 +0200 -+++ build/mixxx.py 2014-08-27 20:24:18.551421642 +0200 -@@ -42,6 +42,7 @@ - if machine not in ['x86_64', 'x86', 'i686', 'i586', - 'alpha', 'hppa', 'mips', 'mipsel', 's390', - 'sparc', 'ia64', 'armel', 'armhf', 'hurd-i386', -+ 'armv5l', 'armv6l', 'armv7l', - 'sh3', 'sh4', - 'kfreebsd-amd64', 'kfreebsd-i386', - 'i486', 'i386', 'powerpc', 'powerpc64', diff --git a/srcpkgs/mixxx/patches/fix-build.patch b/srcpkgs/mixxx/patches/fix-build.patch deleted file mode 100644 index 325e575b192..00000000000 --- a/srcpkgs/mixxx/patches/fix-build.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- src/waveform/vsyncthread.h.orig 2015-12-21 14:23:59.671910985 +0100 -+++ src/waveform/vsyncthread.h 2015-12-21 14:24:38.067912746 +0100 -@@ -18,10 +18,11 @@ - #include - //#include "GL/glxext.h" - // clean up after Xlib.h, which #defines values that conflict with QT. -- #undef Bool -- #undef Unsorted - #endif // QT_OPENGL_ES_2 - #endif // QT_VERSION < QT_VERSION_CHECK(5, 0, 0) -+ #include -+ #undef Bool -+ #undef Unsorted - #endif - - #include "util/performancetimer.h" diff --git a/srcpkgs/mixxx/patches/fix-sqlite-build.patch b/srcpkgs/mixxx/patches/fix-sqlite-build.patch deleted file mode 100644 index 1b8ec7c5336..00000000000 --- a/srcpkgs/mixxx/patches/fix-sqlite-build.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- src/library/trackcollection.h.orig 2017-09-05 13:52:28.293440706 +0200 -+++ src/library/trackcollection.h 2017-09-05 13:52:56.925387795 +0200 -@@ -34,8 +34,7 @@ - #include "library/dao/libraryhashdao.h" - - #ifdef __SQLITE3__ --typedef struct sqlite3_context sqlite3_context; --typedef struct Mem sqlite3_value; -+#include - #endif - - class TrackInfoObject; diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template index 3784447d750..9d2154e57b0 100644 --- a/srcpkgs/mixxx/template +++ b/srcpkgs/mixxx/template @@ -1,29 +1,32 @@ # Template file for 'mixxx' pkgname=mixxx -version=2.0.0 -revision=6 +version=2.0.0.20180219 +revision=1 +_gitrev="231132e108804db7f832faf0d9d0dce238118e2a" hostmakedepends="scons pkg-config" makedepends="portaudio-devel libusb-devel libmad-devel protobuf-devel libid3tag-devel glu-devel taglib-devel opus-devel portmidi-devel vamp-plugin-sdk-devel faad2-devel libmp4v2-devel libshout-devel - rubberband-devel chromaprint-devel fftw-devel ffmpeg-devel + rubberband-devel chromaprint-devel fftw-devel ffmpeg-devel upower0-devel qt5-svg-devel qt5-script-devel qt5-xmlpatterns-devel qt5-script-devel" depends="qt5-plugin-sqlite" short_desc="Open source digital DJing software that allows mixing music" maintainer="Enno Boland " homepage="http://www.mixxx.org" license="GPL-2" -distfiles="https://github.com/mixxxdj/mixxx/archive/release-${version}.tar.gz" -checksum=688d87d907f3ad3721602f44295a4d0caa41502df8504ca9264ca0c87d8818f1 +distfiles="https://github.com/mixxxdj/mixxx/archive/${_gitrev}.tar.gz>${pkgname}-${version}.tar.gz" +checksum=2144f19492a52a698c27b7c97089169752d6109e6f8c65e697ca0885b27cb27b _scons_args="shoutcast=1 faad=1 tuned=0 prefix=/usr qt5=1 qtdir=/usr/include/qt5" -wrksrc=$pkgname-release-$version - -case "$XBPS_TARGET_MACHINE" in - *-musl) broken="https://build.voidlinux.eu/builders/x86_64-musl_builder/builds/8340/steps/shell_3/logs/stdio" ;; -esac +#wrksrc=$pkgname-release-$version +wrksrc=${pkgname}-${_gitrev} do_build() { - if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then + case "$XBPS_TARGET_MACHINE" in + *-musl) find plugins -type f -exec sed -i "{}" \ + -e "s;u_int8_t;uint8_t;g" -e "s;u_int32_t;uint32_t;g" \; + ;; + esac + if [ "${XBPS_TARGET_MACHINE%-musl}" = "i686" ]; then export CFLAGS+=" -msse" export CXXFLAGS+=" -msse" fi @@ -32,7 +35,7 @@ do_build() { -e 's/vcs_revision = .*/vcs_revision = "'$version'"/' \ src/SConscript - scons ${makejobs} ${_scons_args} + MAKEFLAGS="${makejobs}" scons ${makejobs} ${_scons_args} } do_install() { if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then