[arch-commits] Commit in mixxx/trunk (PKGBUILD scons-python3.patch)
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
===
--- PKGBUILD2019-11-13 21:53:58 UTC (rev 527192)
+++ PKGBUILD2019-11-13 21:58:52 UTC (rev 527193)
@@ -1,5 +1,5 @@
# Maintainer: Lukas Fleischer
-# Contributor: David Runge
+# Contributor: David Runge
# Contributor: Ali H. Caliskan
# Contributor: Ryan Coyner
# Contributor: Stefan Husmann
@@ -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 +
-+++ mixxx-2.2.1/build/depends.py 2019-07-26 23:30:03.631040632 +
-@@ -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
[arch-commits] Commit in mixxx/trunk (PKGBUILD scons-python3.patch)
Date: Saturday, August 31, 2019 @ 00:26:17
Author: dvzrv
Revision: 505535
upgpkg: mixxx 2.2.2-1
Upgrading to 2.2.2. Adding soundtouch and qtkeychain to depends. Moving glu to
makedepends. Building qtkeychain feature by default. Modifying scons python3
patch to be able to apply.
Modified:
mixxx/trunk/PKGBUILD
mixxx/trunk/scons-python3.patch
-+
PKGBUILD| 18 +-
scons-python3.patch | 11 ---
2 files changed, 9 insertions(+), 20 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-08-30 21:41:45 UTC (rev 505534)
+++ PKGBUILD2019-08-31 00:26:17 UTC (rev 505535)
@@ -5,23 +5,22 @@
# Contributor: Stefan Husmann
pkgname=mixxx
-pkgver=2.2.1
+pkgver=2.2.2
pkgrel=1
pkgdesc="Free, open source software for digital DJ'ing."
arch=('x86_64')
-url='https://www.mixxx.org'
+url="https://www.mixxx.org;
license=('GPL2')
groups=('pro-audio')
-depends=('chromaprint' 'faad2' 'gperftools' 'glu' 'libid3tag' 'libmad'
+depends=('chromaprint' 'faad2' 'gperftools' 'hidapi' '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')
+'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=('16f0f4f6a83cd18501fdba3cb8d4f7fe4ac14b980d390406cb61acb889647ba89bc4051bb342d73081f940166f1689027f47fe6928e36c72babc18bf2a0d9bf3'
-
'599bb66acc372daebe10b9dfe65690290027876799a51a8cf0cc2a8f7ed5e9370936ab3e3c004f2a762495b0c73acfa1e9fb60ee757347ccc7699c3fb01a7020')
+sha512sums=('3b9365bd9d9a7d387cd8791d7d9f6315116e04322370db103998d5e055a6de5e159a4605c7de96cbcf13e7d0653cbe53140dca18a8c3f1b688b227be2c4aeb6f'
+
'4b01dc590ca6d7ae2ac20af77e74e02fe7c179ffc1e5cad6cffb22c6cc750ab1757103e27922430abe6d3d7a023bb22fd15640fbaff8acc812acef5099598fe3')
prepare() {
mv -v "${pkgname}-release-${pkgver}" "${pkgname}-${pkgver}"
@@ -39,6 +38,7 @@
perftools=1 \
perftools_profiler=1 \
qt_sqlite_plugin=0 \
+qtkeychain=1 \
test=1 \
target=linux \
virtualize=0 \
Modified: scons-python3.patch
===
--- scons-python3.patch 2019-08-30 21:41:45 UTC (rev 505534)
+++ scons-python3.patch 2019-08-31 00:26:17 UTC (rev 505535)
@@ -1,16 +1,5 @@
--- mixxx-2.2.1/build/depends.py.orig 2019-07-26 23:29:29.253916199 +
+++ mixxx-2.2.1/build/depends.py 2019-07-26 23:30:03.631040632 +
-@@ -30,8 +30,8 @@
- return
-
- def sources(self, build):
-- if build.platform_is_osx:
-- return ['util/filepathurl.mm']
-+if build.platform_is_osx:
-+return ['util/filepathurl.mm']
- return []
-
-
@@ -615,7 +615,7 @@
env.Append(CPPPATH=[self.SOUNDTOUCH_INTERNAL_PATH])
[arch-commits] Commit in mixxx/trunk (PKGBUILD scons-python3.patch)
Date: Saturday, July 27, 2019 @ 11:25:47
Author: arojas
Revision: 493164
Fix build with python3 scons
Added:
mixxx/trunk/scons-python3.patch
Modified:
mixxx/trunk/PKGBUILD
-+
PKGBUILD|6 --
scons-python3.patch | 31 +++
2 files changed, 35 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-07-27 11:25:21 UTC (rev 493163)
+++ PKGBUILD2019-07-27 11:25:47 UTC (rev 493164)
@@ -19,12 +19,14 @@
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')
+source=("https://github.com/${pkgname}dj/${pkgname}/archive/release-${pkgver}.tar.gz;
scons-python3.patch)
+sha512sums=('16f0f4f6a83cd18501fdba3cb8d4f7fe4ac14b980d390406cb61acb889647ba89bc4051bb342d73081f940166f1689027f47fe6928e36c72babc18bf2a0d9bf3'
+
'599bb66acc372daebe10b9dfe65690290027876799a51a8cf0cc2a8f7ed5e9370936ab3e3c004f2a762495b0c73acfa1e9fb60ee757347ccc7699c3fb01a7020')
prepare() {
mv -v "${pkgname}-release-${pkgver}" "${pkgname}-${pkgver}"
cd "${pkgname}-${pkgver}"
+ patch -p1 -i ../scons-python3.patch
}
build() {
Added: scons-python3.patch
===
--- scons-python3.patch (rev 0)
+++ scons-python3.patch 2019-07-27 11:25:47 UTC (rev 493164)
@@ -0,0 +1,31 @@
+--- mixxx-2.2.1/build/depends.py.orig 2019-07-26 23:29:29.253916199 +
mixxx-2.2.1/build/depends.py 2019-07-26 23:30:03.631040632 +
+@@ -30,8 +30,8 @@
+ return
+
+ def sources(self, build):
+- if build.platform_is_osx:
+- return ['util/filepathurl.mm']
++if build.platform_is_osx:
++return ['util/filepathurl.mm']
+ return []
+
+
+@@ -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
