Merge commit '3796209e3c726dc2800186854d2b64f641967df8' into stable

* commit '3796209e3c726dc2800186854d2b64f641967df8': (255 commits) Update THANKS.md Update CHANGELOG.md Update ofConstants.h bugfix ofAppGLFWWindow requested monitor wasn't being clamped (openframeworks#6718) bugfix fmod sound player for macos. closes openframeworks#6714 openframeworks#6708 (openframeworks#6717) Update Info.plist with retina entry (openframeworks#6701) add support for Objective C and Objective C++ source in addon Make builds (openframeworks#6652) update pg and apothecary submodules Update CHANGELOG.md videoGrabberExample - set the inverted pixels to actual grabber dimensions (openframeworks#6698) Update CHANGELOG.md fix for emscripten and ofFbo (openframeworks#6697) added msys2 projectGenerator packaging. (openframeworks#6696) macos - added fix for apps being half sized on retina in Big Sur (openframeworks#6694) removed closing parenthesis (openframeworks#6693) Update CONTRIBUTING.md prevent all md edits from triggering github actions Update CHANGELOG.md Update THANKS.md Update CHANGELOG.md ...
olekristensen · Jun 22, 2021 · e6e2a0e · e6e2a0e
2 parents 97be67f + 3796209
commit e6e2a0e
Show file tree

Hide file tree

Showing 388 changed files with 8,230 additions and 3,238 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -1,71 +1,100 @@
 version: 1.0.{build}
 
+platform:
+  - x86
+  - x64
+
 environment:
   global:
     APPVEYOR_OS_NAME: windows
+    CHERE_INVOKING: 1
+    MSYS2_PATH: c:\msys64
+    #CCACHE settings : Appveyor cache is limited to 1G so we limit CCACHE to 2G and expect 50% compression...
+    CCACHE_DIR: "%APPVEYOR_BUILD_FOLDER%\\.ccache"
+    CCACHE_MAXSIZE: 2G
   matrix:
   #MSYS2 Building
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      platform: x86
       BUILDER: MSYS2
-      CCACHE_DIR: "%APPVEYOR_BUILD_FOLDER%\\.ccache"
-
   #VisualStudio Building
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      platform: x86
-      BUILDER : VS
-      BITS: 32
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      platform: x64
       BUILDER : VS
-      BITS: 64
 
 configuration: Debug
 shallow_clone: true
 clone_depth: 10
 
+
 init:
 # fix for https://github.com/appveyor/ci/issues/2571
 - del C:\Windows\System32\libssl-*.dll C:\Windows\system32\libcrypto-*.dll
 - del C:\Windows\SysWOW64\libssl-*.dll C:\Windows\SysWOW64\libcrypto-*.dll
-- set MSYS2_PATH=c:\msys64
-- set CHERE_INVOKING=1
-- if "%BUILDER%_%PLATFORM%"=="MSYS2_x86" set MSYSTEM=MINGW32
-- if "%BUILDER%_%PLATFORM%"=="MSYS2_x64" set MSYSTEM=MINGW64
-- '%MSYS2_PATH%\usr\bin\bash -lc "pacman --noconfirm --needed -Sy bash pacman pacman-mirrors msys2-runtime msys2-runtime-devel"'
-- '%MSYS2_PATH%\usr\bin\bash -lc "pacman --noconfirm -S --needed unzip rsync libopenssl mingw-w64-i686-openssl"'
-- if "%BUILDER%"=="VS" set PATH=%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin;%PATH%
 
-# - IF "%BUILDER%"=="VS" set PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%PATH%
 
-cache:
+
+for:
+  -
+    matrix:
+      only:
+        - BUILDER: MSYS2
+
+    cache:
     - .ccache
 
-install:
-- if "%BUILDER%"=="VS" (%MSYS2_PATH%\usr\bin\bash -lc "scripts/ci/vs/install.sh")
-- if "%BUILDER%"=="MSYS2" (%MSYS2_PATH%\usr\bin\bash -lc "scripts/ci/msys2/install.sh --noconfirm")
-
-before_build:
-- if "%BUILDER%"=="MSYS2" (%MSYS2_PATH%\usr\bin\bash -lc "ccache -z")
-- if "%BUILDER%"=="MSYS2" (%MSYS2_PATH%\usr\bin\bash -lc "ccache -s")
-
-build_script:
-- if "%BUILDER%"=="MSYS2" (%MSYS2_PATH%\usr\bin\bash -lc "scripts/ci/msys2/build.sh")
-
-- ps: |
-    if ($env:BUILDER -eq "VS") {
-      msbuild libs/openFrameworksCompiled/project/vs/openframeworksLib.vcxproj  /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
-      msbuild examples/templates/emptyExample/emptyExample.vcxproj  /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
-      msbuild examples/templates/allAddonsExample/allAddonsExample.vcxproj  /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
-    }
-
-test_script:
-- if "%BUILDER%"=="MSYS2" (%MSYS2_PATH%\usr\bin\bash -lc "scripts/ci/msys2/run_tests.sh")
-- ps: |
-    if ($env:BUILDER -eq "VS") {
-      cd scripts/ci/vs
-      .\run_tests.bat
-    }
-
-after_test:
-  - if "%BUILDER%"=="MSYS2" (%MSYS2_PATH%\usr\bin\bash -lc "ccache -s")
+    install:
+      - |-
+        set MSYSTEM=%platform:86=32%
+        set MSYSTEM=%MSYSTEM:x=MINGW%
+        cd C:\
+        ren msys64 msys64_old
+        C:\msys64_old\usr\bin\bash -lc "curl -L http://repo.msys2.org/distrib/msys2-x86_64-latest.tar.xz | xz -d | tar -xf -"
+        %MSYS2_PATH%\usr\bin\bash -lc "pacman --noconfirm -Syu"
+        %MSYS2_PATH%\usr\bin\pacman --noconfirm -S --needed unzip rsync wget libopenssl
+        cd "%APPVEYOR_BUILD_FOLDER%"
+        %MSYS2_PATH%\usr\bin\bash -lc "scripts/ci/msys2/install.sh"
+        %MSYS2_PATH%\usr\bin\bash -lc "echo $PATH"
+
+    before_build:
+      - |-
+        %MSYS2_PATH%\usr\bin\bash -lc "ccache -z"
+        %MSYS2_PATH%\usr\bin\bash -lc "ccache -s"
+
+    build_script:
+      - '%MSYS2_PATH%\usr\bin\bash -lc "scripts/ci/msys2/build.sh"'
+
+    test_script:
+      - '%MSYS2_PATH%\usr\bin\bash -lc "scripts/ci/msys2/run_tests.sh"'
+
+    after_test:
+      - '%MSYS2_PATH%\usr\bin\bash -lc "ccache -s"'
+
+
+  -
+    matrix:
+      only:
+        - BUILDER: VS
+
+    install:
+      - |-
+        set BITS=%platform:86=32%
+        set BITS=%BITS:x=%
+        cd C:\
+        ren msys64 msys64_old
+        C:\msys64_old\usr\bin\bash -lc "curl -L http://repo.msys2.org/distrib/msys2-x86_64-latest.tar.xz | xz -d | tar -xf -"
+        %MSYS2_PATH%\usr\bin\bash -lc "pacman --noconfirm -Syu"
+        %MSYS2_PATH%\usr\bin\pacman --noconfirm -S --needed unzip rsync wget libopenssl
+        cd "%APPVEYOR_BUILD_FOLDER%"
+        set PATH=%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin;%PATH%
+        %MSYS2_PATH%\usr\bin\bash -lc "scripts/ci/vs/install.sh"
+
+    build_script:
+      - |-
+          echo BITS=%BITS%
+          msbuild libs/openFrameworksCompiled/project/vs/openframeworksLib.vcxproj  /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+          msbuild examples/templates/emptyExample/emptyExample.vcxproj  /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+          msbuild examples/templates/allAddonsExample/allAddonsExample.vcxproj  /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+
+    test_script:
+      - |-
+        cd scripts/ci/vs
+        .\run_tests.bat
diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml
@@ -0,0 +1,46 @@
+name: build-android
+
+on:
+  push:
+    paths-ignore:
+    - '**/*.md'
+  pull_request:
+    paths-ignore:
+    - '**/*.md'
+
+jobs:
+
+  build-android:
+    runs-on: ubuntu-16.04
+    strategy:
+      matrix:
+        cfg:
+        - {target: android, gradle_target: compileArm7DebugSources}
+        - {target: android, gradle_target: compileX86DebugSources}
+
+    env:
+      TARGET: ${{matrix.cfg.target}}
+      GRADLE_TARGET: ${{matrix.cfg.gradle_target}}
+      NDK_DIR: android-ndk-r15c
+    steps:
+    - uses: actions/checkout@v2
+    - name: Cache projectGenerator folder
+      uses: actions/cache@v2
+      with:
+        path: '~/projectGenerator'
+        key: ${{ runner.os }}-pg-${{matrix.cfg.gradle_target}}
+    - name: Cache NDK
+      uses: actions/cache@v2
+      with:
+        path: '~/android-ndk-r15c'
+        key: ${{ runner.os }}-android-ndk-${{matrix.cfg.gradle_target}}
+    - name: install
+      run: ./scripts/ci/$TARGET/install.sh
+    - name: Download libs
+      run: ./scripts/$TARGET/download_libs.sh
+    - name: Build
+      run: ./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-emscripten.yml b/.github/workflows/build-emscripten.yml
@@ -0,0 +1,34 @@
+name: build-emscripten
+
+on:
+  push:
+    paths-ignore:
+    - '**/*.md'
+  pull_request:
+    paths-ignore:
+    - '**/*.md'
+
+jobs:
+
+  build-emscripten:
+    runs-on: ubuntu-16.04
+    strategy:
+        matrix:
+          cfg:
+          - {target: emscripten}
+    env:
+     TARGET: ${{matrix.cfg.target}}
+    steps:
+    - uses: actions/checkout@v2
+    - name: Docker Step
+      run:  "docker run -di --name emscripten -v $PWD:/src emscripten/emsdk:1.40.0 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
@@ -0,0 +1,33 @@
+name: build-ios-tvos
+
+on:
+  push:
+    paths-ignore:
+    - '**/*.md'
+  pull_request:
+    paths-ignore:
+    - '**/*.md'
+
+jobs:
+
+  build-osx:
+    runs-on: macos-10.15
+    strategy:
+        matrix:
+          cfg:
+          - {target: ios, libs: ios}
+          - {target: tvos, libs: ios}
+    env:
+     TARGET: ${{matrix.cfg.target}}
+    steps:
+    - uses: actions/checkout@v2
+    - 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_11.2.app/Contents/Developer"
+
diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml
@@ -0,0 +1,46 @@
+name: build-linux64-and-arm
+
+on:
+  push:
+    paths-ignore:
+    - '**/*.md'
+  pull_request:
+    paths-ignore:
+    - '**/*.md'
+
+jobs:
+
+  build-linux-platforms:
+    runs-on: ubuntu-16.04
+    strategy:
+        matrix:
+          cfg:
+          - {target: linux64, libs: 64gcc6}
+          - {target: linuxarmv6l, libs: armv6l}
+          - {target: linuxarmv7l, libs: armv7l}
+    env:
+     TARGET: ${{matrix.cfg.target}}
+    steps:
+    - uses: actions/checkout@v2
+    - name: Download libs
+      run: ./scripts/linux/download_libs.sh -a ${{matrix.cfg.libs}};
+    - name: Install dependencies
+      run: ./scripts/ci/$TARGET/install.sh;
+#    - name: Install gcc4
+#      run: if [ ${{matrix.cfg.target}} = "64gcc4" ]; then
+#                sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test;
+#                sudo apt-get update -q;
+#                sudo apt-get install gcc-4.9 g++-4.9;
+#            fi
+    - name: Build
+      run: if [ "$TARGET" = "linux64" ]; then
+            scripts/ci/$TARGET/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
@@ -0,0 +1,41 @@
+name: build-macos
+
+on:
+  push:
+    paths-ignore:
+    - '**/*.md'
+  pull_request:
+    paths-ignore:
+    - '**/*.md'
+
+jobs:
+
+  build-osx:
+    runs-on: macos-10.15
+    strategy:
+        matrix:
+          cfg:
+          - {target: osx, opt: ""}
+          - {target: osx, opt: "makefiles"}
+    env:
+     TARGET: ${{matrix.cfg.target}}
+     OPT: ${{matrix.cfg.opt}}
+    steps:
+    - uses: actions/checkout@v2
+    - name: Download libs
+      run: ./scripts/$TARGET/download_libs.sh
+    - name: rm-dev
+      run: sudo rm -rf /Library/Developer
+    - name: install
+      run: ./scripts/ci/$TARGET/install.sh
+    - name: Build
+      run:
+           if [ "$TARGET" = "osx" ] && [ "$OPT" = "makefiles" ]; then
+            scripts/ci/$TARGET/run_tests.sh;
+           else
+            scripts/ci/$TARGET/build.sh $OPT;
+           fi
+      env:
+        DEVELOPER_DIR: "/Applications/Xcode_12.2.app/Contents/Developer"
+        SDKROOT: "/Applications/Xcode_12.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk"
+
diff --git a/.github/workflows/build-msys2.yml b/.github/workflows/build-msys2.yml
@@ -0,0 +1,42 @@
+name: build-msys2
+
+on:
+  push:
+    paths-ignore:
+    - '**/*.md'
+  pull_request:
+    paths-ignore:
+    - '**/*.md'
+
+jobs:
+
+  build-msys2:
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        mingw: [MINGW64,MINGW32]
+    defaults:
+      run:
+        shell: msys2 {0}
+    steps:
+    - uses: actions/checkout@v2
+    - uses: msys2/setup-msys2@v2
+      with:
+        update: true
+        install: >-
+          git
+          unzip
+          rsync
+          wget
+    - name: Install dependencies
+      run: ./scripts/ci/msys2/install.sh
+      env:
+        MSYSTEM: ${{ matrix.mingw }}
+    - name: Build
+      run: ./scripts/ci/msys2/build.sh
+      env:
+        MSYSTEM: ${{ matrix.mingw }}
+    - name: Run tests
+      run: ./scripts/ci/msys2/run_tests.sh
+      env:
+        MSYSTEM: ${{ matrix.mingw }}