pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/audio/mixxx mixxx: update to 2.3.1
details: https://anonhg.NetBSD.org/pkgsrc/rev/cee90d9f8653
branches: trunk
changeset: 769810:cee90d9f8653
user: nia <nia%pkgsrc.org@localhost>
date: Sat Nov 20 19:07:37 2021 +0000
description:
mixxx: update to 2.3.1
Changes in 2.3.x: https://mixxx.org/news/2021-06-28-mixxx-2-3-0-released/
mCVS: ----------------------------------------------------------------------
diffstat:
audio/mixxx/Makefile | 71 +-
audio/mixxx/PLIST | 1946 +++++++--
audio/mixxx/PLIST.wv | 2 -
audio/mixxx/distinfo | 17 +-
audio/mixxx/options.mk | 14 -
audio/mixxx/patches/patch-build_depends.py | 158 -
audio/mixxx/patches/patch-build_features.py | 72 -
audio/mixxx/patches/patch-lib_vamp_src_vamp-hostsdk_PluginHostAdapter.cpp | 17 -
audio/mixxx/patches/patch-src_controllers_controllermanager.cpp | 19 +-
audio/mixxx/patches/patch-src_encoder_encodermp3.cpp | 25 -
audio/mixxx/patches/patch-vamp-plugins_SConscript | 15 -
11 files changed, 1427 insertions(+), 929 deletions(-)
diffs (truncated from 3095 to 300 lines):
diff -r c96a3378d217 -r cee90d9f8653 audio/mixxx/Makefile
--- a/audio/mixxx/Makefile Sat Nov 20 18:59:16 2021 +0000
+++ b/audio/mixxx/Makefile Sat Nov 20 19:07:37 2021 +0000
@@ -1,63 +1,30 @@
-# $NetBSD: Makefile,v 1.25 2021/11/15 22:54:03 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2021/11/20 19:07:37 nia Exp $
-DISTNAME= mixxx-2.2.2
-PKGREVISION= 17
+DISTNAME= mixxx-2.3.1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_GITHUB:=mixxxdj/}
-GITHUB_TAG= release-${PKGVERSION_NOREV}
+GITHUB_TAG= ${PKGVERSION_NOREV}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://mixxx.org/
COMMENT= DJ mixing application
LICENSE= gnu-gpl-v2
-USE_LANGUAGES= c c++11
+USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
# c++11
GCC_REQD+= 4.9
+USE_CMAKE= yes
+
+CMAKE_ARGS+= -DUSE_SYMLINKS=OFF
+CMAKE_ARGS+= -DPORTMIDI=OFF
+
PLIST_SRCS+= PLIST
.include "../../mk/bsd.prefs.mk"
-SCONS_ARGS+= -j${MAKE_JOBS:U1}
-
-# scons fails otherwise
-PYTHON_VERSIONS_ACCEPTED= 27
-
-CHECK_PORTABILITY_SKIP+= lib/gmock-1.7.0/configure
-
-# No support in the build system.
-BROKEN_ON_PLATFORM+= SunOS-*-*
-
-SUBST_CLASSES+= base
-SUBST_STAGE.base= pre-configure
-SUBST_FILES.base= build/depends.py
-SUBST_VARS.base= LOCALBASE
-
-SCONS_ARGS+= faad=1
-SCONS_ARGS+= modplug=1
-
-SCONS_ARGS+= build="release"
-
-# let pkgsrc take care of this
-SCONS_ARGS+= optimize="off"
-
-# XXX horrible workaround
-CXXFLAGS+= -I${QTDIR}/include/QtConcurrent
-CXXFLAGS+= -I${QTDIR}/include/QtCore
-CXXFLAGS+= -I${QTDIR}/include/QtDBus
-CXXFLAGS+= -I${QTDIR}/include/QtGui
-CXXFLAGS+= -I${QTDIR}/include/QtNetwork
-CXXFLAGS+= -I${QTDIR}/include/QtOpenGL
-CXXFLAGS+= -I${QTDIR}/include/QtScript
-CXXFLAGS+= -I${QTDIR}/include/QtScriptTools
-CXXFLAGS+= -I${QTDIR}/include/QtSql
-CXXFLAGS+= -I${QTDIR}/include/QtSvg
-CXXFLAGS+= -I${QTDIR}/include/QtWidgets
-CXXFLAGS+= -I${QTDIR}/include/QtXml
-
REPLACE_INTERPRETER+= node
REPLACE.node.old= .*/usr/bin/env node
REPLACE.node.new= ${PREFIX}/bin/node
@@ -67,22 +34,13 @@
# avoid a hard nodejs dependency
CHECK_INTERPRETER_SKIP+= share/mixxx/controllers/novation-launchpad/scripts/*
-do-build:
- cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SCONSBIN} ${SCONS_ARGS} \
- CC=${CC:Q} CXX=${CXX:Q} CFLAGS=${CFLAGS:Q} CXXFLAGS=${CXXFLAGS:Q} \
- LINKFLAGS=${LDFLAGS:Q} qtdir=${QTDIR:Q} prefix=${PREFIX}
-do-install:
- cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SCONSBIN} ${SCONS_ARGS} \
- CC=${CC:Q} CXX=${CXX:Q} CFLAGS=${CFLAGS:Q} CXXFLAGS=${CXXFLAGS:Q} \
- LINKFLAGS=${LDFLAGS:Q} qtdir=${QTDIR:Q} prefix=${PREFIX} install \
- --install-sandbox=${DESTDIR}
-
-.include "options.mk"
.include "../../audio/chromaprint/buildlink3.mk"
.include "../../audio/faad2/buildlink3.mk"
.include "../../audio/flac/buildlink3.mk"
+.include "../../audio/lame/buildlink3.mk"
.include "../../audio/libebur128/buildlink3.mk"
.include "../../audio/libid3tag/buildlink3.mk"
+.include "../../audio/libkeyfinder/buildlink3.mk"
.include "../../audio/libmad/buildlink3.mk"
.include "../../audio/libmodplug/buildlink3.mk"
.include "../../audio/libshout/buildlink3.mk"
@@ -95,17 +53,20 @@
.include "../../audio/rubberband/buildlink3.mk"
.include "../../audio/soundtouch/buildlink3.mk"
.include "../../audio/taglib/buildlink3.mk"
-.include "../../audio/vamp-plugin-sdk/buildlink3.mk"
+.include "../../audio/wavpack/buildlink3.mk"
.include "../../comms/libhidapi/buildlink3.mk"
+.include "../../databases/sqlite3/buildlink3.mk"
.include "../../devel/libusb1/buildlink3.mk"
.include "../../devel/protobuf/buildlink3.mk"
-.include "../../devel/scons/buildlink3.mk"
.include "../../graphics/glu/buildlink3.mk"
.include "../../math/fftw/buildlink3.mk"
+.include "../../multimedia/ffmpeg4/buildlink3.mk"
.include "../../multimedia/mp4v2/buildlink3.mk"
+.include "../../security/qt5-qtkeychain/buildlink3.mk"
.include "../../sysutils/upower/buildlink3.mk"
.include "../../x11/qt5-qtbase/buildlink3.mk"
.include "../../x11/qt5-qtscript/buildlink3.mk"
.include "../../x11/qt5-qtsvg/buildlink3.mk"
+.include "../../x11/qt5-qtx11extras/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r c96a3378d217 -r cee90d9f8653 audio/mixxx/PLIST
--- a/audio/mixxx/PLIST Sat Nov 20 18:59:16 2021 +0000
+++ b/audio/mixxx/PLIST Sat Nov 20 19:07:37 2021 +0000
@@ -1,12 +1,18 @@
-@comment $NetBSD: PLIST,v 1.4 2019/10/06 13:45:42 nia Exp $
+@comment $NetBSD: PLIST,v 1.5 2021/11/20 19:07:37 nia Exp $
bin/mixxx
-lib/mixxx/plugins/soundsourceqt5/libsoundsourcem4a.so
-lib/mixxx/plugins/vampqt5/libmixxxminimal.so
-share/appdata/mixxx.appdata.xml
-share/applications/mixxx.desktop
+share/applications/org.mixxx.Mixxx.desktop
+share/doc/mixxx/COPYING
share/doc/mixxx/LICENSE
-share/doc/mixxx/Mixxx-Manual.pdf
-share/doc/mixxx/README
+share/doc/mixxx/Mixxx-Keyboard-Shortcuts.pdf
+share/doc/mixxx/README.md
+share/icons/hicolor/128x128/apps/mixxx.png
+share/icons/hicolor/256x256/apps/mixxx.png
+share/icons/hicolor/32x32/apps/mixxx.png
+share/icons/hicolor/512x512/apps/mixxx.png
+share/icons/hicolor/64x64/apps/mixxx.png
+share/icons/hicolor/scalable/apps/mixxx.svg
+share/metainfo/org.mixxx.Mixxx.metainfo.xml
+share/mixxx/controllers/.eslintrc.json
share/mixxx/controllers/Akai MPD24.midi.xml
share/mixxx/controllers/Akai-LPD8-RK-scripts.js
share/mixxx/controllers/Akai-LPD8-RK.midi.xml
@@ -22,15 +28,22 @@
share/mixxx/controllers/Behringer BCD2000.midi.xml
share/mixxx/controllers/Behringer BCD3000 Advanced.midi.xml
share/mixxx/controllers/Behringer BCD3000.midi.xml
+share/mixxx/controllers/Behringer BCR2000.midi.xml
share/mixxx/controllers/Behringer CMD MM1.midi.xml
share/mixxx/controllers/Behringer CMD Micro.midi.xml
share/mixxx/controllers/Behringer CMDStudio4a.midi.xml
+share/mixxx/controllers/Behringer DDM4000.midi.xml
share/mixxx/controllers/Behringer-BCD2000-scripts.js
share/mixxx/controllers/Behringer-BCD3000-Advanced-scripts.js
share/mixxx/controllers/Behringer-BCD3000-scripts.js
+share/mixxx/controllers/Behringer-BCR2000-preset-scripts.js
+share/mixxx/controllers/Behringer-BCR2000-scripts.js
share/mixxx/controllers/Behringer-CMD-MM1-scripts.js
share/mixxx/controllers/Behringer-CMD-Micro-scripts.js
share/mixxx/controllers/Behringer-CMDStudio4a-scripts.js
+share/mixxx/controllers/Behringer-DDM4000-scripts.js
+share/mixxx/controllers/Behringer-Extension-scripts.js
+share/mixxx/controllers/CueColorsReference.svg
share/mixxx/controllers/DJ TechTools MIDI Fighter Twister.midi.xml
share/mixxx/controllers/DJ TechTools-MIDI Fighter Twister-scripts.js
share/mixxx/controllers/DJ-Tech CDJ-101.midi.xml
@@ -56,6 +69,8 @@
share/mixxx/controllers/Denon-MC4000-scripts.js
share/mixxx/controllers/Denon-MC6000MK2-scripts.js
share/mixxx/controllers/Denon-MC6000MK2.midi.xml
+share/mixxx/controllers/Denon-MC7000-scripts.js
+share/mixxx/controllers/Denon-MC7000.midi.xml
share/mixxx/controllers/EKS Otus.hid.xml
share/mixxx/controllers/EKS-Otus.js
share/mixxx/controllers/Electrix Tweaker.midi.xml
@@ -90,6 +105,7 @@
share/mixxx/controllers/Hercules DJ Control MP3.midi.xml
share/mixxx/controllers/Hercules DJ Control Steel.midi.xml
share/mixxx/controllers/Hercules DJControl Compact.midi.xml
+share/mixxx/controllers/Hercules DJControl Starlight.midi.xml
share/mixxx/controllers/Hercules P32 DJ.midi.xml
share/mixxx/controllers/Hercules-DJ-Console-4-Mx-scripts.js
share/mixxx/controllers/Hercules-DJ-Console-Mk1-hid-scripts.js
@@ -105,9 +121,18 @@
share/mixxx/controllers/Hercules-DJ-Control-MP3-scripts.js
share/mixxx/controllers/Hercules-DJ-Control-Steel-scripts.js
share/mixxx/controllers/Hercules-DJControl-Compact-scripts.js
+share/mixxx/controllers/Hercules-DJControl-Inpulse-200-script.js
+share/mixxx/controllers/Hercules-DJControl-Inpulse-300-script.js
+share/mixxx/controllers/Hercules-DJControl-Starlight-scripts.js
share/mixxx/controllers/Hercules-P32-scripts.js
share/mixxx/controllers/Hercules-mp3e2-compat.js
+share/mixxx/controllers/Hercules_DJControl_Inpulse_200.midi.xml
+share/mixxx/controllers/Hercules_DJControl_Inpulse_300.midi.xml
+share/mixxx/controllers/Hercules_DJControl_Jogvision-scripts.js
+share/mixxx/controllers/Hercules_DJControl_Jogvision.midi.xml
share/mixxx/controllers/Ion Discover DJ.midi.xml
+share/mixxx/controllers/Ion-Discover-DJ-Pro-scripts.js
+share/mixxx/controllers/Ion-Discover-DJ-Pro.midi.xml
share/mixxx/controllers/Ion-Discover-DJ-scripts.js
share/mixxx/controllers/KANE_QuNeo.midi.xml
share/mixxx/controllers/KANE_QuNeo_scripts.js
@@ -147,34 +172,44 @@
share/mixxx/controllers/Numark MIXTRACK.midi.xml
share/mixxx/controllers/Numark Mixtrack 2.midi.xml
share/mixxx/controllers/Numark Mixtrack Platinum.midi.xml
+share/mixxx/controllers/Numark Mixtrack Pro FX.midi.xml
share/mixxx/controllers/Numark Mixtrack Pro.midi.xml
share/mixxx/controllers/Numark N4.midi.xml
share/mixxx/controllers/Numark NS7.midi.xml
share/mixxx/controllers/Numark Omni Control.midi.xml
share/mixxx/controllers/Numark Total Control.midi.xml
share/mixxx/controllers/Numark V7.midi.xml
+share/mixxx/controllers/Numark iDJ Live II.midi.xml
share/mixxx/controllers/Numark-DJ2Go-scripts.js
share/mixxx/controllers/Numark-MixTrack-scripts.js
share/mixxx/controllers/Numark-Mixtrack-2-scripts.js
share/mixxx/controllers/Numark-Mixtrack-3-scripts.js
share/mixxx/controllers/Numark-Mixtrack-3.midi.xml
share/mixxx/controllers/Numark-Mixtrack-Platinum-scripts.js
+share/mixxx/controllers/Numark-Mixtrack-Pro-FX-scripts.js
share/mixxx/controllers/Numark-Mixtrack-Pro-scripts.js
share/mixxx/controllers/Numark-N4-scripts.js
share/mixxx/controllers/Numark-NS7-scripts.js
share/mixxx/controllers/Numark-Omni-Control-scripts.js
share/mixxx/controllers/Numark-Total-Control-scripts.js
share/mixxx/controllers/Numark-V7-scripts.js
+share/mixxx/controllers/Numark-iDJ-Live-II-scripts.js
+share/mixxx/controllers/Numark_DJ2GO2_Touch.midi.xml
+share/mixxx/controllers/Numark_DJ2GO2_Touch_scripts.js
share/mixxx/controllers/Pioneer CDJ HID.hid.xml
share/mixxx/controllers/Pioneer CDJ-2000.midi.xml
share/mixxx/controllers/Pioneer CDJ-350 Ch1.midi.xml
share/mixxx/controllers/Pioneer CDJ-350 Ch2.midi.xml
share/mixxx/controllers/Pioneer CDJ-850.midi.xml
+share/mixxx/controllers/Pioneer DDJ-200.midi.xml
share/mixxx/controllers/Pioneer DDJ-SX.midi.xml
share/mixxx/controllers/Pioneer-CDJ-2000-scripts.js
share/mixxx/controllers/Pioneer-CDJ-350-scripts.js
share/mixxx/controllers/Pioneer-CDJ-850-scripts.js
share/mixxx/controllers/Pioneer-CDJ-HID.js
+share/mixxx/controllers/Pioneer-DDJ-200-scripts.js
+share/mixxx/controllers/Pioneer-DDJ-400-script.js
+share/mixxx/controllers/Pioneer-DDJ-400.midi.xml
share/mixxx/controllers/Pioneer-DDJ-SB-scripts.js
share/mixxx/controllers/Pioneer-DDJ-SB.midi.xml
share/mixxx/controllers/Pioneer-DDJ-SB2-scripts.js
@@ -191,13 +226,19 @@
share/mixxx/controllers/Reloop-Beatpad-scripts.js
share/mixxx/controllers/Reloop-Digital-Jockey2-Controller-scripts.js
share/mixxx/controllers/Reloop-Jockey-3-ME-scripts.js
+share/mixxx/controllers/Roland_DJ-505-scripts.js
+share/mixxx/controllers/Roland_DJ-505.midi.xml
share/mixxx/controllers/Sony SixxAxis.hid.xml
share/mixxx/controllers/Sony-SixxAxis.js
+share/mixxx/controllers/Soundless_joyMIDI.midi.xml
+share/mixxx/controllers/Soundless_joyMIDI_scripts.js
share/mixxx/controllers/Stanton SCS.1d.midi.xml
share/mixxx/controllers/Stanton SCS.1m.midi.xml
share/mixxx/controllers/Stanton SCS.3d Alternate.midi.xml
share/mixxx/controllers/Stanton SCS.3d.midi.xml
share/mixxx/controllers/Stanton SCS.3m.midi.xml
+share/mixxx/controllers/Stanton-DJC-4-scripts.js
+share/mixxx/controllers/Stanton-DJC-4.midi.xml
share/mixxx/controllers/Stanton-SCS1d-scripts.js
share/mixxx/controllers/Stanton-SCS1m-scripts.js
share/mixxx/controllers/Stanton-SCS3d-alternate-scripts.js
@@ -206,9 +247,15 @@
share/mixxx/controllers/TrakProDJ iPad.midi.xml
share/mixxx/controllers/TrakProDJ-iPad-scripts.js
share/mixxx/controllers/Traktor Kontrol F1.hid.xml
+share/mixxx/controllers/Traktor Kontrol S2 MK3.hid.xml
+share/mixxx/controllers/Traktor Kontrol S2 Mk2.hid.xml
+share/mixxx/controllers/Traktor Kontrol S3.hid.xml
share/mixxx/controllers/Traktor Kontrol S4 MK2.hid.xml
share/mixxx/controllers/Traktor Kontrol X1.midi.xml
share/mixxx/controllers/Traktor-Kontrol-F1-scripts.js
+share/mixxx/controllers/Traktor-Kontrol-S2-MK2-hid-scripts.js
+share/mixxx/controllers/Traktor-Kontrol-S2-MK3-hid-scripts.js
+share/mixxx/controllers/Traktor-Kontrol-S3-hid-scripts.js
share/mixxx/controllers/Traktor-Kontrol-S4-MK2-hid-scripts.js
share/mixxx/controllers/Traktor-Kontrol-X1.js
share/mixxx/controllers/Vestax Spin.midi.xml
@@ -247,11 +294,10 @@
share/mixxx/controllers/novation-launchpad/.babelrc
share/mixxx/controllers/novation-launchpad/.editorconfig
share/mixxx/controllers/novation-launchpad/.eslintignore
-share/mixxx/controllers/novation-launchpad/.eslintrc.yaml
share/mixxx/controllers/novation-launchpad/.gitignore
share/mixxx/controllers/novation-launchpad/LICENSE
Home |
Main Index |
Thread Index |
Old Index