diff --git a/pkgs/by-name/wf/wfview/package.nix b/pkgs/by-name/wf/wfview/package.nix index 80913e12940d..b91f96e5a150 100644 --- a/pkgs/by-name/wf/wfview/package.nix +++ b/pkgs/by-name/wf/wfview/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "wfview"; - version = "2.11"; + version = "2.23"; src = fetchFromGitLab { owner = "eliggett"; repo = "wfview"; - rev = "v${finalAttrs.version}"; - hash = "sha256-oPgQnldJA3IEZ0FuigdBpArhVcWE0GR8oa/kyYWDvEo="; + tag = "v${finalAttrs.version}"; + hash = "sha256-RQjNdeBvONxqUdybUvO17lTFjM4kkGx10fNdHsvH+0M="; }; patches = [ diff --git a/pkgs/by-name/wf/wfview/remove-hard-encodings.patch b/pkgs/by-name/wf/wfview/remove-hard-encodings.patch index 088ab998dfe4..f2285087ad64 100644 --- a/pkgs/by-name/wf/wfview/remove-hard-encodings.patch +++ b/pkgs/by-name/wf/wfview/remove-hard-encodings.patch @@ -1,60 +1,98 @@ -diff --git a/audioconverter.h b/audioconverter.h -index d3cf510..308725d 100644 ---- a/audioconverter.h -+++ b/audioconverter.h -@@ -20,13 +20,8 @@ +diff --git a/include/audioconverter.h b/include/audioconverter.h +index 0cf96d2774..d7e8ebdfe8 100644 +--- a/include/audioconverter.h ++++ b/include/audioconverter.h +@@ -20,15 +20,9 @@ #endif - + /* Opus and Eigen */ -#ifndef Q_OS_LINUX -#include "opus.h" -#include +-#include -#else #include "opus/opus.h" #include + #include -#endif - + #include "wfviewtypes.h" - -diff --git a/audiodevices.h b/audiodevices.h -index 3521eb5..0569e49 100644 ---- a/audiodevices.h -+++ b/audiodevices.h + +diff --git a/include/audiodevices.h b/include/audiodevices.h +index 3521eb526f..0569e490fd 100644 +--- a/include/audiodevices.h ++++ b/include/audiodevices.h @@ -13,11 +13,7 @@ #include - + #include -#ifndef Q_OS_LINUX -#include "RtAudio.h" -#else #include "rtaudio/RtAudio.h" -#endif - + #include "wfviewtypes.h" - -diff --git a/rthandler.h b/rthandler.h -index b422cc2..02b1117 100644 ---- a/rthandler.h -+++ b/rthandler.h -@@ -6,11 +6,7 @@ - #include - #include - + +diff --git a/include/audiohandlerrtinput.h b/include/audiohandlerrtinput.h +index 77551b59ee..bd0a327b29 100644 +--- a/include/audiohandlerrtinput.h ++++ b/include/audiohandlerrtinput.h +@@ -3,12 +3,7 @@ + + #include "audiohandlerbase.h" + -#ifndef Q_OS_LINUX -#include "RtAudio.h" -#else #include "rtaudio/RtAudio.h" -#endif - - - #include -diff --git a/tciserver.h b/tciserver.h -index 9b38886..af56763 100644 ---- a/tciserver.h -+++ b/tciserver.h +- + #include + #include "bytering.h" + +diff --git a/include/audiohandlerrtoutput.h b/include/audiohandlerrtoutput.h +index 98328dffd8..39e1e1b953 100644 +--- a/include/audiohandlerrtoutput.h ++++ b/include/audiohandlerrtoutput.h +@@ -3,11 +3,7 @@ + + #include "audiohandlerbase.h" + +-#ifndef Q_OS_LINUX +-#include "RtAudio.h" +-#else + #include "rtaudio/RtAudio.h" +-#endif + #include + #include "bytering.h" + +diff --git a/include/rxaudioprocessor.h b/include/rxaudioprocessor.h +index 873dce49fc..ba92017f6d 100644 +--- a/include/rxaudioprocessor.h ++++ b/include/rxaudioprocessor.h +@@ -31,14 +31,6 @@ + struct rfft_plan_i; + using rfft_plan = rfft_plan_i*; + +-#ifndef Q_OS_LINUX +-#include +-#include +-#else +-#include +-#include +-#endif +- + #include + #include + +diff --git a/include/tciserver.h b/include/tciserver.h +index 41ffeb1101..d8fb5609a5 100644 +--- a/include/tciserver.h ++++ b/include/tciserver.h @@ -9,13 +9,8 @@ #include "cachingqueue.h" - + /* Opus and Eigen */ -#ifndef Q_OS_LINUX -#include "opus.h" @@ -63,64 +101,113 @@ index 9b38886..af56763 100644 #include "opus/opus.h" #include -#endif - + #define TCI_AUDIO_LENGTH 4096 struct tciCommandStruct -diff --git a/wfmain.h b/wfmain.h -index 0404fda..e400a74 100644 ---- a/wfmain.h -+++ b/wfmain.h -@@ -68,11 +68,7 @@ +diff --git a/include/txaudioprocessor.h b/include/txaudioprocessor.h +index aeec52b150..d844af18b8 100644 +--- a/include/txaudioprocessor.h ++++ b/include/txaudioprocessor.h +@@ -11,11 +11,7 @@ + #define M_PI 3.14159265358979323846 + #endif + +-#ifndef Q_OS_LINUX +-# include +-#else +-# include +-#endif ++#include + + #include "plugins/dysoncompress.h" + #include "plugins/mbeq.h" +diff --git a/include/wfmain.h b/include/wfmain.h +index 4f41c6f07a..9d1a589391 100644 +--- a/include/wfmain.h ++++ b/include/wfmain.h +@@ -76,11 +76,7 @@ #include - + #include -#ifndef Q_OS_LINUX -#include "RtAudio.h" -#else #include "rtaudio/RtAudio.h" -#endif - + #ifdef USB_CONTROLLER #ifdef Q_OS_WIN +diff --git a/old-source/rthandler.h b/old-source/rthandler.h +index b422cc203c..3aeed20f58 100644 +--- a/old-source/rthandler.h ++++ b/old-source/rthandler.h +@@ -5,14 +5,6 @@ + #include + #include + #include +- +-#ifndef Q_OS_LINUX +-#include "RtAudio.h" +-#else +-#include "rtaudio/RtAudio.h" +-#endif +- +- + #include + #include + #include +diff --git a/src/audio/plugins/mbeq.cpp b/src/audio/plugins/mbeq.cpp +index 582729e2a1..b2bafbb36c 100644 +--- a/src/audio/plugins/mbeq.cpp ++++ b/src/audio/plugins/mbeq.cpp +@@ -19,7 +19,7 @@ + # include + #else + // TODO: Verify macOS and Windows path +-# include ++# include + #endif + + // ─── constexpr definitions ──────────────────────────────────────────────────── diff --git a/wfview.pro b/wfview.pro -index a0943bd..e8f97e1 100644 +index 34dc8a3a61..f4c6e3c411 100644 --- a/wfview.pro +++ b/wfview.pro -@@ -62,10 +62,8 @@ win32:DEFINES += __WINDOWS_WASAPI__ +@@ -71,10 +71,8 @@ #linux:DEFINES += __LINUX_OSS__ linux:DEFINES += __LINUX_PULSE__ macx:DEFINES += __MACOSX_CORE__ -!linux:SOURCES += ../rtaudio/RTAudio.cpp --!linux:HEADERS += ../rtaudio/RTAUdio.h +-!linux:HEADERS += ../rtaudio/RTAudio.h -!linux:INCLUDEPATH += ../rtaudio - + +macx:LIBS += -lrtaudio linux:LIBS += -lpulse -lpulse-simple -lrtaudio -lpthread -ludev - + win32:INCLUDEPATH += ../portaudio/include -@@ -107,8 +105,6 @@ win32:RC_ICONS = "resources/icons/Windows/wfview 512x512.ico" - +@@ -116,8 +114,6 @@ + macx{ ICON = resources/wfview.icns -- QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.15 +- QMAKE_MACOSX_DEPLOYMENT_TARGET = 12.0 - QMAKE_APPLE_DEVICE_ARCHS = x86_64 arm64 MY_ENTITLEMENTS.name = CODE_SIGN_ENTITLEMENTS MY_ENTITLEMENTS.value = resources/wfview.entitlements QMAKE_MAC_XCODE_SETTINGS += MY_ENTITLEMENTS -@@ -120,8 +116,7 @@ macx{ - +@@ -129,8 +125,7 @@ + QMAKE_TARGET_BUNDLE_PREFIX = org.wfview - + -!win32:DEFINES += HOST=\\\"`hostname`\\\" UNAME=\\\"`whoami`\\\" -!win32:DEFINES += GITSHORT="\\\"$(shell git -C \"$$PWD\" rev-parse --short HEAD)\\\"" +!win32:DEFINES += HOST=\\\"nixos\\\" UNAME=\\\"nix\\\" GITSHORT=\\\"0.0\\\" - + win32:DEFINES += GITSHORT=\\\"$$system(git -C $$PWD rev-parse --short HEAD)\\\" win32:DEFINES += HOST=\\\"$$system(hostname)\\\" -@@ -169,19 +164,8 @@ macx:LIBS += -framework CoreAudio -framework CoreFoundation -lpthread -lopus - +@@ -178,18 +173,8 @@ + CONFIG(debug, release|debug) { - + - macos:LIBS += -L ../qcustomplot/qcustomplot-sharedlib/build -lqcustomplotd - - lessThan(QT_MAJOR_VERSION, 6) { @@ -133,18 +220,19 @@ index a0943bd..e8f97e1 100644 - linux:LIBS += $$system("/sbin/ldconfig -p | awk '/libqcustomplotd2qt6.so/ {print \"-lqcustomplotd2qt6\"}'") - linux:LIBS += $$system("/sbin/ldconfig -p | awk '/libqcustomplotdqt6.so/ {print \"-lqcustomplotdqt6\"}'") - } -- + macos:LIBS += -lqcustomplotd + linux:LIBS += -lqcustomplotd + win32 { contains(QMAKE_TARGET.arch, x86_64) { - LIBS += -L../opus/win32/VS2015/x64/DebugDLL/ -@@ -211,17 +195,8 @@ CONFIG(debug, release|debug) { +@@ -228,17 +213,9 @@ } } else { - + - macos:LIBS += -L ../qcustomplot/qcustomplot-sharedlib/build -lqcustomplot -- ++ macos:LIBS += -lqcustomplotd ++ linux:LIBS += -lqcustomplotd + - lessThan(QT_MAJOR_VERSION, 6) { - linux:LIBS += $$system("/sbin/ldconfig -p | awk '/libQCustomPlot.so/ {print \"-lQCustomPlot\"}'") - linux:LIBS += $$system("/sbin/ldconfig -p | awk '/libqcustomplot2.so/ {print \"-lqcustomplot2\"}'") @@ -154,18 +242,17 @@ index a0943bd..e8f97e1 100644 - linux:LIBS += $$system("/sbin/ldconfig -p | awk '/libqcustomplot2qt6.so/ {print \"-lqcustomplot2qt6\"}'") - linux:LIBS += $$system("/sbin/ldconfig -p | awk '/libqcustomplotqt6.so/ {print \"-lqcustomplotqt6\"}'") - } -+ macos:LIBS += -lqcustomplot -+ linux:LIBS += -lqcustomplot win32 { contains(QMAKE_TARGET.arch, x86_64) { LIBS += -L../opus/win32/VS2015/x64/ReleaseDLL/ -@@ -264,9 +239,6 @@ win32:LIBS += -lopus -lole32 -luser32 - #macx:HEADERS += ../qcustomplot/qcustomplot.h - - win32:INCLUDEPATH += ../qcustomplot +@@ -299,10 +276,6 @@ + # win32:INCLUDEPATH += ../LibFT4222-v1.4.7\imports\ftd2xx + #} + -!linux:INCLUDEPATH += ../opus/include -!linux:INCLUDEPATH += ../eigen -!linux:INCLUDEPATH += ../r8brain-free-src - - INCLUDEPATH += resampler - +- + INCLUDEPATH += include + INCLUDEPATH += src/audio + INCLUDEPATH += src/audio/plugins