Skip to content

Commit e43f7c5

Browse files
danoli3danoli3
committed
Merge commit '7f37e70f65e9e022ba8868fb555570ce2c78a6ba' into branch_bleedingmacOS
* commit '7f37e70f65e9e022ba8868fb555570ce2c78a6ba': (37 commits) Allows Retina hi res enabled via App or Project.xcconfig (openframeworks#7971) actions changes (openframeworks#7968) Changing exr to hdr files for compatability with windows (openframeworks#7964) ofMesh - newfaces push_back to insert a list (openframeworks#7772) restore default-copy-constructibility of ofEvent (openframeworks#7969) [actions] ccache update (openframeworks#7967) Core small changes (openframeworks#7952) config.emscripten.default.mk for Emscripten >= 3.1.52 (openframeworks#7909) Fix edge case in findDelimiter (openframeworks#7911) oscpack / udpSocket: invert the "break_" semaphore (openframeworks#7963) ofxOscMessage: extra implicit adds [fixes something noted through openframeworks#7938 debugging] (openframeworks#7953) #changelog #ofxOsc ofThreadChannel::clear() to clear the channel (openframeworks#7921) #changelog #threadChannel OfxOscReceiver: from detach() to join() (openframeworks#7949) Update ofMathConstants.h (openframeworks#7958) [actions] update ubuntu 24.04 (openframeworks#7955) ofScopedMatrix (openframeworks#7946) [actions] - testing one action with multiple jobs for tests (openframeworks#7860) adding of.entitlements and vscode files to gitignore (openframeworks#7031) Make - use relative paths (openframeworks#7519) FPS timing with chrono (openframeworks#7867) ... # Conflicts: # libs/openFrameworks/sound/ofAVEngineSoundPlayer.mm
2 parents ae7412b + 7f37e70 commit e43f7c5

File tree

199 files changed

+2160
-1450
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

199 files changed

+2160
-1450
lines changed

‎.github/workflows/build-emscripten.yml renamed to ‎.github/workflows/actions/build-emscripten.yml

+7-6
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,26 @@ concurrency:
1717
group: ${{ github.workflow }}-${{ github.ref }}
1818
cancel-in-progress: true
1919

20+
env:
21+
ccache: ccache
22+
2023
jobs:
2124
build-emscripten:
22-
runs-on: ubuntu-latest
25+
runs-on: ubuntu-24.04
2326
strategy:
2427
matrix:
2528
cfg:
2629
- {target: emscripten}
27-
env:
28-
TARGET: ${{matrix.cfg.target}}
2930
steps:
3031
- uses: actions/checkout@v4
3132
- name: Docker Step
3233
run: "docker run -di --name emscripten -v $PWD:/src emscripten/emsdk:3.1.21 bash"
3334
- name: Download libs
34-
run: ./scripts/$TARGET/download_libs.sh
35+
run: ./scripts/${{matrix.cfg.target}}/download_libs.sh
3536
- name: Install dependencies
36-
run: ./scripts/ci/$TARGET/install.sh
37+
run: ./scripts/ci/${{matrix.cfg.target}}/install.sh
3738
- name: Build
38-
run: docker exec -i emscripten sh -c "scripts/ci/$TARGET/build.sh";
39+
run: docker exec -i emscripten sh -c "scripts/ci/${{matrix.cfg.target}}/build.sh";
3940
- name: Upload Libs
4041
run: scripts/ci/upload_of_lib.sh;
4142
env:

‎.github/workflows/build-ios-tvos.yml renamed to ‎.github/workflows/actions/build-ios-tvos.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ on:
1313
- '**/*.md'
1414
- 'examples/**'
1515

16-
env:
17-
ccache: ccache
18-
1916
concurrency:
2017
group: ${{ github.workflow }}-${{ github.ref }}
2118
cancel-in-progress: true
2219

20+
env:
21+
ccache: ccache
22+
2323
jobs:
2424
build-ios-tvos:
2525
runs-on: macos-14
@@ -33,7 +33,7 @@ jobs:
3333
steps:
3434
- uses: actions/checkout@v4
3535
- name: ccache
36-
uses: hendrikmuhs/ccache-action@v1.2.12
36+
uses: hendrikmuhs/ccache-action@v1.2.13
3737
with:
3838
key: ${{ matrix.cfg.target }}-${{ matrix.cfg.libs }}
3939

‎.github/workflows/build-linux64.yml renamed to ‎.github/workflows/actions/build-linux64.yml

+6-7
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@ on:
1313
- '**/*.md'
1414
- 'examples/**'
1515

16-
env:
17-
ccache: ccache
18-
1916
concurrency:
2017
group: ${{ github.workflow }}-${{ github.ref }}
2118
cancel-in-progress: true
2219

20+
env:
21+
ccache: ccache
22+
2323
jobs:
2424
build-linux64-platforms:
25-
runs-on: ubuntu-latest
25+
runs-on: ubuntu-24.04
2626
strategy:
2727
matrix:
2828
cfg:
@@ -37,12 +37,12 @@ jobs:
3737
- name: Cache Packages
3838
uses: awalsh128/cache-apt-pkgs-action@latest
3939
with:
40-
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
40+
packages: wget2 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
4141
version: 1.0
4242

4343
- uses: actions/checkout@v4
4444
- name: ccache
45-
uses: hendrikmuhs/ccache-action@v1.2.12
45+
uses: hendrikmuhs/ccache-action@v1.2.13
4646
with:
4747
key: ${{ matrix.cfg.target }}-${{ matrix.cfg.libs }}
4848

@@ -61,4 +61,3 @@ jobs:
6161
# run: scripts/ci/upload_of_lib.sh;
6262
# env:
6363
# GA_CI_SECRET: ${{ secrets.CI_SECRET }}
64-

‎.github/workflows/build-macos.yml renamed to ‎.github/workflows/actions/build-macos.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ on:
1313
- '**/*.md'
1414
- 'examples/**'
1515

16-
env:
17-
ccache: ccache
18-
1916
concurrency:
2017
group: ${{ github.workflow }}-${{ github.ref }}
2118
cancel-in-progress: true
2219

20+
env:
21+
ccache: ccache
22+
2323
jobs:
2424
build-macos:
2525
runs-on: macos-14
@@ -31,7 +31,7 @@ jobs:
3131
steps:
3232
- uses: actions/checkout@v4
3333
- name: ccache
34-
uses: hendrikmuhs/ccache-action@v1.2.12
34+
uses: hendrikmuhs/ccache-action@v1.2.13
3535
with:
3636
# key: ${{ matrix.os }}-${{ matrix.type }}
3737
key: ${{ matrix.cfg.target }}-${{ matrix.cfg.opt }}

‎.github/workflows/build-msys2.yml renamed to ‎.github/workflows/actions/build-msys2.yml

+10-6
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ on:
1313
- '**/*.md'
1414
- 'examples/**'
1515

16-
env:
17-
ccache: ccache
18-
1916
concurrency:
2017
group: ${{ github.workflow }}-${{ github.ref }}
2118
cancel-in-progress: true
2219

20+
env:
21+
ccache: ccache
22+
2323
jobs:
2424
build-msys2:
2525
runs-on: windows-latest
@@ -34,16 +34,21 @@ jobs:
3434
steps:
3535
- uses: actions/checkout@v4
3636
- name: ccache
37-
uses: hendrikmuhs/ccache-action@v1.2.12
37+
uses: hendrikmuhs/ccache-action@v1.2.13
3838
with:
3939
# key: ${{ matrix.os }}-${{ matrix.type }}
4040
key: ${{ matrix.msystem }}
4141
- uses: msys2/setup-msys2@v2
4242
with:
4343
cache: true
44+
release: true
4445
update: false
4546
msystem: ${{matrix.msystem}}
46-
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
47+
pacboy: gcc:p assimp:p cairo:p curl:p freeglut:p FreeImage:p glew:p glfw:p glm:p libsndfile:p libusb:p libxml2:p mpg123:p nlohmann-json:p openal:p opencv:p pugixml:p rtaudio:p uriparser:p utf8cpp:p
48+
install: >-
49+
unzip
50+
make
51+
# gcc:p gdb:p zlib:p poco:p pkgconf:p harfbuzz:p ntldd-git:p
4752
# boost:p tools:p
4853
# install: >-
4954
# unzip
@@ -59,4 +64,3 @@ jobs:
5964

6065
- name: Run tests
6166
run: ./scripts/ci/msys2/run_tests.sh
62-

‎.github/workflows/actions/build-rpi.yml

+54
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
name: build-rpi
2+
3+
# make the action not run on the local repo if the branch is also in a pull request to OF/OF
4+
on:
5+
push:
6+
if: github.event_name == 'push' && github.event.pull_request == null
7+
paths-ignore:
8+
- '**/*.md'
9+
- 'examples/**'
10+
pull_request:
11+
if: github.event_name == 'pull_request' && github.repository == 'openframeworks/openFrameworks'
12+
paths-ignore:
13+
- '**/*.md'
14+
- 'examples/**'
15+
16+
concurrency:
17+
group: ${{ github.workflow }}-${{ github.ref }}
18+
cancel-in-progress: true
19+
20+
env:
21+
ccache: ccache
22+
23+
jobs:
24+
rpi-build:
25+
runs-on: ubuntu-24.04
26+
strategy:
27+
matrix:
28+
cfg:
29+
- { libs: armv6l, multistrap_arch: armhf, suffix: arm-linux-gnueabihf, alladdons: 1 }
30+
- { libs: aarch64, multistrap_arch: arm64, suffix: aarch64-linux-gnu, alladdons: 1 }
31+
env:
32+
ARCH: ${{matrix.cfg.libs}}
33+
MULTISTRAP_ARCH: ${{matrix.cfg.multistrap_arch}}
34+
ALLADDONSEXAMPLE: ${{matrix.cfg.alladdons}}
35+
steps:
36+
- name: Cache Packages
37+
uses: awalsh128/cache-apt-pkgs-action@latest
38+
with:
39+
packages: wget2 multistrap unzip gcc-${{matrix.cfg.suffix}} g++-${{matrix.cfg.suffix}}
40+
version: 1.0
41+
42+
- uses: actions/checkout@v4
43+
44+
- name: ccache
45+
uses: hendrikmuhs/ccache-action@v1.2.13
46+
with:
47+
key: ${{ matrix.cfg.libs }}
48+
49+
- name: Download libs
50+
run: ./scripts/linux/download_libs.sh -a ${{matrix.cfg.libs}};
51+
- name: Install dependencies
52+
run: ./scripts/ci/linuxrpi/install.sh;
53+
- name: Build
54+
run: ./scripts/ci/linuxrpi/build.sh;

‎.github/workflows/build-vs2022.yml renamed to ‎.github/workflows/actions/build-vs2022.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ concurrency:
1717
group: ${{ github.workflow }}-${{ github.ref }}
1818
cancel-in-progress: true
1919

20+
# env:
21+
# ccache: ccache
22+
2023
jobs:
2124
build-vs2022:
2225
runs-on: windows-2022
@@ -58,4 +61,3 @@ jobs:
5861
working-directory: ${{env.GITHUB_WORKSPACE}}
5962
run:
6063
msbuild examples/templates/allAddonsExample/allAddonsExample.vcxproj /p:configuration=debug /p:platform=${{ matrix.platform }} /p:PlatformToolset=v143
61-

‎.github/workflows/all.py

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
#!/usr/bin/python3
2+
import glob
3+
4+
lista = glob.glob('actions/*.yml')
5+
print(lista)
6+
contagem = 0
7+
alllines = ''
8+
lines = []
9+
first = True
10+
for a in lista:
11+
print(a)
12+
f = open(a,'r')
13+
# alllines += (f.read() + '\n\n\n\n')
14+
15+
16+
if first:
17+
first = False
18+
lines += 'name: OF'
19+
lines += ''
20+
lines += f.readlines()[1:]
21+
else:
22+
lines += f.readlines()[23:]
23+
# lines.append(f.readlines()[2:])
24+
lines += '\n\n'
25+
lines += '# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \n\n'
26+
# lines.append('\n\n\n\n')
27+
f.close()
28+
29+
all = open('of.yml','w')
30+
# all.write(alllines)
31+
print(lines)
32+
all.writelines(lines)
33+
all.close()
34+
35+
print (alllines)

‎.github/workflows/manual-nightly.yml

+11-3
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,14 @@ on:
66
release:
77
description: 'release'
88
required: true
9-
default: 'nightly'
9+
default: 'nightly'
10+
11+
env:
12+
ccache: ccache
13+
1014
jobs:
1115
manual-nightly:
12-
runs-on: ubuntu-latest
16+
runs-on: ubuntu-24.04
1317
strategy:
1418
matrix:
1519
cfg:
@@ -20,11 +24,15 @@ jobs:
2024
- name: Cache Packages
2125
uses: awalsh128/cache-apt-pkgs-action@latest
2226
with:
23-
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
27+
packages: aptitude wget2 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
2428
# libunwind-dev
2529
version: 1.0
2630

2731
- uses: actions/checkout@v4
32+
- name: ccache
33+
uses: hendrikmuhs/ccache-action@v1.2.13
34+
with:
35+
key: ${{ matrix.cfg.target }}
2836
- name: Install dependencies
2937
run: ./scripts/ci/${{matrix.cfg.target}}/install.sh;
3038
- name: Download libs

‎.github/workflows/nightly-linux64.yml

+10-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,13 @@ name: nightly-linux64
33
on:
44
schedule:
55
- cron: "0 6 * * *"
6+
7+
env:
8+
ccache: ccache
9+
610
jobs:
711
build-nightly:
8-
runs-on: ubuntu-latest
12+
runs-on: ubuntu-24.04
913
if: github.repository == 'openframeworks/openFrameworks' && github.ref == 'refs/heads/master'
1014
strategy:
1115
matrix:
@@ -19,11 +23,15 @@ jobs:
1923
- name: Cache Packages
2024
uses: awalsh128/cache-apt-pkgs-action@latest
2125
with:
22-
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
26+
packages: aptitude wget2 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
2327
# libunwind-dev
2428
version: 1.0
2529

2630
- uses: actions/checkout@v4
31+
- name: ccache
32+
uses: hendrikmuhs/ccache-action@v1.2.13
33+
with:
34+
key: ${{ matrix.cfg.target }}
2735
- name: Install dependencies
2836
run: ./scripts/ci/$TARGET/install.sh;
2937
- name: Download libs

0 commit comments

Comments
 (0)