Apothecary Updates

.github/workflows/build-emscripten.yml

@@ -14,7 +14,7 @@ concurrency:
 
 env:
   TARGET: "emscripten"
-  EMSDK_VERSION: "4.0.11"
+  EMSDK_VERSION: "4.0.16"
   USE_ARTIFACT: true
   PTHREADS_ENABLED: 1
   NO_FORCE: 1

.github/workflows/build-linux-cross.yml

@@ -42,12 +42,13 @@ jobs:
     strategy:
         matrix:
           cfg:
-          - {target: linux, arch: arm64, gcc: gcc14}
-          # - {target: linux, arch: jetson, gcc: gcc14}
+          - { distro: ubuntu, target: linux, arch: arm64, gcc: gcc14}
+          # - { distro: jetson, target: linux, arch:arm64, gcc: gcc14}
     env:
       TARGET: ${{matrix.cfg.target}}
       GCC: ${{matrix.cfg.gcc}}
       ARCH: ${{matrix.cfg.arch}}
+      DISTRO: ${{matrix.cfg.distro}}
     steps:      
     - uses: actions/checkout@v4.2.2
     - name: Check if Workflow is disabled
@@ -69,16 +70,13 @@ jobs:
         else
           echo "RELEASE=latest" >> $GITHUB_ENV
         fi
-
     - name: Scripts Calc Formula - ${{matrix.cfg.target}} - ${{matrix.cfg.gcc}}
       run: ./scripts/calculate_formulas.sh
-
     - name: Scripts Setup
-      run: sudo ./scripts/${{ env.TARGET }}/${{ env.ARCH }}/setup.sh
-
-    - name: BuildLinux64
+      run: sudo ./scripts/${{ env.TARGET }}/${{ env.DISTRO }}/${{ env.ARCH }}/setup.sh
+    - name: Build
       working-directory: ${{env.GITHUB_WORKSPACE}}
-      run: scripts/build.sh
+      run: ./scripts/${{ env.TARGET }}/${{ env.DISTRO }}/${{ env.ARCH }}/build.sh
       env:
         BUNDLE: ${{ matrix.bundle }}
     - name: Package
@@ -87,15 +85,13 @@ jobs:
       run: scripts/package.sh
       env:
         BUNDLE: ${{ matrix.bundle }}
-
     - name: List output directory
       run: ls -lah out/
-
-    - name: Update Release 64
+    - name: Update GitHub Release
       if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
       uses: softprops/action-gh-release@v2.1.0
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
         tag_name: ${{ env.RELEASE }}
         draft: false
-        files: out/openFrameworksLibs_${{ env.RELEASE }}_${{ env.TARGET }}_${{ env.ARCH }}_${{ env.GCC }}.tar.bz2
+        files: out/openFrameworksLibs_${{ env.RELEASE }}_${{ env.TARGET }}_${{ env.DISTRO }}_${{ env.ARCH }}_${{ env.GCC }}.tar.bz2

.github/workflows/build-linux-rpi.yml

@@ -17,6 +17,7 @@ env:
   GA_CI_SECRET: ${{ secrets.CI_SECRET }}
   USE_ARTIFACT: false
   DISABLE_WORKFLOW: "true"
+  DISTRO: raspios
 
 jobs:  
   pre-check:
@@ -90,21 +91,22 @@ jobs:
             echo "RELEASE=latest" >> $GITHUB_ENV
           fi
 
-      - name: Script Install
-        run: sudo ./scripts/${{ env.TARGET }}/raspios/${{ env.ARCH }}/install.sh
-
       - name: Setup Cross Compiler and Target Local File System
-        run: sudo ./scripts/${{ env.TARGET }}/raspios/${{ env.ARCH }}/setup.sh
+        run: sudo ./scripts/${{ env.TARGET }}/${{ env.DISTRO }}/${{ env.ARCH }}/setup.sh
 
-      - name: Build
-        run: ./scripts/${{ env.TARGET }}/raspios/${{ env.ARCH }}/build.sh
+      - name: Script Install and Build
+        run: sudo ./scripts/${{ env.TARGET }}/${{ env.DISTRO }}/${{ env.ARCH }}/install.sh
+
+      - name: Script Install and Build
+        run: ./scripts/${{ env.TARGET }}/${{ env.DISTRO }}/${{ env.ARCH }}/build.sh
 
       - name: Package
         #if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
         working-directory: ${{ env.GITHUB_WORKSPACE }}
         run: scripts/package.sh
         env:
           BUNDLE: ${{ matrix.bundle }}
+          DISTRO: ${{ env.DISTRO }}
           GCC: "_${{ matrix.CROSS_CPU }}_${{ matrix.CROSS_OS }}"
 
       - name: List output directory
@@ -119,131 +121,155 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           tag_name: ${{ env.RELEASE }}
           draft: false
-          files: out/openFrameworksLibs_${{ env.RELEASE }}_${{ env.TARGET }}_${{ env.ARCH }}_{{ env.GCC }}.tar.bz2
+          files: out/openFrameworksLibs_${{ env.RELEASE }}_${{ env.TARGET }}_${{ env.DISTRO }}_${{ env.ARCH }}_{{ env.GCC }}.tar.bz2
 
-  build-linux-armv6l-pi-1zero:
-    if: needs.pre-check.outputs.workflow_disabled != 'true'
-    needs: pre-check
-    runs-on: ubuntu-latest
-    env:
-      TARGET: linux
-      ARCH: armv7l
-      CROSS_COMPILER: raspbian
-      CROSS_OS: bookworm
-      WORKDIR: "/home/runner/work/apothecary/apothecary"
-      SYSROOT: "${WORKDIR}/${CROSS_SYSROOT}"
-      TOOLCHAIN_ROOT: "${WORKDIR}/${CROSS_COMPILER}"
-      TOOLCHAIN_PREFIX: "arm-linux-gnueabihf"
+  # build-linux-armv6l-pi-1zero:
+  #   if: needs.pre-check.outputs.workflow_disabled != 'true'
+  #   needs: pre-check
+  #   runs-on: ubuntu-latest
+  #   env:
+  #     TARGET: linux
+  #     ARCH: armv7l
+  #     CROSS_COMPILER: raspbian
+  #     CROSS_OS: bookworm
+  #     WORKDIR: "/home/runner/work/apothecary/apothecary"
+  #     SYSROOT: "${WORKDIR}/${CROSS_SYSROOT}"
+  #     TOOLCHAIN_ROOT: "${WORKDIR}/${CROSS_COMPILER}"
+  #     TOOLCHAIN_PREFIX: "arm-linux-gnueabihf"
 
-    steps:
-      - uses: actions/checkout@v4.2.2
-      - name: Determine Release
-        id: vars
-        shell: bash
-        run: |
-          if [[ "${{ github.ref }}" == refs/tags/* ]]; then
-            echo "RELEASE=${{ github.ref_name }}" >> $GITHUB_ENV
-          elif [[ "${{ github.ref }}" == "refs/heads/master" ]]; then
-            echo "RELEASE=nightly" >> $GITHUB_ENV
-          elif [[ "${{ github.ref }}" == "refs/heads/bleeding" ]]; then
-            echo "RELEASE=latest" >> $GITHUB_ENV
-          else
-            echo "RELEASE=latest" >> $GITHUB_ENV
-          fi
-      - name: Update and Upgrade System Packages
-        run: |
-          sudo apt update && sudo apt dist-upgrade -y
-          sudo apt-get install -y build-essential gcc g++ gfortran git texinfo bison libncurses-dev tar wget qemu-user-static rsync xz-utils
-
-      - name: Setup Cross Compiler and Target Local File System
-        run: ./scripts/${{ env.TARGET }}/raspios/${{ env.ARCH }}/setup.sh
+  #   steps:
+  #     - uses: actions/checkout@v4.2.2
+  #     - name: Determine Release
+  #       id: vars
+  #       shell: bash
+  #       run: |
+  #         if [[ "${{ github.ref }}" == refs/tags/* ]]; then
+  #           echo "RELEASE=${{ github.ref_name }}" >> $GITHUB_ENV
+  #         elif [[ "${{ github.ref }}" == "refs/heads/master" ]]; then
+  #           echo "RELEASE=nightly" >> $GITHUB_ENV
+  #         elif [[ "${{ github.ref }}" == "refs/heads/bleeding" ]]; then
+  #           echo "RELEASE=latest" >> $GITHUB_ENV
+  #         else
+  #           echo "RELEASE=latest" >> $GITHUB_ENV
+  #         fi
+  #     - name: Update and Upgrade System Packages
+  #       run: |
+  #         sudo apt update && sudo apt dist-upgrade -y
+  #         sudo apt-get install -y build-essential gcc g++ gfortran git texinfo bison libncurses-dev tar wget qemu-user-static rsync xz-utils
 
-      - name: Script Install and Build
-        run: ./scripts/${{ env.TARGET }}/raspios/${{ env.ARCH }}/install.sh
+  #     - name: Setup Cross Compiler and Target Local File System
+  #       run: sudo ./scripts/${{ env.TARGET }}/${{ env.DISTRO }}/${{ env.ARCH }}/setup.sh
 
-      - name: Script Install and Build
-        run: ./scripts/${{ env.TARGET }}/raspios/${{ env.ARCH }}/build.sh
+  #     - name: Script Install and Build
+  #       run: sudo ./scripts/${{ env.TARGET }}/${{ env.DISTRO }}/${{ env.ARCH }}/install.sh
 
-      - name: Update Release armv6l
-        if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
-        uses: softprops/action-gh-release@v2.1.0
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          tag_name: ${{ env.RELEASE }}
-          draft: false
-          files: out/openFrameworksLibs_${{ env.RELEASE }}_${{ env.TARGET }}_${{ env.ARCH }}.tar.bz2
+  #     - name: Script Install and Build
+  #       run: ./scripts/${{ env.TARGET }}/${{ env.DISTRO }}/${{ env.ARCH }}/build.sh
 
-  build-linux-armv7-pi3ab45:
-    if: needs.pre-check.outputs.workflow_disabled != 'true'
-    needs: pre-check
-    runs-on: ubuntu-latest
-    env:
-      TARGET: linux
-      ARCH: armv7l
-      CROSS_COMPILER: raspbian
-      CROSS_OS: bookworm
-      WORKDIR: "/home/runner/work/apothecary/apothecary"
-      SYSROOT: "${WORKDIR}/${CROSS_SYSROOT}"
-      TOOLCHAIN_ROOT: "${WORKDIR}/${CROSS_COMPILER}"
-      TOOLCHAIN_PREFIX: "arm-linux-gnueabihf"
-    steps:
-      - uses: actions/checkout@v4.2.2
-      - name: Check if Workflow is disabled
-        run: |
-          if [ "${{ env.DISABLE_WORKFLOW }}" == "true" ]; then
-            echo "Workflow is disabled. Exiting."
-            exit 78
-          fi
+  #     - name: Package
+  #       #if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
+  #       working-directory: ${{ env.GITHUB_WORKSPACE }}
+  #       run: scripts/package.sh
+  #       env:
+  #         BUNDLE: ${{ matrix.bundle }}
+  #         DISTRO: ${{ env.DISTRO }}
+  #         GCC: "_${{ matrix.CROSS_CPU }}_${{ matrix.CROSS_OS }}"
 
-      - name: Determine Release
-        id: vars
-        shell: bash
-        run: |
-          if [[ "${{ github.ref }}" == refs/tags/* ]]; then
-            echo "RELEASE=${{ github.ref_name }}" >> $GITHUB_ENV
-          elif [[ "${{ github.ref }}" == "refs/heads/master" ]]; then
-            echo "RELEASE=nightly" >> $GITHUB_ENV
-          elif [[ "${{ github.ref }}" == "refs/heads/bleeding" ]]; then
-            echo "RELEASE=latest" >> $GITHUB_ENV
-          else
-            echo "RELEASE=latest" >> $GITHUB_ENV
-          fi
+  #     - name: List output directory
+  #       run: ls -lah out/
 
-      - name: Update and Upgrade System Packages
-        run: |
-          sudo apt update && sudo apt dist-upgrade -y
-          sudo apt-get install -y build-essential gcc g++ gfortran git texinfo bison libncurses-dev tar wget qemu-user-static rsync xz-utils
+  #     - name: Update Release armv6l
+  #       if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
+  #       uses: softprops/action-gh-release@v2.1.0
+  #       with:
+  #         token: ${{ secrets.GITHUB_TOKEN }}
+  #         tag_name: ${{ env.RELEASE }}
+  #         draft: false
+  #         files: out/openFrameworksLibs_${{ env.RELEASE }}_${{ env.TARGET }}_${{ env.DISTRO }}_${{ env.ARCH }}_{{ env.GCC }}.tar.bz2
+
+  # build-linux-armv7-pi3ab45:
+  #   if: needs.pre-check.outputs.workflow_disabled != 'true'
+  #   needs: pre-check
+  #   runs-on: ubuntu-latest
+  #   env:
+  #     TARGET: linux
+  #     ARCH: armv7l
+  #     CROSS_COMPILER: raspbian
+  #     CROSS_OS: bookworm
+  #     WORKDIR: "/home/runner/work/apothecary/apothecary"
+  #     SYSROOT: "${WORKDIR}/${CROSS_SYSROOT}"
+  #     TOOLCHAIN_ROOT: "${WORKDIR}/${CROSS_COMPILER}"
+  #     TOOLCHAIN_PREFIX: "arm-linux-gnueabihf"
+  #   steps:
+  #     - uses: actions/checkout@v4.2.2
+  #     - name: Check if Workflow is disabled
+  #       run: |
+  #         if [ "${{ env.DISABLE_WORKFLOW }}" == "true" ]; then
+  #           echo "Workflow is disabled. Exiting."
+  #           exit 78
+  #         fi
+
+  #     - name: Determine Release
+  #       id: vars
+  #       shell: bash
+  #       run: |
+  #         if [[ "${{ github.ref }}" == refs/tags/* ]]; then
+  #           echo "RELEASE=${{ github.ref_name }}" >> $GITHUB_ENV
+  #         elif [[ "${{ github.ref }}" == "refs/heads/master" ]]; then
+  #           echo "RELEASE=nightly" >> $GITHUB_ENV
+  #         elif [[ "${{ github.ref }}" == "refs/heads/bleeding" ]]; then
+  #           echo "RELEASE=latest" >> $GITHUB_ENV
+  #         else
+  #           echo "RELEASE=latest" >> $GITHUB_ENV
+  #         fi
+
+  #     - name: Update and Upgrade System Packages
+  #       run: |
+  #         sudo apt update && sudo apt dist-upgrade -y
+  #         sudo apt-get install -y build-essential gcc g++ gfortran git texinfo bison libncurses-dev tar wget qemu-user-static rsync xz-utils
 
-      # - name: Cache raspbian folder
-      #   uses: actions/cache@v4.2.0
-      #   with:
-      #     path: /home/runner/work/apothecary/apothecary/raspbian
-      #     key: raspbian-pi3ab45-cache-2
+  #     # - name: Cache raspbian folder
+  #     #   uses: actions/cache@v4.2.0
+  #     #   with:
+  #     #     path: /home/runner/work/apothecary/apothecary/raspbian
+  #     #     key: raspbian-pi3ab45-cache-2
 
-      # - name: Check if folder exists
-      #   id: folder-check
-      #   run: >
-      #     if [ -d $TOOLCHAIN_ROOT ]; then
-      #       echo "Raspbian folder already exists. Skipping download and extract."
-      #       echo "::set-output name=folder-exists::true"
-      #     else
-      #       echo "::set-output name=folder-exists::false"
-      #     fi
+  #     # - name: Check if folder exists
+  #     #   id: folder-check
+  #     #   run: >
+  #     #     if [ -d $TOOLCHAIN_ROOT ]; then
+  #     #       echo "Raspbian folder already exists. Skipping download and extract."
+  #     #       echo "::set-output name=folder-exists::true"
+  #     #     else
+  #     #       echo "::set-output name=folder-exists::false"
+  #     #     fi
 
-      - name: Setup Cross Compiler and Target Local File System
-        run: ./scripts/${{ env.TARGET }}/raspios/${{ env.ARCH }}/setup.sh
+  #     - name: Setup Cross Compiler and Target Local File System
+  #       run: sudo ./scripts/${{ env.TARGET }}/${{ env.DISTRO }}/${{ env.ARCH }}/setup.sh
 
-      - name: Script Install and Build
-        run: ./scripts/${{ env.TARGET }}/raspios/${{ env.ARCH }}/install.sh
+  #     - name: Script Install and Build
+  #       run: sudo ./scripts/${{ env.TARGET }}/${{ env.DISTRO }}/${{ env.ARCH }}/install.sh
 
-      - name: Script Install and Build
-        run: ./scripts/${{ env.TARGET }}/raspios/${{ env.ARCH }}/build.sh
+  #     - name: Script Install and Build
+  #       run: ./scripts/${{ env.TARGET }}/${{ env.DISTRO }}/${{ env.ARCH }}/build.sh
 
-      - name: Update Release armv7l
-        if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
-        uses: softprops/action-gh-release@v2.1.0
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          tag_name: ${{ env.RELEASE }}
-          draft: false
-          files: out/openFrameworksLibs_${{ env.RELEASE }}_${{ env.TARGET }}_${{ env.ARCH }}.tar.bz2
+  #     - name: Package
+  #       #if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
+  #       working-directory: ${{ env.GITHUB_WORKSPACE }}
+  #       run: scripts/package.sh
+  #       env:
+  #         BUNDLE: ${{ matrix.bundle }}
+  #         DISTRO: ${{ env.DISTRO }}
+  #         GCC: "_${{ matrix.CROSS_CPU }}_${{ matrix.CROSS_OS }}"
+
+  #     - name: List output directory
+  #       run: ls -lah out/
+
+  #     - name: Update Release
+  #       if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
+  #       uses: softprops/action-gh-release@v2.1.0
+  #       with:
+  #         token: ${{ secrets.GITHUB_TOKEN }}
+  #         tag_name: ${{ env.RELEASE }}
+  #         draft: false
+  #         files: out/openFrameworksLibs_${{ env.RELEASE }}_${{ env.TARGET }}_${{ env.DISTRO }}_${{ env.ARCH }}_{{ env.GCC }}.tar.bz2

.github/workflows/build-linux64.yml

@@ -77,7 +77,7 @@ jobs:
     - name: Scripts Calc Formula - ${{matrix.cfg.target}} - ${{matrix.cfg.gcc}}
       run: ./scripts/calculate_formulas.sh
     - name: Scripts Install
-      run: ./scripts/linux/install.sh
+      run: ./scripts/linux/ubuntu/install.sh
 
     - name: BuildLinux64
       working-directory: ${{env.GITHUB_WORKSPACE}}

apothecary/apothecary

@@ -1431,6 +1431,7 @@ function downloadFormula(){
   # dependencies
   if [ $FORMULA_DEPENDS_MANUAL == 0 ] ; then
     apothecaryDependencies download
+    apothecaryDependencies prepare
   fi
   cd $APOTHECARY_DIR
 }