From a2e4d2d294e2c4e77acee8089e9969cee128e899 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Tue, 12 Nov 2024 18:04:57 -0300 Subject: [PATCH 01/18] headers removal --- apps/projectGenerator | 2 +- libs/openFrameworks/ofMain.h | 11 +++++++++++ libs/openFrameworks/utils/ofConstants.h | 11 +---------- libs/openFrameworks/utils/ofThread.cpp | 1 + libs/openFrameworks/utils/ofTimerFps.cpp | 1 + libs/openFrameworks/utils/ofTimerFps.h | 4 ---- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/apps/projectGenerator b/apps/projectGenerator index a742c1fdb86..30f123082fc 160000 --- a/apps/projectGenerator +++ b/apps/projectGenerator @@ -1 +1 @@ -Subproject commit a742c1fdb869983f7a6a813e69514aea62e89af5 +Subproject commit 30f123082fcccfdf8608414de79dac47962c85e5 diff --git a/libs/openFrameworks/ofMain.h b/libs/openFrameworks/ofMain.h index 602116e0589..9c88758c8ef 100644 --- a/libs/openFrameworks/ofMain.h +++ b/libs/openFrameworks/ofMain.h @@ -134,3 +134,14 @@ using std::vector; using std::weak_ptr; #endif #endif + +// core: --------------------------- +//#include +//#include +//#include +//#include +//#include +//#include +//#include +//#include +//#include diff --git a/libs/openFrameworks/utils/ofConstants.h b/libs/openFrameworks/utils/ofConstants.h index 5b7a8e142e2..69392457d85 100644 --- a/libs/openFrameworks/utils/ofConstants.h +++ b/libs/openFrameworks/utils/ofConstants.h @@ -6,16 +6,7 @@ #define OF_VERSION_PATCH 0 #define OF_VERSION_PRE_RELEASE "master" -// core: --------------------------- -#include -#include -#include -#include -#include -#include -#include -#include -#include + // Set to 1 for compatibility with old projects using ofVec instead of glm #ifndef OF_USE_LEGACY_VECTOR_MATH diff --git a/libs/openFrameworks/utils/ofThread.cpp b/libs/openFrameworks/utils/ofThread.cpp index 8977f3a5e23..f04e0796151 100644 --- a/libs/openFrameworks/utils/ofThread.cpp +++ b/libs/openFrameworks/utils/ofThread.cpp @@ -1,5 +1,6 @@ #include "ofThread.h" #include "ofLog.h" +#include #ifdef TARGET_ANDROID #include diff --git a/libs/openFrameworks/utils/ofTimerFps.cpp b/libs/openFrameworks/utils/ofTimerFps.cpp index 7083088af25..cb91655854d 100644 --- a/libs/openFrameworks/utils/ofTimerFps.cpp +++ b/libs/openFrameworks/utils/ofTimerFps.cpp @@ -1,4 +1,5 @@ #include "ofTimerFps.h" +#include using namespace std::chrono; using namespace std::chrono_literals; diff --git a/libs/openFrameworks/utils/ofTimerFps.h b/libs/openFrameworks/utils/ofTimerFps.h index e0fed4baf94..44e8f6fd2a5 100644 --- a/libs/openFrameworks/utils/ofTimerFps.h +++ b/libs/openFrameworks/utils/ofTimerFps.h @@ -3,9 +3,6 @@ #pragma once #include -#include -#include -#include class ofTimerFps { public: @@ -18,5 +15,4 @@ class ofTimerFps { space interval; std::chrono::time_point wakeTime; std::chrono::time_point lastWakeTime; - }; From 17f1dec40b9eaca3bbc0a040291119709831ef12 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Tue, 12 Nov 2024 18:06:15 -0300 Subject: [PATCH 02/18] subproject --- apps/projectGenerator | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/projectGenerator b/apps/projectGenerator index 30f123082fc..2e354a713af 160000 --- a/apps/projectGenerator +++ b/apps/projectGenerator @@ -1 +1 @@ -Subproject commit 30f123082fcccfdf8608414de79dac47962c85e5 +Subproject commit 2e354a713af4c8169c6988df747db0e323e7b9bc From f06daeefe7177fe55ff4250f1a8d80aa7db99a42 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Tue, 12 Nov 2024 20:06:36 -0300 Subject: [PATCH 03/18] add vector to some files --- libs/openFrameworks/3d/of3dPrimitives.h | 1 + libs/openFrameworks/graphics/ofTrueTypeFont.h | 1 + libs/openFrameworks/utils/ofLog.h | 1 + .../project/ios/iOS+OFLib.xcodeproj/project.pbxproj | 4 ---- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/libs/openFrameworks/3d/of3dPrimitives.h b/libs/openFrameworks/3d/of3dPrimitives.h index 1b30e574c55..dd371614bef 100644 --- a/libs/openFrameworks/3d/of3dPrimitives.h +++ b/libs/openFrameworks/3d/of3dPrimitives.h @@ -2,6 +2,7 @@ #include "ofMesh.h" #include "ofNode.h" +#include class ofTexture; class ofVboMesh; diff --git a/libs/openFrameworks/graphics/ofTrueTypeFont.h b/libs/openFrameworks/graphics/ofTrueTypeFont.h index 77afeab0d94..74c941a39e7 100644 --- a/libs/openFrameworks/graphics/ofTrueTypeFont.h +++ b/libs/openFrameworks/graphics/ofTrueTypeFont.h @@ -6,6 +6,7 @@ #include "ofRectangle.h" #include "ofTexture.h" #include +#include class ofPath; diff --git a/libs/openFrameworks/utils/ofLog.h b/libs/openFrameworks/utils/ofLog.h index 77bf21fc3b4..83cb8c50a81 100644 --- a/libs/openFrameworks/utils/ofLog.h +++ b/libs/openFrameworks/utils/ofLog.h @@ -3,6 +3,7 @@ // Only private ofFile file; #include "ofFileUtils.h" #include +#include diff --git a/libs/openFrameworksCompiled/project/ios/iOS+OFLib.xcodeproj/project.pbxproj b/libs/openFrameworksCompiled/project/ios/iOS+OFLib.xcodeproj/project.pbxproj index c347655e373..c6ce3fe0295 100644 --- a/libs/openFrameworksCompiled/project/ios/iOS+OFLib.xcodeproj/project.pbxproj +++ b/libs/openFrameworksCompiled/project/ios/iOS+OFLib.xcodeproj/project.pbxproj @@ -131,7 +131,6 @@ BFB0B4072C50E019008FB5A3 /* zlib.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF7E591D2BA2057900E5C52E /* zlib.xcframework */; }; BFB0B4082C50E019008FB5A3 /* uriparser.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF7E591B2BA2056600E5C52E /* uriparser.xcframework */; }; BFB0B4092C50E019008FB5A3 /* tess2.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF7E59192BA2054700E5C52E /* tess2.xcframework */; }; - BFB0B40A2C50E019008FB5A3 /* pugixml.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF7E59172BA2052D00E5C52E /* pugixml.xcframework */; }; BFB0B40B2C50E019008FB5A3 /* libpng.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF7E59132BA2050B00E5C52E /* libpng.xcframework */; }; BFB0B40C2C50E019008FB5A3 /* freetype.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF7E590D2BA204D300E5C52E /* freetype.xcframework */; }; BFB0B40D2C50E019008FB5A3 /* fmt.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF7E590B2BA204BC00E5C52E /* fmt.xcframework */; }; @@ -376,7 +375,6 @@ BF7E590B2BA204BC00E5C52E /* fmt.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = fmt.xcframework; path = ../../../fmt/lib/macos/fmt.xcframework; sourceTree = ""; }; BF7E590D2BA204D300E5C52E /* freetype.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = freetype.xcframework; path = ../../../freetype/lib/macos/freetype.xcframework; sourceTree = ""; }; BF7E59132BA2050B00E5C52E /* libpng.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = libpng.xcframework; path = ../../../libpng/lib/macos/libpng.xcframework; sourceTree = ""; }; - BF7E59172BA2052D00E5C52E /* pugixml.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = pugixml.xcframework; path = ../../../pugixml/lib/macos/pugixml.xcframework; sourceTree = ""; }; BF7E59192BA2054700E5C52E /* tess2.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = tess2.xcframework; path = ../../../tess2/lib/macos/tess2.xcframework; sourceTree = ""; }; BF7E591B2BA2056600E5C52E /* uriparser.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = uriparser.xcframework; path = ../../../uriparser/lib/macos/uriparser.xcframework; sourceTree = ""; }; BF7E591D2BA2057900E5C52E /* zlib.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = zlib.xcframework; path = ../../../zlib/lib/macos/zlib.xcframework; sourceTree = ""; }; @@ -524,7 +522,6 @@ BFB0B4072C50E019008FB5A3 /* zlib.xcframework in Frameworks */, BFB0B4082C50E019008FB5A3 /* uriparser.xcframework in Frameworks */, BFB0B4092C50E019008FB5A3 /* tess2.xcframework in Frameworks */, - BFB0B40A2C50E019008FB5A3 /* pugixml.xcframework in Frameworks */, BFB0B40B2C50E019008FB5A3 /* libpng.xcframework in Frameworks */, BFB0B40C2C50E019008FB5A3 /* freetype.xcframework in Frameworks */, BFB0B40D2C50E019008FB5A3 /* fmt.xcframework in Frameworks */, @@ -1001,7 +998,6 @@ BF7E591D2BA2057900E5C52E /* zlib.xcframework */, BF7E591B2BA2056600E5C52E /* uriparser.xcframework */, BF7E59192BA2054700E5C52E /* tess2.xcframework */, - BF7E59172BA2052D00E5C52E /* pugixml.xcframework */, BF7E59132BA2050B00E5C52E /* libpng.xcframework */, BF7E590D2BA204D300E5C52E /* freetype.xcframework */, BF7E590B2BA204BC00E5C52E /* fmt.xcframework */, From 3d481637ef424b3f3ec338da1c911dfa33fbda37 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Tue, 12 Nov 2024 20:12:22 -0300 Subject: [PATCH 04/18] more vector --- libs/openFrameworks/3d/ofMesh.h | 1 + libs/openFrameworks/sound/ofSoundBaseTypes.h | 1 + libs/openFrameworks/utils/ofFileUtils.h | 1 + 3 files changed, 3 insertions(+) diff --git a/libs/openFrameworks/3d/ofMesh.h b/libs/openFrameworks/3d/ofMesh.h index c6b28cfa6ab..c42e2d68d61 100644 --- a/libs/openFrameworks/3d/ofMesh.h +++ b/libs/openFrameworks/3d/ofMesh.h @@ -4,6 +4,7 @@ #define OF_MESH_H #include "ofGLUtils.h" +#include template class ofMeshFace_; diff --git a/libs/openFrameworks/sound/ofSoundBaseTypes.h b/libs/openFrameworks/sound/ofSoundBaseTypes.h index 9996621a2a5..dcbcc2bae68 100644 --- a/libs/openFrameworks/sound/ofSoundBaseTypes.h +++ b/libs/openFrameworks/sound/ofSoundBaseTypes.h @@ -3,6 +3,7 @@ // MARK: ofConstants FS #include "ofConstants.h" #include +#include class ofSoundBuffer; diff --git a/libs/openFrameworks/utils/ofFileUtils.h b/libs/openFrameworks/utils/ofFileUtils.h index c2ed03af9f3..e541dae392b 100644 --- a/libs/openFrameworks/utils/ofFileUtils.h +++ b/libs/openFrameworks/utils/ofFileUtils.h @@ -3,6 +3,7 @@ // MARK: ofConstants FS #include "ofConstants.h" #include +#include //---------------------------------------------------------- // ofBuffer From d4cb5d48880bc4c8bbd4a973e92d8ebff0f1fc30 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Tue, 12 Nov 2024 20:15:18 -0300 Subject: [PATCH 05/18] more vector --- libs/openFrameworks/gl/ofShader.h | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/openFrameworks/gl/ofShader.h b/libs/openFrameworks/gl/ofShader.h index e52cdc18d26..2be4933100b 100644 --- a/libs/openFrameworks/gl/ofShader.h +++ b/libs/openFrameworks/gl/ofShader.h @@ -9,6 +9,7 @@ // MARK: ofConstants Targets #include "ofConstants.h" +#include #include namespace glm { From 4e0d3dac2036381698475a3d39486b0d8f5f2452 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Tue, 12 Nov 2024 20:20:59 -0300 Subject: [PATCH 06/18] more vector --- addons/ofxiOS/src/utils/ofxiOSExternalDisplay.mm | 1 + libs/openFrameworks/communication/ofSerial.h | 1 + libs/openFrameworks/gl/ofGLUtils.h | 2 ++ 3 files changed, 4 insertions(+) diff --git a/addons/ofxiOS/src/utils/ofxiOSExternalDisplay.mm b/addons/ofxiOS/src/utils/ofxiOSExternalDisplay.mm index 1e25ba25bfd..9d54d41e89d 100644 --- a/addons/ofxiOS/src/utils/ofxiOSExternalDisplay.mm +++ b/addons/ofxiOS/src/utils/ofxiOSExternalDisplay.mm @@ -7,6 +7,7 @@ #include "ofxiOSExternalDisplay.h" #include +#include using std::vector; diff --git a/libs/openFrameworks/communication/ofSerial.h b/libs/openFrameworks/communication/ofSerial.h index 0b0f404fdd5..44429f1493c 100644 --- a/libs/openFrameworks/communication/ofSerial.h +++ b/libs/openFrameworks/communication/ofSerial.h @@ -2,6 +2,7 @@ // MARK: ofConstants targets #include "ofConstants.h" +#include class ofBuffer; diff --git a/libs/openFrameworks/gl/ofGLUtils.h b/libs/openFrameworks/gl/ofGLUtils.h index 7600e05880d..403d81a9d1c 100644 --- a/libs/openFrameworks/gl/ofGLUtils.h +++ b/libs/openFrameworks/gl/ofGLUtils.h @@ -8,9 +8,11 @@ #pragma once #include "ofGraphicsConstants.h" +#include // MARK: Targets / Defines //#include "ofConstants.h" + class ofShader; class ofGLProgrammableRenderer; class ofBaseGLRenderer; From 31cd8f196d2bc8f3db5dd3a8a9a8208c10642e69 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Tue, 12 Nov 2024 20:47:42 -0300 Subject: [PATCH 07/18] memcpy --- libs/openFrameworks/graphics/ofPixels.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/openFrameworks/graphics/ofPixels.cpp b/libs/openFrameworks/graphics/ofPixels.cpp index de5d1847b6f..233675bb390 100644 --- a/libs/openFrameworks/graphics/ofPixels.cpp +++ b/libs/openFrameworks/graphics/ofPixels.cpp @@ -1,6 +1,7 @@ #include "ofGraphicsConstants.h" #include "ofPixels.h" #include "ofColor.h" +#include // memcpy static ofImageType getImageTypeFromChannels(size_t channels){ switch(channels){ From 5f3d36d2a45d20a14253fe674c68d951ed1ac8a2 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Tue, 12 Nov 2024 22:38:03 -0300 Subject: [PATCH 08/18] testing fix github actions --- .github/workflows/of.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/of.yml b/.github/workflows/of.yml index c5149527d68..9c647a73d35 100644 --- a/.github/workflows/of.yml +++ b/.github/workflows/of.yml @@ -209,6 +209,8 @@ jobs: run: if [ "$TARGET" = "linux64" ]; then sudo apt-get remove libunwind-14 -y; fi + - name: Fix apt broken + run: apt --fix-broken install - name: Cache Packages uses: awalsh128/cache-apt-pkgs-action@latest with: From 2eb29462b5a86f46c305c5f660aee04b938f7537 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Tue, 12 Nov 2024 22:38:45 -0300 Subject: [PATCH 09/18] readd on ofMain.h --- libs/openFrameworks/ofMain.h | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/libs/openFrameworks/ofMain.h b/libs/openFrameworks/ofMain.h index 9c88758c8ef..c370881f208 100644 --- a/libs/openFrameworks/ofMain.h +++ b/libs/openFrameworks/ofMain.h @@ -135,13 +135,14 @@ using std::weak_ptr; #endif #endif + // core: --------------------------- -//#include -//#include -//#include -//#include -//#include -//#include -//#include -//#include -//#include +#include +#include +#include +#include +#include +#include +#include +#include +#include From 9ba6e5f3a0dcfab7b7219837b854fea67d5510dd Mon Sep 17 00:00:00 2001 From: Dimitre Date: Tue, 12 Nov 2024 23:30:54 -0300 Subject: [PATCH 10/18] sudo --- .github/workflows/of.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/of.yml b/.github/workflows/of.yml index 9c647a73d35..3590d78321a 100644 --- a/.github/workflows/of.yml +++ b/.github/workflows/of.yml @@ -210,7 +210,7 @@ jobs: sudo apt-get remove libunwind-14 -y; fi - name: Fix apt broken - run: apt --fix-broken install + run: sudo apt --fix-broken install - name: Cache Packages uses: awalsh128/cache-apt-pkgs-action@latest with: From 53beb1ff094e3b591ebaa75f81b837cf054c59b6 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Wed, 20 Nov 2024 02:45:03 -0300 Subject: [PATCH 11/18] merge master --- scripts/apothecary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/apothecary b/scripts/apothecary index 7d5a6d85683..bd4f4c10d5a 160000 --- a/scripts/apothecary +++ b/scripts/apothecary @@ -1 +1 @@ -Subproject commit 7d5a6d856838d02224464d57ef19bd17609d4e50 +Subproject commit bd4f4c10d5a26fd4352f05c962d3ebbc13d57e18 From f52ba0b15557392a01e08b971279bb7463f398c9 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Wed, 20 Nov 2024 03:41:28 -0300 Subject: [PATCH 12/18] missing vector --- apps/projectGenerator | 2 +- libs/openFrameworks/graphics/ofTessellator.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/projectGenerator b/apps/projectGenerator index 2e354a713af..0d4e7c3c7cd 160000 --- a/apps/projectGenerator +++ b/apps/projectGenerator @@ -1 +1 @@ -Subproject commit 2e354a713af4c8169c6988df747db0e323e7b9bc +Subproject commit 0d4e7c3c7cd5ad48eae0ba4189887680bc9f847a diff --git a/libs/openFrameworks/graphics/ofTessellator.h b/libs/openFrameworks/graphics/ofTessellator.h index c54656a3f20..4a37c43c797 100644 --- a/libs/openFrameworks/graphics/ofTessellator.h +++ b/libs/openFrameworks/graphics/ofTessellator.h @@ -1,6 +1,7 @@ #pragma once #include "ofGraphicsBaseTypes.h" +#include typedef struct TESStesselator TESStesselator; typedef struct TESSalloc TESSalloc; From b9b866bd6e08ec825c008ded58e3525553217ae6 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Wed, 20 Nov 2024 03:50:53 -0300 Subject: [PATCH 13/18] pixels memcpy --- libs/openFrameworks/graphics/ofPixels.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/openFrameworks/graphics/ofPixels.cpp b/libs/openFrameworks/graphics/ofPixels.cpp index 233675bb390..b6bc0d27fc7 100644 --- a/libs/openFrameworks/graphics/ofPixels.cpp +++ b/libs/openFrameworks/graphics/ofPixels.cpp @@ -1,7 +1,7 @@ #include "ofGraphicsConstants.h" #include "ofPixels.h" #include "ofColor.h" -#include // memcpy +#include // memcpy static ofImageType getImageTypeFromChannels(size_t channels){ switch(channels){ From bc88375191661b255f2b50ece5436240e7b6e63b Mon Sep 17 00:00:00 2001 From: Dimitre Date: Wed, 20 Nov 2024 03:55:16 -0300 Subject: [PATCH 14/18] std::function --- libs/openFrameworks/graphics/ofPixels.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/openFrameworks/graphics/ofPixels.cpp b/libs/openFrameworks/graphics/ofPixels.cpp index b6bc0d27fc7..e0d78c33c34 100644 --- a/libs/openFrameworks/graphics/ofPixels.cpp +++ b/libs/openFrameworks/graphics/ofPixels.cpp @@ -2,6 +2,7 @@ #include "ofPixels.h" #include "ofColor.h" #include // memcpy +#include // std::function static ofImageType getImageTypeFromChannels(size_t channels){ switch(channels){ From ac4a743f289732c1d2ab1ba5fa92526890ccd170 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Mon, 6 Jan 2025 21:18:52 -0300 Subject: [PATCH 15/18] actions ok --- .github/workflows/of.yml | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/.github/workflows/of.yml b/.github/workflows/of.yml index dabdb1f71de..41f2dc1504b 100644 --- a/.github/workflows/of.yml +++ b/.github/workflows/of.yml @@ -274,37 +274,6 @@ jobs: env: TARGET: ${{matrix.cfg.target}} steps: -<<<<<<< HEAD - - name: Remove Old lib-unwind - run: if [ "$TARGET" = "linux64" ]; then - sudo apt-get remove libunwind-14 -y; - fi - - name: Fix apt broken - run: sudo apt --fix-broken install - - name: Cache Packages - uses: awalsh128/cache-apt-pkgs-action@latest - with: - packages: aptitude aptitude-common libboost-iostreams1.83.0 libcwidget4 libsigc++-2.0-0v5 libxapian30 fonts-wine{a} libasound2-plugins{a} libcapi20-3t64{a} libosmesa6{a} libpcsclite1{a} libspeexdsp1{a} libwine{a} libxkbregistry0{a} libz-mingw-w64{a} wine{a} wine64 wget2 make libjack-jackd2-0 libjack-jackd2-dev freeglut3-dev libasound2-dev libxmu-dev libxxf86vm-dev g++ libgl1-mesa-dev libglu1-mesa-dev libraw1394-dev libudev-dev libdrm-dev libglew-dev libopenal-dev libsndfile1-dev libfreeimage-dev libcairo2-dev libfreetype6-dev libpulse-dev libusb-1.0-0-dev libgtk2.0-dev libopencv-dev libassimp-dev librtaudio-dev gdb libglfw3-dev liburiparser-dev libpugixml-dev libgconf-2-4 libgtk2.0-0 libpoco-dev libxcursor-dev libxi-dev libxinerama-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev gstreamer1.0-libav gstreamer1.0-pulseaudio gstreamer1.0-x gstreamer1.0-plugins-bad gstreamer1.0-alsa gstreamer1.0-plugins-base gstreamer1.0-plugins-good - version: 1.0 - - name: Determine Release - id: vars - shell: bash - run: | - if [[ "${{ github.ref }}" == refs/tags/* ]]; then - echo "RELEASE=${{ github.ref_name }}" >> $GITHUB_ENV - elif [[ "${{ github.ref }}" == "refs/heads/master" ]]; then - echo "RELEASE=nightly" >> $GITHUB_ENV - elif [[ "${{ github.ref }}" == "refs/heads/bleeding" ]]; then - echo "RELEASE=latest" >> $GITHUB_ENV - else - echo "RELEASE=latest" >> $GITHUB_ENV - fi - - uses: actions/checkout@v4 - - name: ccache - uses: hendrikmuhs/ccache-action@v1.2.14 - with: - key: ${{ matrix.cfg.target }}-${{ matrix.cfg.libs }} -======= - name: Remove Old lib-unwind run: if [ "$TARGET" = "linux64" ]; then sudo apt-get remove libunwind-14 -y; @@ -332,7 +301,6 @@ jobs: uses: hendrikmuhs/ccache-action@v1.2.14 with: key: ${{ matrix.cfg.target }}-${{ matrix.cfg.libs }} ->>>>>>> master - name: Download libs run: ./scripts/linux/download_libs.sh -t $RELEASE -a ${{matrix.cfg.libs}} From ee8cda6d182bd571f0c4dfc7327765def88b06a8 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Mon, 6 Jan 2025 22:32:27 -0300 Subject: [PATCH 16/18] fix functional --- libs/openFrameworks/graphics/ofPixels.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/openFrameworks/graphics/ofPixels.cpp b/libs/openFrameworks/graphics/ofPixels.cpp index e0d78c33c34..8b2356085a3 100644 --- a/libs/openFrameworks/graphics/ofPixels.cpp +++ b/libs/openFrameworks/graphics/ofPixels.cpp @@ -2,7 +2,7 @@ #include "ofPixels.h" #include "ofColor.h" #include // memcpy -#include // std::function +#include // std::function static ofImageType getImageTypeFromChannels(size_t channels){ switch(channels){ From 1e9e6de1d1bfcba42845080bfd09a10c6cd0a920 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Mon, 6 Jan 2025 22:40:47 -0300 Subject: [PATCH 17/18] more --- libs/openFrameworks/utils/ofLog.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libs/openFrameworks/utils/ofLog.cpp b/libs/openFrameworks/utils/ofLog.cpp index 7a75025fe22..121a2197235 100644 --- a/libs/openFrameworks/utils/ofLog.cpp +++ b/libs/openFrameworks/utils/ofLog.cpp @@ -1,6 +1,8 @@ #include "ofLog.h" #include #include +#include // std::function + #ifdef TARGET_ANDROID #include "ofxAndroidLogChannel.h" #endif @@ -82,7 +84,7 @@ ofLog::ofLog(){ module = ""; bPrinted = false; } - + //-------------------------------------------------- ofLog::ofLog(ofLogLevel _level){ level = _level; @@ -231,7 +233,7 @@ string ofGetLogLevelName(ofLogLevel level, bool pad){ //-------------------------------------------------- void ofConsoleLoggerChannel::log(ofLogLevel level, const string & module, const string & message){ - // print to cerr for OF_LOG_ERROR and OF_LOG_FATAL_ERROR, everything else to cout + // print to cerr for OF_LOG_ERROR and OF_LOG_FATAL_ERROR, everything else to cout std::ostream& out = level < OF_LOG_ERROR ? std::cout : std::cerr; out << "[" << ofGetLogLevelName(level, true) << "] "; // only print the module name if it's not "" @@ -245,7 +247,7 @@ void ofConsoleLoggerChannel::log(ofLogLevel level, const string & module, const #ifdef TARGET_WIN32 #include void ofDebugViewLoggerChannel::log(ofLogLevel level, const string & module, const string & message) { - // print to cerr for OF_LOG_ERROR and OF_LOG_FATAL_ERROR, everything else to cout + // print to cerr for OF_LOG_ERROR and OF_LOG_FATAL_ERROR, everything else to cout std::stringstream out; out << "[" << ofGetLogLevelName(level, true) << "] "; // only print the module name if it's not "" @@ -287,4 +289,3 @@ void ofFileLoggerChannel::log(ofLogLevel level, const string & module, const str } file << message << std::endl; } - From 10f92b5ed58921ed1fbad3543211fdc74681cc4b Mon Sep 17 00:00:00 2001 From: Dimitre Date: Mon, 6 Jan 2025 23:30:26 -0300 Subject: [PATCH 18/18] vector --- libs/openFrameworks/gl/ofShader.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/openFrameworks/gl/ofShader.cpp b/libs/openFrameworks/gl/ofShader.cpp index b4df3358905..a7eec43fef7 100644 --- a/libs/openFrameworks/gl/ofShader.cpp +++ b/libs/openFrameworks/gl/ofShader.cpp @@ -8,6 +8,7 @@ #include "ofxAndroidUtils.h" #endif #include +#include using std::endl; using std::ostringstream; @@ -958,7 +959,7 @@ void ofShader::setUniformTexture(const string & name, const ofTexture & tex, int setUniformTexture( name, texData, textureLocation); } } - + //-------------------------------------------------------------- void ofShader::setUniformTexture(const string & name, const ofTextureData & texData, int textureLocation) const{ if (bLoaded) {