[arch-commits] Commit in mixxx/repos/community-x86_64 (3 files)

[David Runge]

    Date: Saturday, August 31, 2019 @ 00:26:26
  Author: dvzrv
Revision: 505536

archrelease: copy trunk to community-x86_64

Added:
  mixxx/repos/community-x86_64/PKGBUILD
    (from rev 505535, mixxx/trunk/PKGBUILD)
  mixxx/repos/community-x86_64/scons-python3.patch
    (from rev 505535, mixxx/trunk/scons-python3.patch)
Deleted:
  mixxx/repos/community-x86_64/PKGBUILD

---------------------+
 PKGBUILD            |  118 +++++++++++++++++++++++++-------------------------
 scons-python3.patch |   20 ++++++++
 2 files changed, 80 insertions(+), 58 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-08-31 00:26:17 UTC (rev 505535)
+++ PKGBUILD	2019-08-31 00:26:26 UTC (rev 505536)
@@ -1,58 +0,0 @@
-# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
-# Contributor: David Runge <dave at sleepmap.de>
-# Contributor: Ali H. Caliskan <ali.h.caliskan AT gmail DOT com>
-# Contributor: Ryan Coyner <rcoyner at gmail.com>
-# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
-
-pkgname=mixxx
-pkgver=2.2.1
-pkgrel=1
-pkgdesc="Free, open source software for digital DJ'ing."
-arch=('x86_64')
-url='https://www.mixxx.org'
-license=('GPL2')
-groups=('pro-audio')
-depends=('chromaprint' 'faad2' 'gperftools' 'glu' 'libid3tag' 'libmad'
-'libmp4v2' 'libshout' 'lilv' 'opusfile' 'portaudio' 'portmidi' 'protobuf'
-'qt5-script' 'qt5-svg' 'qt5-x11extras' 'rubberband' 'taglib' 'upower'
-'wavpack')
-makedepends=('qt5-tools' 'qtkeychain' 'scons')
-optdepends=('qtkeychain: Credentials storage support for Live Broadcasting profiles')
-checkdepends=('xorg-server-xvfb')
-source=("https://github.com/${pkgname}dj/${pkgname}/archive/release-${pkgver}.tar.gz")
-sha512sums=('16f0f4f6a83cd18501fdba3cb8d4f7fe4ac14b980d390406cb61acb889647ba89bc4051bb342d73081f940166f1689027f47fe6928e36c72babc18bf2a0d9bf3')
-
-prepare() {
-  mv -v "${pkgname}-release-${pkgver}" "${pkgname}-${pkgver}"
-  cd "${pkgname}-${pkgver}"
-}
-
-build() {
-  cd "${pkgname}-${pkgver}"
-  export SCONSFLAGS="-j $(nproc)"
-  scons prefix=/usr \
-        build=release \
-        faad=1 \
-        modplug=1 \
-        perftools=1 \
-        perftools_profiler=1 \
-        qt_sqlite_plugin=0 \
-        test=1 \
-        target=linux \
-        virtualize=0 \
-        wv=1
-}
-
-check() {
-  cd "${pkgname}-${pkgver}"
-  xvfb-run lin64_build/${pkgname}-test
-}
-
-package() {
-  cd "${pkgname}-${pkgver}"
-  scons prefix=/usr \
-        install_root="${pkgdir}/usr" \
-        install
-  # removing the test executable
-  rm -v "${pkgdir}/usr/bin/${pkgname}-test"
-}

Copied: mixxx/repos/community-x86_64/PKGBUILD (from rev 505535, mixxx/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-08-31 00:26:26 UTC (rev 505536)
@@ -0,0 +1,60 @@
+# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
+# Contributor: David Runge <dave at sleepmap.de>
+# Contributor: Ali H. Caliskan <ali.h.caliskan AT gmail DOT com>
+# Contributor: Ryan Coyner <rcoyner at gmail.com>
+# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
+
+pkgname=mixxx
+pkgver=2.2.2
+pkgrel=1
+pkgdesc="Free, open source software for digital DJ'ing."
+arch=('x86_64')
+url="https://www.mixxx.org"
+license=('GPL2')
+groups=('pro-audio')
+depends=('chromaprint' 'faad2' 'gperftools' 'hidapi' 'libid3tag' 'libmad'
+'libmp4v2' 'libshout' 'lilv' 'opusfile' 'portaudio' 'portmidi' 'protobuf'
+'qt5-script' 'qt5-svg' 'qt5-x11extras' 'qtkeychain' 'rubberband' 'soundtouch'
+'taglib' 'upower' 'wavpack')
+makedepends=('glu' 'qt5-tools' 'scons' 'vamp-plugin-sdk')
+checkdepends=('xorg-server-xvfb')
+source=("https://github.com/${pkgname}dj/${pkgname}/archive/release-${pkgver}.tar.gz" scons-python3.patch)
+sha512sums=('3b9365bd9d9a7d387cd8791d7d9f6315116e04322370db103998d5e055a6de5e159a4605c7de96cbcf13e7d0653cbe53140dca18a8c3f1b688b227be2c4aeb6f'
+            '4b01dc590ca6d7ae2ac20af77e74e02fe7c179ffc1e5cad6cffb22c6cc750ab1757103e27922430abe6d3d7a023bb22fd15640fbaff8acc812acef5099598fe3')
+
+prepare() {
+  mv -v "${pkgname}-release-${pkgver}" "${pkgname}-${pkgver}"
+  cd "${pkgname}-${pkgver}"
+  patch -p1 -i ../scons-python3.patch
+}
+
+build() {
+  cd "${pkgname}-${pkgver}"
+  export SCONSFLAGS="-j $(nproc)"
+  scons prefix=/usr \
+        build=release \
+        faad=1 \
+        modplug=1 \
+        perftools=1 \
+        perftools_profiler=1 \
+        qt_sqlite_plugin=0 \
+        qtkeychain=1 \
+        test=1 \
+        target=linux \
+        virtualize=0 \
+        wv=1
+}
+
+check() {
+  cd "${pkgname}-${pkgver}"
+  xvfb-run lin64_build/${pkgname}-test
+}
+
+package() {
+  cd "${pkgname}-${pkgver}"
+  scons prefix=/usr \
+        install_root="${pkgdir}/usr" \
+        install
+  # removing the test executable
+  rm -v "${pkgdir}/usr/bin/${pkgname}-test"
+}

Copied: mixxx/repos/community-x86_64/scons-python3.patch (from rev 505535, mixxx/trunk/scons-python3.patch)
===================================================================
--- scons-python3.patch	                        (rev 0)
+++ scons-python3.patch	2019-08-31 00:26:26 UTC (rev 505536)
@@ -0,0 +1,20 @@
+--- mixxx-2.2.1/build/depends.py.orig	2019-07-26 23:29:29.253916199 +0000
++++ mixxx-2.2.1/build/depends.py	2019-07-26 23:30:03.631040632 +0000
+@@ -615,7 +615,7 @@
+             env.Append(CPPPATH=[self.SOUNDTOUCH_INTERNAL_PATH])
+ 
+             # Prevents circular import.
+-            from features import Optimize
++            from .features import Optimize
+ 
+             # If we do not want optimizations then disable them.
+             optimize = (build.flags['optimize'] if 'optimize' in build.flags
+@@ -1304,7 +1305,7 @@
+             'preferences/dialog/dlgprefvinyldlg.ui',
+             'preferences/dialog/dlgprefwaveformdlg.ui',
+         ]
+-        map(Qt.uic(build), ui_files)
++        list(map(Qt.uic(build), ui_files))
+
+         if build.platform_is_windows:
+             # Add Windows resource file with icons and such