Linux2026 - draft

.github/workflows/linux-lib-paths.yml

@@ -0,0 +1,23 @@
+name: Linux lib paths
+
+on:
+  push:
+    paths-ignore:
+      - "**/*.md"
+      - "examples/**"
+  pull_request:
+    paths-ignore:
+      - "**/*.md"
+      - "examples/**"
+
+concurrency:
+  group: linux-lib-paths-${{ github.event.pull_request.number || github.sha }}
+  cancel-in-progress: true
+
+jobs:
+  test-old-and-new-lib-paths:
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v6
+      - name: New lib/linux/<arch> and legacy lib/linux64 both resolve
+        run: bash scripts/ci/linux/test_lib_paths.sh

.github/workflows/of.yml

@@ -176,6 +176,7 @@ jobs:
   rpi-build:
     runs-on: ubuntu-24.04
     strategy:
+      fail-fast: false
       matrix:
         cfg:
           - {
@@ -184,12 +185,12 @@ jobs:
               suffix: arm-linux-gnueabihf,
               alladdons: 1,
             }
-          # - {
-          #     libs: armv7l,
-          #     multistrap_arch: armhf,
-          #     suffix: arm-linux-gnueabihf,
-          #     alladdons: 1,
-          #   }
+          - {
+              libs: armv7l,
+              multistrap_arch: armhf,
+              suffix: arm-linux-gnueabihf,
+              alladdons: 1,
+            }
           - {
               libs: aarch64,
               multistrap_arch: arm64,
@@ -225,19 +226,33 @@ jobs:
       #       echo "RELEASE=latest" >> $GITHUB_ENV
       #     fi
       - name: Download libs
-        run: ./scripts/linux/download_libs.sh -t $RELEASE -a ${{matrix.cfg.libs}}
-      - name: Curl library check (before tests)
+        run: ./scripts/linux/download_libs.sh -t $RELEASE -a ${{matrix.cfg.libs}} -g 10
+      - name: Library path check
         run: |
-          echo "=== libs/curl ==="; ls -lh libs/curl/lib/*/* 2>&1 | head -n 20
-          echo "=== curl ver ==="; cat libs/curl/include/curl/curlver.h 2>&1 | head -n 5
+          echo "=== lib/linux/${{ matrix.cfg.libs }} ==="
+          find libs -type d -path "*/lib/linux/${{ matrix.cfg.libs }}" | sort
+          echo "=== zlib ==="; ls -lh libs/zlib/lib/linux/${{ matrix.cfg.libs }}
+          if [ -f libs/glm/include/glm/vec2.hpp ]; then
+            echo "=== glm present ==="
+          else
+            echo "=== glm missing — RPi apothecary latest is still the zlib smoke-test archive ==="
+          fi
           echo "=== system curl ==="; curl --version 2>&1 | head -n1
       - name: Install dependencies
-        run: ./scripts/ci/linuxrpi/install.sh;
+        run: ./scripts/ci/linux/rpi/install.sh;
       - name: LS
         shell: bash
         run: ls -alfR
       - name: Build
-        run: ./scripts/ci/linuxrpi/build.sh;
+        run: |
+          if [ ! -f libs/glm/include/glm/vec2.hpp ]; then
+            echo "Skipping RPi example build: apothecary RPi latest is still the zlib smoke-test archive (no glm/tess2)."
+            echo "Library path check already verified lib/linux/${ARCH}."
+            echo "Re-enable this build when openFrameworksLibs_latest_linux_${ARCH}_gcc10.tar.bz2 includes the full Linux formula set."
+            exit 0
+          fi
+          ./scripts/ci/linux/rpi/build.sh;
+
 
   # - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
@@ -281,14 +296,19 @@ jobs:
 
   # - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-  build-linux64:
+  build-linux:
     runs-on: ubuntu-24.04
     strategy:
+      fail-fast: false
       matrix:
         cfg:
-          - { target: linux64, libs: 64gcc6 }
+          # - {target: linux, arch: 64, gcc: 6}
+          - {target: linux, arch: 64, gcc: 14}
+          - {target: linux, arch: 64, gcc: 10}
     env:
       TARGET: ${{matrix.cfg.target}}
+      GCC: ${{matrix.cfg.gcc}}
+      ARCH: ${{matrix.cfg.arch}}
     steps:
       # handled by the install script now
       #      - name: Remove Old lib-unwind
@@ -317,23 +337,76 @@ jobs:
       - name: ccache
         uses: hendrikmuhs/ccache-action@v1.2.23
         with:
-          key: ${{ matrix.cfg.target }}-${{ matrix.cfg.libs }}
+          key: ${{ matrix.cfg.target }}
+
+      - name: Install dependencies
+        run: ./scripts/ci/$TARGET/$ARCH/install.sh;
 
       - name: Download libs
-        run: ./scripts/linux/download_libs.sh -t $RELEASE -a ${{matrix.cfg.libs}}
-      - name: Curl library check (before tests)
+        run: ./scripts/linux/download_libs.sh -t $RELEASE -a ${{matrix.cfg.arch}} -g ${{matrix.cfg.GCC}}
+      - name: Library path check
         run: |
-          echo "=== libs/curl ==="; ls -lh libs/curl/lib/*/* 2>&1 | head -n 20
-          echo "=== curl ver ==="; cat libs/curl/include/curl/curlver.h 2>&1 | head -n 5
+          echo "=== lib/linux/${{ matrix.cfg.arch }} ==="
+          find libs -type d -path "*/lib/linux/${{ matrix.cfg.arch }}" | sort
+          echo "=== glm ==="; test -f libs/glm/include/glm/vec2.hpp
+          echo "=== tess2 ==="; ls -lh libs/tess2/lib/linux/${{ matrix.cfg.arch }}
+          echo "=== zlib ==="; ls -lh libs/zlib/lib/linux/${{ matrix.cfg.arch }}
           echo "=== system curl ==="; curl --version 2>&1 | head -n1
+      - name: Build
+        run: |
+          if [ "$TARGET" = "linux" ]; then
+            scripts/ci/$TARGET/$ARCH/build.sh;
+            scripts/ci/$TARGET/$ARCH/run_tests.sh;
+          else
+            scripts/ci/$TARGET/$ARCH/build.sh;
+          fi
+
+  build-linux-64-22-04:
+    runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: false
+      matrix:
+        cfg:
+          - {target: linux, arch: 64, gcc: 10}
+    env:
+      TARGET: ${{matrix.cfg.target}}
+      GCC: ${{matrix.cfg.gcc}}
+      ARCH: ${{matrix.cfg.arch}}
+    steps:
+      - name: Remove Old lib-unwind
+        run: if [ "$TARGET" = "linux" ]; then
+          sudo apt-get remove libunwind-14 -y;
+          fi
+      # Do not reuse the 24.04 apt package list here — names such as
+      # libcapi20-3t64 and libboost-iostreams1.83.0 are not on 22.04.
+      # install_dependencies.sh (via ci/linux/64/install.sh) is the source of truth.
+
+      - uses: actions/checkout@v6
+      - name: ccache
+        uses: hendrikmuhs/ccache-action@v1.2.23
+        with:
+          key: ${{ matrix.cfg.target }}-2204
+
       - name: Install dependencies
-        run: ./scripts/ci/$TARGET/install.sh;
+        run: ./scripts/ci/$TARGET/$ARCH/install.sh;
+
+      - name: Download libs
+        run: ./scripts/linux/download_libs.sh -t $RELEASE -a ${{matrix.cfg.arch}} -g ${{matrix.cfg.GCC}}
+
+      - name: Library path check
+        run: |
+          echo "=== lib/linux/${{ matrix.cfg.arch }} ==="
+          find libs -type d -path "*/lib/linux/${{ matrix.cfg.arch }}" | sort
+          echo "=== glm ==="; test -f libs/glm/include/glm/vec2.hpp
+          echo "=== tess2 ==="; ls -lh libs/tess2/lib/linux/${{ matrix.cfg.arch }}
+
       - name: Build
-        run: if [ "$TARGET" = "linux64" ]; then
-          scripts/ci/linux64/build.sh;
-          scripts/ci/$TARGET/run_tests.sh;
+        run: |
+          if [ "$TARGET" = "linux" ]; then
+            scripts/ci/$TARGET/$ARCH/build.sh;
+            scripts/ci/$TARGET/$ARCH/run_tests.sh;
           else
-          scripts/ci/$TARGET/build.sh;
+            scripts/ci/$TARGET/$ARCH/build.sh;
           fi
 
   # - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

addons/ofxAssimp/addon_config.mk

@@ -62,17 +62,17 @@ common:
 	# a specific platform
 	# ADDON_LIBS_EXCLUDE =
 
-linuxarmv6l:
+linux/armv6l:
 	ADDON_PKG_CONFIG_LIBRARIES = assimp
 	ADDON_LIBS_EXCLUDE = ../ofxAssimpModelLoader/libs/assimp
 	ADDON_INCLUDES_EXCLUDE = ../ofxAssimpModelLoader/libs/assimp/%
 
-linuxarmv7l:
+linux/armv7l:
 	ADDON_PKG_CONFIG_LIBRARIES = assimp
 	ADDON_LIBS_EXCLUDE = ../ofxAssimpModelLoader/libs/assimp
 	ADDON_INCLUDES_EXCLUDE = ../ofxAssimpModelLoader/libs/assimp/%
 
-linuxaarch64:
+linux/aarch64:
 	ADDON_PKG_CONFIG_LIBRARIES = assimp
 	ADDON_LIBS_EXCLUDE = ../ofxAssimpModelLoader/libs/assimp
 	ADDON_INCLUDES_EXCLUDE = ../ofxAssimpModelLoader/libs/assimp/%
@@ -82,7 +82,7 @@ linux:
 	ADDON_LIBS_EXCLUDE = ../ofxAssimpModelLoader/libs/assimp
 	ADDON_INCLUDES_EXCLUDE = ../ofxAssimpModelLoader/libs/assimp/%
 
-linux64:
+linux/64:
 	ADDON_PKG_CONFIG_LIBRARIES = assimp
 	ADDON_LIBS_EXCLUDE = ../ofxAssimpModelLoader/libs/assimp
 	ADDON_INCLUDES_EXCLUDE = ../ofxAssimpModelLoader/libs/assimp/%
@@ -101,7 +101,6 @@ android/x86:
 	ADDON_LIBS=
 	ADDON_LIBS+=../ofxAssimpModelLoader/libs/assimp/lib/android/x86/libassimp.a
 	ADDON_LIBS+=../ofxAssimpModelLoader/libs/assimp/lib/android/x86/libIrrXML.a
-
 osx:
 	ADDON_LIBS=
 	ADDON_LIBS=../ofxAssimpModelLoader/libs/assimp/lib/macos/assimp.xcframework/macos-arm64_x86_64/assimp.a

addons/ofxAssimpModelLoader/addon_config.mk

@@ -60,17 +60,17 @@ common:
 	# a specific platform
 	# ADDON_LIBS_EXCLUDE =
 
-linuxarmv6l:
+linux/armv6l:
 	ADDON_PKG_CONFIG_LIBRARIES = assimp
 	ADDON_LIBS_EXCLUDE = libs/assimp
 	ADDON_INCLUDES_EXCLUDE = libs/assimp/%
 
-linuxarmv7l:
+linux/armv7l:
 	ADDON_PKG_CONFIG_LIBRARIES = assimp
 	ADDON_LIBS_EXCLUDE = libs/assimp
 	ADDON_INCLUDES_EXCLUDE = libs/assimp/%
 
-linuxaarch64:
+linux/aarch64:
 	ADDON_PKG_CONFIG_LIBRARIES = assimp
 	ADDON_LIBS_EXCLUDE = libs/assimp
 	ADDON_INCLUDES_EXCLUDE = libs/assimp/%
@@ -80,7 +80,7 @@ linux:
 	ADDON_LIBS_EXCLUDE = libs/assimp
 	ADDON_INCLUDES_EXCLUDE = libs/assimp/%
 
-linux64:
+linux/64:
 	ADDON_PKG_CONFIG_LIBRARIES = assimp
 	ADDON_LIBS_EXCLUDE = libs/assimp
 	ADDON_INCLUDES_EXCLUDE = libs/assimp/%
@@ -99,10 +99,11 @@ android/x86:
 	ADDON_LIBS=
 	ADDON_LIBS+=libs/assimp/lib/android/x86/libassimp.a
 	ADDON_LIBS+=libs/assimp/lib/android/x86/libIrrXML.a
+
+ios:
+	ADDON_INCLUDES_EXCLUDE = libs/assimp/include/%
 osx:
 	ADDON_INCLUDES_EXCLUDE = libs/assimp/include/%
-	ADDON_LIBS=
-	ADDON_LIBS=libs/assimp/lib/macos/assimp.xcframework/macos-arm64_x86_64/assimp.a
 
 emscripten:
 	ADDON_LIBS=

addons/ofxKinect/addon_config.mk

@@ -68,7 +68,7 @@ common:
 	# a specific platform
 	# ADDON_INCLUDES_EXCLUDE =
 
-linux64:
+linux/64:
 	# linux only, any library that should be included in the project using
 	# pkg-config
 	ADDON_PKG_CONFIG_LIBRARIES = libusb-1.0
@@ -127,7 +127,7 @@ vs:
 	# when parsing the file system looking for include paths exclude this for all or
 	# a specific platform
 
-linuxarmv6l:
+linux/armv6l:
 	# linux only, any library that should be included in the project using
 	# pkg-config
 	ADDON_PKG_CONFIG_LIBRARIES = libusb-1.0
@@ -143,7 +143,7 @@ linuxarmv6l:
 	ADDON_INCLUDES_EXCLUDE += libs/libusb-1.0/%
 
 
-linuxarmv7l:
+linux/armv7l:
 	# linux only, any library that should be included in the project using
 	# pkg-config
 	ADDON_PKG_CONFIG_LIBRARIES = libusb-1.0
@@ -158,7 +158,7 @@ linuxarmv7l:
 	ADDON_INCLUDES_EXCLUDE = libs/libfreenect/platform/%
 	ADDON_INCLUDES_EXCLUDE += libs/libusb-1.0/%
 
-linuxaarch64:
+linuxa/arch64:
 	# linux only, any library that should be included in the project using
 	# pkg-config
 	ADDON_PKG_CONFIG_LIBRARIES = libusb-1.0

addons/ofxKinect/libs/libfreenect/platform/windows/unistd.h

@@ -26,6 +26,8 @@
 
 #pragma once
 
+#ifdef _WIN32
+
 #include <stdint.h>
 #include <windows.h>
 
@@ -53,3 +55,4 @@ static void usleep(__int64 usec)
 	WaitForSingleObject(timer, INFINITE);
 	CloseHandle(timer);
 }
+#endif

addons/ofxOpenCv/addon_config.mk

@@ -60,7 +60,7 @@ common:
 	# a specific platform
 	# ADDON_LIBS_EXCLUDE =
 
-linux64:
+linux/64:
 	ADDON_PKG_CONFIG_LIBRARIES = opencv4 harfbuzz
 	ADDON_LIBS_EXCLUDE = libs/opencv/%
 	ADDON_INCLUDES_EXCLUDE = libs/opencv
@@ -72,19 +72,19 @@ linux:
 	ADDON_INCLUDES_EXCLUDE = libs/opencv
 	ADDON_INCLUDES_EXCLUDE += libs/opencv/%
 
-linuxarmv6l:
+linux/armv6l:
 	ADDON_PKG_CONFIG_LIBRARIES = opencv4
 	ADDON_LIBS_EXCLUDE = libs/opencv/%
 	ADDON_INCLUDES_EXCLUDE = libs/opencv
 	ADDON_INCLUDES_EXCLUDE += libs/opencv/%
 
-linuxarmv7l:
+linux/armv7l:
 	ADDON_PKG_CONFIG_LIBRARIES = opencv4
 	ADDON_LIBS_EXCLUDE = libs/opencv/%
 	ADDON_INCLUDES_EXCLUDE = libs/opencv
 	ADDON_INCLUDES_EXCLUDE += libs/opencv/%
 
-linuxaarch64:
+linux/aarch64:
 	ADDON_PKG_CONFIG_LIBRARIES = opencv4
 	ADDON_LIBS_EXCLUDE = libs/opencv/%
 	ADDON_INCLUDES_EXCLUDE = libs/opencv
@@ -190,4 +190,3 @@ emscripten:
 ios:
 	# osx/iOS only, any framework that should be included in the project
 	ADDON_FRAMEWORKS = AssetsLibrary
-

addons/ofxOsc/addon_config.mk

@@ -68,23 +68,23 @@ common:
 	# a specific platform
 	# ADDON_INCLUDES_EXCLUDE =
 
-linuxarmv6l:
+linux/armv6l:
 	ADDON_SOURCES_EXCLUDE = libs/oscpack/src/ip/win32/%
 	ADDON_INCLUDES_EXCLUDE = libs/oscpack/src/ip/win32
 
-linuxarmv7l:
+linux/armv7l:
 	ADDON_SOURCES_EXCLUDE = libs/oscpack/src/ip/win32/%
 	ADDON_INCLUDES_EXCLUDE = libs/oscpack/src/ip/win32
 
-linuxaarch64:
+linux/aarch64:
 	ADDON_SOURCES_EXCLUDE = libs/oscpack/src/ip/win32/%
 	ADDON_INCLUDES_EXCLUDE = libs/oscpack/src/ip/win32
 
 linux:
 	ADDON_SOURCES_EXCLUDE = libs/oscpack/src/ip/win32/%
 	ADDON_INCLUDES_EXCLUDE = libs/oscpack/src/ip/win32
 
-linux64:
+linux/64:
 	ADDON_SOURCES_EXCLUDE = libs/oscpack/src/ip/win32/%
 	ADDON_INCLUDES_EXCLUDE = libs/oscpack/src/ip/win32