[arch-commits] Commit in mixxx/trunk (5 files)
Lukas Fleischer
lfleischer at archlinux.org
Sun May 20 10:21:20 UTC 2018
Date: Sunday, May 20, 2018 @ 10:21:19
Author: lfleischer
Revision: 325221
upgpkg: mixxx 2.1.0-1
Upstream update.
Modified:
mixxx/trunk/PKGBUILD
Deleted:
mixxx/trunk/mixxx-2.0.0-build.patch
mixxx/trunk/mixxx-2.0.0-chromaprint-1.4.0.patch
mixxx/trunk/mixxx-2.0.0-gcc-6.patch
mixxx/trunk/mixxx-remove-sqlite-typedef.patch
-------------------------------------+
PKGBUILD | 30 +++++++-----------------------
mixxx-2.0.0-build.patch | 10 ----------
mixxx-2.0.0-chromaprint-1.4.0.patch | 17 -----------------
mixxx-2.0.0-gcc-6.patch | 17 -----------------
mixxx-remove-sqlite-typedef.patch | 27 ---------------------------
5 files changed, 7 insertions(+), 94 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-05-20 09:22:57 UTC (rev 325220)
+++ PKGBUILD 2018-05-20 10:21:19 UTC (rev 325221)
@@ -4,8 +4,8 @@
# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
pkgname=mixxx
-pkgver=2.0.0
-pkgrel=13
+pkgver=2.1.0
+pkgrel=1
pkgdesc="Free, open source software for digital DJ'ing."
arch=('x86_64')
url='http://www.mixxx.org'
@@ -12,29 +12,13 @@
license=('GPL')
depends=('fftw' 'libid3tag' 'libmad' 'libogg' 'libshout' 'libsndfile' 'portaudio' 'portmidi'
'taglib' 'qt4' 'vamp-plugin-sdk' 'libusbx' 'protobuf' 'faad2' 'libmp4v2'
- 'rubberband' 'chromaprint' 'sqlite' 'opus' 'opusfile')
+ 'rubberband' 'chromaprint' 'sqlite' 'opus' 'opusfile' 'upower')
makedepends=('mesa' 'scons' 'libshout' 'glu')
-source=("https://downloads.mixxx.org/${pkgname}-${pkgver}/${pkgname}-${pkgver}-src.tar.gz"
- mixxx-2.0.0-gcc-6.patch
- mixxx-2.0.0-chromaprint-1.4.0.patch
- mixxx-2.0.0-build.patch
- mixxx-remove-sqlite-typedef.patch)
-md5sums=('5520a2f110f1078197d2ff914ccca37a'
- '957245cf7a06e57d42fb7f8e3421a934'
- '9aa411ccc9e72b27860858ac68104f2b'
- '0da474abaf9eb50cfdcdc449854a6772'
- '5cbc4f21a5ff8e477a986af015f1ed31')
+source=("https://github.com/${pkgname}dj/${pkgname}/archive/release-${pkgver}.tar.gz")
+md5sums=('d266cb04ee6589ce7ecc806f5266b0e5')
-prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p1 -i ../mixxx-2.0.0-gcc-6.patch
- patch -p1 -i ../mixxx-2.0.0-chromaprint-1.4.0.patch
- patch -p1 -i ../mixxx-2.0.0-build.patch
- patch -p1 -i ../mixxx-remove-sqlite-typedef.patch # rpmfusion
-}
-
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd "${srcdir}/${pkgname}-release-${pkgver}"
export SCONSFLAGS="-j $(nproc)"
scons build=release optimize=portable virtualize=0 localecompare=1 qt_sqlite_plugin=0 opus=1 \
qtdir=/usr/lib/qt4 prefix=/usr faad=1
@@ -41,6 +25,6 @@
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd "${srcdir}/${pkgname}-release-${pkgver}"
scons qtdir=/usr/lib/qt4 prefix=/usr install_root="${pkgdir}/usr" install
}
Deleted: mixxx-2.0.0-build.patch
===================================================================
--- mixxx-2.0.0-build.patch 2018-05-20 09:22:57 UTC (rev 325220)
+++ mixxx-2.0.0-build.patch 2018-05-20 10:21:19 UTC (rev 325221)
@@ -1,10 +0,0 @@
-diff -ur mixxx-2.0.0/build/mixxx.py mixxx-2.0.0-patched/build/mixxx.py
---- ./build/depends.py.orig 2016-02-09 04:30:54.860754912 +0000
-+++ ./build/depends.py 2016-02-09 04:29:53.286383033 +0000
-@@ -359,7 +359,6 @@ class Qt(Dependence):
- qtdir = build.env['QTDIR']
- framework_path = Qt.find_framework_libdir(qtdir, qt5)
- if os.path.isdir(framework_path):
-- build.env.Append(LINKFLAGS="-Wl,-rpath," + framework_path)
- build.env.Append(LINKFLAGS="-L" + framework_path)
-
Deleted: mixxx-2.0.0-chromaprint-1.4.0.patch
===================================================================
--- mixxx-2.0.0-chromaprint-1.4.0.patch 2018-05-20 09:22:57 UTC (rev 325220)
+++ mixxx-2.0.0-chromaprint-1.4.0.patch 2018-05-20 10:21:19 UTC (rev 325221)
@@ -1,17 +0,0 @@
---- mixxx-2.0.0/src/musicbrainz/chromaprinter.cpp.old 2017-01-13 14:24:15.105139156 +0100
-+++ mixxx-2.0.0/src/musicbrainz/chromaprinter.cpp 2017-01-13 14:24:06.568450904 +0100
-@@ -57,12 +57,12 @@ QString ChromaPrinter::calcFingerPrint(c
- }
- chromaprint_finish(ctx);
-
-- void* fprint = NULL;
-+ uint32_t* fprint = NULL;
- int size = 0;
- int ret = chromaprint_get_raw_fingerprint(ctx, &fprint, &size);
- QByteArray fingerprint;
- if (ret == 1) {
-- void* encoded = NULL;
-+ char* encoded = NULL;
- int encoded_size = 0;
- chromaprint_encode_fingerprint(fprint, size,
- CHROMAPRINT_ALGORITHM_DEFAULT,
Deleted: mixxx-2.0.0-gcc-6.patch
===================================================================
--- mixxx-2.0.0-gcc-6.patch 2018-05-20 09:22:57 UTC (rev 325220)
+++ mixxx-2.0.0-gcc-6.patch 2018-05-20 10:21:19 UTC (rev 325221)
@@ -1,17 +0,0 @@
---- ./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"
Deleted: mixxx-remove-sqlite-typedef.patch
===================================================================
--- mixxx-remove-sqlite-typedef.patch 2018-05-20 09:22:57 UTC (rev 325220)
+++ mixxx-remove-sqlite-typedef.patch 2018-05-20 10:21:19 UTC (rev 325221)
@@ -1,27 +0,0 @@
---- a/src/library/trackcollection.cpp
-+++ b/src/library/trackcollection.cpp
-@@ -2,10 +2,6 @@
- #include <QtDebug>
-
- #include "library/trackcollection.h"
--
--#ifdef __SQLITE3__
--#include <sqlite3.h>
--#endif
-
- #include "library/librarytablemodel.h"
- #include "library/schemamanager.h"
-
---- a/src/library/trackcollection.h
-+++ b/src/library/trackcollection.h
-@@ -34,8 +34,7 @@
- #include "library/dao/libraryhashdao.h"
-
- #ifdef __SQLITE3__
--typedef struct sqlite3_context sqlite3_context;
--typedef struct Mem sqlite3_value;
-+#include <sqlite3.h>
- #endif
-
- class TrackInfoObject;
-
More information about the arch-commits
mailing list