From e454dd3b98882afa254efc298b0f3cf5ef49f419 Mon Sep 17 00:00:00 2001 From: Nitin Nair Date: Fri, 10 Apr 2026 14:14:20 +0530 Subject: [PATCH 1/3] adding dependency updates to build with updated branches of the dependencies --- dependencies.json | 54 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 45 insertions(+), 9 deletions(-) diff --git a/dependencies.json b/dependencies.json index 7c5e447..125b316 100644 --- a/dependencies.json +++ b/dependencies.json @@ -1,13 +1,49 @@ { "dependencies": [ - { "name": "ofxNetworkUtils", "repo": "https://github.com/bakercp/ofxNetworkUtils.git", "ref": "stable" }, - { "name": "ofxOscilloscope", "repo": "https://github.com/produceconsumerobot/ofxOscilloscope.git", "ref": "master" }, - { "name": "ofxThreadedLogger", "repo": "https://github.com/produceconsumerobot/ofxThreadedLogger.git", "ref": "master" }, - { "name": "ofxBiquadFilter", "repo": "https://github.com/smukkejohan/ofxBiquadFilter.git", "ref": "master" }, - { "name": "ofxJSON", "repo": "https://github.com/jeffcrouse/ofxJSON.git", "ref": "master" }, - { "name": "EmotiBit_XPlat_Utils", "repo": "https://github.com/EmotiBit/EmotiBit_XPlat_Utils.git", "ref": "master" }, - { "name": "ofxLSL", "repo": "https://github.com/EmotiBit/ofxLSL.git", "ref": "master" }, - { "name": "ofxSerial", "repo": "https://github.com/EmotiBit/ofxSerial.git", "ref": "stable" }, - { "name": "ofxIO", "repo": "https://github.com/bakercp/ofxIO.git", "ref": "stable" } + { + "name": "ofxNetworkUtils", + "repo": "https://github.com/bakercp/ofxNetworkUtils.git", + "ref": "stable" + }, + { + "name": "ofxOscilloscope", + "repo": "https://github.com/produceconsumerobot/ofxOscilloscope.git", + "ref": "fix/namespace_issues" + }, + { + "name": "ofxThreadedLogger", + "repo": "https://github.com/produceconsumerobot/ofxThreadedLogger.git", + "ref": "fix/namespace_issues" + }, + { + "name": "ofxBiquadFilter", + "repo": "https://github.com/smukkejohan/ofxBiquadFilter.git", + "ref": "master" + }, + { + "name": "ofxJSON", + "repo": "https://github.com/jeffcrouse/ofxJSON.git", + "ref": "master" + }, + { + "name": "EmotiBit_XPlat_Utils", + "repo": "https://github.com/EmotiBit/EmotiBit_XPlat_Utils.git", + "ref": "master" + }, + { + "name": "ofxLSL", + "repo": "https://github.com/EmotiBit/ofxLSL.git", + "ref": "fix/namespace_issues" + }, + { + "name": "ofxSerial", + "repo": "https://github.com/EmotiBit/ofxSerial.git", + "ref": "stable" + }, + { + "name": "ofxIO", + "repo": "https://github.com/bakercp/ofxIO.git", + "ref": "stable" + } ] } From 78d70ca0d6339e25951e208d3c97588d52428315 Mon Sep 17 00:00:00 2001 From: Nitin Nair Date: Fri, 10 Apr 2026 16:11:15 +0530 Subject: [PATCH 2/3] changing the dependencies back to master --- dependencies.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies.json b/dependencies.json index 125b316..1aaa24c 100644 --- a/dependencies.json +++ b/dependencies.json @@ -8,12 +8,12 @@ { "name": "ofxOscilloscope", "repo": "https://github.com/produceconsumerobot/ofxOscilloscope.git", - "ref": "fix/namespace_issues" + "ref": "master" }, { "name": "ofxThreadedLogger", "repo": "https://github.com/produceconsumerobot/ofxThreadedLogger.git", - "ref": "fix/namespace_issues" + "ref": "master" }, { "name": "ofxBiquadFilter", @@ -33,7 +33,7 @@ { "name": "ofxLSL", "repo": "https://github.com/EmotiBit/ofxLSL.git", - "ref": "fix/namespace_issues" + "ref": "master" }, { "name": "ofxSerial", From bdabde5b63adcfeac0e53ca439aa8339b524b6e2 Mon Sep 17 00:00:00 2001 From: Nitin Nair Date: Fri, 10 Apr 2026 16:13:34 +0530 Subject: [PATCH 3/3] version bumped to v1.16.2 --- src/ofxEmotiBitVersion.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ofxEmotiBitVersion.h b/src/ofxEmotiBitVersion.h index 6445f9a..eb168d6 100644 --- a/src/ofxEmotiBitVersion.h +++ b/src/ofxEmotiBitVersion.h @@ -2,7 +2,7 @@ //#include #include "ofMain.h" -const std::string ofxEmotiBitVersion = "1.16.1"; +const std::string ofxEmotiBitVersion = "1.16.2"; static const char SOFTWARE_VERSION_PREFIX = 'v';