[arch-commits] Commit in mixxx/trunk (PKGBUILD scons-python3.patch)

[David Runge]

    Date: Wednesday, November 13, 2019 @ 21:58:52
  Author: dvzrv
Revision: 527193

upgpkg: mixxx 2.2.2-3

Updating maintainer info. Adding all direct library dependencies. Adding lv2 to makedepends. Using upstreamed fixes for scons on python3.

Modified:
  mixxx/trunk/PKGBUILD
Deleted:
  mixxx/trunk/scons-python3.patch

---------------------+
 PKGBUILD            |   30 ++++++++++++++++++------------
 scons-python3.patch |   20 --------------------
 2 files changed, 18 insertions(+), 32 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-13 21:53:58 UTC (rev 527192)
+++ PKGBUILD	2019-11-13 21:58:52 UTC (rev 527193)
@@ -1,5 +1,5 @@
 # Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
-# Contributor: David Runge <dave at sleepmap.de>
+# Contributor: David Runge <dvzrv at archlinux.org>
 # 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>
@@ -6,28 +6,34 @@
 
 pkgname=mixxx
 pkgver=2.2.2
-pkgrel=2
+pkgrel=3
 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' 'flac' 'gcc-libs' 'glibc' 'glib2' 'hidapi'
-'libglvnd' 'libid3tag' 'libmad' 'libmodplug' 'libmp4v2' 'libogg' 'libshout'
-'libsndfile' 'libtcmalloc.so' 'libusb' 'libvorbis.so' 'libvorbisfile.so' 'lilv'
-'libx11' 'opusfile' 'portaudio' 'portmidi' 'protobuf' 'qt5-base' 'qt5-script'
-'qt5-svg' 'qt5-x11extras' 'qtkeychain' 'rubberband' 'soundtouch' 'sqlite'
-'taglib' 'upower' 'wavpack')
-makedepends=('glu' 'qt5-tools' 'scons' 'vamp-plugin-sdk')
+depends=('chromaprint' 'faad2' 'gcc-libs' 'glibc' 'glib2' 'hidapi' 'libFLAC.so'
+'libglvnd' 'libid3tag' 'liblilv-0.so' 'libmad' 'libmodplug' 'libmp4v2' 'libogg'
+'libportaudio.so' 'libportmidi.so' 'librubberband.so' 'libshout' 'libsndfile'
+'libtcmalloc.so' 'libusb-1.0.so' 'libvorbis.so' 'libvorbisenc.so'
+'libvorbisfile.so' 'libx11' 'opusfile' 'protobuf' 'qt5-base' 'qt5-script'
+'qt5-svg' 'qt5-x11extras' 'qtkeychain' 'soundtouch' 'sqlite' 'taglib' 'upower'
+'wavpack')
+makedepends=('glu' 'lv2' '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)
+source=("https://github.com/${pkgname}dj/${pkgname}/archive/release-${pkgver}.tar.gz"
+        "${pkgname}-scons-python3.patch::https://github.com/mixxxdj/mixxx/commit/73d02e58bcd.patch"
+        "${pkgname}-list-fix.patch::https://github.com/mixxxdj/mixxx/commit/03fad27e1f0.patch")
 sha512sums=('3b9365bd9d9a7d387cd8791d7d9f6315116e04322370db103998d5e055a6de5e159a4605c7de96cbcf13e7d0653cbe53140dca18a8c3f1b688b227be2c4aeb6f'
-            '4b01dc590ca6d7ae2ac20af77e74e02fe7c179ffc1e5cad6cffb22c6cc750ab1757103e27922430abe6d3d7a023bb22fd15640fbaff8acc812acef5099598fe3')
+            '3dc0e7de1dbc6ab45b42ac418c03e5dd122411b0504b122050c27fbea41e7c5a5f9414c4189978e76d58d0c04e41aebe83addf7c449f80ae0a3674b00d018539'
+            'aaef4ff6a8f9384b97157dad5ad655ddd7efaecd277fc34c90e52fb67b1aba127bda4e9ba72152279210c77ca9a42d1beadcd04595f6f43a98bd7ef22dc2c880')
 
 prepare() {
   mv -v "${pkgname}-release-${pkgver}" "${pkgname}-${pkgver}"
   cd "${pkgname}-${pkgver}"
-  patch -p1 -i ../scons-python3.patch
+  # fixes for building with python3 based scons
+  patch -Np1 -i ../${pkgname}-scons-python3.patch
+  patch -Np1 -i ../${pkgname}-list-fix.patch
 }
 
 build() {

Deleted: scons-python3.patch
===================================================================
--- scons-python3.patch	2019-11-13 21:53:58 UTC (rev 527192)
+++ scons-python3.patch	2019-11-13 21:58:52 UTC (rev 527193)
@@ -1,20 +0,0 @@
---- 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