From 5d8f06ffdd2dc6b4157881a8da1211d7f4fac8c8 Mon Sep 17 00:00:00 2001 From: Alexandre Quessy Date: Thu, 21 May 2026 00:36:44 -0400 Subject: [PATCH] Remove stale liblo references OSC support now uses the bundled oscpack library, not liblo. Remove all leftover liblo references from source, CI configs, and docs. Also fixes a memory leak: osc_timer deletion was guarded by HAVE_OSC which was never defined. --- .github/workflows/macos-build.yml | 2 +- .github/workflows/ubuntu-build.yml | 2 -- .travis.yml | 3 +-- INSTALL.md | 7 +++---- OSC | 1 - docs/index.dox | 5 +---- src/gui/AboutDialog.cpp | 3 --- src/gui/AboutDialog.h | 4 ---- src/gui/MainWindow.cpp | 2 -- 9 files changed, 6 insertions(+), 23 deletions(-) diff --git a/.github/workflows/macos-build.yml b/.github/workflows/macos-build.yml index 7721b83..006c33a 100644 --- a/.github/workflows/macos-build.yml +++ b/.github/workflows/macos-build.yml @@ -17,7 +17,7 @@ jobs: - name: Install dependencies run: | - brew install qt liblo + brew install qt - name: Configure with qmake run: | diff --git a/.github/workflows/ubuntu-build.yml b/.github/workflows/ubuntu-build.yml index a666403..1200f50 100644 --- a/.github/workflows/ubuntu-build.yml +++ b/.github/workflows/ubuntu-build.yml @@ -20,8 +20,6 @@ jobs: sudo apt-get update sudo apt-get install -y \ build-essential \ - liblo-dev \ - liblo-tools \ libqt6opengl6-dev \ libqt6openglwidgets6 \ pkg-config \ diff --git a/.travis.yml b/.travis.yml index 124c2b5..bc99d95 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,12 +34,11 @@ install: sudo apt-get install -y qt6-base-dev qt6-tools-dev qt6-multimedia-dev libqt6opengl6-dev libqt6openglwidgets6 - liblo-dev liblo-tools ccache; fi - if [ "$TARGET" == "osx" ]; then - brew install qt liblo ccache; + brew install qt ccache; export PATH="$(brew --prefix qt)/bin:$PATH"; export PATH="/usr/local/opt/ccache/libexec:$PATH"; fi diff --git a/INSTALL.md b/INSTALL.md index 5354175..43ef784 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -21,11 +21,10 @@ Alternatively: ### Ubuntu -Install basic development tools for Qt 6 projects, plus liblo for OSC support: +Install basic development tools for Qt 6 projects: ``` sudo apt-get install -y \ - liblo-dev liblo-tools \ qt6-tools-dev \ qt6-multimedia-dev \ qt6-base-dev \ @@ -45,10 +44,10 @@ sudo apt-get install -y \ ### Arch Linux -Install basic development tools for Qt 6 projects and liblo for OSC support: +Install basic development tools for Qt 6 projects: ``` -sudo pacman -S qt6-tools qt6-multimedia qt6-base liblo +sudo pacman -S qt6-tools qt6-multimedia qt6-base ``` Build on macOS diff --git a/OSC b/OSC index 3f93117..81a82ae 100644 --- a/OSC +++ b/OSC @@ -27,5 +27,4 @@ You might consider using: * The txosc library for python. It contains osc-send * The oscsend utility -* The liblo C library diff --git a/docs/index.dox b/docs/index.dox index 1dfe222..994c98e 100644 --- a/docs/index.dox +++ b/docs/index.dox @@ -25,8 +25,5 @@ * * \section install_sec Installation * - * liblo-dev - * qttools5-dev-tools - * qt5-default - * ./build.sh + * See INSTALL.md for build instructions. */ diff --git a/src/gui/AboutDialog.cpp b/src/gui/AboutDialog.cpp index 528ecf8..c1dd03a 100644 --- a/src/gui/AboutDialog.cpp +++ b/src/gui/AboutDialog.cpp @@ -125,12 +125,9 @@ void AboutDialog::createLibrariesTab() librariesTextBrowser->setOpenExternalLinks(true); QString qtVersionText = QString("

Qt %1

").arg(QT_VERSION_STR); - // TODO: ifdef HAVE_OSC - //QString libloVersionText = QString("

%1

").arg(lo_version('str', 0, 0, 0, 0, 0, 0, 0, 0)); QString librairiesText; librairiesText.append(qtVersionText); - //librairiesText.append(libloVersionText); // Set librairies main text librariesTextBrowser->setText(librairiesText); diff --git a/src/gui/AboutDialog.h b/src/gui/AboutDialog.h index 7cf82e2..aaabe76 100644 --- a/src/gui/AboutDialog.h +++ b/src/gui/AboutDialog.h @@ -22,10 +22,6 @@ #include -#ifdef HAVE_OSC -#include "lo/lo.h" -#endif - #include "GuiForward.h" #include "MM.h" diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp index aafffda..de35a04 100644 --- a/src/gui/MainWindow.cpp +++ b/src/gui/MainWindow.cpp @@ -114,9 +114,7 @@ MainWindow::~MainWindow() { delete mappingManager; // delete _facade; -#ifdef HAVE_OSC delete osc_timer; -#endif // ifdef delete systemTimer; }