Date: Saturday, November 12, 2016 @ 11:28:30 Author: lfleischer Revision: 195426
upgpkg: mixxx 2.0.0-5 protobuf3 rebuild. Added: mixxx/trunk/mixxx-2.0.0-gcc-6.patch Modified: mixxx/trunk/PKGBUILD -------------------------+ PKGBUILD | 13 ++++++++++--- mixxx-2.0.0-gcc-6.patch | 17 +++++++++++++++++ 2 files changed, 27 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-11-12 10:45:35 UTC (rev 195425) +++ PKGBUILD 2016-11-12 11:28:30 UTC (rev 195426) @@ -5,7 +5,7 @@ pkgname=mixxx pkgver=2.0.0 -pkgrel=4 +pkgrel=5 pkgdesc="Free, open source software for digital DJ'ing." arch=('i686' 'x86_64') url='http://www.mixxx.org' @@ -14,9 +14,16 @@ 'taglib' 'qtwebkit' 'vamp-plugin-sdk' 'libusbx' 'protobuf' 'faad2' 'libmp4v2' 'rubberband' 'chromaprint' 'sqlite' 'opus' 'opusfile') makedepends=('mesa' 'scons' 'libshout' 'glu') -source=("http://downloads.mixxx.org/${pkgname}-${pkgver}/${pkgname}-${pkgver}-src.tar.gz") -md5sums=('5520a2f110f1078197d2ff914ccca37a') +source=("https://downloads.mixxx.org/${pkgname}-${pkgver}/${pkgname}-${pkgver}-src.tar.gz" + mixxx-2.0.0-gcc-6.patch) +md5sums=('5520a2f110f1078197d2ff914ccca37a' + '957245cf7a06e57d42fb7f8e3421a934') +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../mixxx-2.0.0-gcc-6.patch +} + build() { cd "${srcdir}/${pkgname}-${pkgver}" export SCONSFLAGS="-j $(nproc)" Added: mixxx-2.0.0-gcc-6.patch =================================================================== --- mixxx-2.0.0-gcc-6.patch (rev 0) +++ mixxx-2.0.0-gcc-6.patch 2016-11-12 11:28:30 UTC (rev 195426) @@ -0,0 +1,17 @@ +--- ./src/util/math.h.orig 2016-07-14 04:13:22.861482580 +0100 ++++ ./src/util/math.h 2016-07-14 04:15:36.966067224 +0100 +@@ -4,7 +4,13 @@ + // Causes MSVC to define M_PI and friends. + // http://msdn.microsoft.com/en-us/library/4hwaceh6.aspx + #define _USE_MATH_DEFINES +-#include <cmath> ++#include <math.h> ++#include <cmath> ++// 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 <algorithm> + + #include "util/assert.h"