[arch-commits] Commit in mixxx/trunk (PKGBUILD mixxx-mp4v2-c++.patch)
David Runge
dvzrv at archlinux.org
Wed Jun 30 21:41:55 UTC 2021
Date: Wednesday, June 30, 2021 @ 21:41:55
Author: dvzrv
Revision: 968051
upgpkg: mixxx 2.3.0-1: Upgrade to 2.3.0.
Switch to cmake as scons has been deprecated as build system \o/
Remove libshout as dependency as mixxx now uses a statically linked version of libshout-idjc (currently only in the AUR).
Add fftw to makedepends/ soname depends.
Remove mp4v2 patch for scons build system.
Modified:
mixxx/trunk/PKGBUILD
Deleted:
mixxx/trunk/mixxx-mp4v2-c++.patch
-----------------------+
PKGBUILD | 75 ++++++++++++++++++------------------------------
mixxx-mp4v2-c++.patch | 26 ----------------
2 files changed, 29 insertions(+), 72 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-06-30 20:53:53 UTC (rev 968050)
+++ PKGBUILD 2021-06-30 21:41:55 UTC (rev 968051)
@@ -5,67 +5,50 @@
# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
pkgname=mixxx
-pkgver=2.2.4
-pkgrel=6
+pkgver=2.3.0
+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' 'gcc-libs' 'glibc' 'hidapi' 'libglvnd' 'libmad'
-'libmodplug' 'libmp4v2' 'libshout' 'libx11' 'openssl' 'opusfile>=0.12' 'qt5-base'
-'qt5-script' 'qt5-svg' 'qt5-x11extras' 'qtkeychain' 'soundtouch' 'speex'
-'sqlite' 'taglib' 'upower' 'wavpack')
-makedepends=('faad2' 'ffmpeg' 'flac' 'glib2' 'glu' 'gperftools' 'libid3tag'
-'libogg' 'libsndfile' 'libusb' 'libvorbis' 'lilv' 'lv2' 'qt5-tools' 'portaudio'
-'portmidi' 'protobuf' 'rubberband' 'scons' 'vamp-plugin-sdk')
+# TODO: package libshout-idjc
+depends=('gcc-libs' 'glibc' 'hidapi' 'lame' 'libglvnd' 'libmad' 'libmodplug'
+'libmp4v2' 'libx11' 'openssl' 'opusfile' 'qt5-base' 'qt5-script'
+'qt5-svg' 'qt5-x11extras' 'qtkeychain' 'soundtouch' 'speex' 'sqlite' 'taglib'
+'upower' 'wavpack')
+makedepends=('chromaprint' 'cmake' 'faad2' 'ffmpeg' 'fftw' 'flac' 'glib2' 'glu'
+'gperftools' 'libid3tag' 'libogg' 'libsndfile' 'libusb' 'libvorbis' 'lilv'
+'lv2' 'qt5-tools' 'portaudio' 'portmidi' 'protobuf' 'rubberband'
+'vamp-plugin-sdk')
checkdepends=('xorg-server-xvfb')
-source=("https://github.com/${pkgname}dj/${pkgname}/archive/release-${pkgver}.tar.gz"
- mixxx-mp4v2-c++.patch)
-sha512sums=('34f67088ea2271cb13b75d001d3814237b1b6c2052646d670a36e341fb78e24c34d361a3eb03b0dbfb2d94b0026fecc9125713d7533aac7e99161c27090115fa'
- 'c7ea562ac32e46ec12302cb3c50f2152d172830cfe669f230f810dff51c1421ae7811a96a26cbc06f28be6cf1900f9fc161ff91dfcad659831bd0ff24dea3cd7')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/${pkgname}dj/${pkgname}/archive/${pkgver}.tar.gz")
+sha512sums=('9ebb735b4f5d85b5f2b1ea6b8976ccfc0b1cd39516c5d5d6eb9038761836bb640583ea5c941f3b0d37e1882fa14dbc971c99f69498de764218d2815f58fc00f1')
+b2sums=('346bef3feecf1671729b2b07156be281d9f7879aaf3bb5764ec7bdfa1004ef1630c9279df46467ab3696ea7debf3c2a6b68202db9f5a288879d8a34ee00df738')
-prepare() {
- mv -v "${pkgname}-release-${pkgver}" "${pkgname}-${pkgver}"
- cd "${pkgname}-${pkgver}"
-
-# Check for mp4v2 headers in C++ mode, since using mp4v2 in C is broken https://github.com/TechSmith/mp4v2/issues/47
- patch -p1 < ../mixxx-mp4v2-c++.patch
-}
-
build() {
cd "${pkgname}-${pkgver}"
- export SCONSFLAGS="-j $(nproc)"
- scons prefix=/usr \
- build=release \
- faad=1 \
- ffmpeg=1 \
- modplug=1 \
- perftools=1 \
- perftools_profiler=1 \
- qt_sqlite_plugin=0 \
- qtkeychain=1 \
- test=1 \
- target=linux \
- virtualize=0 \
- wv=1
+ cmake -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE='Release' \
+ -Wno-dev \
+ -B build \
+ -S .
+ make VERBOSE=1 -C build
}
check() {
cd "${pkgname}-${pkgver}"
- xvfb-run lin64_build/${pkgname}-test
+ xvfb-run build/${pkgname}-test
}
package() {
- depends+=('libFLAC.so' 'libfaad.so' 'libavcodec.so' 'libavformat.so'
- 'libavutil.so' 'libglib-2.0.so' 'libid3tag.so' 'libgobject-2.0.so'
- 'liblilv-0.so' 'libogg.so' 'libportaudio.so' 'libportmidi.so'
- 'libprotobuf-lite.so' 'librubberband.so' 'libsndfile.so' 'libtcmalloc.so'
- 'libusb-1.0.so' 'libvorbis.so' 'libvorbisenc.so' 'libvorbisfile.so')
+ depends+=('libFLAC.so' 'libavcodec.so' 'libavformat.so' 'libavutil.so'
+ 'libchromaprint.so' 'libfftw3.so' 'libglib-2.0.so' 'libid3tag.so'
+ 'libgobject-2.0.so' 'liblilv-0.so' 'libogg.so' 'libportaudio.so'
+ 'libportmidi.so' 'libprotobuf-lite.so' 'librubberband.so' 'libsndfile.so'
+ 'libtcmalloc.so' 'libusb-1.0.so' 'libvorbis.so' 'libvorbisenc.so'
+ 'libvorbisfile.so')
+
cd "${pkgname}-${pkgver}"
- scons prefix=/usr \
- install_root="${pkgdir}/usr" \
- install
- # removing the test executable
- rm -v "${pkgdir}/usr/bin/${pkgname}-test"
+ make DESTDIR="${pkgdir}" install -C build
}
Deleted: mixxx-mp4v2-c++.patch
===================================================================
--- mixxx-mp4v2-c++.patch 2021-06-30 20:53:53 UTC (rev 968050)
+++ mixxx-mp4v2-c++.patch 2021-06-30 21:41:55 UTC (rev 968051)
@@ -1,26 +0,0 @@
-diff --git a/build/features.py b/build/features.py
-index 7d5c76249f..2275567e4b 100644
---- a/build/features.py
-+++ b/build/features.py
-@@ -502,7 +502,7 @@ class FAAD(Feature):
- if not self.enabled(build):
- return
-
-- have_mp4v2_h = conf.CheckHeader('mp4v2/mp4v2.h')
-+ have_mp4v2_h = conf.CheckHeader('mp4v2/mp4v2.h', language='C++')
- have_mp4v2 = conf.CheckLib(['mp4v2', 'libmp4v2'], autoadd=False)
- have_mp4_h = conf.CheckHeader('mp4.h')
- have_mp4 = conf.CheckLib('mp4', autoadd=False)
-diff --git a/plugins/soundsourcem4a/SConscript b/plugins/soundsourcem4a/SConscript
-index 9f9a74cbca..9f8006908a 100644
---- a/plugins/soundsourcem4a/SConscript
-+++ b/plugins/soundsourcem4a/SConscript
-@@ -38,7 +38,7 @@ if int(build.flags['faad']):
-
- conf = Configure(env)
-
-- have_mp4v2_h = conf.CheckHeader('mp4v2/mp4v2.h')
-+ have_mp4v2_h = conf.CheckHeader('mp4v2/mp4v2.h', language='C++')
- if have_mp4v2_h:
- env.Append(CPPDEFINES = '__MP4V2__')
-
More information about the arch-commits
mailing list