Received: by mail.netbsd.org (Postfix, from userid 605) id 99AE784DAF; Fri, 24 Apr 2020 08:43:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 20C0B84DA1 for ; Fri, 24 Apr 2020 08:43:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id NUhslApnL_kp for ; Fri, 24 Apr 2020 08:43:09 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id F0A5584D27 for ; Fri, 24 Apr 2020 08:43:08 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id E9863FB27; Fri, 24 Apr 2020 08:43:08 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_158771778887790" MIME-Version: 1.0 Date: Fri, 24 Apr 2020 08:43:08 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/audio To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20200424084308.E9863FB27@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_158771778887790 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Fri Apr 24 08:43:08 UTC 2020 Modified Files: pkgsrc/audio: Makefile Added Files: pkgsrc/audio/traverso: DESCR Makefile PLIST distinfo options.mk pkgsrc/audio/traverso/patches: patch-src_core_Sheet.cpp patch-src_engine_PADriver.cpp patch-src_engine_PADriver.h patch-src_traverso_Traverso.cpp patch-src_traverso_dialogs_settings_Pages.cpp Log Message: audio: Add traverso. Traverso DAW is a cross-platform multitrack audio recording and audio editing suite with support for non-linear processing. To generate a diff of this commit: cvs rdiff -u -r1.596 -r1.597 pkgsrc/audio/Makefile cvs rdiff -u -r0 -r1.1 pkgsrc/audio/traverso/DESCR \ pkgsrc/audio/traverso/Makefile pkgsrc/audio/traverso/PLIST \ pkgsrc/audio/traverso/distinfo pkgsrc/audio/traverso/options.mk cvs rdiff -u -r0 -r1.1 pkgsrc/audio/traverso/patches/patch-src_core_Sheet.cpp \ pkgsrc/audio/traverso/patches/patch-src_engine_PADriver.cpp \ pkgsrc/audio/traverso/patches/patch-src_engine_PADriver.h \ pkgsrc/audio/traverso/patches/patch-src_traverso_Traverso.cpp \ pkgsrc/audio/traverso/patches/patch-src_traverso_dialogs_settings_Pages.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_158771778887790 Content-Disposition: inline Content-Length: 15233 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/audio/Makefile diff -u pkgsrc/audio/Makefile:1.596 pkgsrc/audio/Makefile:1.597 --- pkgsrc/audio/Makefile:1.596 Tue Apr 21 13:32:23 2020 +++ pkgsrc/audio/Makefile Fri Apr 24 08:43:08 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.596 2020/04/21 13:32:23 nia Exp $ +# $NetBSD: Makefile,v 1.597 2020/04/24 08:43:08 nia Exp $ # COMMENT= Audio tools @@ -447,6 +447,7 @@ SUBDIR+= tfmxplay SUBDIR+= timidity SUBDIR+= toolame SUBDIR+= tracker +SUBDIR+= traverso SUBDIR+= tremor SUBDIR+= tremor-tools SUBDIR+= trm Added files: Index: pkgsrc/audio/traverso/DESCR diff -u /dev/null pkgsrc/audio/traverso/DESCR:1.1 --- /dev/null Fri Apr 24 08:43:08 2020 +++ pkgsrc/audio/traverso/DESCR Fri Apr 24 08:43:08 2020 @@ -0,0 +1,2 @@ +Traverso DAW is a cross-platform multitrack audio recording and +audio editing suite with support for non-linear processing. Index: pkgsrc/audio/traverso/Makefile diff -u /dev/null pkgsrc/audio/traverso/Makefile:1.1 --- /dev/null Fri Apr 24 08:43:08 2020 +++ pkgsrc/audio/traverso/Makefile Fri Apr 24 08:43:08 2020 @@ -0,0 +1,51 @@ +# $NetBSD: Makefile,v 1.1 2020/04/24 08:43:08 nia Exp $ + +DISTNAME= traverso-0.49.6 +CATEGORIES= audio +MASTER_SITES= https://traverso-daw.org/ + +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= https://traverso-daw.org/ +COMMENT= Multitrack audio recording and audio editing suite +LICENSE= gnu-gpl-v2 + +USE_CMAKE= yes +USE_TOOLS+= pkg-config +USE_LANGUAGES= c c++ + +CMAKE_ARGS+= -DWANT_MP3_ENCODE=ON + +.include "../../mk/bsd.prefs.mk" + +.if ${OPSYS} == "Darwin" +CMAKE_ARGS+= -DWANT_COREAUDIO=ON +.endif + +INSTALLATION_DIRS+= share/applications + +post-install: + ${INSTALL_DATA} ${WRKSRC}/resources/traverso.desktop \ + ${DESTDIR}${PREFIX}/share/applications +.for s in 16x16 24x24 48x48 64x64 128x128 scalable + ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/icons/hicolor/${s}/apps + ${INSTALL_DATA} ${WRKSRC}/resources/freedesktop/icons/${s}/apps/*.* \ + ${DESTDIR}${PREFIX}/share/icons/hicolor/${s}/apps + ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/icons/hicolor/${s}/mimetypes + ${INSTALL_DATA} ${WRKSRC}/resources/freedesktop/icons/${s}/mimetypes/*.* \ + ${DESTDIR}${PREFIX}/share/icons/hicolor/${s}/mimetypes +.endfor + +.include "options.mk" +.include "../../audio/flac/buildlink3.mk" +.include "../../audio/lame/buildlink3.mk" +.include "../../audio/libmad/buildlink3.mk" +.include "../../audio/libvorbis/buildlink3.mk" +.include "../../audio/lilv/buildlink3.mk" +.include "../../audio/wavpack/buildlink3.mk" +.include "../../graphics/hicolor-icon-theme/buildlink3.mk" +.include "../../math/fftw/buildlink3.mk" +.include "../../sysutils/desktop-file-utils/desktopdb.mk" +.include "../../x11/qt5-qtbase/buildlink3.mk" +.include "../../mk/dlopen.buildlink3.mk" +BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q} +.include "../../mk/bsd.pkg.mk" Index: pkgsrc/audio/traverso/PLIST diff -u /dev/null pkgsrc/audio/traverso/PLIST:1.1 --- /dev/null Fri Apr 24 08:43:08 2020 +++ pkgsrc/audio/traverso/PLIST Fri Apr 24 08:43:08 2020 @@ -0,0 +1,15 @@ +@comment $NetBSD: PLIST,v 1.1 2020/04/24 08:43:08 nia Exp $ +bin/traverso +share/applications/traverso.desktop +share/icons/hicolor/128x128/apps/traverso.png +share/icons/hicolor/128x128/mimetypes/gnome-mime-application-x-traverso.png +share/icons/hicolor/16x16/apps/traverso.png +share/icons/hicolor/16x16/mimetypes/gnome-mime-application-x-traverso.png +share/icons/hicolor/24x24/apps/traverso.png +share/icons/hicolor/24x24/mimetypes/gnome-mime-application-x-traverso.png +share/icons/hicolor/48x48/apps/traverso.png +share/icons/hicolor/48x48/mimetypes/gnome-mime-application-x-traverso.png +share/icons/hicolor/64x64/apps/traverso.png +share/icons/hicolor/64x64/mimetypes/gnome-mime-application-x-traverso.png +share/icons/hicolor/scalable/apps/traverso.svg +share/icons/hicolor/scalable/mimetypes/gnome-mime-application-x-traverso.svg Index: pkgsrc/audio/traverso/distinfo diff -u /dev/null pkgsrc/audio/traverso/distinfo:1.1 --- /dev/null Fri Apr 24 08:43:08 2020 +++ pkgsrc/audio/traverso/distinfo Fri Apr 24 08:43:08 2020 @@ -0,0 +1,11 @@ +$NetBSD: distinfo,v 1.1 2020/04/24 08:43:08 nia Exp $ + +SHA1 (traverso-0.49.6.tar.gz) = 40c8f5cd86e73e65d5a9c63953bf5dc7ad8685bf +RMD160 (traverso-0.49.6.tar.gz) = 176c4815f4184e609684db7ea76c21187551080e +SHA512 (traverso-0.49.6.tar.gz) = ff802994bd2de214a307143800287c48f3c68f02074524e124d985cb86c03ee5989ea43babdb50f763dd41de6fab67ee3c68c04d635a9c67ba349a3693531f60 +Size (traverso-0.49.6.tar.gz) = 1511714 bytes +SHA1 (patch-src_core_Sheet.cpp) = a1c59a95e1c517222ffa92b99d304351e688c247 +SHA1 (patch-src_engine_PADriver.cpp) = 6d5220ffda0c4d41f1c3c88a66f925ecc8e901d7 +SHA1 (patch-src_engine_PADriver.h) = 5d859bc7d1af8d66dbfa1144e57c0a848f61000d +SHA1 (patch-src_traverso_Traverso.cpp) = 60cd8268eb060feff9ab345c28ef4fd883af8cb5 +SHA1 (patch-src_traverso_dialogs_settings_Pages.cpp) = 7e40c2d41334d393577371b67664912f610ca946 Index: pkgsrc/audio/traverso/options.mk diff -u /dev/null pkgsrc/audio/traverso/options.mk:1.1 --- /dev/null Fri Apr 24 08:43:08 2020 +++ pkgsrc/audio/traverso/options.mk Fri Apr 24 08:43:08 2020 @@ -0,0 +1,42 @@ +# $NetBSD: options.mk,v 1.1 2020/04/24 08:43:08 nia Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.traverso +PKG_SUPPORTED_OPTIONS= alsa jack portaudio pulseaudio + +.include "../../mk/bsd.fast.prefs.mk" + +.if ${OPSYS} == "Linux" +PKG_SUGGESTED_OPTIONS= alsa jack portaudio +.else +PKG_SUGGESTED_OPTIONS= jack portaudio +.endif + +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Malsa) +CMAKE_ARGS+= -DWANT_ALSA=ON +.include "../../audio/alsa-lib/buildlink3.mk" +.else +CMAKE_ARGS+= -DWANT_ALSA=OFF +.endif + +.if !empty(PKG_OPTIONS:Mjack) +CMAKE_ARGS+= -DWANT_JACK=ON +.include "../../audio/jack/buildlink3.mk" +.else +CMAKE_ARGS+= -DWANT_JACK=OFF +.endif + +.if !empty(PKG_OPTIONS:Mportaudio) +CMAKE_ARGS+= -DWANT_PORTAUDIO=ON +.include "../../audio/portaudio/buildlink3.mk" +.else +CMAKE_ARGS+= -DWANT_PORTAUDIO=OFF +.endif + +.if !empty(PKG_OPTIONS:Mpulseaudio) +CMAKE_ARGS+= -DWANT_PULSEAUDIO=ON +.include "../../audio/pulseaudio/buildlink3.mk" +.else +CMAKE_ARGS+= -DWANT_PULSEAUDIO=OFF +.endif Index: pkgsrc/audio/traverso/patches/patch-src_core_Sheet.cpp diff -u /dev/null pkgsrc/audio/traverso/patches/patch-src_core_Sheet.cpp:1.1 --- /dev/null Fri Apr 24 08:43:08 2020 +++ pkgsrc/audio/traverso/patches/patch-src_core_Sheet.cpp Fri Apr 24 08:43:08 2020 @@ -0,0 +1,15 @@ +$NetBSD: patch-src_core_Sheet.cpp,v 1.1 2020/04/24 08:43:08 nia Exp $ + +Use standard LLONG_MAX definition. + +--- src/core/Sheet.cpp.orig 2017-10-09 18:38:43.000000000 +0000 ++++ src/core/Sheet.cpp +@@ -397,7 +397,7 @@ int Sheet::prepare_export(ExportSpecific + m_rendering = true; + } + +- spec->startLocation = LONG_LONG_MAX; ++ spec->startLocation = LLONG_MAX; + spec->endLocation = TimeRef(); + + TimeRef endlocation, startlocation; Index: pkgsrc/audio/traverso/patches/patch-src_engine_PADriver.cpp diff -u /dev/null pkgsrc/audio/traverso/patches/patch-src_engine_PADriver.cpp:1.1 --- /dev/null Fri Apr 24 08:43:08 2020 +++ pkgsrc/audio/traverso/patches/patch-src_engine_PADriver.cpp Fri Apr 24 08:43:08 2020 @@ -0,0 +1,84 @@ +$NetBSD: patch-src_engine_PADriver.cpp,v 1.1 2020/04/24 08:43:08 nia Exp $ + +More hostapis (oss, sun) + +--- src/engine/PADriver.cpp.orig 2009-03-28 08:48:39.000000000 +0000 ++++ src/engine/PADriver.cpp +@@ -142,33 +142,51 @@ int PADriver::setup(bool capture, bool p + + // device->message(tr("hostapi name is %1, deviceCount is %2").arg(inf->name).arg(inf->deviceCount), AudioDevice::INFO); + +- if (hostapi == "alsa" && inf->type == paALSA) { +- printf("PADriver:: Found alsa host api, using device %d\n", i); +- deviceindex = i; +- break; +- } +- +- if (hostapi == "jack" && inf->type == paJACK) { +- printf("PADriver:: Found jack host api, using device %d\n", i); +- deviceindex = i; +- break; ++ switch (inf->type) { ++ case paALSA: ++ if (hostapi == "alsa") { ++ printf("PADriver:: Found alsa host api, using device %d\n", i); ++ deviceindex = i; ++ } ++ break; ++ case paJACK: ++ if (hostapi == "jack") { ++ printf("PADriver:: Found jack host api, using device %d\n", i); ++ deviceindex = i; ++ } ++ break; ++ case paOSS: ++ if (hostapi == "oss") { ++ printf("PADriver:: Found oss host api, using device %d\n", i); ++ deviceindex = i; ++ } ++ break; ++ case paMME: ++ if (hostapi == "wmme") { ++ printf("PADriver:: Found wmme host api, using device %d\n", i); ++ deviceindex = i; ++ } ++ break; ++ case paDirectSound: ++ if (hostapi == "directsound") { ++ printf("PADriver:: Found directsound host api, using device %d\n", i); ++ deviceindex = i; ++ } ++ break; ++ case paCoreAudio: ++ if (hostapi == "coreaudio") { ++ printf("PADriver:: Found coreaudio host api, using device %d\n", i); ++ deviceindex = i; ++ } ++ break; ++ default: ++ if (hostapi == "sun") { ++ printf("PADriver:: Found sun host api, using device %d\n", i); ++ deviceindex = i; ++ } ++ break; + } +- +- if (hostapi == "wmme" && inf->type == paMME) { +- printf("PADriver:: Found wmme host api, using device %d\n", i); +- deviceindex = i; +- break; +- } +- +- if (hostapi == "directsound" && inf->type == paDirectSound ) { +- printf("PADriver:: Found directsound host api, using device %d\n", i); +- deviceindex = i; +- break; +- } +- +- if (hostapi == "coreaudio" && inf->type == paCoreAudio ) { +- printf("PADriver:: Found directsound host api, using device %d\n", i); +- deviceindex = i; ++ if (deviceindex != -1) { + break; + } + } Index: pkgsrc/audio/traverso/patches/patch-src_engine_PADriver.h diff -u /dev/null pkgsrc/audio/traverso/patches/patch-src_engine_PADriver.h:1.1 --- /dev/null Fri Apr 24 08:43:08 2020 +++ pkgsrc/audio/traverso/patches/patch-src_engine_PADriver.h Fri Apr 24 08:43:08 2020 @@ -0,0 +1,15 @@ +$NetBSD: patch-src_engine_PADriver.h,v 1.1 2020/04/24 08:43:08 nia Exp $ + +Correct portaudio header path for pkgsrc. + +--- src/engine/PADriver.h.orig 2009-03-28 08:48:39.000000000 +0000 ++++ src/engine/PADriver.h +@@ -23,7 +23,7 @@ + #define PORTAUDIO_DRIVER_H + + #include "Driver.h" +-#include "portaudio.h" ++#include + + class PADriver : public Driver + { Index: pkgsrc/audio/traverso/patches/patch-src_traverso_Traverso.cpp diff -u /dev/null pkgsrc/audio/traverso/patches/patch-src_traverso_Traverso.cpp:1.1 --- /dev/null Fri Apr 24 08:43:08 2020 +++ pkgsrc/audio/traverso/patches/patch-src_traverso_Traverso.cpp Fri Apr 24 08:43:08 2020 @@ -0,0 +1,41 @@ +$NetBSD: patch-src_traverso_Traverso.cpp,v 1.1 2020/04/24 08:43:08 nia Exp $ + +Use Sun on NetBSD and OSS on other unixes. + +Pick a nicer default sample rate for NetBSD and SunOS. + +--- src/traverso/Traverso.cpp.orig 2017-10-09 20:04:26.000000000 +0000 ++++ src/traverso/Traverso.cpp +@@ -306,9 +306,13 @@ void Traverso::setup_fpu() + + void Traverso::prepare_audio_device( ) + { ++#if defined (__NetBSD__) || defined (__sun) ++ int rate = config().get_property("Hardware", "samplerate", 48000).toInt(); ++#else + int rate = config().get_property("Hardware", "samplerate", 44100).toInt(); ++#endif + int bufferSize = config().get_property("Hardware", "buffersize", 512).toInt(); +-#if defined (Q_WS_X11) ++#if defined (__linux__) + QString driverType = config().get_property("Hardware", "drivertype", "ALSA").toString(); + #else + QString driverType = config().get_property("Hardware", "drivertype", "PortAudio").toString(); +@@ -339,12 +343,16 @@ void Traverso::prepare_audio_device( ) + + #if defined (PORTAUDIO_SUPPORT) + if (driverType == "PortAudio") { +-#if defined (Q_WS_X11) ++#if defined (__linux__) + cardDevice = config().get_property("Hardware", "pahostapi", "alsa").toString(); ++#elif defined (__NetBSD__) ++ cardDevice = config().get_property("Hardware", "pahostapi", "sun").toString(); + #elif defined (Q_WS_MAC) + cardDevice = config().get_property("Hardware", "pahostapi", "coreaudio").toString(); + #elif defined (Q_WS_WIN) + cardDevice = config().get_property("Hardware", "pahostapi", "wmme").toString(); ++#else ++ cardDevice = config().get_property("Hardware", "pahostapi", "oss").toString(); + #endif + } + #endif // end PORTAUDIO_SUPPORT Index: pkgsrc/audio/traverso/patches/patch-src_traverso_dialogs_settings_Pages.cpp diff -u /dev/null pkgsrc/audio/traverso/patches/patch-src_traverso_dialogs_settings_Pages.cpp:1.1 --- /dev/null Fri Apr 24 08:43:08 2020 +++ pkgsrc/audio/traverso/patches/patch-src_traverso_dialogs_settings_Pages.cpp Fri Apr 24 08:43:08 2020 @@ -0,0 +1,64 @@ +$NetBSD: patch-src_traverso_dialogs_settings_Pages.cpp,v 1.1 2020/04/24 08:43:08 nia Exp $ + +Support Sun on NetBSD and OSS on other unixes. + +--- src/traverso/dialogs/settings/Pages.cpp.orig 2017-10-09 11:40:46.000000000 +0000 ++++ src/traverso/dialogs/settings/Pages.cpp +@@ -139,9 +139,15 @@ void AudioDriverConfigPage::reset_defaul + #endif + + #if defined (PORTAUDIO_SUPPORT) +-#if defined (Q_WS_X11) ++#if defined (__linux__) + config().set_property("Hardware", "pahostapi", "alsa"); + #endif ++#if defined (Q_WS_X11) ++ config().set_property("Hardware", "pahostapi", "oss"); ++#endif ++#if defined (__NetBSD__) ++ config().set_property("Hardware", "pahostapi", "sun"); ++#endif + #if defined (Q_WS_MAC) + config().set_property("Hardware", "pahostapi", "coreaudio"); + #endif +@@ -162,7 +168,7 @@ void AudioDriverConfigPage::load_config( + { + int samplerate = config().get_property("Hardware", "samplerate", 44100).toInt(); + int buffersize = config().get_property("Hardware", "buffersize", 512).toInt(); +-#if defined (Q_WS_X11) ++#if defined (__linux__) + QString driverType = config().get_property("Hardware", "drivertype", "ALSA").toString(); + #else + QString driverType = config().get_property("Hardware", "drivertype", "PortAudio").toString(); +@@ -232,24 +238,21 @@ void AudioDriverConfigPage::load_config( + m_portaudiodrivers->driverCombo->clear(); + QString defaulthostapi = ""; + +-#if defined (Q_WS_X11) +- m_portaudiodrivers->driverCombo->addItem("ALSA", "alsa"); +- m_portaudiodrivers->driverCombo->addItem("Jack", "jack"); +- m_portaudiodrivers->driverCombo->addItem("OSS", "oss"); +- defaulthostapi = "jack"; +-#endif +- + #if defined (Q_WS_MAC) + m_portaudiodrivers->driverCombo->addItem("Core Audio", "coreaudio"); + m_portaudiodrivers->driverCombo->addItem("Jack", "jack"); + defaulthostapi = "coreaudio"; +-#endif +- +-#if defined (Q_WS_WIN) ++#elif defined (Q_WS_WIN) + m_portaudiodrivers->driverCombo->addItem("MME", "wmme"); + m_portaudiodrivers->driverCombo->addItem("Direct Sound", "directsound"); + m_portaudiodrivers->driverCombo->addItem("ASIO", "asio"); + defaulthostapi = "wmme"; ++#else ++ m_portaudiodrivers->driverCombo->addItem("ALSA", "alsa"); ++ m_portaudiodrivers->driverCombo->addItem("Jack", "jack"); ++ m_portaudiodrivers->driverCombo->addItem("OSS", "oss"); ++ m_portaudiodrivers->driverCombo->addItem("Sun", "sun"); ++ defaulthostapi = "oss"; + #endif + + QString hostapi = config().get_property("Hardware", "pahostapi", defaulthostapi).toString(); --_----------=_158771778887790--