From 53d36c97bf6d629f4eab758549e6e63592e8667c Mon Sep 17 00:00:00 2001 From: Dimitre Date: Fri, 3 May 2024 12:14:25 -0300 Subject: [PATCH 01/62] rpi changes --- .github/workflows/build-emscripten.yml | 42 ------------ .github/workflows/build-ios-tvos.yml | 48 -------------- .github/workflows/build-linux-arm.yml | 51 --------------- .github/workflows/build-linux64.yml | 64 ------------------- .github/workflows/build-macos.yml | 60 ----------------- .github/workflows/build-msys2.yml | 62 ------------------ .github/workflows/build-rpi.yml | 57 +++++++++++++++++ .github/workflows/build-vs2022.yml | 61 ------------------ .github/workflows/manual-nightly.yml | 43 ------------- .github/workflows/manual-web-examples.yml | 48 -------------- .github/workflows/nightly-linux64.yml | 42 ------------ apps/projectGenerator | 2 +- .../project/makefileCommon/compile.core.mk | 15 ++++- .../project/makefileCommon/compile.project.mk | 26 ++++---- .../project/makefileCommon/config.shared.mk | 2 + scripts/ci/linuxaarch64/build.sh | 47 +++++++++----- scripts/ci/linuxaarch64/install.sh | 58 +++-------------- scripts/ci/linuxaarch64/multistrap.conf | 25 +++----- 18 files changed, 137 insertions(+), 616 deletions(-) delete mode 100644 .github/workflows/build-emscripten.yml delete mode 100644 .github/workflows/build-ios-tvos.yml delete mode 100644 .github/workflows/build-linux-arm.yml delete mode 100644 .github/workflows/build-linux64.yml delete mode 100644 .github/workflows/build-macos.yml delete mode 100644 .github/workflows/build-msys2.yml create mode 100644 .github/workflows/build-rpi.yml delete mode 100644 .github/workflows/build-vs2022.yml delete mode 100644 .github/workflows/manual-nightly.yml delete mode 100644 .github/workflows/manual-web-examples.yml delete mode 100644 .github/workflows/nightly-linux64.yml diff --git a/.github/workflows/build-emscripten.yml b/.github/workflows/build-emscripten.yml deleted file mode 100644 index 3d21aeaab2d..00000000000 --- a/.github/workflows/build-emscripten.yml +++ /dev/null @@ -1,42 +0,0 @@ -name: build-emscripten - -# make the action not run on the local repo if the branch is also in a pull request to OF/OF -on: - push: - if: github.event_name == 'push' && github.event.pull_request == null - paths-ignore: - - '**/*.md' - - 'examples/**' - pull_request: - if: github.event_name == 'pull_request' && github.repository == 'openframeworks/openFrameworks' - paths-ignore: - - '**/*.md' - - 'examples/**' - -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -jobs: - build-emscripten: - runs-on: ubuntu-latest - strategy: - matrix: - cfg: - - {target: emscripten} - env: - TARGET: ${{matrix.cfg.target}} - steps: - - uses: actions/checkout@v4 - - name: Docker Step - run: "docker run -di --name emscripten -v $PWD:/src emscripten/emsdk:3.1.21 bash" - - name: Download libs - run: ./scripts/$TARGET/download_libs.sh - - name: Install dependencies - run: ./scripts/ci/$TARGET/install.sh - - name: Build - run: docker exec -i emscripten sh -c "scripts/ci/$TARGET/build.sh"; - - name: Upload Libs - run: scripts/ci/upload_of_lib.sh; - env: - GA_CI_SECRET: ${{ secrets.CI_SECRET }} diff --git a/.github/workflows/build-ios-tvos.yml b/.github/workflows/build-ios-tvos.yml deleted file mode 100644 index ab83923059a..00000000000 --- a/.github/workflows/build-ios-tvos.yml +++ /dev/null @@ -1,48 +0,0 @@ -name: build-ios-tvos - -# make the action not run on the local repo if the branch is also in a pull request to OF/OF -on: - push: - if: github.event_name == 'push' && github.event.pull_request == null - paths-ignore: - - '**/*.md' - - 'examples/**' - pull_request: - if: github.event_name == 'pull_request' && github.repository == 'openframeworks/openFrameworks' - paths-ignore: - - '**/*.md' - - 'examples/**' - -env: - ccache: ccache - -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -jobs: - build-ios-tvos: - runs-on: macos-13 - strategy: - matrix: - cfg: - - {target: ios, libs: ios} - #- {target: tvos, libs: ios} #broken currently maybe better to just remove - env: - TARGET: ${{matrix.cfg.target}} - steps: - - uses: actions/checkout@v4 - - name: ccache - uses: hendrikmuhs/ccache-action@v1.2.12 - with: - key: ${{ matrix.cfg.target }}-${{ matrix.cfg.libs }} - - - name: Download libs - run: ./scripts/${{matrix.cfg.libs}}/download_libs.sh - - name: install - run: ./scripts/ci/$TARGET/install.sh - - name: Build - run: ./scripts/ci/$TARGET/build.sh; - - env: - DEVELOPER_DIR: "/Applications/Xcode_15.2.app/Contents/Developer" diff --git a/.github/workflows/build-linux-arm.yml b/.github/workflows/build-linux-arm.yml deleted file mode 100644 index 4dc36efb9cc..00000000000 --- a/.github/workflows/build-linux-arm.yml +++ /dev/null @@ -1,51 +0,0 @@ -name: build-linux-arm - -# make the action not run on the local repo if the branch is also in a pull request to OF/OF -on: - push: - if: github.event_name == 'push' && github.event.pull_request == null - paths-ignore: - - '**/*.md' - - 'examples/**' - pull_request: - if: github.event_name == 'pull_request' && github.repository == 'openframeworks/openFrameworks' - paths-ignore: - - '**/*.md' - - 'examples/**' - -env: - ccache: ccache - -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -jobs: - build-linux-arm-platforms: - runs-on: ubuntu-latest - strategy: - matrix: - cfg: - - {target: linuxarmv6l, libs: armv6l} - - {target: linuxaarch64, libs: aarch64} - env: - TARGET: ${{matrix.cfg.target}} - steps: - - name: Cache Packages - uses: awalsh128/cache-apt-pkgs-action@latest - with: - packages: make curl libunwind-dev 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 libssl-dev libpulse-dev libusb-1.0-0-dev libgtk2.0-dev libopencv-dev libassimp-dev librtaudio-dev gdb libglfw3-dev liburiparser-dev libcurl4-openssl-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 - - - uses: actions/checkout@v4 - - name: ccache - uses: hendrikmuhs/ccache-action@v1.2.12 - with: - # key: ${{ matrix.os }}-${{ matrix.type }} - key: ${{ matrix.cfg.target }} - - name: Download libs - run: ./scripts/linux/download_libs.sh -a ${{matrix.cfg.libs}}; - - name: Install dependencies - run: ./scripts/ci/$TARGET/install.sh; - - name: Build - run: ./scripts/ci/$TARGET/build.sh; diff --git a/.github/workflows/build-linux64.yml b/.github/workflows/build-linux64.yml deleted file mode 100644 index 97eebdf7c87..00000000000 --- a/.github/workflows/build-linux64.yml +++ /dev/null @@ -1,64 +0,0 @@ -name: build-linux64 - -# make the action not run on the local repo if the branch is also in a pull request to OF/OF -on: - push: - if: github.event_name == 'push' && github.event.pull_request == null - paths-ignore: - - '**/*.md' - - 'examples/**' - pull_request: - if: github.event_name == 'pull_request' && github.repository == 'openframeworks/openFrameworks' - paths-ignore: - - '**/*.md' - - 'examples/**' - -env: - ccache: ccache - -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -jobs: - build-linux64-platforms: - runs-on: ubuntu-latest - strategy: - matrix: - cfg: - - {target: linux64, libs: 64gcc6} - env: - TARGET: ${{matrix.cfg.target}} - steps: - - name: Remove Old lib-unwind - run: if [ "$TARGET" = "linux64" ]; then - sudo apt-get remove libunwind-14 -y; - fi - - name: Cache Packages - uses: awalsh128/cache-apt-pkgs-action@latest - with: - packages: make curl libunwind-dev 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 libssl-dev libpulse-dev libusb-1.0-0-dev libgtk2.0-dev libopencv-dev libassimp-dev librtaudio-dev gdb libglfw3-dev liburiparser-dev libcurl4-openssl-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 - - - uses: actions/checkout@v4 - - name: ccache - uses: hendrikmuhs/ccache-action@v1.2.12 - with: - key: ${{ matrix.cfg.target }}-${{ matrix.cfg.libs }} - - - name: Download libs - run: ./scripts/linux/download_libs.sh -a ${{matrix.cfg.libs}}; - - name: Install dependencies - run: ./scripts/ci/$TARGET/install.sh; - - name: Build - run: if [ "$TARGET" = "linux64" ]; then - scripts/ci/linux64/build.sh; - scripts/ci/$TARGET/run_tests.sh; - else - scripts/ci/$TARGET/build.sh; - fi - # - name: Upload Libs - # run: scripts/ci/upload_of_lib.sh; - # env: - # GA_CI_SECRET: ${{ secrets.CI_SECRET }} - diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml deleted file mode 100644 index 8cafbb0ff49..00000000000 --- a/.github/workflows/build-macos.yml +++ /dev/null @@ -1,60 +0,0 @@ -name: build-macos - -# make the action not run on the local repo if the branch is also in a pull request to OF/OF -on: - push: - if: github.event_name == 'push' && github.event.pull_request == null - paths-ignore: - - '**/*.md' - - 'examples/**' - pull_request: - if: github.event_name == 'pull_request' && github.repository == 'openframeworks/openFrameworks' - paths-ignore: - - '**/*.md' - - 'examples/**' - -env: - ccache: ccache - -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -jobs: - build-macos: - runs-on: macos-13 - strategy: - matrix: - cfg: - - {target: osx, opt: "xcode"} - - {target: osx, opt: "makefiles"} - steps: - - uses: actions/checkout@v4 - - name: ccache - uses: hendrikmuhs/ccache-action@v1.2.12 - with: - # key: ${{ matrix.os }}-${{ matrix.type }} - key: ${{ matrix.cfg.target }}-${{ matrix.cfg.opt }} - # key: ${{ matrix.msystem }} - - - - name: Download libs - # continue-on-error: true - run: ./scripts/${{ matrix.cfg.target }}/download_libs.sh -# - name: rm-dev -# run: sudo rm -rf /Library/Developer - - # this step is not needed here because the script is empty - # - name: install - # run: ./scripts/ci/$TARGET/install.sh - - - name: Build - run: - if [ ${{ matrix.cfg.opt }} = "xcode" ]; then - scripts/ci/${{ matrix.cfg.target }}/build.sh ${{ matrix.cfg.opt }}; - else - scripts/ci/${{ matrix.cfg.target }}/run_tests.sh; - fi - env: - DEVELOPER_DIR: "/Applications/Xcode.app/Contents/Developer" - SDKROOT: "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk" diff --git a/.github/workflows/build-msys2.yml b/.github/workflows/build-msys2.yml deleted file mode 100644 index 6bec16d4557..00000000000 --- a/.github/workflows/build-msys2.yml +++ /dev/null @@ -1,62 +0,0 @@ -name: build-msys2 - -# make the action not run on the local repo if the branch is also in a pull request to OF/OF -on: - push: - if: github.event_name == 'push' && github.event.pull_request == null - paths-ignore: - - '**/*.md' - - 'examples/**' - pull_request: - if: github.event_name == 'pull_request' && github.repository == 'openframeworks/openFrameworks' - paths-ignore: - - '**/*.md' - - 'examples/**' - -env: - ccache: ccache - -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -jobs: - build-msys2: - runs-on: windows-latest - strategy: - matrix: - msystem: - - mingw64 - # - ucrt64 - defaults: - run: - shell: msys2 {0} - steps: - - uses: actions/checkout@v4 - - name: ccache - uses: hendrikmuhs/ccache-action@v1.2.12 - with: - # key: ${{ matrix.os }}-${{ matrix.type }} - key: ${{ matrix.msystem }} - - uses: msys2/setup-msys2@v2 - with: - cache: true - update: false - msystem: ${{matrix.msystem}} - pacboy: assimp:p cairo:p curl:p freeglut:p FreeImage:p gcc:p gdb:p glew:p glfw:p glm:p harfbuzz:p libsndfile:p libusb:p libxml2:p mpg123:p nlohmann-json:p ntldd-git:p openal:p opencv:p pkgconf:p pugixml:p rtaudio:p uriparser:p utf8cpp:p zlib:p poco:p - # boost:p tools:p - # install: >- - # unzip - # git - # rsync - # wget - - - name: Install dependencies - run: ./scripts/ci/msys2/install.sh - - - name: Build - run: ./scripts/ci/msys2/build.sh - - - name: Run tests - run: ./scripts/ci/msys2/run_tests.sh - diff --git a/.github/workflows/build-rpi.yml b/.github/workflows/build-rpi.yml new file mode 100644 index 00000000000..d594020c2ce --- /dev/null +++ b/.github/workflows/build-rpi.yml @@ -0,0 +1,57 @@ +name: build-linux-arm + +# make the action not run on the local repo if the branch is also in a pull request to OF/OF +on: + push: + if: github.event_name == 'push' && github.event.pull_request == null + paths-ignore: + - '**/*.md' + - 'examples/**' + pull_request: + if: github.event_name == 'pull_request' && github.repository == 'openframeworks/openFrameworks' + paths-ignore: + - '**/*.md' + - 'examples/**' + +env: + ccache: ccache + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + raspberry-pi: + runs-on: ubuntu-latest + strategy: + matrix: + cfg: + # - {target: linuxarmv6l, libs: armv6l} + # - {target: linuxaarch64, libs: aarch64} + - { libs: armv6l, multistrap_arch: armhf, suffix: arm-linux-gnueabihf } + - { libs: aarch64, multistrap_arch: arm64, suffix: aarch64-linux-gnu } + env: + ARCH: ${{matrix.cfg.libs}} + MULTISTRAP_ARCH: ${{matrix.cfg.multistrap_arch}} + steps: + - name: Cache Packages + uses: awalsh128/cache-apt-pkgs-action@latest + with: + packages: multistrap unzip gcc-${{matrix.cfg.suffix}} g++-${{matrix.cfg.suffix}} + version: 1.0 + + - uses: actions/checkout@v4 + + - name: ccache + uses: hendrikmuhs/ccache-action@v1.2.12 + with: + key: ${{ matrix.cfg.libs }} + + - name: Download libs + run: ./scripts/linux/download_libs.sh -a ${{matrix.cfg.libs}}; + - name: Install dependencies + # run: ./scripts/ci/linux${{matrix.cfg.libs}}/install.sh; + run: ./scripts/ci/linuxaarch64/install.sh; + - name: Build + # run: ./scripts/ci/linux${{matrix.cfg.libs}}/build.sh; + run: ./scripts/ci/linuxaarch64/build.sh; diff --git a/.github/workflows/build-vs2022.yml b/.github/workflows/build-vs2022.yml deleted file mode 100644 index 0b48729cf86..00000000000 --- a/.github/workflows/build-vs2022.yml +++ /dev/null @@ -1,61 +0,0 @@ -name: build-vs - -# make the action not run on the local repo if the branch is also in a pull request to OF/OF -on: - push: - if: github.event_name == 'push' && github.event.pull_request == null - paths-ignore: - - '**/*.md' - - 'examples/**' - pull_request: - if: github.event_name == 'pull_request' && github.repository == 'openframeworks/openFrameworks' - paths-ignore: - - '**/*.md' - - 'examples/**' - -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -jobs: - build-vs2022: - runs-on: windows-2022 - strategy: - matrix: - platform: [x64, ARM64, ARM64EC] - env: - BITS: ${{ matrix.bits }} - steps: - - name: Clone repository - uses: actions/checkout@v4 - - uses: msys2/setup-msys2@v2.22.0 - with: - update: true - install: >- - git - unzip - rsync - wget - - name: Install dependencies - shell: msys2 {0} - run: - ./scripts/ci/vs/install_bleeding.sh - - name: Setup MSBuild - uses: microsoft/setup-msbuild@v2 - - name: Build emptyExample - working-directory: ${{env.GITHUB_WORKSPACE}} - run: - msbuild examples/templates/emptyExample/emptyExample.vcxproj /p:configuration=release /p:platform=${{ matrix.platform }} /p:PlatformToolset=v143 - - name: Build allAddonsExample - working-directory: ${{env.GITHUB_WORKSPACE}} - run: - msbuild examples/templates/allAddonsExample/allAddonsExample.vcxproj /p:configuration=release /p:platform=${{ matrix.platform }} /p:PlatformToolset=v143 - - name: Build DEBUG emptyExample - working-directory: ${{env.GITHUB_WORKSPACE}} - run: - msbuild examples/templates/emptyExample/emptyExample.vcxproj /p:configuration=debug /p:platform=${{ matrix.platform }} /p:PlatformToolset=v143 - - name: Build DEBUG allAddonsExample - working-directory: ${{env.GITHUB_WORKSPACE}} - run: - msbuild examples/templates/allAddonsExample/allAddonsExample.vcxproj /p:configuration=debug /p:platform=${{ matrix.platform }} /p:PlatformToolset=v143 - diff --git a/.github/workflows/manual-nightly.yml b/.github/workflows/manual-nightly.yml deleted file mode 100644 index f4599c7bb50..00000000000 --- a/.github/workflows/manual-nightly.yml +++ /dev/null @@ -1,43 +0,0 @@ -name: manual-nightly - -on: - workflow_dispatch: - inputs: - release: - description: 'release' - required: true - default: 'nightly' -jobs: - manual-nightly: - runs-on: ubuntu-latest - strategy: - matrix: - cfg: - - {target: linux64, libs: 64gcc6} - steps: - - name: Install libunwind - run: sudo apt-get install libunwind-dev - - name: Cache Packages - uses: awalsh128/cache-apt-pkgs-action@latest - with: - packages: make curl 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 libssl-dev libpulse-dev libusb-1.0-0-dev libgtk2.0-dev libopencv-dev libassimp-dev librtaudio-dev gdb libglfw3-dev liburiparser-dev libcurl4-openssl-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 - # libunwind-dev - version: 1.0 - - - uses: actions/checkout@v4 - - name: Install dependencies - run: ./scripts/ci/${{matrix.cfg.target}}/install.sh; - - name: Download libs - run: ./scripts/linux/download_libs.sh -a ${{matrix.cfg.libs}}; - - name: Create Package - run: scripts/ci/package_builds.sh ${{ github.event.inputs.release }}; - id: createpackage - - name: Update Release - uses: IsaacShelton/update-existing-release@v1.3.4 - with: - token: ${{ secrets.GITHUB_TOKEN }} - tag: ${{ github.event.inputs.release }} - release: ${{ github.event.inputs.release }} - prerelease: false - replace: true - files: ${{ steps.createpackage.outputs.FILES_OUT }} diff --git a/.github/workflows/manual-web-examples.yml b/.github/workflows/manual-web-examples.yml deleted file mode 100644 index c00771a8d8e..00000000000 --- a/.github/workflows/manual-web-examples.yml +++ /dev/null @@ -1,48 +0,0 @@ -name: build-web-examples - - -# make the action not run on the local repo if the branch is also in a pull request to OF/OF -on: - workflow_dispatch: - inputs: - release: - description: 'release' - required: true - default: 'nightly' -#on: -# push: -# if: github.event_name == 'push' && github.event.pull_request == null -# paths-ignore: -# - '**/*.md' -# - 'examples/**' -# pull_request: -# if: github.event_name == 'pull_request' && github.repository == 'openframeworks/openFrameworks' -# paths-ignore: -# - '**/*.md' -# - 'examples/**' -jobs: - build-web-examples: - runs-on: ubuntu-latest - strategy: - matrix: - cfg: - - target: emscripten - env: - TARGET: ${{matrix.cfg.target}} - steps: - - uses: actions/checkout@v4 - - name: Docker Step - run: docker run -di --name emscripten -v $PWD:/src emscripten/emsdk:3.1.50 bash - - name: Download libs - run: ./scripts/dev/download_libs.sh -p emscripten - - name: Install dependencies - run: ./scripts/ci/$TARGET/install_web_examples.sh - - name: Build - run: docker exec -e GA_EXAMPLES_USER=${{ secrets.SSH_USER }} -e GA_EXAMPLES_SERVER=${{ secrets.SSH_SERVER }} -e GA_EXAMPLES_KEY="${{ secrets.SSH_KEY }}" -e GH_HEAD_REF=${{ github.head_ref }} -e GH_BRANCH=${{ github.ref_name }} -e GH_ACTIONS=true -i emscripten sh -c "scripts/ci/$TARGET/examples_to_build.sh" - env: - GA_EXAMPLES_USER: ${{ secrets.SSH_USER }} - GA_EXAMPLES_SERVER: ${{ secrets.SSH_SERVER }} - GA_EXAMPLES_KEY: ${{ secrets.SSH_KEY }} - GH_HEAD_REF: ${{ github.head_ref }} - GH_BRANCH: ${{ github.ref_name }} - GH_ACTIONS: "true" diff --git a/.github/workflows/nightly-linux64.yml b/.github/workflows/nightly-linux64.yml deleted file mode 100644 index 42a38bf2d63..00000000000 --- a/.github/workflows/nightly-linux64.yml +++ /dev/null @@ -1,42 +0,0 @@ -name: nightly-linux64 - -on: - schedule: - - cron: "0 6 * * *" -jobs: - build-nightly: - runs-on: ubuntu-latest - if: github.repository == 'openframeworks/openFrameworks' && github.ref == 'refs/heads/master' - strategy: - matrix: - cfg: - - {target: linux64, libs: 64gcc6} - env: - TARGET: ${{matrix.cfg.target}} - steps: - - name: Install libunwind - run: sudo apt-get install libunwind-dev - - name: Cache Packages - uses: awalsh128/cache-apt-pkgs-action@latest - with: - packages: make curl 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 libssl-dev libpulse-dev libusb-1.0-0-dev libgtk2.0-dev libopencv-dev libassimp-dev librtaudio-dev gdb libglfw3-dev liburiparser-dev libcurl4-openssl-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 - # libunwind-dev - version: 1.0 - - - uses: actions/checkout@v4 - - name: Install dependencies - run: ./scripts/ci/$TARGET/install.sh; - - name: Download libs - run: ./scripts/linux/download_libs.sh -a ${{matrix.cfg.libs}}; - - name: Create Package - run: scripts/ci/package_builds.sh; - id: createpackage - - name: Update Release - uses: IsaacShelton/update-existing-release@v1.3.4 - with: - token: ${{ secrets.GITHUB_TOKEN }} - tag: nightly - release: nightly - prerelease: false - replace: true - files: ${{ steps.createpackage.outputs.FILES_OUT }} diff --git a/apps/projectGenerator b/apps/projectGenerator index 67f29fb2b56..22db54d0c4f 160000 --- a/apps/projectGenerator +++ b/apps/projectGenerator @@ -1 +1 @@ -Subproject commit 67f29fb2b5638cc727afda8e97b211d4634f69b8 +Subproject commit 22db54d0c4f84ae71a6f09e876c592c5f8779b93 diff --git a/libs/openFrameworksCompiled/project/makefileCommon/compile.core.mk b/libs/openFrameworksCompiled/project/makefileCommon/compile.core.mk index a23dd9897b2..1d37d1ce450 100644 --- a/libs/openFrameworksCompiled/project/makefileCommon/compile.core.mk +++ b/libs/openFrameworksCompiled/project/makefileCommon/compile.core.mk @@ -39,7 +39,20 @@ ifdef ${ccache} $(info 💿 Using CCACHE - compile.core.mk ) CXX := ${ccache} $(CXX) CC := ${ccache} $(CXX) -endif +endif + +# IWYU = include-what-you-use +# ifdef ${IWYU} +# $(info OWWWW ) +# CXX := ${IWYU} +# CC := ${IWYU} +# endif + +# CXX := include-what-you-use +# CC := include-what-you-use + +$(info 💾 CXX = $(CXX)) +$(info 💾 CC = $(CC)) ################################################################################ # CFLAGS diff --git a/libs/openFrameworksCompiled/project/makefileCommon/compile.project.mk b/libs/openFrameworksCompiled/project/makefileCommon/compile.project.mk index 1d17327d439..c0987ba4ab3 100644 --- a/libs/openFrameworksCompiled/project/makefileCommon/compile.project.mk +++ b/libs/openFrameworksCompiled/project/makefileCommon/compile.project.mk @@ -119,29 +119,31 @@ endif .PHONY: all Debug Release after clean CleanDebug CleanRelease help force +# $(info MAKEFLAGS XXX = ${MAKEFLAGS}) +JOBS = -j2 Release: @echo Compiling OF library for Release - @$(MAKE) -j -C $(OF_ROOT)/libs/openFrameworksCompiled/project/ Release PLATFORM_OS=$(PLATFORM_OS) ABIS_TO_COMPILE_RELEASE="$(ABIS_TO_COMPILE_RELEASE)" + @$(MAKE) $(JOBS) -C $(OF_ROOT)/libs/openFrameworksCompiled/project/ Release PLATFORM_OS=$(PLATFORM_OS) ABIS_TO_COMPILE_RELEASE="$(ABIS_TO_COMPILE_RELEASE)" @echo @echo @echo Compiling $(APPNAME) for Release ifndef ABIS_TO_COMPILE_RELEASE - @$(MAKE) -j ReleaseABI + @$(MAKE) $(JOBS) ReleaseABI else - @$(foreach abi,$(ABIS_TO_COMPILE_RELEASE),$(MAKE) -j ReleaseABI ABI=$(abi) &&) echo + @$(foreach abi,$(ABIS_TO_COMPILE_RELEASE),$(MAKE) $(JOBS) ReleaseABI ABI=$(abi) &&) echo endif Debug: @echo Compiling OF library for Debug - $(MAKE) -j -C $(OF_ROOT)/libs/openFrameworksCompiled/project/ Debug PLATFORM_OS=$(PLATFORM_OS) ABIS_TO_COMPILE_DEBUG="$(ABIS_TO_COMPILE_DEBUG)" + $(MAKE) $(JOBS) -C $(OF_ROOT)/libs/openFrameworksCompiled/project/ Debug PLATFORM_OS=$(PLATFORM_OS) ABIS_TO_COMPILE_DEBUG="$(ABIS_TO_COMPILE_DEBUG)" @echo @echo @echo Compiling $(APPNAME) for Debug ifndef ABIS_TO_COMPILE_DEBUG - @$(MAKE) -j DebugABI + @$(MAKE) $(JOBS) DebugABI else @$(foreach abi,$(ABIS_TO_COMPILE_DEBUG),$(MAKE) DebugABI ABI=$(abi) &&) echo endif @@ -149,7 +151,7 @@ endif ReleaseNoOF: @echo Compiling $(APPNAME) for Release ifndef ABIS_TO_COMPILE_RELEASE - @$(MAKE) -j ReleaseABI + @$(MAKE) $(JOBS) ReleaseABI else @$(foreach abi,$(ABIS_TO_COMPILE_RELEASE),$(MAKE) ReleaseABI ABI=$(abi) &&) echo endif @@ -157,27 +159,27 @@ endif DebugNoOF: @echo Compiling $(APPNAME) for Debug ifndef ABIS_TO_COMPILE_DEBUG - @$(MAKE) -j DebugABI + @$(MAKE) $(JOBS) DebugABI else @$(foreach abi,$(ABIS_TO_COMPILE_DEBUG),$(MAKE) DebugABI ABI=$(abi) &&) echo endif ReleaseABI: $(TARGET) ifneq ($(strip $(PROJECT_ADDONS_DATA)),) - @$(MAKE) -j copyaddonsdata PROJECT_ADDONS_DATA="$(PROJECT_ADDONS_DATA)" + @$(MAKE) $(JOBS) copyaddonsdata PROJECT_ADDONS_DATA="$(PROJECT_ADDONS_DATA)" endif - @$(MAKE) -j afterplatform BIN_NAME=$(BIN_NAME) ABIS_TO_COMPILE="$(ABIS_TO_COMPILE_RELEASE)" RUN_TARGET=$(RUN_TARGET) TARGET=$(TARGET) + @$(MAKE) $(JOBS) afterplatform BIN_NAME=$(BIN_NAME) ABIS_TO_COMPILE="$(ABIS_TO_COMPILE_RELEASE)" RUN_TARGET=$(RUN_TARGET) TARGET=$(TARGET) @$(PROJECT_AFTER) DebugABI: $(TARGET) ifneq ($(strip $(PROJECT_ADDONS_DATA)),) - @$(MAKE) -j copyaddonsdata PROJECT_ADDONS_DATA="$(PROJECT_ADDONS_DATA)" + @$(MAKE) $(JOBS) copyaddonsdata PROJECT_ADDONS_DATA="$(PROJECT_ADDONS_DATA)" endif - @$(MAKE) -j afterplatform BIN_NAME=$(BIN_NAME) ABIS_TO_COMPILE="$(ABIS_TO_COMPILE_DEBUG)" RUN_TARGET=$(RUN_TARGET) TARGET=$(TARGET) + @$(MAKE) $(JOBS) afterplatform BIN_NAME=$(BIN_NAME) ABIS_TO_COMPILE="$(ABIS_TO_COMPILE_DEBUG)" RUN_TARGET=$(RUN_TARGET) TARGET=$(TARGET) @$(PROJECT_AFTER) all: - $(MAKE) -j Debug + $(MAKE) $(JOBS) Debug run: ifeq ($(PLATFORM_RUN_COMMAND),) diff --git a/libs/openFrameworksCompiled/project/makefileCommon/config.shared.mk b/libs/openFrameworksCompiled/project/makefileCommon/config.shared.mk index 38ebdf4cb94..ff641f864d1 100644 --- a/libs/openFrameworksCompiled/project/makefileCommon/config.shared.mk +++ b/libs/openFrameworksCompiled/project/makefileCommon/config.shared.mk @@ -293,6 +293,8 @@ CORE_PKG_CONFIG_LIBRARIES = CORE_PKG_CONFIG_LIBRARIES += $(PLATFORM_PKG_CONFIG_LIBRARIES) CORE_PKG_CONFIG_LIBRARIES += $(PROJECT_PKG_CONFIG_LIBRARIES) +$(info $(CORE_PKG_CONFIG_LIBRARIES)) + ifneq ($(strip $(CORE_PKG_CONFIG_LIBRARIES)),) ifneq ($(strip $(PKG_CONFIG_LIBDIR)),) ifdef MAKEFILE_DEBUG diff --git a/scripts/ci/linuxaarch64/build.sh b/scripts/ci/linuxaarch64/build.sh index ad5308373f7..027eaf77034 100755 --- a/scripts/ci/linuxaarch64/build.sh +++ b/scripts/ci/linuxaarch64/build.sh @@ -2,33 +2,46 @@ set -ev OF_ROOT=$( cd "$(dirname "$0")/../../.." ; pwd -P ) +export CROSS_COMPILING=1 + +if [ -n "$ARCH" ]; then +export PLATFORM_ARCH=${ARCH} +else +export PLATFORM_ARCH=aarch64 +fi + +echo "${PLATFORM_ARCH}" + +# export RPI_ROOT=${OF_ROOT}/scripts/ci/linux${PLATFORM_ARCH}/raspbian +export RPI_ROOT=${OF_ROOT}/scripts/ci/linuxaarch64/raspbian +if [ ${PLATFORM_ARCH} = "aarch64" ]; then export GCC_PREFIX=aarch64-linux-gnu -export GCC_VERSION=10.3.0 +else +export GCC_PREFIX=arm-linux-gnueabihf +fi +# export GCC_PREFIX=aarch64-linux-gnu export GST_VERSION=1.0 -export RPI_ROOT=${OF_ROOT}/scripts/ci/$TARGET/raspbian -export TOOLCHAIN_ROOT=${OF_ROOT}/scripts/ci/$TARGET/rpi_toolchain export PLATFORM_OS=Linux -export PLATFORM_ARCH=aarch64 -export PKG_CONFIG_LIBDIR=${RPI_ROOT}/usr/lib/pkgconfig:${RPI_ROOT}/usr/lib/${GCC_PREFIX}/pkgconfig:${RPI_ROOT}/usr/share/pkgconfig + + +# export PKG_CONFIG_LIBDIR=${RPI_ROOT}/usr/include:${RPI_ROOT}/usr/lib/pkgconfig:${RPI_ROOT}/usr/lib/${GCC_PREFIX}/pkgconfig:${RPI_ROOT}/usr/share/pkgconfig +export PKG_CONFIG_PATH=${RPI_ROOT}/usr/include:${RPI_ROOT}/usr/lib/pkgconfig:${RPI_ROOT}/usr/lib/${GCC_PREFIX}/pkgconfig:${RPI_ROOT}/usr/share/pkgconfig +export TOOLCHAIN_ROOT=/usr export CXX="${TOOLCHAIN_ROOT}/bin/${GCC_PREFIX}-g++" export CC="${TOOLCHAIN_ROOT}/bin/${GCC_PREFIX}-gcc" export AR=${TOOLCHAIN_ROOT}/bin/${GCC_PREFIX}-ar export LD=${TOOLCHAIN_ROOT}/bin/${GCC_PREFIX}-ld -export PATH=/rpi_toolchain/bin/:$PATH -export LD_LIBRARY_PATH=/rpi_toolchain/lib:$LD_LIBRARY_PATH - echo "**** Building emptyExample ****" cd $OF_ROOT -cp scripts/templates/linuxaarch64/Makefile examples/templates/emptyExample/ -cp scripts/templates/linuxaarch64/config.make examples/templates/emptyExample/ +cp scripts/templates/linux${PLATFORM_ARCH}/Makefile examples/templates/emptyExample/ +cp scripts/templates/linux${PLATFORM_ARCH}/config.make examples/templates/emptyExample/ cd examples/templates/emptyExample/ make Debug -j -#TODO: -#echo "**** Building allAddonsExample ****" -#cd $OF_ROOT -#cp scripts/templates/linuxaarch64/Makefile examples/templates/allAddonsExample/ -#cp scripts/templates/linuxaarch64/config.make examples/templates/allAddonsExample/ -#cd examples/templates/allAddonsExample/ -#make Debug -j +echo "**** Building allAddonsExample ****" +cd $OF_ROOT +cp scripts/templates/linux${PLATFORM_ARCH}/Makefile examples/templates/allAddonsExample/ +cp scripts/templates/linux${PLATFORM_ARCH}/config.make examples/templates/allAddonsExample/ +cd examples/templates/allAddonsExample/ +make Debug -j diff --git a/scripts/ci/linuxaarch64/install.sh b/scripts/ci/linuxaarch64/install.sh index 8c6cba11a20..20c6dcbb783 100755 --- a/scripts/ci/linuxaarch64/install.sh +++ b/scripts/ci/linuxaarch64/install.sh @@ -13,70 +13,30 @@ trapError() { installPackages(){ sudo apt-get -y update - sudo apt-get -y install multistrap unzip #workaround for https://bugs.launchpad.net/ubuntu/+source/multistrap/+bug/1313787 sudo sed -i s/\$forceyes//g /usr/sbin/multistrap } createRaspbianImg(){ + +if [ -n "$MULTISTRAP_ARCH" ]; then +echo ${MULTISTRAP_ARCH} +else +export MULTISTRAP_ARCH=aarch64 +fi #needed since Ubuntu 18.04 - allow non https repositories mkdir -p raspbian/etc/apt/apt.conf.d/ echo 'Acquire::AllowInsecureRepositories "true";' | sudo tee raspbian/etc/apt/apt.conf.d/90insecure - multistrap -a arm64 -d raspbian -f multistrap.conf + # multistrap -a arm64 -d raspbian -f multistrap.conf + multistrap -a ${MULTISTRAP_ARCH} -d raspbian -f multistrap.conf } SCRIPT_DIR="${BASH_SOURCE%/*}" if [[ ! -d "$SCRIPT_DIR" ]]; then SCRIPT_DIR="$PWD"; fi . "$SCRIPT_DIR/../../dev/downloader.sh" -downloadToolchain(){ - wget https://github.com/openframeworks/openFrameworks/releases/download/tools/cross-gcc-10.3.0-pi_64.tar.gz - tar xvf cross-gcc-10.3.0-pi_64.tar.gz - mv cross-pi-gcc-10.3.0-64 rpi_toolchain - rm cross-gcc-10.3.0-pi_64.tar.gz -} - -downloadFirmware(){ - #kicking the can down the road - stable still containts /opt/vc includes - wget https://github.com/raspberrypi/firmware/archive/stable.zip -O firmware.zip - unzip firmware.zip - cp -r firmware-stable/opt raspbian/ - rm -r firmware-stable - rm firmware.zip -} - -relativeSoftLinks(){ - for link in $(ls -la | grep "\-> /" | sed "s/.* \([^ ]*\) \-> \/\(.*\)/\1->\/\2/g"); do - lib=$(echo $link | sed "s/\(.*\)\->\(.*\)/\1/g"); - link=$(echo $link | sed "s/\(.*\)\->\(.*\)/\2/g"); - rm $lib - ln -s ../../..$link $lib - done - - for f in *; do - error=$(grep " \/lib/" $f > /dev/null 2>&1; echo $?) - if [ $error -eq 0 ]; then - sed -i "s/ \/lib/ ..\/..\/..\/lib/g" $f - sed -i "s/ \/usr/ ..\/..\/..\/usr/g" $f - fi - done -} - - ROOT=$( cd "$(dirname "$0")" ; pwd -P ) echo $ROOT cd $ROOT -installPackages +# installPackages createRaspbianImg -downloadToolchain -downloadFirmware - -cp -rn rpi_toolchain/aarch64-linux-gnu/libc/lib/* $ROOT/raspbian/usr/lib/ -cp -rn rpi_toolchain/aarch64-linux-gnu/libc/usr/lib/* $ROOT/raspbian/usr/lib/ -cp -rn rpi_toolchain/aarch64-linux-gnu/lib/* $ROOT/raspbian/usr/lib/ - -cd $ROOT/raspbian/usr/lib -relativeSoftLinks -cd $ROOT/raspbian/usr/lib/aarch64-linux-gnu -relativeSoftLinks - diff --git a/scripts/ci/linuxaarch64/multistrap.conf b/scripts/ci/linuxaarch64/multistrap.conf index d35454ce980..a4a60506247 100644 --- a/scripts/ci/linuxaarch64/multistrap.conf +++ b/scripts/ci/linuxaarch64/multistrap.conf @@ -1,23 +1,18 @@ [General] -arch=arm64 -directory=raspbian +# arch=arm64 +directory=~/raspbian cleanup=true noauth=true unpack=true -aptsources=Raspbian-Base OpenFrameworks -debootstrap=Raspbian-Base OpenFrameworks - - -[Raspbian-Base] -packages=base-files dbus dpkg dropbear initscripts iputils-ping isc-dhcp-client kmod login locales lsb-base lsb-release makedev netbase net-tools sysvinit-utils sysv-rc libudev-dev -source=http://deb.debian.org/debian -keyring=debian-archive-keyring -components=main contrib non-free rpi -suite=bullseye +aptsources=OpenFrameworks +debootstrap=OpenFrameworks [OpenFrameworks] -packages=libasound2-dev libxmu-dev libxxf86vm-dev g++ libgl1-mesa-dev libglu1-mesa-dev libraw1394-dev libudev-dev libdrm-dev libglew-dev libopenal-dev libsndfile-dev libfreeimage-dev libcairo2-dev libfreetype6-dev libssl-dev libpulse-dev libusb-1.0-0-dev libopencv-dev libegl1-mesa-dev libglvnd-dev libgles2-mesa-dev libassimp-dev librtaudio-dev libboost-filesystem-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 liburiparser-dev libcurl4-openssl-dev libxml2-dev libpugixml-dev libpoco-dev libglfw3-dev libxrandr-dev libxinerama-dev libxcursor-dev freeglut3-dev libxi-dev +packages=base-files dbus dpkg dropbear initscripts iputils-ping isc-dhcp-client kmod login locales lsb-base lsb-release makedev netbase net-tools sysvinit-utils sysv-rc libudev-dev libasound2-dev libxmu-dev libxxf86vm-dev g++ libgl1-mesa-dev libglu1-mesa-dev libraw1394-dev libudev-dev libdrm-dev libglew-dev libopenal-dev libsndfile-dev libfreeimage-dev libcairo2-dev libfreetype6-dev libssl-dev libpulse-dev libusb-1.0-0-dev libopencv-dev libegl1-mesa-dev libglvnd-dev libgles2-mesa-dev libassimp-dev librtaudio-dev libboost-filesystem-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 liburiparser-dev libcurl4-openssl-dev libxml2-dev libpugixml-dev libpoco-dev libglfw3-dev libxrandr-dev libxinerama-dev libxcursor-dev freeglut3-dev libxi-dev +# libraspberrypi-dev raspberrypi-kernel-headers +# libblas3 liblapack3 +# libopenblas-dev liblapack-dev source=http://deb.debian.org/debian -keyring=debian-archive-keyring +keyring=debian-keyring components=main contrib non-free rpi -suite=bullseye +suite=bookworm From 7ad92a60a26e8628850e43d323709506875d19eb Mon Sep 17 00:00:00 2001 From: Dimitre Date: Fri, 3 May 2024 12:16:28 -0300 Subject: [PATCH 02/62] act back --- .github/workflows/2/build-emscripten.yml | 42 ++++++++++++++ .github/workflows/2/build-ios-tvos.yml | 48 ++++++++++++++++ .github/workflows/2/build-linux64.yml | 64 +++++++++++++++++++++ .github/workflows/2/build-macos.yml | 60 +++++++++++++++++++ .github/workflows/2/build-msys2.yml | 62 ++++++++++++++++++++ .github/workflows/2/build-vs2022.yml | 61 ++++++++++++++++++++ .github/workflows/2/manual-nightly.yml | 43 ++++++++++++++ .github/workflows/2/manual-web-examples.yml | 48 ++++++++++++++++ .github/workflows/2/nightly-linux64.yml | 42 ++++++++++++++ 9 files changed, 470 insertions(+) create mode 100644 .github/workflows/2/build-emscripten.yml create mode 100644 .github/workflows/2/build-ios-tvos.yml create mode 100644 .github/workflows/2/build-linux64.yml create mode 100644 .github/workflows/2/build-macos.yml create mode 100644 .github/workflows/2/build-msys2.yml create mode 100644 .github/workflows/2/build-vs2022.yml create mode 100644 .github/workflows/2/manual-nightly.yml create mode 100644 .github/workflows/2/manual-web-examples.yml create mode 100644 .github/workflows/2/nightly-linux64.yml diff --git a/.github/workflows/2/build-emscripten.yml b/.github/workflows/2/build-emscripten.yml new file mode 100644 index 00000000000..3d21aeaab2d --- /dev/null +++ b/.github/workflows/2/build-emscripten.yml @@ -0,0 +1,42 @@ +name: build-emscripten + +# make the action not run on the local repo if the branch is also in a pull request to OF/OF +on: + push: + if: github.event_name == 'push' && github.event.pull_request == null + paths-ignore: + - '**/*.md' + - 'examples/**' + pull_request: + if: github.event_name == 'pull_request' && github.repository == 'openframeworks/openFrameworks' + paths-ignore: + - '**/*.md' + - 'examples/**' + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + build-emscripten: + runs-on: ubuntu-latest + strategy: + matrix: + cfg: + - {target: emscripten} + env: + TARGET: ${{matrix.cfg.target}} + steps: + - uses: actions/checkout@v4 + - name: Docker Step + run: "docker run -di --name emscripten -v $PWD:/src emscripten/emsdk:3.1.21 bash" + - name: Download libs + run: ./scripts/$TARGET/download_libs.sh + - name: Install dependencies + run: ./scripts/ci/$TARGET/install.sh + - name: Build + run: docker exec -i emscripten sh -c "scripts/ci/$TARGET/build.sh"; + - name: Upload Libs + run: scripts/ci/upload_of_lib.sh; + env: + GA_CI_SECRET: ${{ secrets.CI_SECRET }} diff --git a/.github/workflows/2/build-ios-tvos.yml b/.github/workflows/2/build-ios-tvos.yml new file mode 100644 index 00000000000..ab83923059a --- /dev/null +++ b/.github/workflows/2/build-ios-tvos.yml @@ -0,0 +1,48 @@ +name: build-ios-tvos + +# make the action not run on the local repo if the branch is also in a pull request to OF/OF +on: + push: + if: github.event_name == 'push' && github.event.pull_request == null + paths-ignore: + - '**/*.md' + - 'examples/**' + pull_request: + if: github.event_name == 'pull_request' && github.repository == 'openframeworks/openFrameworks' + paths-ignore: + - '**/*.md' + - 'examples/**' + +env: + ccache: ccache + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + build-ios-tvos: + runs-on: macos-13 + strategy: + matrix: + cfg: + - {target: ios, libs: ios} + #- {target: tvos, libs: ios} #broken currently maybe better to just remove + env: + TARGET: ${{matrix.cfg.target}} + steps: + - uses: actions/checkout@v4 + - name: ccache + uses: hendrikmuhs/ccache-action@v1.2.12 + with: + key: ${{ matrix.cfg.target }}-${{ matrix.cfg.libs }} + + - name: Download libs + run: ./scripts/${{matrix.cfg.libs}}/download_libs.sh + - name: install + run: ./scripts/ci/$TARGET/install.sh + - name: Build + run: ./scripts/ci/$TARGET/build.sh; + + env: + DEVELOPER_DIR: "/Applications/Xcode_15.2.app/Contents/Developer" diff --git a/.github/workflows/2/build-linux64.yml b/.github/workflows/2/build-linux64.yml new file mode 100644 index 00000000000..97eebdf7c87 --- /dev/null +++ b/.github/workflows/2/build-linux64.yml @@ -0,0 +1,64 @@ +name: build-linux64 + +# make the action not run on the local repo if the branch is also in a pull request to OF/OF +on: + push: + if: github.event_name == 'push' && github.event.pull_request == null + paths-ignore: + - '**/*.md' + - 'examples/**' + pull_request: + if: github.event_name == 'pull_request' && github.repository == 'openframeworks/openFrameworks' + paths-ignore: + - '**/*.md' + - 'examples/**' + +env: + ccache: ccache + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + build-linux64-platforms: + runs-on: ubuntu-latest + strategy: + matrix: + cfg: + - {target: linux64, libs: 64gcc6} + env: + TARGET: ${{matrix.cfg.target}} + steps: + - name: Remove Old lib-unwind + run: if [ "$TARGET" = "linux64" ]; then + sudo apt-get remove libunwind-14 -y; + fi + - name: Cache Packages + uses: awalsh128/cache-apt-pkgs-action@latest + with: + packages: make curl libunwind-dev 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 libssl-dev libpulse-dev libusb-1.0-0-dev libgtk2.0-dev libopencv-dev libassimp-dev librtaudio-dev gdb libglfw3-dev liburiparser-dev libcurl4-openssl-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 + + - uses: actions/checkout@v4 + - name: ccache + uses: hendrikmuhs/ccache-action@v1.2.12 + with: + key: ${{ matrix.cfg.target }}-${{ matrix.cfg.libs }} + + - name: Download libs + run: ./scripts/linux/download_libs.sh -a ${{matrix.cfg.libs}}; + - name: Install dependencies + run: ./scripts/ci/$TARGET/install.sh; + - name: Build + run: if [ "$TARGET" = "linux64" ]; then + scripts/ci/linux64/build.sh; + scripts/ci/$TARGET/run_tests.sh; + else + scripts/ci/$TARGET/build.sh; + fi + # - name: Upload Libs + # run: scripts/ci/upload_of_lib.sh; + # env: + # GA_CI_SECRET: ${{ secrets.CI_SECRET }} + diff --git a/.github/workflows/2/build-macos.yml b/.github/workflows/2/build-macos.yml new file mode 100644 index 00000000000..8cafbb0ff49 --- /dev/null +++ b/.github/workflows/2/build-macos.yml @@ -0,0 +1,60 @@ +name: build-macos + +# make the action not run on the local repo if the branch is also in a pull request to OF/OF +on: + push: + if: github.event_name == 'push' && github.event.pull_request == null + paths-ignore: + - '**/*.md' + - 'examples/**' + pull_request: + if: github.event_name == 'pull_request' && github.repository == 'openframeworks/openFrameworks' + paths-ignore: + - '**/*.md' + - 'examples/**' + +env: + ccache: ccache + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + build-macos: + runs-on: macos-13 + strategy: + matrix: + cfg: + - {target: osx, opt: "xcode"} + - {target: osx, opt: "makefiles"} + steps: + - uses: actions/checkout@v4 + - name: ccache + uses: hendrikmuhs/ccache-action@v1.2.12 + with: + # key: ${{ matrix.os }}-${{ matrix.type }} + key: ${{ matrix.cfg.target }}-${{ matrix.cfg.opt }} + # key: ${{ matrix.msystem }} + + + - name: Download libs + # continue-on-error: true + run: ./scripts/${{ matrix.cfg.target }}/download_libs.sh +# - name: rm-dev +# run: sudo rm -rf /Library/Developer + + # this step is not needed here because the script is empty + # - name: install + # run: ./scripts/ci/$TARGET/install.sh + + - name: Build + run: + if [ ${{ matrix.cfg.opt }} = "xcode" ]; then + scripts/ci/${{ matrix.cfg.target }}/build.sh ${{ matrix.cfg.opt }}; + else + scripts/ci/${{ matrix.cfg.target }}/run_tests.sh; + fi + env: + DEVELOPER_DIR: "/Applications/Xcode.app/Contents/Developer" + SDKROOT: "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk" diff --git a/.github/workflows/2/build-msys2.yml b/.github/workflows/2/build-msys2.yml new file mode 100644 index 00000000000..6bec16d4557 --- /dev/null +++ b/.github/workflows/2/build-msys2.yml @@ -0,0 +1,62 @@ +name: build-msys2 + +# make the action not run on the local repo if the branch is also in a pull request to OF/OF +on: + push: + if: github.event_name == 'push' && github.event.pull_request == null + paths-ignore: + - '**/*.md' + - 'examples/**' + pull_request: + if: github.event_name == 'pull_request' && github.repository == 'openframeworks/openFrameworks' + paths-ignore: + - '**/*.md' + - 'examples/**' + +env: + ccache: ccache + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + build-msys2: + runs-on: windows-latest + strategy: + matrix: + msystem: + - mingw64 + # - ucrt64 + defaults: + run: + shell: msys2 {0} + steps: + - uses: actions/checkout@v4 + - name: ccache + uses: hendrikmuhs/ccache-action@v1.2.12 + with: + # key: ${{ matrix.os }}-${{ matrix.type }} + key: ${{ matrix.msystem }} + - uses: msys2/setup-msys2@v2 + with: + cache: true + update: false + msystem: ${{matrix.msystem}} + pacboy: assimp:p cairo:p curl:p freeglut:p FreeImage:p gcc:p gdb:p glew:p glfw:p glm:p harfbuzz:p libsndfile:p libusb:p libxml2:p mpg123:p nlohmann-json:p ntldd-git:p openal:p opencv:p pkgconf:p pugixml:p rtaudio:p uriparser:p utf8cpp:p zlib:p poco:p + # boost:p tools:p + # install: >- + # unzip + # git + # rsync + # wget + + - name: Install dependencies + run: ./scripts/ci/msys2/install.sh + + - name: Build + run: ./scripts/ci/msys2/build.sh + + - name: Run tests + run: ./scripts/ci/msys2/run_tests.sh + diff --git a/.github/workflows/2/build-vs2022.yml b/.github/workflows/2/build-vs2022.yml new file mode 100644 index 00000000000..0b48729cf86 --- /dev/null +++ b/.github/workflows/2/build-vs2022.yml @@ -0,0 +1,61 @@ +name: build-vs + +# make the action not run on the local repo if the branch is also in a pull request to OF/OF +on: + push: + if: github.event_name == 'push' && github.event.pull_request == null + paths-ignore: + - '**/*.md' + - 'examples/**' + pull_request: + if: github.event_name == 'pull_request' && github.repository == 'openframeworks/openFrameworks' + paths-ignore: + - '**/*.md' + - 'examples/**' + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + build-vs2022: + runs-on: windows-2022 + strategy: + matrix: + platform: [x64, ARM64, ARM64EC] + env: + BITS: ${{ matrix.bits }} + steps: + - name: Clone repository + uses: actions/checkout@v4 + - uses: msys2/setup-msys2@v2.22.0 + with: + update: true + install: >- + git + unzip + rsync + wget + - name: Install dependencies + shell: msys2 {0} + run: + ./scripts/ci/vs/install_bleeding.sh + - name: Setup MSBuild + uses: microsoft/setup-msbuild@v2 + - name: Build emptyExample + working-directory: ${{env.GITHUB_WORKSPACE}} + run: + msbuild examples/templates/emptyExample/emptyExample.vcxproj /p:configuration=release /p:platform=${{ matrix.platform }} /p:PlatformToolset=v143 + - name: Build allAddonsExample + working-directory: ${{env.GITHUB_WORKSPACE}} + run: + msbuild examples/templates/allAddonsExample/allAddonsExample.vcxproj /p:configuration=release /p:platform=${{ matrix.platform }} /p:PlatformToolset=v143 + - name: Build DEBUG emptyExample + working-directory: ${{env.GITHUB_WORKSPACE}} + run: + msbuild examples/templates/emptyExample/emptyExample.vcxproj /p:configuration=debug /p:platform=${{ matrix.platform }} /p:PlatformToolset=v143 + - name: Build DEBUG allAddonsExample + working-directory: ${{env.GITHUB_WORKSPACE}} + run: + msbuild examples/templates/allAddonsExample/allAddonsExample.vcxproj /p:configuration=debug /p:platform=${{ matrix.platform }} /p:PlatformToolset=v143 + diff --git a/.github/workflows/2/manual-nightly.yml b/.github/workflows/2/manual-nightly.yml new file mode 100644 index 00000000000..f4599c7bb50 --- /dev/null +++ b/.github/workflows/2/manual-nightly.yml @@ -0,0 +1,43 @@ +name: manual-nightly + +on: + workflow_dispatch: + inputs: + release: + description: 'release' + required: true + default: 'nightly' +jobs: + manual-nightly: + runs-on: ubuntu-latest + strategy: + matrix: + cfg: + - {target: linux64, libs: 64gcc6} + steps: + - name: Install libunwind + run: sudo apt-get install libunwind-dev + - name: Cache Packages + uses: awalsh128/cache-apt-pkgs-action@latest + with: + packages: make curl 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 libssl-dev libpulse-dev libusb-1.0-0-dev libgtk2.0-dev libopencv-dev libassimp-dev librtaudio-dev gdb libglfw3-dev liburiparser-dev libcurl4-openssl-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 + # libunwind-dev + version: 1.0 + + - uses: actions/checkout@v4 + - name: Install dependencies + run: ./scripts/ci/${{matrix.cfg.target}}/install.sh; + - name: Download libs + run: ./scripts/linux/download_libs.sh -a ${{matrix.cfg.libs}}; + - name: Create Package + run: scripts/ci/package_builds.sh ${{ github.event.inputs.release }}; + id: createpackage + - name: Update Release + uses: IsaacShelton/update-existing-release@v1.3.4 + with: + token: ${{ secrets.GITHUB_TOKEN }} + tag: ${{ github.event.inputs.release }} + release: ${{ github.event.inputs.release }} + prerelease: false + replace: true + files: ${{ steps.createpackage.outputs.FILES_OUT }} diff --git a/.github/workflows/2/manual-web-examples.yml b/.github/workflows/2/manual-web-examples.yml new file mode 100644 index 00000000000..c00771a8d8e --- /dev/null +++ b/.github/workflows/2/manual-web-examples.yml @@ -0,0 +1,48 @@ +name: build-web-examples + + +# make the action not run on the local repo if the branch is also in a pull request to OF/OF +on: + workflow_dispatch: + inputs: + release: + description: 'release' + required: true + default: 'nightly' +#on: +# push: +# if: github.event_name == 'push' && github.event.pull_request == null +# paths-ignore: +# - '**/*.md' +# - 'examples/**' +# pull_request: +# if: github.event_name == 'pull_request' && github.repository == 'openframeworks/openFrameworks' +# paths-ignore: +# - '**/*.md' +# - 'examples/**' +jobs: + build-web-examples: + runs-on: ubuntu-latest + strategy: + matrix: + cfg: + - target: emscripten + env: + TARGET: ${{matrix.cfg.target}} + steps: + - uses: actions/checkout@v4 + - name: Docker Step + run: docker run -di --name emscripten -v $PWD:/src emscripten/emsdk:3.1.50 bash + - name: Download libs + run: ./scripts/dev/download_libs.sh -p emscripten + - name: Install dependencies + run: ./scripts/ci/$TARGET/install_web_examples.sh + - name: Build + run: docker exec -e GA_EXAMPLES_USER=${{ secrets.SSH_USER }} -e GA_EXAMPLES_SERVER=${{ secrets.SSH_SERVER }} -e GA_EXAMPLES_KEY="${{ secrets.SSH_KEY }}" -e GH_HEAD_REF=${{ github.head_ref }} -e GH_BRANCH=${{ github.ref_name }} -e GH_ACTIONS=true -i emscripten sh -c "scripts/ci/$TARGET/examples_to_build.sh" + env: + GA_EXAMPLES_USER: ${{ secrets.SSH_USER }} + GA_EXAMPLES_SERVER: ${{ secrets.SSH_SERVER }} + GA_EXAMPLES_KEY: ${{ secrets.SSH_KEY }} + GH_HEAD_REF: ${{ github.head_ref }} + GH_BRANCH: ${{ github.ref_name }} + GH_ACTIONS: "true" diff --git a/.github/workflows/2/nightly-linux64.yml b/.github/workflows/2/nightly-linux64.yml new file mode 100644 index 00000000000..42a38bf2d63 --- /dev/null +++ b/.github/workflows/2/nightly-linux64.yml @@ -0,0 +1,42 @@ +name: nightly-linux64 + +on: + schedule: + - cron: "0 6 * * *" +jobs: + build-nightly: + runs-on: ubuntu-latest + if: github.repository == 'openframeworks/openFrameworks' && github.ref == 'refs/heads/master' + strategy: + matrix: + cfg: + - {target: linux64, libs: 64gcc6} + env: + TARGET: ${{matrix.cfg.target}} + steps: + - name: Install libunwind + run: sudo apt-get install libunwind-dev + - name: Cache Packages + uses: awalsh128/cache-apt-pkgs-action@latest + with: + packages: make curl 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 libssl-dev libpulse-dev libusb-1.0-0-dev libgtk2.0-dev libopencv-dev libassimp-dev librtaudio-dev gdb libglfw3-dev liburiparser-dev libcurl4-openssl-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 + # libunwind-dev + version: 1.0 + + - uses: actions/checkout@v4 + - name: Install dependencies + run: ./scripts/ci/$TARGET/install.sh; + - name: Download libs + run: ./scripts/linux/download_libs.sh -a ${{matrix.cfg.libs}}; + - name: Create Package + run: scripts/ci/package_builds.sh; + id: createpackage + - name: Update Release + uses: IsaacShelton/update-existing-release@v1.3.4 + with: + token: ${{ secrets.GITHUB_TOKEN }} + tag: nightly + release: nightly + prerelease: false + replace: true + files: ${{ steps.createpackage.outputs.FILES_OUT }} From ff7ce13adc1e7398efb37be250eaaf4786316e9d Mon Sep 17 00:00:00 2001 From: Dimitre Date: Fri, 3 May 2024 12:20:41 -0300 Subject: [PATCH 03/62] remove armv6l --- .github/workflows/build-rpi.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-rpi.yml b/.github/workflows/build-rpi.yml index d594020c2ce..2edd4dd17fa 100644 --- a/.github/workflows/build-rpi.yml +++ b/.github/workflows/build-rpi.yml @@ -28,7 +28,7 @@ jobs: cfg: # - {target: linuxarmv6l, libs: armv6l} # - {target: linuxaarch64, libs: aarch64} - - { libs: armv6l, multistrap_arch: armhf, suffix: arm-linux-gnueabihf } + # - { libs: armv6l, multistrap_arch: armhf, suffix: arm-linux-gnueabihf } - { libs: aarch64, multistrap_arch: arm64, suffix: aarch64-linux-gnu } env: ARCH: ${{matrix.cfg.libs}} From 884f70866d975ef84c2225833bd963faafd5f398 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Fri, 3 May 2024 12:42:10 -0300 Subject: [PATCH 04/62] new tests --- ...{build-rpi.yml => build-rpi-aarch64-b.yml} | 16 +++--- .github/workflows/build-rpi-aarch64.yml | 55 +++++++++++++++++++ .github/workflows/build-rpi-armv6l-b.yml | 55 +++++++++++++++++++ .github/workflows/build-rpi-armv6l.yml | 55 +++++++++++++++++++ .../ci/{linuxaarch64 => linuxrpi}/build.sh | 5 +- .../ci/{linuxaarch64 => linuxrpi}/install.sh | 0 .../multistrap.conf | 0 7 files changed, 176 insertions(+), 10 deletions(-) rename .github/workflows/{build-rpi.yml => build-rpi-aarch64-b.yml} (80%) create mode 100644 .github/workflows/build-rpi-aarch64.yml create mode 100644 .github/workflows/build-rpi-armv6l-b.yml create mode 100644 .github/workflows/build-rpi-armv6l.yml rename scripts/ci/{linuxaarch64 => linuxrpi}/build.sh (92%) rename scripts/ci/{linuxaarch64 => linuxrpi}/install.sh (100%) rename scripts/ci/{linuxaarch64 => linuxrpi}/multistrap.conf (100%) diff --git a/.github/workflows/build-rpi.yml b/.github/workflows/build-rpi-aarch64-b.yml similarity index 80% rename from .github/workflows/build-rpi.yml rename to .github/workflows/build-rpi-aarch64-b.yml index 2edd4dd17fa..21521d3921b 100644 --- a/.github/workflows/build-rpi.yml +++ b/.github/workflows/build-rpi-aarch64-b.yml @@ -1,4 +1,4 @@ -name: build-linux-arm +name: build-rpi # make the action not run on the local repo if the branch is also in a pull request to OF/OF on: @@ -21,18 +21,17 @@ concurrency: cancel-in-progress: true jobs: - raspberry-pi: + rpi-aarch64-alladdons: runs-on: ubuntu-latest strategy: matrix: cfg: - # - {target: linuxarmv6l, libs: armv6l} - # - {target: linuxaarch64, libs: aarch64} - # - { libs: armv6l, multistrap_arch: armhf, suffix: arm-linux-gnueabihf } - - { libs: aarch64, multistrap_arch: arm64, suffix: aarch64-linux-gnu } + # - { libs: armv6l, multistrap_arch: armhf, suffix: arm-linux-gnueabihf, alladdons: 0 } + - { libs: aarch64, multistrap_arch: arm64, suffix: aarch64-linux-gnu, alladdons: 1 } env: ARCH: ${{matrix.cfg.libs}} MULTISTRAP_ARCH: ${{matrix.cfg.multistrap_arch}} + ALLADDONSEXAMPLE: ${{matrix.cfg.alladdons}} steps: - name: Cache Packages uses: awalsh128/cache-apt-pkgs-action@latest @@ -50,8 +49,7 @@ jobs: - name: Download libs run: ./scripts/linux/download_libs.sh -a ${{matrix.cfg.libs}}; - name: Install dependencies - # run: ./scripts/ci/linux${{matrix.cfg.libs}}/install.sh; - run: ./scripts/ci/linuxaarch64/install.sh; + run: ./scripts/ci/linuxrpi/install.sh; - name: Build # run: ./scripts/ci/linux${{matrix.cfg.libs}}/build.sh; - run: ./scripts/ci/linuxaarch64/build.sh; + run: ./scripts/ci/linuxrpi/build.sh; diff --git a/.github/workflows/build-rpi-aarch64.yml b/.github/workflows/build-rpi-aarch64.yml new file mode 100644 index 00000000000..774089534b8 --- /dev/null +++ b/.github/workflows/build-rpi-aarch64.yml @@ -0,0 +1,55 @@ +name: build-rpi + +# make the action not run on the local repo if the branch is also in a pull request to OF/OF +on: + push: + if: github.event_name == 'push' && github.event.pull_request == null + paths-ignore: + - '**/*.md' + - 'examples/**' + pull_request: + if: github.event_name == 'pull_request' && github.repository == 'openframeworks/openFrameworks' + paths-ignore: + - '**/*.md' + - 'examples/**' + +env: + ccache: ccache + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + rpi-aarch64: + runs-on: ubuntu-latest + strategy: + matrix: + cfg: + # - { libs: armv6l, multistrap_arch: armhf, suffix: arm-linux-gnueabihf, alladdons: 0 } + - { libs: aarch64, multistrap_arch: arm64, suffix: aarch64-linux-gnu, alladdons: 0 } + env: + ARCH: ${{matrix.cfg.libs}} + MULTISTRAP_ARCH: ${{matrix.cfg.multistrap_arch}} + ALLADDONSEXAMPLE: ${{matrix.cfg.alladdons}} + steps: + - name: Cache Packages + uses: awalsh128/cache-apt-pkgs-action@latest + with: + packages: multistrap unzip gcc-${{matrix.cfg.suffix}} g++-${{matrix.cfg.suffix}} + version: 1.0 + + - uses: actions/checkout@v4 + + - name: ccache + uses: hendrikmuhs/ccache-action@v1.2.12 + with: + key: ${{ matrix.cfg.libs }} + + - name: Download libs + run: ./scripts/linux/download_libs.sh -a ${{matrix.cfg.libs}}; + - name: Install dependencies + run: ./scripts/ci/linuxrpi/install.sh; + - name: Build + # run: ./scripts/ci/linux${{matrix.cfg.libs}}/build.sh; + run: ./scripts/ci/linuxrpi/build.sh; diff --git a/.github/workflows/build-rpi-armv6l-b.yml b/.github/workflows/build-rpi-armv6l-b.yml new file mode 100644 index 00000000000..69770deb77c --- /dev/null +++ b/.github/workflows/build-rpi-armv6l-b.yml @@ -0,0 +1,55 @@ +name: build-rpi + +# make the action not run on the local repo if the branch is also in a pull request to OF/OF +on: + push: + if: github.event_name == 'push' && github.event.pull_request == null + paths-ignore: + - '**/*.md' + - 'examples/**' + pull_request: + if: github.event_name == 'pull_request' && github.repository == 'openframeworks/openFrameworks' + paths-ignore: + - '**/*.md' + - 'examples/**' + +env: + ccache: ccache + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + raspberry-pi: + runs-on: ubuntu-latest + strategy: + matrix: + cfg: + - { libs: armv6l, multistrap_arch: armhf, suffix: arm-linux-gnueabihf, alladdons: 1 } + # - { libs: aarch64, multistrap_arch: arm64, suffix: aarch64-linux-gnu, alladdons: 0 } + env: + ARCH: ${{matrix.cfg.libs}} + MULTISTRAP_ARCH: ${{matrix.cfg.multistrap_arch}} + ALLADDONSEXAMPLE: ${{matrix.cfg.alladdons}} + steps: + - name: Cache Packages + uses: awalsh128/cache-apt-pkgs-action@latest + with: + packages: multistrap unzip gcc-${{matrix.cfg.suffix}} g++-${{matrix.cfg.suffix}} + version: 1.0 + + - uses: actions/checkout@v4 + + - name: ccache + uses: hendrikmuhs/ccache-action@v1.2.12 + with: + key: ${{ matrix.cfg.libs }} + + - name: Download libs + run: ./scripts/linux/download_libs.sh -a ${{matrix.cfg.libs}}; + - name: Install dependencies + run: ./scripts/ci/linuxrpi/install.sh; + - name: Build + # run: ./scripts/ci/linux${{matrix.cfg.libs}}/build.sh; + run: ./scripts/ci/linuxrpi/build.sh; diff --git a/.github/workflows/build-rpi-armv6l.yml b/.github/workflows/build-rpi-armv6l.yml new file mode 100644 index 00000000000..bc902f9e872 --- /dev/null +++ b/.github/workflows/build-rpi-armv6l.yml @@ -0,0 +1,55 @@ +name: build-rpi + +# make the action not run on the local repo if the branch is also in a pull request to OF/OF +on: + push: + if: github.event_name == 'push' && github.event.pull_request == null + paths-ignore: + - '**/*.md' + - 'examples/**' + pull_request: + if: github.event_name == 'pull_request' && github.repository == 'openframeworks/openFrameworks' + paths-ignore: + - '**/*.md' + - 'examples/**' + +env: + ccache: ccache + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + rpi-armv6l: + runs-on: ubuntu-latest + strategy: + matrix: + cfg: + - { libs: armv6l, multistrap_arch: armhf, suffix: arm-linux-gnueabihf, alladdons: 0 } + # - { libs: aarch64, multistrap_arch: arm64, suffix: aarch64-linux-gnu, alladdons: 0 } + env: + ARCH: ${{matrix.cfg.libs}} + MULTISTRAP_ARCH: ${{matrix.cfg.multistrap_arch}} + ALLADDONSEXAMPLE: ${{matrix.cfg.alladdons}} + steps: + - name: Cache Packages + uses: awalsh128/cache-apt-pkgs-action@latest + with: + packages: multistrap unzip gcc-${{matrix.cfg.suffix}} g++-${{matrix.cfg.suffix}} + version: 1.0 + + - uses: actions/checkout@v4 + + - name: ccache + uses: hendrikmuhs/ccache-action@v1.2.12 + with: + key: ${{ matrix.cfg.libs }} + + - name: Download libs + run: ./scripts/linux/download_libs.sh -a ${{matrix.cfg.libs}}; + - name: Install dependencies + run: ./scripts/ci/linuxrpi/install.sh; + - name: Build + # run: ./scripts/ci/linux${{matrix.cfg.libs}}/build.sh; + run: ./scripts/ci/linuxrpi/build.sh; diff --git a/scripts/ci/linuxaarch64/build.sh b/scripts/ci/linuxrpi/build.sh similarity index 92% rename from scripts/ci/linuxaarch64/build.sh rename to scripts/ci/linuxrpi/build.sh index 027eaf77034..4ec2f75973f 100755 --- a/scripts/ci/linuxaarch64/build.sh +++ b/scripts/ci/linuxrpi/build.sh @@ -13,7 +13,7 @@ fi echo "${PLATFORM_ARCH}" # export RPI_ROOT=${OF_ROOT}/scripts/ci/linux${PLATFORM_ARCH}/raspbian -export RPI_ROOT=${OF_ROOT}/scripts/ci/linuxaarch64/raspbian +export RPI_ROOT=${OF_ROOT}/scripts/ci/linuxrpi/raspbian if [ ${PLATFORM_ARCH} = "aarch64" ]; then export GCC_PREFIX=aarch64-linux-gnu else @@ -39,9 +39,12 @@ cp scripts/templates/linux${PLATFORM_ARCH}/config.make examples/templates/emptyE cd examples/templates/emptyExample/ make Debug -j +# if [ -n "$ALLADDONSEXAMPLE" ]; then +if [[ "$ALLADDONSEXAMPLE" == 1 ]]; then echo "**** Building allAddonsExample ****" cd $OF_ROOT cp scripts/templates/linux${PLATFORM_ARCH}/Makefile examples/templates/allAddonsExample/ cp scripts/templates/linux${PLATFORM_ARCH}/config.make examples/templates/allAddonsExample/ cd examples/templates/allAddonsExample/ make Debug -j +fi \ No newline at end of file diff --git a/scripts/ci/linuxaarch64/install.sh b/scripts/ci/linuxrpi/install.sh similarity index 100% rename from scripts/ci/linuxaarch64/install.sh rename to scripts/ci/linuxrpi/install.sh diff --git a/scripts/ci/linuxaarch64/multistrap.conf b/scripts/ci/linuxrpi/multistrap.conf similarity index 100% rename from scripts/ci/linuxaarch64/multistrap.conf rename to scripts/ci/linuxrpi/multistrap.conf From ef4e8ec2655dd75f11877e36f5316616583f48aa Mon Sep 17 00:00:00 2001 From: Dimitre Date: Fri, 3 May 2024 12:44:23 -0300 Subject: [PATCH 05/62] changes --- .github/workflows/build-rpi-aarch64-b.yml | 4 ++-- .github/workflows/build-rpi-aarch64.yml | 4 ++-- .github/workflows/build-rpi-armv6l-b.yml | 4 ++-- .github/workflows/build-rpi-armv6l.yml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-rpi-aarch64-b.yml b/.github/workflows/build-rpi-aarch64-b.yml index 21521d3921b..6eb4e532c0c 100644 --- a/.github/workflows/build-rpi-aarch64-b.yml +++ b/.github/workflows/build-rpi-aarch64-b.yml @@ -1,4 +1,4 @@ -name: build-rpi +name: rpi-aarch64-alladdons # make the action not run on the local repo if the branch is also in a pull request to OF/OF on: @@ -21,7 +21,7 @@ concurrency: cancel-in-progress: true jobs: - rpi-aarch64-alladdons: + rpi-build: runs-on: ubuntu-latest strategy: matrix: diff --git a/.github/workflows/build-rpi-aarch64.yml b/.github/workflows/build-rpi-aarch64.yml index 774089534b8..705b7381d5a 100644 --- a/.github/workflows/build-rpi-aarch64.yml +++ b/.github/workflows/build-rpi-aarch64.yml @@ -1,4 +1,4 @@ -name: build-rpi +name: rpi-aarch64 # make the action not run on the local repo if the branch is also in a pull request to OF/OF on: @@ -21,7 +21,7 @@ concurrency: cancel-in-progress: true jobs: - rpi-aarch64: + rpi-build: runs-on: ubuntu-latest strategy: matrix: diff --git a/.github/workflows/build-rpi-armv6l-b.yml b/.github/workflows/build-rpi-armv6l-b.yml index 69770deb77c..a1bc11e3b9f 100644 --- a/.github/workflows/build-rpi-armv6l-b.yml +++ b/.github/workflows/build-rpi-armv6l-b.yml @@ -1,4 +1,4 @@ -name: build-rpi +name: rpi-armv6l-alladdons # make the action not run on the local repo if the branch is also in a pull request to OF/OF on: @@ -21,7 +21,7 @@ concurrency: cancel-in-progress: true jobs: - raspberry-pi: + rpi-build: runs-on: ubuntu-latest strategy: matrix: diff --git a/.github/workflows/build-rpi-armv6l.yml b/.github/workflows/build-rpi-armv6l.yml index bc902f9e872..44aa2ec6d59 100644 --- a/.github/workflows/build-rpi-armv6l.yml +++ b/.github/workflows/build-rpi-armv6l.yml @@ -1,4 +1,4 @@ -name: build-rpi +name: rpi-armv6l # make the action not run on the local repo if the branch is also in a pull request to OF/OF on: @@ -21,7 +21,7 @@ concurrency: cancel-in-progress: true jobs: - rpi-armv6l: + rpi-build: runs-on: ubuntu-latest strategy: matrix: From ac6924ce942c0d7ed8bb5c53073da08c797317cd Mon Sep 17 00:00:00 2001 From: Dimitre Date: Fri, 3 May 2024 13:33:59 -0300 Subject: [PATCH 06/62] test --- .github/workflows/build-rpi-armv6l.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-rpi-armv6l.yml b/.github/workflows/build-rpi-armv6l.yml index 44aa2ec6d59..60d9ba36e05 100644 --- a/.github/workflows/build-rpi-armv6l.yml +++ b/.github/workflows/build-rpi-armv6l.yml @@ -36,7 +36,7 @@ jobs: - name: Cache Packages uses: awalsh128/cache-apt-pkgs-action@latest with: - packages: multistrap unzip gcc-${{matrix.cfg.suffix}} g++-${{matrix.cfg.suffix}} + packages: multistrap unzip libraspberrypi-dev raspberrypi-kernel-headers gcc-${{matrix.cfg.suffix}} g++-${{matrix.cfg.suffix}} version: 1.0 - uses: actions/checkout@v4 From 9d8a3ddd89eee2ff8e7cfcee67f5ff7611887a4d Mon Sep 17 00:00:00 2001 From: Dimitre Date: Fri, 3 May 2024 15:39:49 -0300 Subject: [PATCH 07/62] liblaplack-dev --- scripts/ci/linuxrpi/multistrap.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/linuxrpi/multistrap.conf b/scripts/ci/linuxrpi/multistrap.conf index a4a60506247..f48148bc153 100644 --- a/scripts/ci/linuxrpi/multistrap.conf +++ b/scripts/ci/linuxrpi/multistrap.conf @@ -8,7 +8,7 @@ aptsources=OpenFrameworks debootstrap=OpenFrameworks [OpenFrameworks] -packages=base-files dbus dpkg dropbear initscripts iputils-ping isc-dhcp-client kmod login locales lsb-base lsb-release makedev netbase net-tools sysvinit-utils sysv-rc libudev-dev libasound2-dev libxmu-dev libxxf86vm-dev g++ libgl1-mesa-dev libglu1-mesa-dev libraw1394-dev libudev-dev libdrm-dev libglew-dev libopenal-dev libsndfile-dev libfreeimage-dev libcairo2-dev libfreetype6-dev libssl-dev libpulse-dev libusb-1.0-0-dev libopencv-dev libegl1-mesa-dev libglvnd-dev libgles2-mesa-dev libassimp-dev librtaudio-dev libboost-filesystem-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 liburiparser-dev libcurl4-openssl-dev libxml2-dev libpugixml-dev libpoco-dev libglfw3-dev libxrandr-dev libxinerama-dev libxcursor-dev freeglut3-dev libxi-dev +packages=base-files dbus dpkg dropbear initscripts iputils-ping isc-dhcp-client kmod login locales lsb-base lsb-release makedev netbase net-tools sysvinit-utils sysv-rc libudev-dev libasound2-dev libxmu-dev libxxf86vm-dev g++ libgl1-mesa-dev libglu1-mesa-dev libraw1394-dev libudev-dev libdrm-dev libglew-dev libopenal-dev libsndfile-dev libfreeimage-dev libcairo2-dev libfreetype6-dev libssl-dev libpulse-dev libusb-1.0-0-dev libopencv-dev libegl1-mesa-dev libglvnd-dev libgles2-mesa-dev libassimp-dev librtaudio-dev libboost-filesystem-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 liburiparser-dev libcurl4-openssl-dev libxml2-dev libpugixml-dev libpoco-dev libglfw3-dev libxrandr-dev libxinerama-dev libxcursor-dev freeglut3-dev libxi-dev liblapack-dev # libraspberrypi-dev raspberrypi-kernel-headers # libblas3 liblapack3 # libopenblas-dev liblapack-dev From e3392aeb9144be85f875c318056435fa7d9a114f Mon Sep 17 00:00:00 2001 From: Dimitre Date: Fri, 3 May 2024 16:06:46 -0300 Subject: [PATCH 08/62] more test --- scripts/ci/linuxrpi/build.sh | 4 +++- scripts/ci/linuxrpi/install.sh | 7 +++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/scripts/ci/linuxrpi/build.sh b/scripts/ci/linuxrpi/build.sh index 4ec2f75973f..765ccf2bb09 100755 --- a/scripts/ci/linuxrpi/build.sh +++ b/scripts/ci/linuxrpi/build.sh @@ -14,6 +14,7 @@ echo "${PLATFORM_ARCH}" # export RPI_ROOT=${OF_ROOT}/scripts/ci/linux${PLATFORM_ARCH}/raspbian export RPI_ROOT=${OF_ROOT}/scripts/ci/linuxrpi/raspbian +export BCM_FOLDER=${OF_ROOT}/scripts/ci/linuxrpi/userland/host_applications/linux/libs/bcm_host/include if [ ${PLATFORM_ARCH} = "aarch64" ]; then export GCC_PREFIX=aarch64-linux-gnu else @@ -25,7 +26,8 @@ export PLATFORM_OS=Linux # export PKG_CONFIG_LIBDIR=${RPI_ROOT}/usr/include:${RPI_ROOT}/usr/lib/pkgconfig:${RPI_ROOT}/usr/lib/${GCC_PREFIX}/pkgconfig:${RPI_ROOT}/usr/share/pkgconfig -export PKG_CONFIG_PATH=${RPI_ROOT}/usr/include:${RPI_ROOT}/usr/lib/pkgconfig:${RPI_ROOT}/usr/lib/${GCC_PREFIX}/pkgconfig:${RPI_ROOT}/usr/share/pkgconfig + +export PKG_CONFIG_PATH=${BCM_FOLDER}:${RPI_ROOT}/usr/lib/aarch64-linux-gnu:${RPI_ROOT}/usr/include:${RPI_ROOT}/usr/lib/pkgconfig:${RPI_ROOT}/usr/lib/${GCC_PREFIX}/pkgconfig:${RPI_ROOT}/usr/share/pkgconfig export TOOLCHAIN_ROOT=/usr export CXX="${TOOLCHAIN_ROOT}/bin/${GCC_PREFIX}-g++" export CC="${TOOLCHAIN_ROOT}/bin/${GCC_PREFIX}-gcc" diff --git a/scripts/ci/linuxrpi/install.sh b/scripts/ci/linuxrpi/install.sh index 20c6dcbb783..70c51d18031 100755 --- a/scripts/ci/linuxrpi/install.sh +++ b/scripts/ci/linuxrpi/install.sh @@ -17,6 +17,12 @@ installPackages(){ sudo sed -i s/\$forceyes//g /usr/sbin/multistrap } +downloadFirmware(){ + # FIXME: only if it is not aarch64 + git clone https://github.com/raspberrypi/userland --depth 1 + # cp -r userland/opt raspbian/ +} + createRaspbianImg(){ if [ -n "$MULTISTRAP_ARCH" ]; then @@ -40,3 +46,4 @@ echo $ROOT cd $ROOT # installPackages createRaspbianImg +downloadFirmware From f1e9a01c9ba9c9750f52be4f360eb2e0b91bcf61 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Fri, 3 May 2024 16:42:06 -0300 Subject: [PATCH 09/62] libdir --- scripts/ci/linuxrpi/build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/ci/linuxrpi/build.sh b/scripts/ci/linuxrpi/build.sh index 765ccf2bb09..0d8ccda9269 100755 --- a/scripts/ci/linuxrpi/build.sh +++ b/scripts/ci/linuxrpi/build.sh @@ -26,8 +26,9 @@ export PLATFORM_OS=Linux # export PKG_CONFIG_LIBDIR=${RPI_ROOT}/usr/include:${RPI_ROOT}/usr/lib/pkgconfig:${RPI_ROOT}/usr/lib/${GCC_PREFIX}/pkgconfig:${RPI_ROOT}/usr/share/pkgconfig +export PKG_CONFIG_LIBDIR=${BCM_FOLDER}:${RPI_ROOT}/usr/lib/aarch64-linux-gnu -export PKG_CONFIG_PATH=${BCM_FOLDER}:${RPI_ROOT}/usr/lib/aarch64-linux-gnu:${RPI_ROOT}/usr/include:${RPI_ROOT}/usr/lib/pkgconfig:${RPI_ROOT}/usr/lib/${GCC_PREFIX}/pkgconfig:${RPI_ROOT}/usr/share/pkgconfig +export PKG_CONFIG_PATH=${RPI_ROOT}/usr/include:${RPI_ROOT}/usr/lib/pkgconfig:${RPI_ROOT}/usr/lib/${GCC_PREFIX}/pkgconfig:${RPI_ROOT}/usr/share/pkgconfig export TOOLCHAIN_ROOT=/usr export CXX="${TOOLCHAIN_ROOT}/bin/${GCC_PREFIX}-g++" export CC="${TOOLCHAIN_ROOT}/bin/${GCC_PREFIX}-gcc" From ad79a1bb9e6c39ae0f6580ac1eb07446608beafb Mon Sep 17 00:00:00 2001 From: Dimitre Date: Fri, 3 May 2024 17:37:37 -0300 Subject: [PATCH 10/62] adjustments --- .../config.linuxaarch64.default.mk | 30 ++++++++++++------- .../linuxarmv6l/config.linuxarmv6l.default.mk | 24 ++++++++------- 2 files changed, 32 insertions(+), 22 deletions(-) diff --git a/libs/openFrameworksCompiled/project/linuxaarch64/config.linuxaarch64.default.mk b/libs/openFrameworksCompiled/project/linuxaarch64/config.linuxaarch64.default.mk index d10f9885c78..79368fe44b8 100644 --- a/libs/openFrameworksCompiled/project/linuxaarch64/config.linuxaarch64.default.mk +++ b/libs/openFrameworksCompiled/project/linuxaarch64/config.linuxaarch64.default.mk @@ -38,6 +38,12 @@ include $(OF_SHARED_MAKEFILES_PATH)/config.linux.common.mk # Note: Leave a leading space when adding list items with the += operator ################################################################################ +#c++ 17 support - comment out two lines below to use c++11 +PLATFORM_CFLAGS += -std=c++17 +PLATFORM_LDFLAGS += -lstdc++fs +PLATFORM_CXXVER = -std=c++17 + + PLATFORM_LDFLAGS += -lstdc++fs PLATFORM_LDFLAGS += -no-pie # PLATFORM_LDFLAGS += -nostartfiles @@ -119,19 +125,21 @@ endif PLATFORM_CFLAGS += --sysroot=$(SYSROOT) - PLATFORM_HEADER_SEARCH_PATHS += $(SYSROOT)/usr/include/c++ - PLATFORM_HEADER_SEARCH_PATHS += $(TOOLCHAIN_ROOT)/lib/gcc/$(GCC_PREFIX)/$(GCC_VERSION)/include + # PLATFORM_HEADER_SEARCH_PATHS += $(SYSROOT)/usr/include/c++ + # PLATFORM_HEADER_SEARCH_PATHS += $(TOOLCHAIN_ROOT)/lib/gcc/$(GCC_PREFIX)/$(GCC_VERSION)/include - PLATFORM_LIBRARY_SEARCH_PATHS += $(SYSROOT)/usr/lib/$(GCC_PREFIX) - PLATFORM_LIBRARY_SEARCH_PATHS += $(SYSROOT)/lib/$(GCC_PREFIX) - PLATFORM_LIBRARY_SEARCH_PATHS += $(TOOLCHAIN_ROOT)/lib/gcc/$(GCC_PREFIX)/$(GCC_VERSION) + PLATFORM_LIBRARY_SEARCH_PATHS += /usr/lib/$(GCC_PREFIX) + PLATFORM_LIBRARY_SEARCH_PATHS += /lib/$(GCC_PREFIX) + # PLATFORM_LIBRARY_SEARCH_PATHS += $(TOOLCHAIN_ROOT)/lib/gcc/$(GCC_PREFIX)/$(GCC_VERSION) PLATFORM_LDFLAGS += --sysroot=$(SYSROOT) - PLATFORM_LDFLAGS += -Xlinker -rpath-link=$(SYSROOT)/usr/lib/$(GCC_PREFIX) - PLATFORM_LDFLAGS += -Xlinker -rpath-link=$(SYSROOT)/lib/$(GCC_PREFIX) - PLATFORM_LDFLAGS += -Xlinker -rpath-link=$(SYSROOT)/opt/vc/lib - PLATFORM_LDFLAGS += -Xlinker -rpath-link=$(SYSROOT)/usr/lib/arm-linux-gnueabihf/pulseaudio - - PKG_CONFIG_LIBDIR=$(SYSROOT)/usr/lib/pkgconfig:$(SYSROOT)/usr/lib/$(GCC_PREFIX)/pkgconfig:$(SYSROOT)/usr/share/pkgconfig + # no need to prefix with sysroot, once sysroot is already set. + PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX) + PLATFORM_LDFLAGS += -Xlinker -rpath-link=/lib/$(GCC_PREFIX) + # PLATFORM_LDFLAGS += -Xlinker -rpath-link=/opt/vc/lib + PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX)/pulseaudio + + # PKG_CONFIG_LIBDIR=$(SYSROOT)/usr/lib/pkgconfig:$(SYSROOT)/usr/lib/$(GCC_PREFIX)/pkgconfig:$(SYSROOT)/usr/share/pkgconfig + PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/usr/lib/$(GCC_PREFIX)/pkgconfig:/usr/share/pkgconfig endif diff --git a/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk b/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk index d33871572bb..ffbba817dac 100644 --- a/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk +++ b/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk @@ -269,19 +269,21 @@ endif PLATFORM_CFLAGS += --sysroot=$(SYSROOT) - PLATFORM_HEADER_SEARCH_PATHS += $(SYSROOT)/usr/include/c++ - PLATFORM_HEADER_SEARCH_PATHS += $(TOOLCHAIN_ROOT)/lib/gcc/$(GCC_PREFIX)/$(GCC_VERSION)/include + # PLATFORM_HEADER_SEARCH_PATHS += $(SYSROOT)/usr/include/c++ + # PLATFORM_HEADER_SEARCH_PATHS += $(TOOLCHAIN_ROOT)/lib/gcc/$(GCC_PREFIX)/$(GCC_VERSION)/include - PLATFORM_LIBRARY_SEARCH_PATHS += $(SYSROOT)/usr/lib/$(GCC_PREFIX) - PLATFORM_LIBRARY_SEARCH_PATHS += $(SYSROOT)/lib/$(GCC_PREFIX) - PLATFORM_LIBRARY_SEARCH_PATHS += $(TOOLCHAIN_ROOT)/lib/gcc/$(GCC_PREFIX)/$(GCC_VERSION) + PLATFORM_LIBRARY_SEARCH_PATHS += /usr/lib/$(GCC_PREFIX) + PLATFORM_LIBRARY_SEARCH_PATHS += /lib/$(GCC_PREFIX) + # PLATFORM_LIBRARY_SEARCH_PATHS += $(TOOLCHAIN_ROOT)/lib/gcc/$(GCC_PREFIX)/$(GCC_VERSION) PLATFORM_LDFLAGS += --sysroot=$(SYSROOT) - PLATFORM_LDFLAGS += -Xlinker -rpath-link=$(SYSROOT)/usr/lib/$(GCC_PREFIX) - PLATFORM_LDFLAGS += -Xlinker -rpath-link=$(SYSROOT)/lib/$(GCC_PREFIX) - PLATFORM_LDFLAGS += -Xlinker -rpath-link=$(SYSROOT)/opt/vc/lib - PLATFORM_LDFLAGS += -Xlinker -rpath-link=$(SYSROOT)/usr/lib/arm-linux-gnueabihf/pulseaudio - - PKG_CONFIG_LIBDIR=$(SYSROOT)/usr/lib/pkgconfig:$(SYSROOT)/usr/lib/$(GCC_PREFIX)/pkgconfig:$(SYSROOT)/usr/share/pkgconfig + PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX) + PLATFORM_LDFLAGS += -Xlinker -rpath-link=/lib/$(GCC_PREFIX) + # PLATFORM_LDFLAGS += -Xlinker -rpath-link=/opt/vc/lib + PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX)/pulseaudio + PLATFORM_LDFLAGS += -Xlinker -rpath-link=../userland/host_applications/linux/libs/bcm_host/include + + # PKG_CONFIG_LIBDIR=$(SYSROOT)/usr/lib/pkgconfig:$(SYSROOT)/usr/lib/$(GCC_PREFIX)/pkgconfig:$(SYSROOT)/usr/share/pkgconfig + PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/usr/lib/$(GCC_PREFIX)/pkgconfig:/usr/share/pkgconfig endif From ce4dd16725e8c1fcfc167b6a1d68b9bc5ae9a44d Mon Sep 17 00:00:00 2001 From: Dimitre Date: Fri, 3 May 2024 18:04:31 -0300 Subject: [PATCH 11/62] more --- .../project/linuxaarch64/config.linuxaarch64.default.mk | 3 +-- .../project/linuxarmv6l/config.linuxarmv6l.default.mk | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/openFrameworksCompiled/project/linuxaarch64/config.linuxaarch64.default.mk b/libs/openFrameworksCompiled/project/linuxaarch64/config.linuxaarch64.default.mk index 79368fe44b8..08cb5e73f6f 100644 --- a/libs/openFrameworksCompiled/project/linuxaarch64/config.linuxaarch64.default.mk +++ b/libs/openFrameworksCompiled/project/linuxaarch64/config.linuxaarch64.default.mk @@ -136,10 +136,9 @@ endif # no need to prefix with sysroot, once sysroot is already set. PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX) PLATFORM_LDFLAGS += -Xlinker -rpath-link=/lib/$(GCC_PREFIX) - # PLATFORM_LDFLAGS += -Xlinker -rpath-link=/opt/vc/lib PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX)/pulseaudio + PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX)/lapack - # PKG_CONFIG_LIBDIR=$(SYSROOT)/usr/lib/pkgconfig:$(SYSROOT)/usr/lib/$(GCC_PREFIX)/pkgconfig:$(SYSROOT)/usr/share/pkgconfig PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/usr/lib/$(GCC_PREFIX)/pkgconfig:/usr/share/pkgconfig endif diff --git a/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk b/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk index ffbba817dac..4631499b31d 100644 --- a/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk +++ b/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk @@ -275,13 +275,14 @@ endif PLATFORM_LIBRARY_SEARCH_PATHS += /usr/lib/$(GCC_PREFIX) PLATFORM_LIBRARY_SEARCH_PATHS += /lib/$(GCC_PREFIX) # PLATFORM_LIBRARY_SEARCH_PATHS += $(TOOLCHAIN_ROOT)/lib/gcc/$(GCC_PREFIX)/$(GCC_VERSION) + PLATFORM_LIBRARY_SEARCH_PATHS += $(TOOLCHAIN_ROOT)/../userland/host_applications/linux/libs/bcm_host/include PLATFORM_LDFLAGS += --sysroot=$(SYSROOT) PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX) PLATFORM_LDFLAGS += -Xlinker -rpath-link=/lib/$(GCC_PREFIX) # PLATFORM_LDFLAGS += -Xlinker -rpath-link=/opt/vc/lib PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX)/pulseaudio - PLATFORM_LDFLAGS += -Xlinker -rpath-link=../userland/host_applications/linux/libs/bcm_host/include + PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX)/lapack # PKG_CONFIG_LIBDIR=$(SYSROOT)/usr/lib/pkgconfig:$(SYSROOT)/usr/lib/$(GCC_PREFIX)/pkgconfig:$(SYSROOT)/usr/share/pkgconfig PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/usr/lib/$(GCC_PREFIX)/pkgconfig:/usr/share/pkgconfig From 44205ea05956a48bff99daaac86510fb22635d03 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Fri, 3 May 2024 18:15:14 -0300 Subject: [PATCH 12/62] test --- .../project/makefileCommon/config.linux.common.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/openFrameworksCompiled/project/makefileCommon/config.linux.common.mk b/libs/openFrameworksCompiled/project/makefileCommon/config.linux.common.mk index 7614ab84347..02f9df1ae38 100755 --- a/libs/openFrameworksCompiled/project/makefileCommon/config.linux.common.mk +++ b/libs/openFrameworksCompiled/project/makefileCommon/config.linux.common.mk @@ -362,6 +362,9 @@ PLATFORM_PKG_CONFIG_LIBRARIES += openal # PLATFORM_PKG_CONFIG_LIBRARIES += openssl PLATFORM_PKG_CONFIG_LIBRARIES += libcurl +# TEST +PLATFORM_PKG_CONFIG_LIBRARIES += lapack + ifeq ($(CROSS_COMPILING),1) ifeq "$(shell export PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR); pkg-config --exists glfw3 && echo 1)" "1" PLATFORM_PKG_CONFIG_LIBRARIES += glfw3 From 3f26382b1d1a7c1f17719b0366637cbc0c2b8afe Mon Sep 17 00:00:00 2001 From: Dimitre Date: Fri, 3 May 2024 18:55:48 -0300 Subject: [PATCH 13/62] up --- .../project/makefileCommon/config.linux.common.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/openFrameworksCompiled/project/makefileCommon/config.linux.common.mk b/libs/openFrameworksCompiled/project/makefileCommon/config.linux.common.mk index 02f9df1ae38..090ed62b4dc 100755 --- a/libs/openFrameworksCompiled/project/makefileCommon/config.linux.common.mk +++ b/libs/openFrameworksCompiled/project/makefileCommon/config.linux.common.mk @@ -363,7 +363,7 @@ PLATFORM_PKG_CONFIG_LIBRARIES += openal PLATFORM_PKG_CONFIG_LIBRARIES += libcurl # TEST -PLATFORM_PKG_CONFIG_LIBRARIES += lapack +PLATFORM_PKG_CONFIG_LIBRARIES += liblapack ifeq ($(CROSS_COMPILING),1) ifeq "$(shell export PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR); pkg-config --exists glfw3 && echo 1)" "1" From f8f10bfc5ff4b85b25d9cefdc93b1e6011ce1944 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Fri, 3 May 2024 20:28:50 -0300 Subject: [PATCH 14/62] revert test --- .../project/makefileCommon/config.linux.common.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/openFrameworksCompiled/project/makefileCommon/config.linux.common.mk b/libs/openFrameworksCompiled/project/makefileCommon/config.linux.common.mk index 090ed62b4dc..5b1f32bafc8 100755 --- a/libs/openFrameworksCompiled/project/makefileCommon/config.linux.common.mk +++ b/libs/openFrameworksCompiled/project/makefileCommon/config.linux.common.mk @@ -363,7 +363,7 @@ PLATFORM_PKG_CONFIG_LIBRARIES += openal PLATFORM_PKG_CONFIG_LIBRARIES += libcurl # TEST -PLATFORM_PKG_CONFIG_LIBRARIES += liblapack +# PLATFORM_PKG_CONFIG_LIBRARIES += liblapack ifeq ($(CROSS_COMPILING),1) ifeq "$(shell export PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR); pkg-config --exists glfw3 && echo 1)" "1" From e341c9862e25cd3b8dfc97b4592806956fbc9f7d Mon Sep 17 00:00:00 2001 From: Dimitre Date: Fri, 3 May 2024 23:49:10 -0300 Subject: [PATCH 15/62] updates --- .../project/linuxaarch64/config.linuxaarch64.default.mk | 4 ++++ .../project/makefileCommon/config.linux.common.mk | 3 ++- scripts/ci/linuxrpi/build.sh | 6 +++--- scripts/ci/linuxrpi/multistrap.conf | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/libs/openFrameworksCompiled/project/linuxaarch64/config.linuxaarch64.default.mk b/libs/openFrameworksCompiled/project/linuxaarch64/config.linuxaarch64.default.mk index 08cb5e73f6f..4b3d7d5d84f 100644 --- a/libs/openFrameworksCompiled/project/linuxaarch64/config.linuxaarch64.default.mk +++ b/libs/openFrameworksCompiled/project/linuxaarch64/config.linuxaarch64.default.mk @@ -125,10 +125,14 @@ endif PLATFORM_CFLAGS += --sysroot=$(SYSROOT) + # PLATFORM_HEADER_SEARCH_PATHS += $(SYSROOT)/usr/include/c++ # PLATFORM_HEADER_SEARCH_PATHS += $(TOOLCHAIN_ROOT)/lib/gcc/$(GCC_PREFIX)/$(GCC_VERSION)/include PLATFORM_LIBRARY_SEARCH_PATHS += /usr/lib/$(GCC_PREFIX) + PLATFORM_LIBRARY_SEARCH_PATHS += /usr/lib/$(GCC_PREFIX)/lapack + PLATFORM_LIBRARY_SEARCH_PATHS += /usr/lib/$(GCC_PREFIX)/blas + PLATFORM_LIBRARY_SEARCH_PATHS += /lib/$(GCC_PREFIX) # PLATFORM_LIBRARY_SEARCH_PATHS += $(TOOLCHAIN_ROOT)/lib/gcc/$(GCC_PREFIX)/$(GCC_VERSION) diff --git a/libs/openFrameworksCompiled/project/makefileCommon/config.linux.common.mk b/libs/openFrameworksCompiled/project/makefileCommon/config.linux.common.mk index 5b1f32bafc8..bba7c50372d 100755 --- a/libs/openFrameworksCompiled/project/makefileCommon/config.linux.common.mk +++ b/libs/openFrameworksCompiled/project/makefileCommon/config.linux.common.mk @@ -363,7 +363,8 @@ PLATFORM_PKG_CONFIG_LIBRARIES += openal PLATFORM_PKG_CONFIG_LIBRARIES += libcurl # TEST -# PLATFORM_PKG_CONFIG_LIBRARIES += liblapack +PLATFORM_PKG_CONFIG_LIBRARIES += lapack +PLATFORM_PKG_CONFIG_LIBRARIES += blas ifeq ($(CROSS_COMPILING),1) ifeq "$(shell export PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR); pkg-config --exists glfw3 && echo 1)" "1" diff --git a/scripts/ci/linuxrpi/build.sh b/scripts/ci/linuxrpi/build.sh index 0d8ccda9269..ff13932570a 100755 --- a/scripts/ci/linuxrpi/build.sh +++ b/scripts/ci/linuxrpi/build.sh @@ -14,7 +14,7 @@ echo "${PLATFORM_ARCH}" # export RPI_ROOT=${OF_ROOT}/scripts/ci/linux${PLATFORM_ARCH}/raspbian export RPI_ROOT=${OF_ROOT}/scripts/ci/linuxrpi/raspbian -export BCM_FOLDER=${OF_ROOT}/scripts/ci/linuxrpi/userland/host_applications/linux/libs/bcm_host/include +export BCM_FOLDER=${RPI_ROOT}/../userland/host_applications/linux/libs/bcm_host/include if [ ${PLATFORM_ARCH} = "aarch64" ]; then export GCC_PREFIX=aarch64-linux-gnu else @@ -26,9 +26,9 @@ export PLATFORM_OS=Linux # export PKG_CONFIG_LIBDIR=${RPI_ROOT}/usr/include:${RPI_ROOT}/usr/lib/pkgconfig:${RPI_ROOT}/usr/lib/${GCC_PREFIX}/pkgconfig:${RPI_ROOT}/usr/share/pkgconfig -export PKG_CONFIG_LIBDIR=${BCM_FOLDER}:${RPI_ROOT}/usr/lib/aarch64-linux-gnu +# export PKG_CONFIG_LIBDIR=${BCM_FOLDER}:${RPI_ROOT}/usr/lib/aarch64-linux-gnu -export PKG_CONFIG_PATH=${RPI_ROOT}/usr/include:${RPI_ROOT}/usr/lib/pkgconfig:${RPI_ROOT}/usr/lib/${GCC_PREFIX}/pkgconfig:${RPI_ROOT}/usr/share/pkgconfig +export PKG_CONFIG_PATH=${BCM_FOLDER}:${RPI_ROOT}/usr/include:${RPI_ROOT}/usr/lib/pkgconfig:${RPI_ROOT}/usr/lib/${GCC_PREFIX}/pkgconfig:${RPI_ROOT}/usr/share/pkgconfig export TOOLCHAIN_ROOT=/usr export CXX="${TOOLCHAIN_ROOT}/bin/${GCC_PREFIX}-g++" export CC="${TOOLCHAIN_ROOT}/bin/${GCC_PREFIX}-gcc" diff --git a/scripts/ci/linuxrpi/multistrap.conf b/scripts/ci/linuxrpi/multistrap.conf index f48148bc153..0a8e3931c32 100644 --- a/scripts/ci/linuxrpi/multistrap.conf +++ b/scripts/ci/linuxrpi/multistrap.conf @@ -8,7 +8,7 @@ aptsources=OpenFrameworks debootstrap=OpenFrameworks [OpenFrameworks] -packages=base-files dbus dpkg dropbear initscripts iputils-ping isc-dhcp-client kmod login locales lsb-base lsb-release makedev netbase net-tools sysvinit-utils sysv-rc libudev-dev libasound2-dev libxmu-dev libxxf86vm-dev g++ libgl1-mesa-dev libglu1-mesa-dev libraw1394-dev libudev-dev libdrm-dev libglew-dev libopenal-dev libsndfile-dev libfreeimage-dev libcairo2-dev libfreetype6-dev libssl-dev libpulse-dev libusb-1.0-0-dev libopencv-dev libegl1-mesa-dev libglvnd-dev libgles2-mesa-dev libassimp-dev librtaudio-dev libboost-filesystem-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 liburiparser-dev libcurl4-openssl-dev libxml2-dev libpugixml-dev libpoco-dev libglfw3-dev libxrandr-dev libxinerama-dev libxcursor-dev freeglut3-dev libxi-dev liblapack-dev +packages=base-files dbus dpkg dropbear initscripts iputils-ping isc-dhcp-client kmod login locales lsb-base lsb-release makedev netbase net-tools sysvinit-utils sysv-rc libudev-dev libasound2-dev libxmu-dev libxxf86vm-dev g++ libgl1-mesa-dev libglu1-mesa-dev libraw1394-dev libudev-dev libdrm-dev libglew-dev libopenal-dev libsndfile-dev libfreeimage-dev libcairo2-dev libfreetype6-dev libssl-dev libpulse-dev libusb-1.0-0-dev libopencv-dev libegl1-mesa-dev libglvnd-dev libgles2-mesa-dev libassimp-dev librtaudio-dev libboost-filesystem-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 liburiparser-dev libcurl4-openssl-dev libxml2-dev libpugixml-dev libpoco-dev libglfw3-dev libxrandr-dev libxinerama-dev libxcursor-dev freeglut3-dev libxi-dev liblapack-dev libblas-dev # libraspberrypi-dev raspberrypi-kernel-headers # libblas3 liblapack3 # libopenblas-dev liblapack-dev From e5572ba22a8540f19da63095ff165b2551fca9d7 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Fri, 3 May 2024 23:59:37 -0300 Subject: [PATCH 16/62] one more --- .../makefileCommon/config.linux.common.mk | 34 +++++++++++++++++-- scripts/ci/linuxrpi/build.sh | 1 - 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/libs/openFrameworksCompiled/project/makefileCommon/config.linux.common.mk b/libs/openFrameworksCompiled/project/makefileCommon/config.linux.common.mk index bba7c50372d..73b9f9057cb 100755 --- a/libs/openFrameworksCompiled/project/makefileCommon/config.linux.common.mk +++ b/libs/openFrameworksCompiled/project/makefileCommon/config.linux.common.mk @@ -363,8 +363,8 @@ PLATFORM_PKG_CONFIG_LIBRARIES += openal PLATFORM_PKG_CONFIG_LIBRARIES += libcurl # TEST -PLATFORM_PKG_CONFIG_LIBRARIES += lapack -PLATFORM_PKG_CONFIG_LIBRARIES += blas +# PLATFORM_PKG_CONFIG_LIBRARIES += lapack +# PLATFORM_PKG_CONFIG_LIBRARIES += blas ifeq ($(CROSS_COMPILING),1) ifeq "$(shell export PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR); pkg-config --exists glfw3 && echo 1)" "1" @@ -393,6 +393,36 @@ else endif + +ifeq ($(CROSS_COMPILING),1) + ifeq "$(shell export PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR); pkg-config --exists lapack && echo 1)" "1" + PLATFORM_PKG_CONFIG_LIBRARIES += lapack + else + PLATFORM_LIBRARIES += lapack + endif +else + ifeq "$(shell pkg-config --exists lapack && echo 1)" "1" + PLATFORM_PKG_CONFIG_LIBRARIES += lapack + else + PLATFORM_LIBRARIES += lapack + endif +endif + +ifeq ($(CROSS_COMPILING),1) + ifeq "$(shell export PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR); pkg-config --exists blas && echo 1)" "1" + PLATFORM_PKG_CONFIG_LIBRARIES += blas + else + PLATFORM_LIBRARIES += blas + endif +else + ifeq "$(shell pkg-config --exists blas && echo 1)" "1" + PLATFORM_PKG_CONFIG_LIBRARIES += blas + else + PLATFORM_LIBRARIES += blas + endif +endif + + ifneq ($(LINUX_ARM),1) PLATFORM_PKG_CONFIG_LIBRARIES += libpulse-simple PLATFORM_PKG_CONFIG_LIBRARIES += alsa diff --git a/scripts/ci/linuxrpi/build.sh b/scripts/ci/linuxrpi/build.sh index ff13932570a..13c3467135b 100755 --- a/scripts/ci/linuxrpi/build.sh +++ b/scripts/ci/linuxrpi/build.sh @@ -12,7 +12,6 @@ fi echo "${PLATFORM_ARCH}" -# export RPI_ROOT=${OF_ROOT}/scripts/ci/linux${PLATFORM_ARCH}/raspbian export RPI_ROOT=${OF_ROOT}/scripts/ci/linuxrpi/raspbian export BCM_FOLDER=${RPI_ROOT}/../userland/host_applications/linux/libs/bcm_host/include if [ ${PLATFORM_ARCH} = "aarch64" ]; then From 6e54f91e7e9263d27ed940a66c4a218f4ea381df Mon Sep 17 00:00:00 2001 From: Dimitre Date: Sat, 4 May 2024 00:10:03 -0300 Subject: [PATCH 17/62] up --- scripts/ci/linuxrpi/build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/ci/linuxrpi/build.sh b/scripts/ci/linuxrpi/build.sh index 13c3467135b..7ba674b1601 100755 --- a/scripts/ci/linuxrpi/build.sh +++ b/scripts/ci/linuxrpi/build.sh @@ -13,6 +13,8 @@ fi echo "${PLATFORM_ARCH}" export RPI_ROOT=${OF_ROOT}/scripts/ci/linuxrpi/raspbian +echo "${RPI_ROOT}" + export BCM_FOLDER=${RPI_ROOT}/../userland/host_applications/linux/libs/bcm_host/include if [ ${PLATFORM_ARCH} = "aarch64" ]; then export GCC_PREFIX=aarch64-linux-gnu From 4b016e490e5364e6c189cc866c60d40f54320c0d Mon Sep 17 00:00:00 2001 From: Dimitre Date: Sat, 4 May 2024 00:17:06 -0300 Subject: [PATCH 18/62] up --- scripts/ci/linuxrpi/multistrap.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/linuxrpi/multistrap.conf b/scripts/ci/linuxrpi/multistrap.conf index 0a8e3931c32..9e81d3a6761 100644 --- a/scripts/ci/linuxrpi/multistrap.conf +++ b/scripts/ci/linuxrpi/multistrap.conf @@ -13,6 +13,6 @@ packages=base-files dbus dpkg dropbear initscripts iputils-ping isc-dhcp-client # libblas3 liblapack3 # libopenblas-dev liblapack-dev source=http://deb.debian.org/debian -keyring=debian-keyring +keyring=debian-archive-keyring components=main contrib non-free rpi suite=bookworm From 2ea7e2f40424496bc617b2bde30f30541045dc2b Mon Sep 17 00:00:00 2001 From: Dimitre Date: Sat, 4 May 2024 00:18:47 -0300 Subject: [PATCH 19/62] up --- scripts/ci/linuxrpi/multistrap.conf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/ci/linuxrpi/multistrap.conf b/scripts/ci/linuxrpi/multistrap.conf index 9e81d3a6761..f30831999df 100644 --- a/scripts/ci/linuxrpi/multistrap.conf +++ b/scripts/ci/linuxrpi/multistrap.conf @@ -8,7 +8,9 @@ aptsources=OpenFrameworks debootstrap=OpenFrameworks [OpenFrameworks] -packages=base-files dbus dpkg dropbear initscripts iputils-ping isc-dhcp-client kmod login locales lsb-base lsb-release makedev netbase net-tools sysvinit-utils sysv-rc libudev-dev libasound2-dev libxmu-dev libxxf86vm-dev g++ libgl1-mesa-dev libglu1-mesa-dev libraw1394-dev libudev-dev libdrm-dev libglew-dev libopenal-dev libsndfile-dev libfreeimage-dev libcairo2-dev libfreetype6-dev libssl-dev libpulse-dev libusb-1.0-0-dev libopencv-dev libegl1-mesa-dev libglvnd-dev libgles2-mesa-dev libassimp-dev librtaudio-dev libboost-filesystem-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 liburiparser-dev libcurl4-openssl-dev libxml2-dev libpugixml-dev libpoco-dev libglfw3-dev libxrandr-dev libxinerama-dev libxcursor-dev freeglut3-dev libxi-dev liblapack-dev libblas-dev +packages=libudev-dev libasound2-dev libxmu-dev libxxf86vm-dev g++ libgl1-mesa-dev libglu1-mesa-dev libraw1394-dev libudev-dev libdrm-dev libglew-dev libopenal-dev libsndfile-dev libfreeimage-dev libcairo2-dev libfreetype6-dev libssl-dev libpulse-dev libusb-1.0-0-dev libopencv-dev libegl1-mesa-dev libglvnd-dev libgles2-mesa-dev libassimp-dev librtaudio-dev libboost-filesystem-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 liburiparser-dev libcurl4-openssl-dev libxml2-dev libpugixml-dev libpoco-dev libglfw3-dev libxrandr-dev libxinerama-dev libxcursor-dev freeglut3-dev libxi-dev liblapack-dev libblas-dev + +# base-files dbus dpkg dropbear initscripts iputils-ping isc-dhcp-client kmod login locales lsb-base lsb-release makedev netbase net-tools sysvinit-utils sysv-rc # libraspberrypi-dev raspberrypi-kernel-headers # libblas3 liblapack3 # libopenblas-dev liblapack-dev From 4570238b5cf6f59fcb416974728956abae93edbd Mon Sep 17 00:00:00 2001 From: Dimitre Date: Sat, 4 May 2024 00:21:22 -0300 Subject: [PATCH 20/62] up --- scripts/ci/linuxrpi/multistrap.conf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/ci/linuxrpi/multistrap.conf b/scripts/ci/linuxrpi/multistrap.conf index f30831999df..8f3008bdf4c 100644 --- a/scripts/ci/linuxrpi/multistrap.conf +++ b/scripts/ci/linuxrpi/multistrap.conf @@ -8,9 +8,10 @@ aptsources=OpenFrameworks debootstrap=OpenFrameworks [OpenFrameworks] -packages=libudev-dev libasound2-dev libxmu-dev libxxf86vm-dev g++ libgl1-mesa-dev libglu1-mesa-dev libraw1394-dev libudev-dev libdrm-dev libglew-dev libopenal-dev libsndfile-dev libfreeimage-dev libcairo2-dev libfreetype6-dev libssl-dev libpulse-dev libusb-1.0-0-dev libopencv-dev libegl1-mesa-dev libglvnd-dev libgles2-mesa-dev libassimp-dev librtaudio-dev libboost-filesystem-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 liburiparser-dev libcurl4-openssl-dev libxml2-dev libpugixml-dev libpoco-dev libglfw3-dev libxrandr-dev libxinerama-dev libxcursor-dev freeglut3-dev libxi-dev liblapack-dev libblas-dev +packages=libudev-dev libasound2-dev libxmu-dev libxxf86vm-dev libgl1-mesa-dev libglu1-mesa-dev libraw1394-dev libudev-dev libdrm-dev libglew-dev libopenal-dev libsndfile-dev libfreeimage-dev libcairo2-dev libfreetype6-dev libssl-dev libpulse-dev libusb-1.0-0-dev libopencv-dev libegl1-mesa-dev libglvnd-dev libgles2-mesa-dev libassimp-dev librtaudio-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 liburiparser-dev libcurl4-openssl-dev libxml2-dev libpugixml-dev libpoco-dev libglfw3-dev libxrandr-dev libxinerama-dev libxcursor-dev freeglut3-dev libxi-dev liblapack-dev libblas-dev -# base-files dbus dpkg dropbear initscripts iputils-ping isc-dhcp-client kmod login locales lsb-base lsb-release makedev netbase net-tools sysvinit-utils sysv-rc +# g++ base-files dbus dpkg dropbear initscripts iputils-ping isc-dhcp-client kmod login locales lsb-base lsb-release makedev netbase net-tools sysvinit-utils sysv-rc +# libboost-filesystem-dev # libraspberrypi-dev raspberrypi-kernel-headers # libblas3 liblapack3 # libopenblas-dev liblapack-dev From 81cd65c7a3eb310e9e0118d4a358bc1893f1c96e Mon Sep 17 00:00:00 2001 From: Dimitre Date: Sat, 4 May 2024 00:48:18 -0300 Subject: [PATCH 21/62] test --- .../config.linuxaarch64.default.mk | 23 ++++++++----------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/libs/openFrameworksCompiled/project/linuxaarch64/config.linuxaarch64.default.mk b/libs/openFrameworksCompiled/project/linuxaarch64/config.linuxaarch64.default.mk index 4b3d7d5d84f..3cb2d9db43f 100644 --- a/libs/openFrameworksCompiled/project/linuxaarch64/config.linuxaarch64.default.mk +++ b/libs/openFrameworksCompiled/project/linuxaarch64/config.linuxaarch64.default.mk @@ -104,11 +104,6 @@ ifeq ($(CROSS_COMPILING),1) ifdef MAKEFILE_DEBUG $(info detected cross compiling $(CROSS_COMPILING)) endif - ifdef TOOLCHAIN_ROOT - #You have specified TOOLCHAIN_ROOT with an environment variable - else - TOOLCHAIN_ROOT = /opt/cross/bin - endif ifdef GCC_PREFIX #You have specified GCC_PREFIX with an environment variable @@ -116,10 +111,10 @@ endif GCC_PREFIX = aarch64-linux-gnu endif - PLATFORM_CXX = $(TOOLCHAIN_ROOT)/bin/$(GCC_PREFIX)-g++ - PLATFORM_CC = $(TOOLCHAIN_ROOT)/bin/$(GCC_PREFIX)-gcc - PLATFORM_AR = $(TOOLCHAIN_ROOT)/bin/$(GCC_PREFIX)-ar - PLATFORM_LD = $(TOOLCHAIN_ROOT)/bin/$(GCC_PREFIX)-ld + PLATFORM_CXX = /usr/bin/$(GCC_PREFIX)-g++ + PLATFORM_CC = /usr/bin/$(GCC_PREFIX)-gcc + PLATFORM_AR = /usr/bin/$(GCC_PREFIX)-ar + PLATFORM_LD = /usr/bin/$(GCC_PREFIX)-ld SYSROOT=$(RPI_ROOT) @@ -127,21 +122,21 @@ endif # PLATFORM_HEADER_SEARCH_PATHS += $(SYSROOT)/usr/include/c++ - # PLATFORM_HEADER_SEARCH_PATHS += $(TOOLCHAIN_ROOT)/lib/gcc/$(GCC_PREFIX)/$(GCC_VERSION)/include + # PLATFORM_HEADER_SEARCH_PATHS += /usr/lib/gcc/$(GCC_PREFIX)/$(GCC_VERSION)/include PLATFORM_LIBRARY_SEARCH_PATHS += /usr/lib/$(GCC_PREFIX) - PLATFORM_LIBRARY_SEARCH_PATHS += /usr/lib/$(GCC_PREFIX)/lapack - PLATFORM_LIBRARY_SEARCH_PATHS += /usr/lib/$(GCC_PREFIX)/blas + # PLATFORM_LIBRARY_SEARCH_PATHS += /usr/lib/$(GCC_PREFIX)/lapack + # PLATFORM_LIBRARY_SEARCH_PATHS += /usr/lib/$(GCC_PREFIX)/blas PLATFORM_LIBRARY_SEARCH_PATHS += /lib/$(GCC_PREFIX) - # PLATFORM_LIBRARY_SEARCH_PATHS += $(TOOLCHAIN_ROOT)/lib/gcc/$(GCC_PREFIX)/$(GCC_VERSION) + # PLATFORM_LIBRARY_SEARCH_PATHS += /usr/lib/gcc/$(GCC_PREFIX)/$(GCC_VERSION) PLATFORM_LDFLAGS += --sysroot=$(SYSROOT) # no need to prefix with sysroot, once sysroot is already set. PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX) PLATFORM_LDFLAGS += -Xlinker -rpath-link=/lib/$(GCC_PREFIX) PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX)/pulseaudio - PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX)/lapack + # PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX)/lapack PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/usr/lib/$(GCC_PREFIX)/pkgconfig:/usr/share/pkgconfig From 43503934355f9443d015093602ce2e6f2b133f84 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Sat, 4 May 2024 00:59:26 -0300 Subject: [PATCH 22/62] up; --- .../makefileCommon/config.linux.common.mk | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/libs/openFrameworksCompiled/project/makefileCommon/config.linux.common.mk b/libs/openFrameworksCompiled/project/makefileCommon/config.linux.common.mk index 73b9f9057cb..817cd09fbb6 100755 --- a/libs/openFrameworksCompiled/project/makefileCommon/config.linux.common.mk +++ b/libs/openFrameworksCompiled/project/makefileCommon/config.linux.common.mk @@ -394,33 +394,33 @@ endif -ifeq ($(CROSS_COMPILING),1) - ifeq "$(shell export PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR); pkg-config --exists lapack && echo 1)" "1" - PLATFORM_PKG_CONFIG_LIBRARIES += lapack - else - PLATFORM_LIBRARIES += lapack - endif -else - ifeq "$(shell pkg-config --exists lapack && echo 1)" "1" - PLATFORM_PKG_CONFIG_LIBRARIES += lapack - else - PLATFORM_LIBRARIES += lapack - endif -endif - -ifeq ($(CROSS_COMPILING),1) - ifeq "$(shell export PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR); pkg-config --exists blas && echo 1)" "1" - PLATFORM_PKG_CONFIG_LIBRARIES += blas - else - PLATFORM_LIBRARIES += blas - endif -else - ifeq "$(shell pkg-config --exists blas && echo 1)" "1" - PLATFORM_PKG_CONFIG_LIBRARIES += blas - else - PLATFORM_LIBRARIES += blas - endif -endif +# ifeq ($(CROSS_COMPILING),1) +# ifeq "$(shell export PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR); pkg-config --exists lapack && echo 1)" "1" +# PLATFORM_PKG_CONFIG_LIBRARIES += lapack +# else +# PLATFORM_LIBRARIES += lapack +# endif +# else +# ifeq "$(shell pkg-config --exists lapack && echo 1)" "1" +# PLATFORM_PKG_CONFIG_LIBRARIES += lapack +# else +# PLATFORM_LIBRARIES += lapack +# endif +# endif + +# ifeq ($(CROSS_COMPILING),1) +# ifeq "$(shell export PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR); pkg-config --exists blas && echo 1)" "1" +# PLATFORM_PKG_CONFIG_LIBRARIES += blas +# else +# PLATFORM_LIBRARIES += blas +# endif +# else +# ifeq "$(shell pkg-config --exists blas && echo 1)" "1" +# PLATFORM_PKG_CONFIG_LIBRARIES += blas +# else +# PLATFORM_LIBRARIES += blas +# endif +# endif ifneq ($(LINUX_ARM),1) From ead7d4e1dd1ee1170786c4d1d5d80ee03d55c948 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Sat, 4 May 2024 01:05:07 -0300 Subject: [PATCH 23/62] one more --- .../makefileCommon/config.linux.common.mk | 31 +++++++++++-------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/libs/openFrameworksCompiled/project/makefileCommon/config.linux.common.mk b/libs/openFrameworksCompiled/project/makefileCommon/config.linux.common.mk index 817cd09fbb6..f5707c02737 100755 --- a/libs/openFrameworksCompiled/project/makefileCommon/config.linux.common.mk +++ b/libs/openFrameworksCompiled/project/makefileCommon/config.linux.common.mk @@ -394,19 +394,24 @@ endif -# ifeq ($(CROSS_COMPILING),1) -# ifeq "$(shell export PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR); pkg-config --exists lapack && echo 1)" "1" -# PLATFORM_PKG_CONFIG_LIBRARIES += lapack -# else -# PLATFORM_LIBRARIES += lapack -# endif -# else -# ifeq "$(shell pkg-config --exists lapack && echo 1)" "1" -# PLATFORM_PKG_CONFIG_LIBRARIES += lapack -# else -# PLATFORM_LIBRARIES += lapack -# endif -# endif +ifeq ($(CROSS_COMPILING),1) + ifeq "$(shell export PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR); pkg-config --exists lapack && echo 1)" "1" + PLATFORM_PKG_CONFIG_LIBRARIES += lapack + PLATFORM_LIBRARIES += lapack + + else + PLATFORM_PKG_CONFIG_LIBRARIES += lapack + PLATFORM_LIBRARIES += lapack + endif +else + ifeq "$(shell pkg-config --exists lapack && echo 1)" "1" + PLATFORM_PKG_CONFIG_LIBRARIES += lapack + PLATFORM_LIBRARIES += lapack + else + PLATFORM_PKG_CONFIG_LIBRARIES += lapack + PLATFORM_LIBRARIES += lapack + endif +endif # ifeq ($(CROSS_COMPILING),1) # ifeq "$(shell export PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR); pkg-config --exists blas && echo 1)" "1" From df19f22e9483fb64c6c4c435d874ae01bbbe436e Mon Sep 17 00:00:00 2001 From: Dimitre Date: Sat, 4 May 2024 01:10:26 -0300 Subject: [PATCH 24/62] rm lapack --- .../makefileCommon/config.linux.common.mk | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/libs/openFrameworksCompiled/project/makefileCommon/config.linux.common.mk b/libs/openFrameworksCompiled/project/makefileCommon/config.linux.common.mk index f5707c02737..4ce0519b7b9 100755 --- a/libs/openFrameworksCompiled/project/makefileCommon/config.linux.common.mk +++ b/libs/openFrameworksCompiled/project/makefileCommon/config.linux.common.mk @@ -394,24 +394,24 @@ endif -ifeq ($(CROSS_COMPILING),1) - ifeq "$(shell export PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR); pkg-config --exists lapack && echo 1)" "1" - PLATFORM_PKG_CONFIG_LIBRARIES += lapack - PLATFORM_LIBRARIES += lapack +# ifeq ($(CROSS_COMPILING),1) +# ifeq "$(shell export PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR); pkg-config --exists lapack && echo 1)" "1" +# PLATFORM_PKG_CONFIG_LIBRARIES += lapack +# PLATFORM_LIBRARIES += lapack - else - PLATFORM_PKG_CONFIG_LIBRARIES += lapack - PLATFORM_LIBRARIES += lapack - endif -else - ifeq "$(shell pkg-config --exists lapack && echo 1)" "1" - PLATFORM_PKG_CONFIG_LIBRARIES += lapack - PLATFORM_LIBRARIES += lapack - else - PLATFORM_PKG_CONFIG_LIBRARIES += lapack - PLATFORM_LIBRARIES += lapack - endif -endif +# else +# PLATFORM_PKG_CONFIG_LIBRARIES += lapack +# PLATFORM_LIBRARIES += lapack +# endif +# else +# ifeq "$(shell pkg-config --exists lapack && echo 1)" "1" +# PLATFORM_PKG_CONFIG_LIBRARIES += lapack +# PLATFORM_LIBRARIES += lapack +# else +# PLATFORM_PKG_CONFIG_LIBRARIES += lapack +# PLATFORM_LIBRARIES += lapack +# endif +# endif # ifeq ($(CROSS_COMPILING),1) # ifeq "$(shell export PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR); pkg-config --exists blas && echo 1)" "1" From bdf78916211f495299fba0b8dbb45765030911b1 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Sat, 4 May 2024 01:33:09 -0300 Subject: [PATCH 25/62] up --- .../project/linuxarmv6l/config.linuxarmv6l.default.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk b/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk index 4631499b31d..8c12bbd110d 100644 --- a/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk +++ b/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk @@ -282,7 +282,7 @@ endif PLATFORM_LDFLAGS += -Xlinker -rpath-link=/lib/$(GCC_PREFIX) # PLATFORM_LDFLAGS += -Xlinker -rpath-link=/opt/vc/lib PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX)/pulseaudio - PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX)/lapack + # PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX)/lapack # PKG_CONFIG_LIBDIR=$(SYSROOT)/usr/lib/pkgconfig:$(SYSROOT)/usr/lib/$(GCC_PREFIX)/pkgconfig:$(SYSROOT)/usr/share/pkgconfig PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/usr/lib/$(GCC_PREFIX)/pkgconfig:/usr/share/pkgconfig From ea70205baf995aaec10f48d5fe8f7e8b539cd9da Mon Sep 17 00:00:00 2001 From: Dimitre Date: Sun, 5 May 2024 14:31:02 -0300 Subject: [PATCH 26/62] update scripts to armv6l as default --- scripts/ci/linuxrpi/build.sh | 4 +++- scripts/ci/linuxrpi/install.sh | 34 +++++++++++++++++----------------- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/scripts/ci/linuxrpi/build.sh b/scripts/ci/linuxrpi/build.sh index 7ba674b1601..f72f13a571d 100755 --- a/scripts/ci/linuxrpi/build.sh +++ b/scripts/ci/linuxrpi/build.sh @@ -4,10 +4,12 @@ OF_ROOT=$( cd "$(dirname "$0")/../../.." ; pwd -P ) export CROSS_COMPILING=1 +# Allows test locally without github actions env variables. if [ -n "$ARCH" ]; then export PLATFORM_ARCH=${ARCH} else -export PLATFORM_ARCH=aarch64 +# export PLATFORM_ARCH=aarch64 +export PLATFORM_ARCH=armv6l fi echo "${PLATFORM_ARCH}" diff --git a/scripts/ci/linuxrpi/install.sh b/scripts/ci/linuxrpi/install.sh index 70c51d18031..d99a010d151 100755 --- a/scripts/ci/linuxrpi/install.sh +++ b/scripts/ci/linuxrpi/install.sh @@ -12,29 +12,29 @@ trapError() { } installPackages(){ - sudo apt-get -y update - #workaround for https://bugs.launchpad.net/ubuntu/+source/multistrap/+bug/1313787 - sudo sed -i s/\$forceyes//g /usr/sbin/multistrap + sudo apt-get -y update + #workaround for https://bugs.launchpad.net/ubuntu/+source/multistrap/+bug/1313787 + sudo sed -i s/\$forceyes//g /usr/sbin/multistrap } downloadFirmware(){ - # FIXME: only if it is not aarch64 - git clone https://github.com/raspberrypi/userland --depth 1 - # cp -r userland/opt raspbian/ + # FIXME: only if it is not aarch64 + git clone https://github.com/raspberrypi/userland --depth 1 + # cp -r userland/opt raspbian/ } createRaspbianImg(){ - -if [ -n "$MULTISTRAP_ARCH" ]; then -echo ${MULTISTRAP_ARCH} -else -export MULTISTRAP_ARCH=aarch64 -fi - #needed since Ubuntu 18.04 - allow non https repositories - mkdir -p raspbian/etc/apt/apt.conf.d/ - echo 'Acquire::AllowInsecureRepositories "true";' | sudo tee raspbian/etc/apt/apt.conf.d/90insecure - # multistrap -a arm64 -d raspbian -f multistrap.conf - multistrap -a ${MULTISTRAP_ARCH} -d raspbian -f multistrap.conf + if [ -n "$MULTISTRAP_ARCH" ]; then + echo ${MULTISTRAP_ARCH} + else + # export MULTISTRAP_ARCH=arm64 + export MULTISTRAP_ARCH=armhf + fi + #needed since Ubuntu 18.04 - allow non https repositories + mkdir -p raspbian/etc/apt/apt.conf.d/ + echo 'Acquire::AllowInsecureRepositories "true";' | sudo tee raspbian/etc/apt/apt.conf.d/90insecure + # multistrap -a arm64 -d raspbian -f multistrap.conf + multistrap -a ${MULTISTRAP_ARCH} -d raspbian -f multistrap.conf } SCRIPT_DIR="${BASH_SOURCE%/*}" From f53576ab86ea11bc1dcaad683f4cefb143739efc Mon Sep 17 00:00:00 2001 From: Dimitre Date: Mon, 6 May 2024 12:44:34 -0300 Subject: [PATCH 27/62] openCv LDFLAGS lblas llapack --- addons/ofxOpenCv/addon_config.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/ofxOpenCv/addon_config.mk b/addons/ofxOpenCv/addon_config.mk index 1ce0c834e46..09d978eb5d4 100644 --- a/addons/ofxOpenCv/addon_config.mk +++ b/addons/ofxOpenCv/addon_config.mk @@ -89,6 +89,7 @@ linuxaarch64: ADDON_LIBS_EXCLUDE = libs/opencv/% ADDON_INCLUDES_EXCLUDE = libs/opencv ADDON_INCLUDES_EXCLUDE += libs/opencv/% + ADDON_LDFLAGS = -lblas -llapack msys2: ADDON_PKG_CONFIG_LIBRARIES = opencv4 From 99e5b5d7e540e92a8c4798370e4c14b1a064411a Mon Sep 17 00:00:00 2001 From: Dimitre Date: Mon, 6 May 2024 14:10:00 -0300 Subject: [PATCH 28/62] update --- .../project/linuxaarch64/config.linuxaarch64.default.mk | 2 +- scripts/ci/linuxrpi/build.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/openFrameworksCompiled/project/linuxaarch64/config.linuxaarch64.default.mk b/libs/openFrameworksCompiled/project/linuxaarch64/config.linuxaarch64.default.mk index 3cb2d9db43f..1bb37c9080f 100644 --- a/libs/openFrameworksCompiled/project/linuxaarch64/config.linuxaarch64.default.mk +++ b/libs/openFrameworksCompiled/project/linuxaarch64/config.linuxaarch64.default.mk @@ -138,6 +138,6 @@ endif PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX)/pulseaudio # PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX)/lapack - PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/usr/lib/$(GCC_PREFIX)/pkgconfig:/usr/share/pkgconfig + PKG_CONFIG_LIBDIR += /usr/lib/pkgconfig:/usr/lib/$(GCC_PREFIX)/pkgconfig:/usr/share/pkgconfig endif diff --git a/scripts/ci/linuxrpi/build.sh b/scripts/ci/linuxrpi/build.sh index f72f13a571d..590027dcae3 100755 --- a/scripts/ci/linuxrpi/build.sh +++ b/scripts/ci/linuxrpi/build.sh @@ -31,6 +31,7 @@ export PLATFORM_OS=Linux # export PKG_CONFIG_LIBDIR=${RPI_ROOT}/usr/include:${RPI_ROOT}/usr/lib/pkgconfig:${RPI_ROOT}/usr/lib/${GCC_PREFIX}/pkgconfig:${RPI_ROOT}/usr/share/pkgconfig # export PKG_CONFIG_LIBDIR=${BCM_FOLDER}:${RPI_ROOT}/usr/lib/aarch64-linux-gnu +export PKG_CONFIG_LIBDIR=${BCM_FOLDER}:${RPI_ROOT}/usr/include:${RPI_ROOT}/usr/lib/pkgconfig:${RPI_ROOT}/usr/lib/${GCC_PREFIX}/pkgconfig:${RPI_ROOT}/usr/share/pkgconfig export PKG_CONFIG_PATH=${BCM_FOLDER}:${RPI_ROOT}/usr/include:${RPI_ROOT}/usr/lib/pkgconfig:${RPI_ROOT}/usr/lib/${GCC_PREFIX}/pkgconfig:${RPI_ROOT}/usr/share/pkgconfig export TOOLCHAIN_ROOT=/usr export CXX="${TOOLCHAIN_ROOT}/bin/${GCC_PREFIX}-g++" From 30587277b8b1e82eb2998b015a65976b4b776ca7 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Mon, 6 May 2024 14:13:35 -0300 Subject: [PATCH 29/62] update --- .../project/linuxaarch64/config.linuxaarch64.default.mk | 1 + scripts/ci/linuxrpi/build.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/openFrameworksCompiled/project/linuxaarch64/config.linuxaarch64.default.mk b/libs/openFrameworksCompiled/project/linuxaarch64/config.linuxaarch64.default.mk index 1bb37c9080f..03906259c2f 100644 --- a/libs/openFrameworksCompiled/project/linuxaarch64/config.linuxaarch64.default.mk +++ b/libs/openFrameworksCompiled/project/linuxaarch64/config.linuxaarch64.default.mk @@ -138,6 +138,7 @@ endif PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX)/pulseaudio # PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX)/lapack + PLATFORM_LIBRARY_SEARCH_PATHS += ../userland/host_applications/linux/libs/bcm_host/include PKG_CONFIG_LIBDIR += /usr/lib/pkgconfig:/usr/lib/$(GCC_PREFIX)/pkgconfig:/usr/share/pkgconfig endif diff --git a/scripts/ci/linuxrpi/build.sh b/scripts/ci/linuxrpi/build.sh index 590027dcae3..eeb149debf7 100755 --- a/scripts/ci/linuxrpi/build.sh +++ b/scripts/ci/linuxrpi/build.sh @@ -17,7 +17,6 @@ echo "${PLATFORM_ARCH}" export RPI_ROOT=${OF_ROOT}/scripts/ci/linuxrpi/raspbian echo "${RPI_ROOT}" -export BCM_FOLDER=${RPI_ROOT}/../userland/host_applications/linux/libs/bcm_host/include if [ ${PLATFORM_ARCH} = "aarch64" ]; then export GCC_PREFIX=aarch64-linux-gnu else @@ -28,6 +27,7 @@ export GST_VERSION=1.0 export PLATFORM_OS=Linux +export BCM_FOLDER=${RPI_ROOT}/../userland/host_applications/linux/libs/bcm_host/include # export PKG_CONFIG_LIBDIR=${RPI_ROOT}/usr/include:${RPI_ROOT}/usr/lib/pkgconfig:${RPI_ROOT}/usr/lib/${GCC_PREFIX}/pkgconfig:${RPI_ROOT}/usr/share/pkgconfig # export PKG_CONFIG_LIBDIR=${BCM_FOLDER}:${RPI_ROOT}/usr/lib/aarch64-linux-gnu From e5be9dbcc4227fbe689f736b6e91183dd34cd46e Mon Sep 17 00:00:00 2001 From: Dimitre Date: Mon, 6 May 2024 14:14:55 -0300 Subject: [PATCH 30/62] update --- .../project/linuxarmv6l/config.linuxarmv6l.default.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk b/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk index 8c12bbd110d..f9fc3d333d6 100644 --- a/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk +++ b/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk @@ -283,8 +283,9 @@ endif # PLATFORM_LDFLAGS += -Xlinker -rpath-link=/opt/vc/lib PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX)/pulseaudio # PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX)/lapack + PLATFORM_LIBRARY_SEARCH_PATHS += ../userland/host_applications/linux/libs/bcm_host/include # PKG_CONFIG_LIBDIR=$(SYSROOT)/usr/lib/pkgconfig:$(SYSROOT)/usr/lib/$(GCC_PREFIX)/pkgconfig:$(SYSROOT)/usr/share/pkgconfig - PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/usr/lib/$(GCC_PREFIX)/pkgconfig:/usr/share/pkgconfig + PKG_CONFIG_LIBDIR += /usr/lib/pkgconfig:/usr/lib/$(GCC_PREFIX)/pkgconfig:/usr/share/pkgconfig endif From 0a83293b2023290c14e454b97d023adffb627cb4 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Mon, 6 May 2024 14:15:29 -0300 Subject: [PATCH 31/62] update --- scripts/ci/linuxrpi/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ci/linuxrpi/build.sh b/scripts/ci/linuxrpi/build.sh index eeb149debf7..f2956dbc40b 100755 --- a/scripts/ci/linuxrpi/build.sh +++ b/scripts/ci/linuxrpi/build.sh @@ -27,11 +27,11 @@ export GST_VERSION=1.0 export PLATFORM_OS=Linux -export BCM_FOLDER=${RPI_ROOT}/../userland/host_applications/linux/libs/bcm_host/include +# export BCM_FOLDER=${RPI_ROOT}/../userland/host_applications/linux/libs/bcm_host/include # export PKG_CONFIG_LIBDIR=${RPI_ROOT}/usr/include:${RPI_ROOT}/usr/lib/pkgconfig:${RPI_ROOT}/usr/lib/${GCC_PREFIX}/pkgconfig:${RPI_ROOT}/usr/share/pkgconfig # export PKG_CONFIG_LIBDIR=${BCM_FOLDER}:${RPI_ROOT}/usr/lib/aarch64-linux-gnu -export PKG_CONFIG_LIBDIR=${BCM_FOLDER}:${RPI_ROOT}/usr/include:${RPI_ROOT}/usr/lib/pkgconfig:${RPI_ROOT}/usr/lib/${GCC_PREFIX}/pkgconfig:${RPI_ROOT}/usr/share/pkgconfig +# export PKG_CONFIG_LIBDIR=${BCM_FOLDER}:${RPI_ROOT}/usr/include:${RPI_ROOT}/usr/lib/pkgconfig:${RPI_ROOT}/usr/lib/${GCC_PREFIX}/pkgconfig:${RPI_ROOT}/usr/share/pkgconfig export PKG_CONFIG_PATH=${BCM_FOLDER}:${RPI_ROOT}/usr/include:${RPI_ROOT}/usr/lib/pkgconfig:${RPI_ROOT}/usr/lib/${GCC_PREFIX}/pkgconfig:${RPI_ROOT}/usr/share/pkgconfig export TOOLCHAIN_ROOT=/usr export CXX="${TOOLCHAIN_ROOT}/bin/${GCC_PREFIX}-g++" From 31decf5fb351da0439905b7d486c724814e61023 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Mon, 6 May 2024 14:16:08 -0300 Subject: [PATCH 32/62] update --- scripts/ci/linuxrpi/build.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/ci/linuxrpi/build.sh b/scripts/ci/linuxrpi/build.sh index f2956dbc40b..3fcd522157b 100755 --- a/scripts/ci/linuxrpi/build.sh +++ b/scripts/ci/linuxrpi/build.sh @@ -26,8 +26,6 @@ fi export GST_VERSION=1.0 export PLATFORM_OS=Linux - -# export BCM_FOLDER=${RPI_ROOT}/../userland/host_applications/linux/libs/bcm_host/include # export PKG_CONFIG_LIBDIR=${RPI_ROOT}/usr/include:${RPI_ROOT}/usr/lib/pkgconfig:${RPI_ROOT}/usr/lib/${GCC_PREFIX}/pkgconfig:${RPI_ROOT}/usr/share/pkgconfig # export PKG_CONFIG_LIBDIR=${BCM_FOLDER}:${RPI_ROOT}/usr/lib/aarch64-linux-gnu From a071fc17af1b859d795c380e55a85ecbdeb2e34a Mon Sep 17 00:00:00 2001 From: Dimitre Date: Mon, 6 May 2024 14:17:24 -0300 Subject: [PATCH 33/62] update --- .../project/linuxaarch64/config.linuxaarch64.default.mk | 2 -- .../project/linuxarmv6l/config.linuxarmv6l.default.mk | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/libs/openFrameworksCompiled/project/linuxaarch64/config.linuxaarch64.default.mk b/libs/openFrameworksCompiled/project/linuxaarch64/config.linuxaarch64.default.mk index 03906259c2f..92617f04eb3 100644 --- a/libs/openFrameworksCompiled/project/linuxaarch64/config.linuxaarch64.default.mk +++ b/libs/openFrameworksCompiled/project/linuxaarch64/config.linuxaarch64.default.mk @@ -120,7 +120,6 @@ endif PLATFORM_CFLAGS += --sysroot=$(SYSROOT) - # PLATFORM_HEADER_SEARCH_PATHS += $(SYSROOT)/usr/include/c++ # PLATFORM_HEADER_SEARCH_PATHS += /usr/lib/gcc/$(GCC_PREFIX)/$(GCC_VERSION)/include @@ -138,7 +137,6 @@ endif PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX)/pulseaudio # PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX)/lapack - PLATFORM_LIBRARY_SEARCH_PATHS += ../userland/host_applications/linux/libs/bcm_host/include PKG_CONFIG_LIBDIR += /usr/lib/pkgconfig:/usr/lib/$(GCC_PREFIX)/pkgconfig:/usr/share/pkgconfig endif diff --git a/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk b/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk index f9fc3d333d6..68b4d0b87bf 100644 --- a/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk +++ b/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk @@ -283,7 +283,7 @@ endif # PLATFORM_LDFLAGS += -Xlinker -rpath-link=/opt/vc/lib PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX)/pulseaudio # PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX)/lapack - PLATFORM_LIBRARY_SEARCH_PATHS += ../userland/host_applications/linux/libs/bcm_host/include + PLATFORM_HEADER_SEARCH_PATHS += ../userland/host_applications/linux/libs/bcm_host/include # PKG_CONFIG_LIBDIR=$(SYSROOT)/usr/lib/pkgconfig:$(SYSROOT)/usr/lib/$(GCC_PREFIX)/pkgconfig:$(SYSROOT)/usr/share/pkgconfig PKG_CONFIG_LIBDIR += /usr/lib/pkgconfig:/usr/lib/$(GCC_PREFIX)/pkgconfig:/usr/share/pkgconfig From 6dfe78adbe86c9e796a324fffb637cdba09ca392 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Mon, 6 May 2024 14:19:09 -0300 Subject: [PATCH 34/62] update --- .../project/linuxarmv6l/config.linuxarmv6l.default.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk b/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk index 68b4d0b87bf..0429a80fdb8 100644 --- a/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk +++ b/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk @@ -283,7 +283,7 @@ endif # PLATFORM_LDFLAGS += -Xlinker -rpath-link=/opt/vc/lib PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX)/pulseaudio # PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX)/lapack - PLATFORM_HEADER_SEARCH_PATHS += ../userland/host_applications/linux/libs/bcm_host/include + PLATFORM_HEADER_SEARCH_PATHS += /home/z/ofw/scripts/ci/linuxrpi/userland/host_applications/linux/libs/bcm_host/include # PKG_CONFIG_LIBDIR=$(SYSROOT)/usr/lib/pkgconfig:$(SYSROOT)/usr/lib/$(GCC_PREFIX)/pkgconfig:$(SYSROOT)/usr/share/pkgconfig PKG_CONFIG_LIBDIR += /usr/lib/pkgconfig:/usr/lib/$(GCC_PREFIX)/pkgconfig:/usr/share/pkgconfig From 7221afbd08c0b2d8b32208dc54fc674659d6398c Mon Sep 17 00:00:00 2001 From: Dimitre Date: Mon, 6 May 2024 14:22:58 -0300 Subject: [PATCH 35/62] update --- scripts/ci/linuxrpi/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/linuxrpi/install.sh b/scripts/ci/linuxrpi/install.sh index d99a010d151..6e79b708520 100755 --- a/scripts/ci/linuxrpi/install.sh +++ b/scripts/ci/linuxrpi/install.sh @@ -19,7 +19,7 @@ installPackages(){ downloadFirmware(){ # FIXME: only if it is not aarch64 - git clone https://github.com/raspberrypi/userland --depth 1 + git clone https://github.com/raspberrypi/userland --depth 1 raspbian # cp -r userland/opt raspbian/ } From 296c1f8d103e35580b012d656d60287b30105de6 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Mon, 6 May 2024 14:23:39 -0300 Subject: [PATCH 36/62] update --- scripts/ci/linuxrpi/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/linuxrpi/install.sh b/scripts/ci/linuxrpi/install.sh index 6e79b708520..7a9edc2b8ae 100755 --- a/scripts/ci/linuxrpi/install.sh +++ b/scripts/ci/linuxrpi/install.sh @@ -19,7 +19,7 @@ installPackages(){ downloadFirmware(){ # FIXME: only if it is not aarch64 - git clone https://github.com/raspberrypi/userland --depth 1 raspbian + git clone https://github.com/raspberrypi/userland --depth 1 raspbian/userland # cp -r userland/opt raspbian/ } From 78fe7f1d873f703d80a670fa6269a728cffde3e7 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Mon, 6 May 2024 14:24:24 -0300 Subject: [PATCH 37/62] update --- .../project/linuxarmv6l/config.linuxarmv6l.default.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk b/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk index 0429a80fdb8..91dde0e711b 100644 --- a/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk +++ b/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk @@ -283,7 +283,7 @@ endif # PLATFORM_LDFLAGS += -Xlinker -rpath-link=/opt/vc/lib PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX)/pulseaudio # PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX)/lapack - PLATFORM_HEADER_SEARCH_PATHS += /home/z/ofw/scripts/ci/linuxrpi/userland/host_applications/linux/libs/bcm_host/include + PLATFORM_HEADER_SEARCH_PATHS += userland/host_applications/linux/libs/bcm_host/include # PKG_CONFIG_LIBDIR=$(SYSROOT)/usr/lib/pkgconfig:$(SYSROOT)/usr/lib/$(GCC_PREFIX)/pkgconfig:$(SYSROOT)/usr/share/pkgconfig PKG_CONFIG_LIBDIR += /usr/lib/pkgconfig:/usr/lib/$(GCC_PREFIX)/pkgconfig:/usr/share/pkgconfig From cb42f5b19edad198bf10058961f892d2ed1fb618 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Mon, 6 May 2024 14:24:53 -0300 Subject: [PATCH 38/62] update --- .../project/linuxarmv6l/config.linuxarmv6l.default.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk b/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk index 91dde0e711b..1b15fe53739 100644 --- a/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk +++ b/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk @@ -283,7 +283,7 @@ endif # PLATFORM_LDFLAGS += -Xlinker -rpath-link=/opt/vc/lib PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX)/pulseaudio # PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX)/lapack - PLATFORM_HEADER_SEARCH_PATHS += userland/host_applications/linux/libs/bcm_host/include + PLATFORM_HEADER_SEARCH_PATHS += /userland/host_applications/linux/libs/bcm_host/include # PKG_CONFIG_LIBDIR=$(SYSROOT)/usr/lib/pkgconfig:$(SYSROOT)/usr/lib/$(GCC_PREFIX)/pkgconfig:$(SYSROOT)/usr/share/pkgconfig PKG_CONFIG_LIBDIR += /usr/lib/pkgconfig:/usr/lib/$(GCC_PREFIX)/pkgconfig:/usr/share/pkgconfig From eb1b5324a140c7c07c1b229f901e3b4bf1900369 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Mon, 6 May 2024 14:25:57 -0300 Subject: [PATCH 39/62] update --- .../project/linuxarmv6l/config.linuxarmv6l.default.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk b/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk index 1b15fe53739..5d3bf770fa2 100644 --- a/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk +++ b/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk @@ -283,7 +283,7 @@ endif # PLATFORM_LDFLAGS += -Xlinker -rpath-link=/opt/vc/lib PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX)/pulseaudio # PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX)/lapack - PLATFORM_HEADER_SEARCH_PATHS += /userland/host_applications/linux/libs/bcm_host/include + PLATFORM_HEADER_SEARCH_PATHS += $(RPI_ROOT)/userland/host_applications/linux/libs/bcm_host/include # PKG_CONFIG_LIBDIR=$(SYSROOT)/usr/lib/pkgconfig:$(SYSROOT)/usr/lib/$(GCC_PREFIX)/pkgconfig:$(SYSROOT)/usr/share/pkgconfig PKG_CONFIG_LIBDIR += /usr/lib/pkgconfig:/usr/lib/$(GCC_PREFIX)/pkgconfig:/usr/share/pkgconfig From 06a23e19f9548bf48dfc8d38931acb3310e0370e Mon Sep 17 00:00:00 2001 From: Dimitre Date: Mon, 6 May 2024 14:26:59 -0300 Subject: [PATCH 40/62] update --- .../project/linuxarmv6l/config.linuxarmv6l.default.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk b/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk index 5d3bf770fa2..03cfad34da3 100644 --- a/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk +++ b/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk @@ -284,6 +284,7 @@ endif PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX)/pulseaudio # PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX)/lapack PLATFORM_HEADER_SEARCH_PATHS += $(RPI_ROOT)/userland/host_applications/linux/libs/bcm_host/include + PLATFORM_HEADER_SEARCH_PATHS += $(RPI_ROOT)/userland/interface/vmcs_host # PKG_CONFIG_LIBDIR=$(SYSROOT)/usr/lib/pkgconfig:$(SYSROOT)/usr/lib/$(GCC_PREFIX)/pkgconfig:$(SYSROOT)/usr/share/pkgconfig PKG_CONFIG_LIBDIR += /usr/lib/pkgconfig:/usr/lib/$(GCC_PREFIX)/pkgconfig:/usr/share/pkgconfig From 97284ad6944ca1c29d9a49592e3509cd3c331e48 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Mon, 6 May 2024 14:27:27 -0300 Subject: [PATCH 41/62] update --- .../project/linuxarmv6l/config.linuxarmv6l.default.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk b/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk index 03cfad34da3..18c56923cb6 100644 --- a/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk +++ b/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk @@ -284,7 +284,7 @@ endif PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX)/pulseaudio # PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX)/lapack PLATFORM_HEADER_SEARCH_PATHS += $(RPI_ROOT)/userland/host_applications/linux/libs/bcm_host/include - PLATFORM_HEADER_SEARCH_PATHS += $(RPI_ROOT)/userland/interface/vmcs_host + PLATFORM_HEADER_SEARCH_PATHS += $(RPI_ROOT)/userland # PKG_CONFIG_LIBDIR=$(SYSROOT)/usr/lib/pkgconfig:$(SYSROOT)/usr/lib/$(GCC_PREFIX)/pkgconfig:$(SYSROOT)/usr/share/pkgconfig PKG_CONFIG_LIBDIR += /usr/lib/pkgconfig:/usr/lib/$(GCC_PREFIX)/pkgconfig:/usr/share/pkgconfig From dc8f24f9251a97f307177e928cb762af19e90b6d Mon Sep 17 00:00:00 2001 From: Dimitre Date: Mon, 6 May 2024 14:30:31 -0300 Subject: [PATCH 42/62] update --- .../project/linuxarmv6l/config.linuxarmv6l.default.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk b/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk index 18c56923cb6..74c0f32f0fe 100644 --- a/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk +++ b/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk @@ -129,7 +129,9 @@ PLATFORM_CFLAGS += -std=c++17 PLATFORM_LDFLAGS += -lstdc++fs PLATFORM_CXXVER = -std=c++17 -PLATFORM_CFLAGS += -march=armv6 +# PLATFORM_CFLAGS += -march=armv6 +PLATFORM_CFLAGS += -marm + PLATFORM_CFLAGS += -mfpu=vfp PLATFORM_CFLAGS += -mfloat-abi=hard PLATFORM_CFLAGS += -fPIC From 3a4ee0f482659554dcdde77cd33f14ccfcdc6204 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Mon, 6 May 2024 14:32:06 -0300 Subject: [PATCH 43/62] update --- .../project/linuxarmv6l/config.linuxarmv6l.default.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk b/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk index 74c0f32f0fe..cb9cb7f4e94 100644 --- a/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk +++ b/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk @@ -180,10 +180,10 @@ else PLATFORM_LIBRARIES += brcmEGL endif -PLATFORM_LIBRARIES += openmaxil -PLATFORM_LIBRARIES += bcm_host -PLATFORM_LIBRARIES += vcos -PLATFORM_LIBRARIES += vchiq_arm +# PLATFORM_LIBRARIES += openmaxil +# PLATFORM_LIBRARIES += bcm_host +# PLATFORM_LIBRARIES += vcos +# PLATFORM_LIBRARIES += vchiq_arm PLATFORM_LIBRARIES += pcre PLATFORM_LIBRARIES += rt PLATFORM_LIBRARIES += X11 From df467aeb13f29a2ed7f87c23f731bbfc8d6fb04f Mon Sep 17 00:00:00 2001 From: Dimitre Date: Mon, 6 May 2024 16:56:24 -0300 Subject: [PATCH 44/62] up --- .../project/linuxarmv6l/config.linuxarmv6l.default.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk b/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk index cb9cb7f4e94..545ea456436 100644 --- a/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk +++ b/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk @@ -271,18 +271,12 @@ endif PLATFORM_CFLAGS += --sysroot=$(SYSROOT) - # PLATFORM_HEADER_SEARCH_PATHS += $(SYSROOT)/usr/include/c++ - # PLATFORM_HEADER_SEARCH_PATHS += $(TOOLCHAIN_ROOT)/lib/gcc/$(GCC_PREFIX)/$(GCC_VERSION)/include - PLATFORM_LIBRARY_SEARCH_PATHS += /usr/lib/$(GCC_PREFIX) PLATFORM_LIBRARY_SEARCH_PATHS += /lib/$(GCC_PREFIX) - # PLATFORM_LIBRARY_SEARCH_PATHS += $(TOOLCHAIN_ROOT)/lib/gcc/$(GCC_PREFIX)/$(GCC_VERSION) - PLATFORM_LIBRARY_SEARCH_PATHS += $(TOOLCHAIN_ROOT)/../userland/host_applications/linux/libs/bcm_host/include PLATFORM_LDFLAGS += --sysroot=$(SYSROOT) PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX) PLATFORM_LDFLAGS += -Xlinker -rpath-link=/lib/$(GCC_PREFIX) - # PLATFORM_LDFLAGS += -Xlinker -rpath-link=/opt/vc/lib PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX)/pulseaudio # PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX)/lapack PLATFORM_HEADER_SEARCH_PATHS += $(RPI_ROOT)/userland/host_applications/linux/libs/bcm_host/include From 794eb1eb6bdac16d8f1c9a58fb2bee3d66449cf2 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Mon, 6 May 2024 16:58:50 -0300 Subject: [PATCH 45/62] up --- .../linuxarmv6l/config.linuxarmv6l.default.mk | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk b/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk index 545ea456436..a36d2e4b130 100644 --- a/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk +++ b/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk @@ -171,6 +171,7 @@ ifeq ($(USE_PI_LEGACY), 0) PLATFORM_LIBRARIES += GLESv2 PLATFORM_LIBRARIES += GLESv1_CM PLATFORM_LIBRARIES += EGL +# FIXME: update to what is possible now. else ifneq (,$(wildcard $(RPI_ROOT)/opt/vc/lib/libGLESv2.so)) PLATFORM_LIBRARIES += GLESv2 PLATFORM_LIBRARIES += GLESv1_CM @@ -207,10 +208,8 @@ endif ################################################################################ # Broadcom hardware interface library -PLATFORM_HEADER_SEARCH_PATHS += $(RPI_ROOT)/opt/vc/include -PLATFORM_HEADER_SEARCH_PATHS += $(RPI_ROOT)/opt/vc/include/IL -PLATFORM_HEADER_SEARCH_PATHS += $(RPI_ROOT)/opt/vc/include/interface/vcos/pthreads -PLATFORM_HEADER_SEARCH_PATHS += $(RPI_ROOT)/opt/vc/include/interface/vmcs_host/linux +PLATFORM_HEADER_SEARCH_PATHS += $(RPI_ROOT)/userland/host_applications/linux/libs/bcm_host/include +PLATFORM_HEADER_SEARCH_PATHS += $(RPI_ROOT)/userland ########################################################################################## # PLATFORM LIBRARY SEARCH PATH @@ -274,13 +273,15 @@ endif PLATFORM_LIBRARY_SEARCH_PATHS += /usr/lib/$(GCC_PREFIX) PLATFORM_LIBRARY_SEARCH_PATHS += /lib/$(GCC_PREFIX) + PLATFORM_LIBRARY_SEARCH_PATHS += /usr/lib/$(GCC_PREFIX)/blas + PLATFORM_LIBRARY_SEARCH_PATHS += /usr/lib/$(GCC_PREFIX)/lapack + + PLATFORM_LDFLAGS += --sysroot=$(SYSROOT) PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX) PLATFORM_LDFLAGS += -Xlinker -rpath-link=/lib/$(GCC_PREFIX) PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX)/pulseaudio # PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX)/lapack - PLATFORM_HEADER_SEARCH_PATHS += $(RPI_ROOT)/userland/host_applications/linux/libs/bcm_host/include - PLATFORM_HEADER_SEARCH_PATHS += $(RPI_ROOT)/userland # PKG_CONFIG_LIBDIR=$(SYSROOT)/usr/lib/pkgconfig:$(SYSROOT)/usr/lib/$(GCC_PREFIX)/pkgconfig:$(SYSROOT)/usr/share/pkgconfig PKG_CONFIG_LIBDIR += /usr/lib/pkgconfig:/usr/lib/$(GCC_PREFIX)/pkgconfig:/usr/share/pkgconfig From 7731fff193df41a8b37f4bda7f6617f825ac21e3 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Mon, 6 May 2024 16:59:47 -0300 Subject: [PATCH 46/62] up --- scripts/ci/linuxrpi/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/ci/linuxrpi/build.sh b/scripts/ci/linuxrpi/build.sh index 3fcd522157b..cf0591ff73d 100755 --- a/scripts/ci/linuxrpi/build.sh +++ b/scripts/ci/linuxrpi/build.sh @@ -45,6 +45,7 @@ cd examples/templates/emptyExample/ make Debug -j # if [ -n "$ALLADDONSEXAMPLE" ]; then +ALLADDONSEXAMPLE = 1 if [[ "$ALLADDONSEXAMPLE" == 1 ]]; then echo "**** Building allAddonsExample ****" cd $OF_ROOT From df88754915c313e592ae86fae9b0c4528250397a Mon Sep 17 00:00:00 2001 From: Dimitre Date: Mon, 6 May 2024 17:00:05 -0300 Subject: [PATCH 47/62] up --- scripts/ci/linuxrpi/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/ci/linuxrpi/build.sh b/scripts/ci/linuxrpi/build.sh index cf0591ff73d..8029887b208 100755 --- a/scripts/ci/linuxrpi/build.sh +++ b/scripts/ci/linuxrpi/build.sh @@ -46,6 +46,7 @@ make Debug -j # if [ -n "$ALLADDONSEXAMPLE" ]; then ALLADDONSEXAMPLE = 1 + if [[ "$ALLADDONSEXAMPLE" == 1 ]]; then echo "**** Building allAddonsExample ****" cd $OF_ROOT From 712e8972641ced9db728d5fd458335c1a5528afe Mon Sep 17 00:00:00 2001 From: Dimitre Date: Mon, 6 May 2024 17:00:25 -0300 Subject: [PATCH 48/62] up --- scripts/ci/linuxrpi/build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/ci/linuxrpi/build.sh b/scripts/ci/linuxrpi/build.sh index 8029887b208..9bf4ae3b497 100755 --- a/scripts/ci/linuxrpi/build.sh +++ b/scripts/ci/linuxrpi/build.sh @@ -45,13 +45,13 @@ cd examples/templates/emptyExample/ make Debug -j # if [ -n "$ALLADDONSEXAMPLE" ]; then -ALLADDONSEXAMPLE = 1 +# ALLADDONSEXAMPLE = 1 -if [[ "$ALLADDONSEXAMPLE" == 1 ]]; then +# if [[ "$ALLADDONSEXAMPLE" == 1 ]]; then echo "**** Building allAddonsExample ****" cd $OF_ROOT cp scripts/templates/linux${PLATFORM_ARCH}/Makefile examples/templates/allAddonsExample/ cp scripts/templates/linux${PLATFORM_ARCH}/config.make examples/templates/allAddonsExample/ cd examples/templates/allAddonsExample/ make Debug -j -fi \ No newline at end of file +# fi \ No newline at end of file From 52f79b32ec13b013970fe626ed9e227b54d640ec Mon Sep 17 00:00:00 2001 From: Dimitre Date: Mon, 6 May 2024 17:03:21 -0300 Subject: [PATCH 49/62] up --- .../project/linuxarmv6l/config.linuxarmv6l.default.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk b/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk index a36d2e4b130..174873abaa1 100644 --- a/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk +++ b/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk @@ -281,7 +281,8 @@ endif PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX) PLATFORM_LDFLAGS += -Xlinker -rpath-link=/lib/$(GCC_PREFIX) PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX)/pulseaudio - # PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX)/lapack + PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX)/lapack + PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX)/blas # PKG_CONFIG_LIBDIR=$(SYSROOT)/usr/lib/pkgconfig:$(SYSROOT)/usr/lib/$(GCC_PREFIX)/pkgconfig:$(SYSROOT)/usr/share/pkgconfig PKG_CONFIG_LIBDIR += /usr/lib/pkgconfig:/usr/lib/$(GCC_PREFIX)/pkgconfig:/usr/share/pkgconfig From 001c185f92ffe4f2d3ff938fffb7ea7c686e19b9 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Mon, 6 May 2024 17:05:14 -0300 Subject: [PATCH 50/62] up --- .../project/linuxarmv6l/config.linuxarmv6l.default.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk b/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk index 174873abaa1..a5cb1d10c0f 100644 --- a/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk +++ b/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk @@ -278,6 +278,7 @@ endif PLATFORM_LDFLAGS += --sysroot=$(SYSROOT) + PLATFORM_LDFLAGS += -lblas -llapack PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX) PLATFORM_LDFLAGS += -Xlinker -rpath-link=/lib/$(GCC_PREFIX) PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX)/pulseaudio From a609094d2bd67d63786a6b8f116d19e5d6173364 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Mon, 6 May 2024 17:06:42 -0300 Subject: [PATCH 51/62] up --- .../project/linuxarmv6l/config.linuxarmv6l.default.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk b/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk index a5cb1d10c0f..62a71bbbd3b 100644 --- a/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk +++ b/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk @@ -273,8 +273,8 @@ endif PLATFORM_LIBRARY_SEARCH_PATHS += /usr/lib/$(GCC_PREFIX) PLATFORM_LIBRARY_SEARCH_PATHS += /lib/$(GCC_PREFIX) - PLATFORM_LIBRARY_SEARCH_PATHS += /usr/lib/$(GCC_PREFIX)/blas - PLATFORM_LIBRARY_SEARCH_PATHS += /usr/lib/$(GCC_PREFIX)/lapack + PLATFORM_LIBRARY_SEARCH_PATHS += $(RPI_ROOT)/usr/lib/$(GCC_PREFIX)/blas + PLATFORM_LIBRARY_SEARCH_PATHS += $(RPI_ROOT)/usr/lib/$(GCC_PREFIX)/lapack PLATFORM_LDFLAGS += --sysroot=$(SYSROOT) @@ -282,8 +282,8 @@ endif PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX) PLATFORM_LDFLAGS += -Xlinker -rpath-link=/lib/$(GCC_PREFIX) PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX)/pulseaudio - PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX)/lapack - PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX)/blas + PLATFORM_LDFLAGS += -Xlinker -rpath-link=$(RPI_ROOT)/usr/lib/$(GCC_PREFIX)/lapack + PLATFORM_LDFLAGS += -Xlinker -rpath-link=$(RPI_ROOT)/usr/lib/$(GCC_PREFIX)/blas # PKG_CONFIG_LIBDIR=$(SYSROOT)/usr/lib/pkgconfig:$(SYSROOT)/usr/lib/$(GCC_PREFIX)/pkgconfig:$(SYSROOT)/usr/share/pkgconfig PKG_CONFIG_LIBDIR += /usr/lib/pkgconfig:/usr/lib/$(GCC_PREFIX)/pkgconfig:/usr/share/pkgconfig From 8cd8e1c6b5231a099264c6e816c98c7b6988294c Mon Sep 17 00:00:00 2001 From: Dimitre Date: Mon, 6 May 2024 17:10:59 -0300 Subject: [PATCH 52/62] up --- .../linuxaarch64/config.linuxaarch64.default.mk | 14 +++++--------- .../linuxarmv6l/config.linuxarmv6l.default.mk | 2 -- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/libs/openFrameworksCompiled/project/linuxaarch64/config.linuxaarch64.default.mk b/libs/openFrameworksCompiled/project/linuxaarch64/config.linuxaarch64.default.mk index 92617f04eb3..bdf92f3871d 100644 --- a/libs/openFrameworksCompiled/project/linuxaarch64/config.linuxaarch64.default.mk +++ b/libs/openFrameworksCompiled/project/linuxaarch64/config.linuxaarch64.default.mk @@ -120,22 +120,18 @@ endif PLATFORM_CFLAGS += --sysroot=$(SYSROOT) - # PLATFORM_HEADER_SEARCH_PATHS += $(SYSROOT)/usr/include/c++ - # PLATFORM_HEADER_SEARCH_PATHS += /usr/lib/gcc/$(GCC_PREFIX)/$(GCC_VERSION)/include - PLATFORM_LIBRARY_SEARCH_PATHS += /usr/lib/$(GCC_PREFIX) - # PLATFORM_LIBRARY_SEARCH_PATHS += /usr/lib/$(GCC_PREFIX)/lapack - # PLATFORM_LIBRARY_SEARCH_PATHS += /usr/lib/$(GCC_PREFIX)/blas - PLATFORM_LIBRARY_SEARCH_PATHS += /lib/$(GCC_PREFIX) - # PLATFORM_LIBRARY_SEARCH_PATHS += /usr/lib/gcc/$(GCC_PREFIX)/$(GCC_VERSION) + PLATFORM_LIBRARY_SEARCH_PATHS += $(RPI_ROOT)/usr/lib/$(GCC_PREFIX)/blas + PLATFORM_LIBRARY_SEARCH_PATHS += $(RPI_ROOT)/usr/lib/$(GCC_PREFIX)/lapack PLATFORM_LDFLAGS += --sysroot=$(SYSROOT) - # no need to prefix with sysroot, once sysroot is already set. + PLATFORM_LDFLAGS += -lblas -llapack PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX) PLATFORM_LDFLAGS += -Xlinker -rpath-link=/lib/$(GCC_PREFIX) PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX)/pulseaudio - # PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX)/lapack + PLATFORM_LDFLAGS += -Xlinker -rpath-link=$(RPI_ROOT)/usr/lib/$(GCC_PREFIX)/lapack + PLATFORM_LDFLAGS += -Xlinker -rpath-link=$(RPI_ROOT)/usr/lib/$(GCC_PREFIX)/blas PKG_CONFIG_LIBDIR += /usr/lib/pkgconfig:/usr/lib/$(GCC_PREFIX)/pkgconfig:/usr/share/pkgconfig diff --git a/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk b/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk index 62a71bbbd3b..ba7ed4b675f 100644 --- a/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk +++ b/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk @@ -276,7 +276,6 @@ endif PLATFORM_LIBRARY_SEARCH_PATHS += $(RPI_ROOT)/usr/lib/$(GCC_PREFIX)/blas PLATFORM_LIBRARY_SEARCH_PATHS += $(RPI_ROOT)/usr/lib/$(GCC_PREFIX)/lapack - PLATFORM_LDFLAGS += --sysroot=$(SYSROOT) PLATFORM_LDFLAGS += -lblas -llapack PLATFORM_LDFLAGS += -Xlinker -rpath-link=/usr/lib/$(GCC_PREFIX) @@ -285,7 +284,6 @@ endif PLATFORM_LDFLAGS += -Xlinker -rpath-link=$(RPI_ROOT)/usr/lib/$(GCC_PREFIX)/lapack PLATFORM_LDFLAGS += -Xlinker -rpath-link=$(RPI_ROOT)/usr/lib/$(GCC_PREFIX)/blas - # PKG_CONFIG_LIBDIR=$(SYSROOT)/usr/lib/pkgconfig:$(SYSROOT)/usr/lib/$(GCC_PREFIX)/pkgconfig:$(SYSROOT)/usr/share/pkgconfig PKG_CONFIG_LIBDIR += /usr/lib/pkgconfig:/usr/lib/$(GCC_PREFIX)/pkgconfig:/usr/share/pkgconfig endif From ce49a3b4a653fedbbd23bd6d4b59e97f73b8941e Mon Sep 17 00:00:00 2001 From: Dimitre Date: Mon, 6 May 2024 17:22:36 -0300 Subject: [PATCH 53/62] now only one action for rpi --- .github/workflows/build-rpi-aarch64-b.yml | 55 ----------------------- .github/workflows/build-rpi-aarch64.yml | 55 ----------------------- .github/workflows/build-rpi-armv6l-b.yml | 55 ----------------------- .github/workflows/build-rpi-armv6l.yml | 55 ----------------------- 4 files changed, 220 deletions(-) delete mode 100644 .github/workflows/build-rpi-aarch64-b.yml delete mode 100644 .github/workflows/build-rpi-aarch64.yml delete mode 100644 .github/workflows/build-rpi-armv6l-b.yml delete mode 100644 .github/workflows/build-rpi-armv6l.yml diff --git a/.github/workflows/build-rpi-aarch64-b.yml b/.github/workflows/build-rpi-aarch64-b.yml deleted file mode 100644 index 6eb4e532c0c..00000000000 --- a/.github/workflows/build-rpi-aarch64-b.yml +++ /dev/null @@ -1,55 +0,0 @@ -name: rpi-aarch64-alladdons - -# make the action not run on the local repo if the branch is also in a pull request to OF/OF -on: - push: - if: github.event_name == 'push' && github.event.pull_request == null - paths-ignore: - - '**/*.md' - - 'examples/**' - pull_request: - if: github.event_name == 'pull_request' && github.repository == 'openframeworks/openFrameworks' - paths-ignore: - - '**/*.md' - - 'examples/**' - -env: - ccache: ccache - -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -jobs: - rpi-build: - runs-on: ubuntu-latest - strategy: - matrix: - cfg: - # - { libs: armv6l, multistrap_arch: armhf, suffix: arm-linux-gnueabihf, alladdons: 0 } - - { libs: aarch64, multistrap_arch: arm64, suffix: aarch64-linux-gnu, alladdons: 1 } - env: - ARCH: ${{matrix.cfg.libs}} - MULTISTRAP_ARCH: ${{matrix.cfg.multistrap_arch}} - ALLADDONSEXAMPLE: ${{matrix.cfg.alladdons}} - steps: - - name: Cache Packages - uses: awalsh128/cache-apt-pkgs-action@latest - with: - packages: multistrap unzip gcc-${{matrix.cfg.suffix}} g++-${{matrix.cfg.suffix}} - version: 1.0 - - - uses: actions/checkout@v4 - - - name: ccache - uses: hendrikmuhs/ccache-action@v1.2.12 - with: - key: ${{ matrix.cfg.libs }} - - - name: Download libs - run: ./scripts/linux/download_libs.sh -a ${{matrix.cfg.libs}}; - - name: Install dependencies - run: ./scripts/ci/linuxrpi/install.sh; - - name: Build - # run: ./scripts/ci/linux${{matrix.cfg.libs}}/build.sh; - run: ./scripts/ci/linuxrpi/build.sh; diff --git a/.github/workflows/build-rpi-aarch64.yml b/.github/workflows/build-rpi-aarch64.yml deleted file mode 100644 index 705b7381d5a..00000000000 --- a/.github/workflows/build-rpi-aarch64.yml +++ /dev/null @@ -1,55 +0,0 @@ -name: rpi-aarch64 - -# make the action not run on the local repo if the branch is also in a pull request to OF/OF -on: - push: - if: github.event_name == 'push' && github.event.pull_request == null - paths-ignore: - - '**/*.md' - - 'examples/**' - pull_request: - if: github.event_name == 'pull_request' && github.repository == 'openframeworks/openFrameworks' - paths-ignore: - - '**/*.md' - - 'examples/**' - -env: - ccache: ccache - -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -jobs: - rpi-build: - runs-on: ubuntu-latest - strategy: - matrix: - cfg: - # - { libs: armv6l, multistrap_arch: armhf, suffix: arm-linux-gnueabihf, alladdons: 0 } - - { libs: aarch64, multistrap_arch: arm64, suffix: aarch64-linux-gnu, alladdons: 0 } - env: - ARCH: ${{matrix.cfg.libs}} - MULTISTRAP_ARCH: ${{matrix.cfg.multistrap_arch}} - ALLADDONSEXAMPLE: ${{matrix.cfg.alladdons}} - steps: - - name: Cache Packages - uses: awalsh128/cache-apt-pkgs-action@latest - with: - packages: multistrap unzip gcc-${{matrix.cfg.suffix}} g++-${{matrix.cfg.suffix}} - version: 1.0 - - - uses: actions/checkout@v4 - - - name: ccache - uses: hendrikmuhs/ccache-action@v1.2.12 - with: - key: ${{ matrix.cfg.libs }} - - - name: Download libs - run: ./scripts/linux/download_libs.sh -a ${{matrix.cfg.libs}}; - - name: Install dependencies - run: ./scripts/ci/linuxrpi/install.sh; - - name: Build - # run: ./scripts/ci/linux${{matrix.cfg.libs}}/build.sh; - run: ./scripts/ci/linuxrpi/build.sh; diff --git a/.github/workflows/build-rpi-armv6l-b.yml b/.github/workflows/build-rpi-armv6l-b.yml deleted file mode 100644 index a1bc11e3b9f..00000000000 --- a/.github/workflows/build-rpi-armv6l-b.yml +++ /dev/null @@ -1,55 +0,0 @@ -name: rpi-armv6l-alladdons - -# make the action not run on the local repo if the branch is also in a pull request to OF/OF -on: - push: - if: github.event_name == 'push' && github.event.pull_request == null - paths-ignore: - - '**/*.md' - - 'examples/**' - pull_request: - if: github.event_name == 'pull_request' && github.repository == 'openframeworks/openFrameworks' - paths-ignore: - - '**/*.md' - - 'examples/**' - -env: - ccache: ccache - -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -jobs: - rpi-build: - runs-on: ubuntu-latest - strategy: - matrix: - cfg: - - { libs: armv6l, multistrap_arch: armhf, suffix: arm-linux-gnueabihf, alladdons: 1 } - # - { libs: aarch64, multistrap_arch: arm64, suffix: aarch64-linux-gnu, alladdons: 0 } - env: - ARCH: ${{matrix.cfg.libs}} - MULTISTRAP_ARCH: ${{matrix.cfg.multistrap_arch}} - ALLADDONSEXAMPLE: ${{matrix.cfg.alladdons}} - steps: - - name: Cache Packages - uses: awalsh128/cache-apt-pkgs-action@latest - with: - packages: multistrap unzip gcc-${{matrix.cfg.suffix}} g++-${{matrix.cfg.suffix}} - version: 1.0 - - - uses: actions/checkout@v4 - - - name: ccache - uses: hendrikmuhs/ccache-action@v1.2.12 - with: - key: ${{ matrix.cfg.libs }} - - - name: Download libs - run: ./scripts/linux/download_libs.sh -a ${{matrix.cfg.libs}}; - - name: Install dependencies - run: ./scripts/ci/linuxrpi/install.sh; - - name: Build - # run: ./scripts/ci/linux${{matrix.cfg.libs}}/build.sh; - run: ./scripts/ci/linuxrpi/build.sh; diff --git a/.github/workflows/build-rpi-armv6l.yml b/.github/workflows/build-rpi-armv6l.yml deleted file mode 100644 index 60d9ba36e05..00000000000 --- a/.github/workflows/build-rpi-armv6l.yml +++ /dev/null @@ -1,55 +0,0 @@ -name: rpi-armv6l - -# make the action not run on the local repo if the branch is also in a pull request to OF/OF -on: - push: - if: github.event_name == 'push' && github.event.pull_request == null - paths-ignore: - - '**/*.md' - - 'examples/**' - pull_request: - if: github.event_name == 'pull_request' && github.repository == 'openframeworks/openFrameworks' - paths-ignore: - - '**/*.md' - - 'examples/**' - -env: - ccache: ccache - -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -jobs: - rpi-build: - runs-on: ubuntu-latest - strategy: - matrix: - cfg: - - { libs: armv6l, multistrap_arch: armhf, suffix: arm-linux-gnueabihf, alladdons: 0 } - # - { libs: aarch64, multistrap_arch: arm64, suffix: aarch64-linux-gnu, alladdons: 0 } - env: - ARCH: ${{matrix.cfg.libs}} - MULTISTRAP_ARCH: ${{matrix.cfg.multistrap_arch}} - ALLADDONSEXAMPLE: ${{matrix.cfg.alladdons}} - steps: - - name: Cache Packages - uses: awalsh128/cache-apt-pkgs-action@latest - with: - packages: multistrap unzip libraspberrypi-dev raspberrypi-kernel-headers gcc-${{matrix.cfg.suffix}} g++-${{matrix.cfg.suffix}} - version: 1.0 - - - uses: actions/checkout@v4 - - - name: ccache - uses: hendrikmuhs/ccache-action@v1.2.12 - with: - key: ${{ matrix.cfg.libs }} - - - name: Download libs - run: ./scripts/linux/download_libs.sh -a ${{matrix.cfg.libs}}; - - name: Install dependencies - run: ./scripts/ci/linuxrpi/install.sh; - - name: Build - # run: ./scripts/ci/linux${{matrix.cfg.libs}}/build.sh; - run: ./scripts/ci/linuxrpi/build.sh; From fcca9c75104437062eb008728aedff60e8187c2c Mon Sep 17 00:00:00 2001 From: Dimitre Date: Mon, 6 May 2024 17:24:14 -0300 Subject: [PATCH 54/62] up --- .github/workflows/2/build-rpi-aarch64-b.yml | 55 +++++++++++++++++++++ .github/workflows/2/build-rpi-aarch64.yml | 55 +++++++++++++++++++++ .github/workflows/2/build-rpi-armv6l-b.yml | 55 +++++++++++++++++++++ .github/workflows/2/build-rpi-armv6l.yml | 55 +++++++++++++++++++++ .github/workflows/build-rpi.yml | 54 ++++++++++++++++++++ 5 files changed, 274 insertions(+) create mode 100644 .github/workflows/2/build-rpi-aarch64-b.yml create mode 100644 .github/workflows/2/build-rpi-aarch64.yml create mode 100644 .github/workflows/2/build-rpi-armv6l-b.yml create mode 100644 .github/workflows/2/build-rpi-armv6l.yml create mode 100644 .github/workflows/build-rpi.yml diff --git a/.github/workflows/2/build-rpi-aarch64-b.yml b/.github/workflows/2/build-rpi-aarch64-b.yml new file mode 100644 index 00000000000..6eb4e532c0c --- /dev/null +++ b/.github/workflows/2/build-rpi-aarch64-b.yml @@ -0,0 +1,55 @@ +name: rpi-aarch64-alladdons + +# make the action not run on the local repo if the branch is also in a pull request to OF/OF +on: + push: + if: github.event_name == 'push' && github.event.pull_request == null + paths-ignore: + - '**/*.md' + - 'examples/**' + pull_request: + if: github.event_name == 'pull_request' && github.repository == 'openframeworks/openFrameworks' + paths-ignore: + - '**/*.md' + - 'examples/**' + +env: + ccache: ccache + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + rpi-build: + runs-on: ubuntu-latest + strategy: + matrix: + cfg: + # - { libs: armv6l, multistrap_arch: armhf, suffix: arm-linux-gnueabihf, alladdons: 0 } + - { libs: aarch64, multistrap_arch: arm64, suffix: aarch64-linux-gnu, alladdons: 1 } + env: + ARCH: ${{matrix.cfg.libs}} + MULTISTRAP_ARCH: ${{matrix.cfg.multistrap_arch}} + ALLADDONSEXAMPLE: ${{matrix.cfg.alladdons}} + steps: + - name: Cache Packages + uses: awalsh128/cache-apt-pkgs-action@latest + with: + packages: multistrap unzip gcc-${{matrix.cfg.suffix}} g++-${{matrix.cfg.suffix}} + version: 1.0 + + - uses: actions/checkout@v4 + + - name: ccache + uses: hendrikmuhs/ccache-action@v1.2.12 + with: + key: ${{ matrix.cfg.libs }} + + - name: Download libs + run: ./scripts/linux/download_libs.sh -a ${{matrix.cfg.libs}}; + - name: Install dependencies + run: ./scripts/ci/linuxrpi/install.sh; + - name: Build + # run: ./scripts/ci/linux${{matrix.cfg.libs}}/build.sh; + run: ./scripts/ci/linuxrpi/build.sh; diff --git a/.github/workflows/2/build-rpi-aarch64.yml b/.github/workflows/2/build-rpi-aarch64.yml new file mode 100644 index 00000000000..705b7381d5a --- /dev/null +++ b/.github/workflows/2/build-rpi-aarch64.yml @@ -0,0 +1,55 @@ +name: rpi-aarch64 + +# make the action not run on the local repo if the branch is also in a pull request to OF/OF +on: + push: + if: github.event_name == 'push' && github.event.pull_request == null + paths-ignore: + - '**/*.md' + - 'examples/**' + pull_request: + if: github.event_name == 'pull_request' && github.repository == 'openframeworks/openFrameworks' + paths-ignore: + - '**/*.md' + - 'examples/**' + +env: + ccache: ccache + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + rpi-build: + runs-on: ubuntu-latest + strategy: + matrix: + cfg: + # - { libs: armv6l, multistrap_arch: armhf, suffix: arm-linux-gnueabihf, alladdons: 0 } + - { libs: aarch64, multistrap_arch: arm64, suffix: aarch64-linux-gnu, alladdons: 0 } + env: + ARCH: ${{matrix.cfg.libs}} + MULTISTRAP_ARCH: ${{matrix.cfg.multistrap_arch}} + ALLADDONSEXAMPLE: ${{matrix.cfg.alladdons}} + steps: + - name: Cache Packages + uses: awalsh128/cache-apt-pkgs-action@latest + with: + packages: multistrap unzip gcc-${{matrix.cfg.suffix}} g++-${{matrix.cfg.suffix}} + version: 1.0 + + - uses: actions/checkout@v4 + + - name: ccache + uses: hendrikmuhs/ccache-action@v1.2.12 + with: + key: ${{ matrix.cfg.libs }} + + - name: Download libs + run: ./scripts/linux/download_libs.sh -a ${{matrix.cfg.libs}}; + - name: Install dependencies + run: ./scripts/ci/linuxrpi/install.sh; + - name: Build + # run: ./scripts/ci/linux${{matrix.cfg.libs}}/build.sh; + run: ./scripts/ci/linuxrpi/build.sh; diff --git a/.github/workflows/2/build-rpi-armv6l-b.yml b/.github/workflows/2/build-rpi-armv6l-b.yml new file mode 100644 index 00000000000..a1bc11e3b9f --- /dev/null +++ b/.github/workflows/2/build-rpi-armv6l-b.yml @@ -0,0 +1,55 @@ +name: rpi-armv6l-alladdons + +# make the action not run on the local repo if the branch is also in a pull request to OF/OF +on: + push: + if: github.event_name == 'push' && github.event.pull_request == null + paths-ignore: + - '**/*.md' + - 'examples/**' + pull_request: + if: github.event_name == 'pull_request' && github.repository == 'openframeworks/openFrameworks' + paths-ignore: + - '**/*.md' + - 'examples/**' + +env: + ccache: ccache + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + rpi-build: + runs-on: ubuntu-latest + strategy: + matrix: + cfg: + - { libs: armv6l, multistrap_arch: armhf, suffix: arm-linux-gnueabihf, alladdons: 1 } + # - { libs: aarch64, multistrap_arch: arm64, suffix: aarch64-linux-gnu, alladdons: 0 } + env: + ARCH: ${{matrix.cfg.libs}} + MULTISTRAP_ARCH: ${{matrix.cfg.multistrap_arch}} + ALLADDONSEXAMPLE: ${{matrix.cfg.alladdons}} + steps: + - name: Cache Packages + uses: awalsh128/cache-apt-pkgs-action@latest + with: + packages: multistrap unzip gcc-${{matrix.cfg.suffix}} g++-${{matrix.cfg.suffix}} + version: 1.0 + + - uses: actions/checkout@v4 + + - name: ccache + uses: hendrikmuhs/ccache-action@v1.2.12 + with: + key: ${{ matrix.cfg.libs }} + + - name: Download libs + run: ./scripts/linux/download_libs.sh -a ${{matrix.cfg.libs}}; + - name: Install dependencies + run: ./scripts/ci/linuxrpi/install.sh; + - name: Build + # run: ./scripts/ci/linux${{matrix.cfg.libs}}/build.sh; + run: ./scripts/ci/linuxrpi/build.sh; diff --git a/.github/workflows/2/build-rpi-armv6l.yml b/.github/workflows/2/build-rpi-armv6l.yml new file mode 100644 index 00000000000..60d9ba36e05 --- /dev/null +++ b/.github/workflows/2/build-rpi-armv6l.yml @@ -0,0 +1,55 @@ +name: rpi-armv6l + +# make the action not run on the local repo if the branch is also in a pull request to OF/OF +on: + push: + if: github.event_name == 'push' && github.event.pull_request == null + paths-ignore: + - '**/*.md' + - 'examples/**' + pull_request: + if: github.event_name == 'pull_request' && github.repository == 'openframeworks/openFrameworks' + paths-ignore: + - '**/*.md' + - 'examples/**' + +env: + ccache: ccache + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + rpi-build: + runs-on: ubuntu-latest + strategy: + matrix: + cfg: + - { libs: armv6l, multistrap_arch: armhf, suffix: arm-linux-gnueabihf, alladdons: 0 } + # - { libs: aarch64, multistrap_arch: arm64, suffix: aarch64-linux-gnu, alladdons: 0 } + env: + ARCH: ${{matrix.cfg.libs}} + MULTISTRAP_ARCH: ${{matrix.cfg.multistrap_arch}} + ALLADDONSEXAMPLE: ${{matrix.cfg.alladdons}} + steps: + - name: Cache Packages + uses: awalsh128/cache-apt-pkgs-action@latest + with: + packages: multistrap unzip libraspberrypi-dev raspberrypi-kernel-headers gcc-${{matrix.cfg.suffix}} g++-${{matrix.cfg.suffix}} + version: 1.0 + + - uses: actions/checkout@v4 + + - name: ccache + uses: hendrikmuhs/ccache-action@v1.2.12 + with: + key: ${{ matrix.cfg.libs }} + + - name: Download libs + run: ./scripts/linux/download_libs.sh -a ${{matrix.cfg.libs}}; + - name: Install dependencies + run: ./scripts/ci/linuxrpi/install.sh; + - name: Build + # run: ./scripts/ci/linux${{matrix.cfg.libs}}/build.sh; + run: ./scripts/ci/linuxrpi/build.sh; diff --git a/.github/workflows/build-rpi.yml b/.github/workflows/build-rpi.yml new file mode 100644 index 00000000000..754f3087e66 --- /dev/null +++ b/.github/workflows/build-rpi.yml @@ -0,0 +1,54 @@ +name: rpi-aarch64-alladdons + +# make the action not run on the local repo if the branch is also in a pull request to OF/OF +on: + push: + if: github.event_name == 'push' && github.event.pull_request == null + paths-ignore: + - '**/*.md' + - 'examples/**' + pull_request: + if: github.event_name == 'pull_request' && github.repository == 'openframeworks/openFrameworks' + paths-ignore: + - '**/*.md' + - 'examples/**' + +env: + ccache: ccache + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + rpi-build: + runs-on: ubuntu-latest + strategy: + matrix: + cfg: + - { libs: armv6l, multistrap_arch: armhf, suffix: arm-linux-gnueabihf, alladdons: 1 } + - { libs: aarch64, multistrap_arch: arm64, suffix: aarch64-linux-gnu, alladdons: 1 } + env: + ARCH: ${{matrix.cfg.libs}} + MULTISTRAP_ARCH: ${{matrix.cfg.multistrap_arch}} + ALLADDONSEXAMPLE: ${{matrix.cfg.alladdons}} + steps: + - name: Cache Packages + uses: awalsh128/cache-apt-pkgs-action@latest + with: + packages: multistrap unzip gcc-${{matrix.cfg.suffix}} g++-${{matrix.cfg.suffix}} + version: 1.0 + + - uses: actions/checkout@v4 + + - name: ccache + uses: hendrikmuhs/ccache-action@v1.2.12 + with: + key: ${{ matrix.cfg.libs }} + + - name: Download libs + run: ./scripts/linux/download_libs.sh -a ${{matrix.cfg.libs}}; + - name: Install dependencies + run: ./scripts/ci/linuxrpi/install.sh; + - name: Build + run: ./scripts/ci/linuxrpi/build.sh; From 89567f16dc0f374bf633ac2bf49b622e7ae02122 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Mon, 6 May 2024 17:41:13 -0300 Subject: [PATCH 55/62] updates --- .github/workflows/build-rpi.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-rpi.yml b/.github/workflows/build-rpi.yml index 754f3087e66..520cdf2612f 100644 --- a/.github/workflows/build-rpi.yml +++ b/.github/workflows/build-rpi.yml @@ -1,4 +1,4 @@ -name: rpi-aarch64-alladdons +name: rpi-alladdons # make the action not run on the local repo if the branch is also in a pull request to OF/OF on: From 36daa10b89de4950c93e06e9edc4d9c5faf8f8e3 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Mon, 6 May 2024 17:44:08 -0300 Subject: [PATCH 56/62] ok --- .github/workflows/2/build-rpi-aarch64-b.yml | 55 ------------------- .github/workflows/2/build-rpi-aarch64.yml | 55 ------------------- .github/workflows/2/build-rpi-armv6l-b.yml | 55 ------------------- .github/workflows/2/build-rpi-armv6l.yml | 55 ------------------- .../workflows/{2 => }/build-emscripten.yml | 0 .github/workflows/{2 => }/build-ios-tvos.yml | 0 .github/workflows/{2 => }/build-linux64.yml | 0 .github/workflows/{2 => }/build-macos.yml | 0 .github/workflows/{2 => }/build-msys2.yml | 0 .github/workflows/{2 => }/build-vs2022.yml | 0 .github/workflows/{2 => }/manual-nightly.yml | 0 .../workflows/{2 => }/manual-web-examples.yml | 0 .github/workflows/{2 => }/nightly-linux64.yml | 0 13 files changed, 220 deletions(-) delete mode 100644 .github/workflows/2/build-rpi-aarch64-b.yml delete mode 100644 .github/workflows/2/build-rpi-aarch64.yml delete mode 100644 .github/workflows/2/build-rpi-armv6l-b.yml delete mode 100644 .github/workflows/2/build-rpi-armv6l.yml rename .github/workflows/{2 => }/build-emscripten.yml (100%) rename .github/workflows/{2 => }/build-ios-tvos.yml (100%) rename .github/workflows/{2 => }/build-linux64.yml (100%) rename .github/workflows/{2 => }/build-macos.yml (100%) rename .github/workflows/{2 => }/build-msys2.yml (100%) rename .github/workflows/{2 => }/build-vs2022.yml (100%) rename .github/workflows/{2 => }/manual-nightly.yml (100%) rename .github/workflows/{2 => }/manual-web-examples.yml (100%) rename .github/workflows/{2 => }/nightly-linux64.yml (100%) diff --git a/.github/workflows/2/build-rpi-aarch64-b.yml b/.github/workflows/2/build-rpi-aarch64-b.yml deleted file mode 100644 index 6eb4e532c0c..00000000000 --- a/.github/workflows/2/build-rpi-aarch64-b.yml +++ /dev/null @@ -1,55 +0,0 @@ -name: rpi-aarch64-alladdons - -# make the action not run on the local repo if the branch is also in a pull request to OF/OF -on: - push: - if: github.event_name == 'push' && github.event.pull_request == null - paths-ignore: - - '**/*.md' - - 'examples/**' - pull_request: - if: github.event_name == 'pull_request' && github.repository == 'openframeworks/openFrameworks' - paths-ignore: - - '**/*.md' - - 'examples/**' - -env: - ccache: ccache - -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -jobs: - rpi-build: - runs-on: ubuntu-latest - strategy: - matrix: - cfg: - # - { libs: armv6l, multistrap_arch: armhf, suffix: arm-linux-gnueabihf, alladdons: 0 } - - { libs: aarch64, multistrap_arch: arm64, suffix: aarch64-linux-gnu, alladdons: 1 } - env: - ARCH: ${{matrix.cfg.libs}} - MULTISTRAP_ARCH: ${{matrix.cfg.multistrap_arch}} - ALLADDONSEXAMPLE: ${{matrix.cfg.alladdons}} - steps: - - name: Cache Packages - uses: awalsh128/cache-apt-pkgs-action@latest - with: - packages: multistrap unzip gcc-${{matrix.cfg.suffix}} g++-${{matrix.cfg.suffix}} - version: 1.0 - - - uses: actions/checkout@v4 - - - name: ccache - uses: hendrikmuhs/ccache-action@v1.2.12 - with: - key: ${{ matrix.cfg.libs }} - - - name: Download libs - run: ./scripts/linux/download_libs.sh -a ${{matrix.cfg.libs}}; - - name: Install dependencies - run: ./scripts/ci/linuxrpi/install.sh; - - name: Build - # run: ./scripts/ci/linux${{matrix.cfg.libs}}/build.sh; - run: ./scripts/ci/linuxrpi/build.sh; diff --git a/.github/workflows/2/build-rpi-aarch64.yml b/.github/workflows/2/build-rpi-aarch64.yml deleted file mode 100644 index 705b7381d5a..00000000000 --- a/.github/workflows/2/build-rpi-aarch64.yml +++ /dev/null @@ -1,55 +0,0 @@ -name: rpi-aarch64 - -# make the action not run on the local repo if the branch is also in a pull request to OF/OF -on: - push: - if: github.event_name == 'push' && github.event.pull_request == null - paths-ignore: - - '**/*.md' - - 'examples/**' - pull_request: - if: github.event_name == 'pull_request' && github.repository == 'openframeworks/openFrameworks' - paths-ignore: - - '**/*.md' - - 'examples/**' - -env: - ccache: ccache - -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -jobs: - rpi-build: - runs-on: ubuntu-latest - strategy: - matrix: - cfg: - # - { libs: armv6l, multistrap_arch: armhf, suffix: arm-linux-gnueabihf, alladdons: 0 } - - { libs: aarch64, multistrap_arch: arm64, suffix: aarch64-linux-gnu, alladdons: 0 } - env: - ARCH: ${{matrix.cfg.libs}} - MULTISTRAP_ARCH: ${{matrix.cfg.multistrap_arch}} - ALLADDONSEXAMPLE: ${{matrix.cfg.alladdons}} - steps: - - name: Cache Packages - uses: awalsh128/cache-apt-pkgs-action@latest - with: - packages: multistrap unzip gcc-${{matrix.cfg.suffix}} g++-${{matrix.cfg.suffix}} - version: 1.0 - - - uses: actions/checkout@v4 - - - name: ccache - uses: hendrikmuhs/ccache-action@v1.2.12 - with: - key: ${{ matrix.cfg.libs }} - - - name: Download libs - run: ./scripts/linux/download_libs.sh -a ${{matrix.cfg.libs}}; - - name: Install dependencies - run: ./scripts/ci/linuxrpi/install.sh; - - name: Build - # run: ./scripts/ci/linux${{matrix.cfg.libs}}/build.sh; - run: ./scripts/ci/linuxrpi/build.sh; diff --git a/.github/workflows/2/build-rpi-armv6l-b.yml b/.github/workflows/2/build-rpi-armv6l-b.yml deleted file mode 100644 index a1bc11e3b9f..00000000000 --- a/.github/workflows/2/build-rpi-armv6l-b.yml +++ /dev/null @@ -1,55 +0,0 @@ -name: rpi-armv6l-alladdons - -# make the action not run on the local repo if the branch is also in a pull request to OF/OF -on: - push: - if: github.event_name == 'push' && github.event.pull_request == null - paths-ignore: - - '**/*.md' - - 'examples/**' - pull_request: - if: github.event_name == 'pull_request' && github.repository == 'openframeworks/openFrameworks' - paths-ignore: - - '**/*.md' - - 'examples/**' - -env: - ccache: ccache - -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -jobs: - rpi-build: - runs-on: ubuntu-latest - strategy: - matrix: - cfg: - - { libs: armv6l, multistrap_arch: armhf, suffix: arm-linux-gnueabihf, alladdons: 1 } - # - { libs: aarch64, multistrap_arch: arm64, suffix: aarch64-linux-gnu, alladdons: 0 } - env: - ARCH: ${{matrix.cfg.libs}} - MULTISTRAP_ARCH: ${{matrix.cfg.multistrap_arch}} - ALLADDONSEXAMPLE: ${{matrix.cfg.alladdons}} - steps: - - name: Cache Packages - uses: awalsh128/cache-apt-pkgs-action@latest - with: - packages: multistrap unzip gcc-${{matrix.cfg.suffix}} g++-${{matrix.cfg.suffix}} - version: 1.0 - - - uses: actions/checkout@v4 - - - name: ccache - uses: hendrikmuhs/ccache-action@v1.2.12 - with: - key: ${{ matrix.cfg.libs }} - - - name: Download libs - run: ./scripts/linux/download_libs.sh -a ${{matrix.cfg.libs}}; - - name: Install dependencies - run: ./scripts/ci/linuxrpi/install.sh; - - name: Build - # run: ./scripts/ci/linux${{matrix.cfg.libs}}/build.sh; - run: ./scripts/ci/linuxrpi/build.sh; diff --git a/.github/workflows/2/build-rpi-armv6l.yml b/.github/workflows/2/build-rpi-armv6l.yml deleted file mode 100644 index 60d9ba36e05..00000000000 --- a/.github/workflows/2/build-rpi-armv6l.yml +++ /dev/null @@ -1,55 +0,0 @@ -name: rpi-armv6l - -# make the action not run on the local repo if the branch is also in a pull request to OF/OF -on: - push: - if: github.event_name == 'push' && github.event.pull_request == null - paths-ignore: - - '**/*.md' - - 'examples/**' - pull_request: - if: github.event_name == 'pull_request' && github.repository == 'openframeworks/openFrameworks' - paths-ignore: - - '**/*.md' - - 'examples/**' - -env: - ccache: ccache - -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -jobs: - rpi-build: - runs-on: ubuntu-latest - strategy: - matrix: - cfg: - - { libs: armv6l, multistrap_arch: armhf, suffix: arm-linux-gnueabihf, alladdons: 0 } - # - { libs: aarch64, multistrap_arch: arm64, suffix: aarch64-linux-gnu, alladdons: 0 } - env: - ARCH: ${{matrix.cfg.libs}} - MULTISTRAP_ARCH: ${{matrix.cfg.multistrap_arch}} - ALLADDONSEXAMPLE: ${{matrix.cfg.alladdons}} - steps: - - name: Cache Packages - uses: awalsh128/cache-apt-pkgs-action@latest - with: - packages: multistrap unzip libraspberrypi-dev raspberrypi-kernel-headers gcc-${{matrix.cfg.suffix}} g++-${{matrix.cfg.suffix}} - version: 1.0 - - - uses: actions/checkout@v4 - - - name: ccache - uses: hendrikmuhs/ccache-action@v1.2.12 - with: - key: ${{ matrix.cfg.libs }} - - - name: Download libs - run: ./scripts/linux/download_libs.sh -a ${{matrix.cfg.libs}}; - - name: Install dependencies - run: ./scripts/ci/linuxrpi/install.sh; - - name: Build - # run: ./scripts/ci/linux${{matrix.cfg.libs}}/build.sh; - run: ./scripts/ci/linuxrpi/build.sh; diff --git a/.github/workflows/2/build-emscripten.yml b/.github/workflows/build-emscripten.yml similarity index 100% rename from .github/workflows/2/build-emscripten.yml rename to .github/workflows/build-emscripten.yml diff --git a/.github/workflows/2/build-ios-tvos.yml b/.github/workflows/build-ios-tvos.yml similarity index 100% rename from .github/workflows/2/build-ios-tvos.yml rename to .github/workflows/build-ios-tvos.yml diff --git a/.github/workflows/2/build-linux64.yml b/.github/workflows/build-linux64.yml similarity index 100% rename from .github/workflows/2/build-linux64.yml rename to .github/workflows/build-linux64.yml diff --git a/.github/workflows/2/build-macos.yml b/.github/workflows/build-macos.yml similarity index 100% rename from .github/workflows/2/build-macos.yml rename to .github/workflows/build-macos.yml diff --git a/.github/workflows/2/build-msys2.yml b/.github/workflows/build-msys2.yml similarity index 100% rename from .github/workflows/2/build-msys2.yml rename to .github/workflows/build-msys2.yml diff --git a/.github/workflows/2/build-vs2022.yml b/.github/workflows/build-vs2022.yml similarity index 100% rename from .github/workflows/2/build-vs2022.yml rename to .github/workflows/build-vs2022.yml diff --git a/.github/workflows/2/manual-nightly.yml b/.github/workflows/manual-nightly.yml similarity index 100% rename from .github/workflows/2/manual-nightly.yml rename to .github/workflows/manual-nightly.yml diff --git a/.github/workflows/2/manual-web-examples.yml b/.github/workflows/manual-web-examples.yml similarity index 100% rename from .github/workflows/2/manual-web-examples.yml rename to .github/workflows/manual-web-examples.yml diff --git a/.github/workflows/2/nightly-linux64.yml b/.github/workflows/nightly-linux64.yml similarity index 100% rename from .github/workflows/2/nightly-linux64.yml rename to .github/workflows/nightly-linux64.yml From a3b9d4e0dabc0b1ed057dc6decc6d3a22efb497d Mon Sep 17 00:00:00 2001 From: Dimitre Date: Mon, 6 May 2024 17:45:27 -0300 Subject: [PATCH 57/62] okk --- .github/workflows/build-rpi.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-rpi.yml b/.github/workflows/build-rpi.yml index 520cdf2612f..29027a40d3b 100644 --- a/.github/workflows/build-rpi.yml +++ b/.github/workflows/build-rpi.yml @@ -52,3 +52,4 @@ jobs: run: ./scripts/ci/linuxrpi/install.sh; - name: Build run: ./scripts/ci/linuxrpi/build.sh; + From ff40beeeff0b964f55151d253c255d6338dd55fc Mon Sep 17 00:00:00 2001 From: Dimitre Date: Mon, 6 May 2024 17:55:50 -0300 Subject: [PATCH 58/62] rename --- .github/workflows/build-rpi.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-rpi.yml b/.github/workflows/build-rpi.yml index 29027a40d3b..6ed0aaf4605 100644 --- a/.github/workflows/build-rpi.yml +++ b/.github/workflows/build-rpi.yml @@ -1,4 +1,4 @@ -name: rpi-alladdons +name: build-rpi # make the action not run on the local repo if the branch is also in a pull request to OF/OF on: From 477acf923b7231f6db03c28940d2ab8754ce82c3 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Mon, 6 May 2024 18:00:53 -0300 Subject: [PATCH 59/62] revert some --- .../linuxarmv6l/config.linuxarmv6l.default.mk | 1 - .../project/makefileCommon/compile.core.mk | 10 ----- .../makefileCommon/config.linux.common.mk | 38 ------------------- .../project/makefileCommon/config.shared.mk | 2 - 4 files changed, 51 deletions(-) diff --git a/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk b/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk index ba7ed4b675f..f61f1fb4677 100644 --- a/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk +++ b/libs/openFrameworksCompiled/project/linuxarmv6l/config.linuxarmv6l.default.mk @@ -272,7 +272,6 @@ endif PLATFORM_LIBRARY_SEARCH_PATHS += /usr/lib/$(GCC_PREFIX) PLATFORM_LIBRARY_SEARCH_PATHS += /lib/$(GCC_PREFIX) - PLATFORM_LIBRARY_SEARCH_PATHS += $(RPI_ROOT)/usr/lib/$(GCC_PREFIX)/blas PLATFORM_LIBRARY_SEARCH_PATHS += $(RPI_ROOT)/usr/lib/$(GCC_PREFIX)/lapack diff --git a/libs/openFrameworksCompiled/project/makefileCommon/compile.core.mk b/libs/openFrameworksCompiled/project/makefileCommon/compile.core.mk index 1d37d1ce450..9efe24699b4 100644 --- a/libs/openFrameworksCompiled/project/makefileCommon/compile.core.mk +++ b/libs/openFrameworksCompiled/project/makefileCommon/compile.core.mk @@ -41,16 +41,6 @@ $(info 💿 Using CCACHE - compile.core.mk ) CC := ${ccache} $(CXX) endif -# IWYU = include-what-you-use -# ifdef ${IWYU} -# $(info OWWWW ) -# CXX := ${IWYU} -# CC := ${IWYU} -# endif - -# CXX := include-what-you-use -# CC := include-what-you-use - $(info 💾 CXX = $(CXX)) $(info 💾 CC = $(CC)) diff --git a/libs/openFrameworksCompiled/project/makefileCommon/config.linux.common.mk b/libs/openFrameworksCompiled/project/makefileCommon/config.linux.common.mk index 4ce0519b7b9..5a0ed9e6fad 100755 --- a/libs/openFrameworksCompiled/project/makefileCommon/config.linux.common.mk +++ b/libs/openFrameworksCompiled/project/makefileCommon/config.linux.common.mk @@ -362,9 +362,6 @@ PLATFORM_PKG_CONFIG_LIBRARIES += openal # PLATFORM_PKG_CONFIG_LIBRARIES += openssl PLATFORM_PKG_CONFIG_LIBRARIES += libcurl -# TEST -# PLATFORM_PKG_CONFIG_LIBRARIES += lapack -# PLATFORM_PKG_CONFIG_LIBRARIES += blas ifeq ($(CROSS_COMPILING),1) ifeq "$(shell export PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR); pkg-config --exists glfw3 && echo 1)" "1" @@ -393,41 +390,6 @@ else endif - -# ifeq ($(CROSS_COMPILING),1) -# ifeq "$(shell export PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR); pkg-config --exists lapack && echo 1)" "1" -# PLATFORM_PKG_CONFIG_LIBRARIES += lapack -# PLATFORM_LIBRARIES += lapack - -# else -# PLATFORM_PKG_CONFIG_LIBRARIES += lapack -# PLATFORM_LIBRARIES += lapack -# endif -# else -# ifeq "$(shell pkg-config --exists lapack && echo 1)" "1" -# PLATFORM_PKG_CONFIG_LIBRARIES += lapack -# PLATFORM_LIBRARIES += lapack -# else -# PLATFORM_PKG_CONFIG_LIBRARIES += lapack -# PLATFORM_LIBRARIES += lapack -# endif -# endif - -# ifeq ($(CROSS_COMPILING),1) -# ifeq "$(shell export PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR); pkg-config --exists blas && echo 1)" "1" -# PLATFORM_PKG_CONFIG_LIBRARIES += blas -# else -# PLATFORM_LIBRARIES += blas -# endif -# else -# ifeq "$(shell pkg-config --exists blas && echo 1)" "1" -# PLATFORM_PKG_CONFIG_LIBRARIES += blas -# else -# PLATFORM_LIBRARIES += blas -# endif -# endif - - ifneq ($(LINUX_ARM),1) PLATFORM_PKG_CONFIG_LIBRARIES += libpulse-simple PLATFORM_PKG_CONFIG_LIBRARIES += alsa diff --git a/libs/openFrameworksCompiled/project/makefileCommon/config.shared.mk b/libs/openFrameworksCompiled/project/makefileCommon/config.shared.mk index ff641f864d1..38ebdf4cb94 100644 --- a/libs/openFrameworksCompiled/project/makefileCommon/config.shared.mk +++ b/libs/openFrameworksCompiled/project/makefileCommon/config.shared.mk @@ -293,8 +293,6 @@ CORE_PKG_CONFIG_LIBRARIES = CORE_PKG_CONFIG_LIBRARIES += $(PLATFORM_PKG_CONFIG_LIBRARIES) CORE_PKG_CONFIG_LIBRARIES += $(PROJECT_PKG_CONFIG_LIBRARIES) -$(info $(CORE_PKG_CONFIG_LIBRARIES)) - ifneq ($(strip $(CORE_PKG_CONFIG_LIBRARIES)),) ifneq ($(strip $(PKG_CONFIG_LIBDIR)),) ifdef MAKEFILE_DEBUG From 7109e18c422d7eb2d51836ae713d7010c05dc8c9 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Mon, 6 May 2024 18:03:33 -0300 Subject: [PATCH 60/62] remove linuxarmv6l/install & build --- scripts/ci/linuxarmv6l/build.sh | 35 ----------- scripts/ci/linuxarmv6l/install.sh | 82 -------------------------- scripts/ci/linuxarmv6l/multistrap.conf | 29 --------- 3 files changed, 146 deletions(-) delete mode 100755 scripts/ci/linuxarmv6l/build.sh delete mode 100755 scripts/ci/linuxarmv6l/install.sh delete mode 100644 scripts/ci/linuxarmv6l/multistrap.conf diff --git a/scripts/ci/linuxarmv6l/build.sh b/scripts/ci/linuxarmv6l/build.sh deleted file mode 100755 index ce85107a02c..00000000000 --- a/scripts/ci/linuxarmv6l/build.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash -set -ev -OF_ROOT=$( cd "$(dirname "$0")/../../.." ; pwd -P ) - -export GCC_PREFIX=arm-linux-gnueabihf -export GST_VERSION=1.0 -#NOTE: GCC_VERSION should match the version present in the downloaded toolchain -export GCC_VERSION=9.4.0 -export RPI_ROOT=${OF_ROOT}/scripts/ci/$TARGET/raspbian -export TOOLCHAIN_ROOT=${OF_ROOT}/scripts/ci/$TARGET/rpi_toolchain -export PLATFORM_OS=Linux -export PLATFORM_ARCH=armv6l -export PKG_CONFIG_LIBDIR=${RPI_ROOT}/usr/lib/pkgconfig:${RPI_ROOT}/usr/lib/${GCC_PREFIX}/pkgconfig:${RPI_ROOT}/usr/share/pkgconfig -export CXX="${TOOLCHAIN_ROOT}/bin/${GCC_PREFIX}-g++" -export CC="${TOOLCHAIN_ROOT}/bin/${GCC_PREFIX}-gcc" -export AR=${TOOLCHAIN_ROOT}/bin/${GCC_PREFIX}-ar -export LD=${TOOLCHAIN_ROOT}/bin/${GCC_PREFIX}-ld -export CROSS_COMPILING=1 - -export PATH=/rpi_toolchain/bin/:$PATH -export LD_LIBRARY_PATH=/rpi_toolchain/lib:$LD_LIBRARY_PATH - -echo "**** Building emptyExample ****" -cd $OF_ROOT -cp scripts/templates/linuxarmv6l/Makefile examples/templates/emptyExample/ -cp scripts/templates/linuxarmv6l/config.make examples/templates/emptyExample/ -cd examples/templates/emptyExample/ -make Debug -j - -echo "**** Building allAddonsExample ****" -cd $OF_ROOT -cp scripts/templates/linuxarmv6l/Makefile examples/templates/allAddonsExample/ -cp scripts/templates/linuxarmv6l/config.make examples/templates/allAddonsExample/ -cd examples/templates/allAddonsExample/ -make Debug -j diff --git a/scripts/ci/linuxarmv6l/install.sh b/scripts/ci/linuxarmv6l/install.sh deleted file mode 100755 index c68f3a03e03..00000000000 --- a/scripts/ci/linuxarmv6l/install.sh +++ /dev/null @@ -1,82 +0,0 @@ -#!/bin/bash -set -e -set -o pipefail -# trap any script errors and exit -trap "trapError" ERR - -trapError() { - echo - echo " ^ Received error ^" - cat formula.log - exit 1 -} - -installPackages(){ - sudo apt-get -y update - sudo apt-get -y install multistrap unzip - #workaround for https://bugs.launchpad.net/ubuntu/+source/multistrap/+bug/1313787 - sudo sed -i s/\$forceyes//g /usr/sbin/multistrap -} - -createRaspbianImg(){ - #needed since Ubuntu 18.04 - allow non https repositories - mkdir -p raspbian/etc/apt/apt.conf.d/ - echo 'Acquire::AllowInsecureRepositories "true";' | sudo tee raspbian/etc/apt/apt.conf.d/90insecure - multistrap -a armhf -d raspbian -f multistrap.conf -} - -SCRIPT_DIR="${BASH_SOURCE%/*}" -if [[ ! -d "$SCRIPT_DIR" ]]; then SCRIPT_DIR="$PWD"; fi -. "$SCRIPT_DIR/../../dev/downloader.sh" - -downloadToolchain(){ - wget https://github.com/openframeworks/openFrameworks/releases/download/tools/cross-gcc-9.4.0-pi_0-1.tar.gz - tar xvf cross-gcc-9.4.0-pi_0-1.tar.gz - mv cross-pi-gcc-9.4.0-0 rpi_toolchain - rm cross-gcc-9.4.0-pi_0-1.tar.gz -} - -downloadFirmware(){ - #kicking the can down the road - stable still containts /opt/vc includes - wget https://github.com/raspberrypi/firmware/archive/stable.zip -O firmware.zip - unzip firmware.zip - cp -r firmware-stable/opt raspbian/ - rm -r firmware-stable - rm firmware.zip -} - -relativeSoftLinks(){ - for link in $(ls -la | grep "\-> /" | sed "s/.* \([^ ]*\) \-> \/\(.*\)/\1->\/\2/g"); do - lib=$(echo $link | sed "s/\(.*\)\->\(.*\)/\1/g"); - link=$(echo $link | sed "s/\(.*\)\->\(.*\)/\2/g"); - rm $lib - ln -s ../../..$link $lib - done - - for f in *; do - error=$(grep " \/lib/" $f > /dev/null 2>&1; echo $?) - if [ $error -eq 0 ]; then - sed -i "s/ \/lib/ ..\/..\/..\/lib/g" $f - sed -i "s/ \/usr/ ..\/..\/..\/usr/g" $f - fi - done -} - - -ROOT=$( cd "$(dirname "$0")" ; pwd -P ) -echo $ROOT -cd $ROOT -installPackages -createRaspbianImg -downloadToolchain -downloadFirmware - -#needed for some of the toolchain libs -cp -rn rpi_toolchain/arm-linux-gnueabihf/libc/lib/* $ROOT/raspbian/usr/lib/ -cp -rn rpi_toolchain/arm-linux-gnueabihf/libc/usr/lib/* $ROOT/raspbian/usr/lib/ -cp -rn rpi_toolchain/arm-linux-gnueabihf/lib/* $ROOT/raspbian/usr/lib/ - -cd $ROOT/raspbian/usr/lib -relativeSoftLinks -cd $ROOT/raspbian/usr/lib/arm-linux-gnueabihf -relativeSoftLinks diff --git a/scripts/ci/linuxarmv6l/multistrap.conf b/scripts/ci/linuxarmv6l/multistrap.conf deleted file mode 100644 index c13f93a78e3..00000000000 --- a/scripts/ci/linuxarmv6l/multistrap.conf +++ /dev/null @@ -1,29 +0,0 @@ -[General] -arch=armhf -directory=raspbian -cleanup=true -noauth=true -unpack=true -aptsources=Raspbian-Base OpenFrameworks -debootstrap=Raspbian-Base OpenFrameworks - -[Raspbian-Bare] -packages=busybox busybox-syslogd udhcpc -source=http://archive.raspbian.org/raspbian -keyring=raspbian-archive-keyring -components=main contrib non-free rpi -suite=bullseye - -[Raspbian-Base] -packages=base-files dbus dpkg dropbear initscripts iputils-ping isc-dhcp-client kmod login locales lsb-base lsb-release makedev netbase net-tools sysvinit-utils sysv-rc udev libudev-dev -source=http://archive.raspbian.org/raspbian -keyring=raspbian-archive-keyring -components=main contrib non-free rpi -suite=bullseye - -[OpenFrameworks] -packages=libasound2-dev libxmu-dev libxxf86vm-dev g++ libgl1-mesa-dev libglu1-mesa-dev libraw1394-dev libudev-dev libdrm-dev libglew-dev libopenal-dev libsndfile-dev libfreeimage-dev libcairo2-dev libfreetype6-dev libssl-dev libpulse-dev libusb-1.0-0-dev libopencv-dev libegl1-mesa-dev libglvnd-dev libgles2-mesa-dev libassimp-dev librtaudio-dev libboost-filesystem-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 liburiparser-dev libcurl4-openssl-dev libxml2-dev libpugixml-dev libpoco-dev libglfw3-dev libxrandr-dev libxinerama-dev libxcursor-dev gfortran -source=http://archive.raspbian.org/raspbian -keyring=raspbian-archive-keyring -components=main contrib non-free rpi -suite=bullseye From 1ceccdea8a3b2c5ed9de14b7e3eae60b3045adb3 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Mon, 6 May 2024 18:14:56 -0300 Subject: [PATCH 61/62] minimal install.sh --- scripts/ci/linuxrpi/build.sh | 15 +++-------- scripts/ci/linuxrpi/install.sh | 49 ++++++++++++---------------------- 2 files changed, 21 insertions(+), 43 deletions(-) diff --git a/scripts/ci/linuxrpi/build.sh b/scripts/ci/linuxrpi/build.sh index 9bf4ae3b497..b6a7208b203 100755 --- a/scripts/ci/linuxrpi/build.sh +++ b/scripts/ci/linuxrpi/build.sh @@ -8,12 +8,11 @@ export CROSS_COMPILING=1 if [ -n "$ARCH" ]; then export PLATFORM_ARCH=${ARCH} else -# export PLATFORM_ARCH=aarch64 +# github actions will be defining this one, next line will set if we are working locally export PLATFORM_ARCH=armv6l +# export PLATFORM_ARCH=aarch64 fi -echo "${PLATFORM_ARCH}" - export RPI_ROOT=${OF_ROOT}/scripts/ci/linuxrpi/raspbian echo "${RPI_ROOT}" @@ -22,14 +21,11 @@ export GCC_PREFIX=aarch64-linux-gnu else export GCC_PREFIX=arm-linux-gnueabihf fi -# export GCC_PREFIX=aarch64-linux-gnu + export GST_VERSION=1.0 export PLATFORM_OS=Linux -# export PKG_CONFIG_LIBDIR=${RPI_ROOT}/usr/include:${RPI_ROOT}/usr/lib/pkgconfig:${RPI_ROOT}/usr/lib/${GCC_PREFIX}/pkgconfig:${RPI_ROOT}/usr/share/pkgconfig -# export PKG_CONFIG_LIBDIR=${BCM_FOLDER}:${RPI_ROOT}/usr/lib/aarch64-linux-gnu - -# export PKG_CONFIG_LIBDIR=${BCM_FOLDER}:${RPI_ROOT}/usr/include:${RPI_ROOT}/usr/lib/pkgconfig:${RPI_ROOT}/usr/lib/${GCC_PREFIX}/pkgconfig:${RPI_ROOT}/usr/share/pkgconfig +# export PKG_CONFIG_LIBDIR= export PKG_CONFIG_PATH=${BCM_FOLDER}:${RPI_ROOT}/usr/include:${RPI_ROOT}/usr/lib/pkgconfig:${RPI_ROOT}/usr/lib/${GCC_PREFIX}/pkgconfig:${RPI_ROOT}/usr/share/pkgconfig export TOOLCHAIN_ROOT=/usr export CXX="${TOOLCHAIN_ROOT}/bin/${GCC_PREFIX}-g++" @@ -44,9 +40,6 @@ cp scripts/templates/linux${PLATFORM_ARCH}/config.make examples/templates/emptyE cd examples/templates/emptyExample/ make Debug -j -# if [ -n "$ALLADDONSEXAMPLE" ]; then -# ALLADDONSEXAMPLE = 1 - # if [[ "$ALLADDONSEXAMPLE" == 1 ]]; then echo "**** Building allAddonsExample ****" cd $OF_ROOT diff --git a/scripts/ci/linuxrpi/install.sh b/scripts/ci/linuxrpi/install.sh index 7a9edc2b8ae..815e7db87bb 100755 --- a/scripts/ci/linuxrpi/install.sh +++ b/scripts/ci/linuxrpi/install.sh @@ -4,6 +4,12 @@ set -o pipefail # trap any script errors and exit trap "trapError" ERR +if [ -n "$MULTISTRAP_ARCH" ]; then +echo ${MULTISTRAP_ARCH} +else +export MULTISTRAP_ARCH=armhf +fi + trapError() { echo echo " ^ Received error ^" @@ -11,39 +17,18 @@ trapError() { exit 1 } -installPackages(){ - sudo apt-get -y update - #workaround for https://bugs.launchpad.net/ubuntu/+source/multistrap/+bug/1313787 - sudo sed -i s/\$forceyes//g /usr/sbin/multistrap -} - -downloadFirmware(){ - # FIXME: only if it is not aarch64 - git clone https://github.com/raspberrypi/userland --depth 1 raspbian/userland - # cp -r userland/opt raspbian/ -} - -createRaspbianImg(){ - if [ -n "$MULTISTRAP_ARCH" ]; then - echo ${MULTISTRAP_ARCH} - else - # export MULTISTRAP_ARCH=arm64 - export MULTISTRAP_ARCH=armhf - fi - #needed since Ubuntu 18.04 - allow non https repositories - mkdir -p raspbian/etc/apt/apt.conf.d/ - echo 'Acquire::AllowInsecureRepositories "true";' | sudo tee raspbian/etc/apt/apt.conf.d/90insecure - # multistrap -a arm64 -d raspbian -f multistrap.conf - multistrap -a ${MULTISTRAP_ARCH} -d raspbian -f multistrap.conf -} - -SCRIPT_DIR="${BASH_SOURCE%/*}" -if [[ ! -d "$SCRIPT_DIR" ]]; then SCRIPT_DIR="$PWD"; fi -. "$SCRIPT_DIR/../../dev/downloader.sh" +# SCRIPT_DIR="${BASH_SOURCE%/*}" +# if [[ ! -d "$SCRIPT_DIR" ]]; then SCRIPT_DIR="$PWD"; fi +# . "$SCRIPT_DIR/../../dev/downloader.sh" ROOT=$( cd "$(dirname "$0")" ; pwd -P ) echo $ROOT cd $ROOT -# installPackages -createRaspbianImg -downloadFirmware + +# mkdir -p raspbian/etc/apt/apt.conf.d/ +# echo 'Acquire::AllowInsecureRepositories "true";' | sudo tee raspbian/etc/apt/apt.conf.d/90insecure +multistrap -a ${MULTISTRAP_ARCH} -d raspbian -f multistrap.conf + +if [ ${MULTISTRAP_ARCH} = "armhf" ]; then + git clone https://github.com/raspberrypi/userland --depth 1 raspbian/userland +fi From 04776c403c79fe9341c371ac7c7f246dbccd9058 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Mon, 6 May 2024 18:24:46 -0300 Subject: [PATCH 62/62] unsecure --- scripts/ci/linuxrpi/install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ci/linuxrpi/install.sh b/scripts/ci/linuxrpi/install.sh index 815e7db87bb..f236fd122a7 100755 --- a/scripts/ci/linuxrpi/install.sh +++ b/scripts/ci/linuxrpi/install.sh @@ -25,8 +25,8 @@ ROOT=$( cd "$(dirname "$0")" ; pwd -P ) echo $ROOT cd $ROOT -# mkdir -p raspbian/etc/apt/apt.conf.d/ -# echo 'Acquire::AllowInsecureRepositories "true";' | sudo tee raspbian/etc/apt/apt.conf.d/90insecure +mkdir -p raspbian/etc/apt/apt.conf.d/ +echo 'Acquire::AllowInsecureRepositories "true";' | sudo tee raspbian/etc/apt/apt.conf.d/90insecure multistrap -a ${MULTISTRAP_ARCH} -d raspbian -f multistrap.conf if [ ${MULTISTRAP_ARCH} = "armhf" ]; then