Skip to content

Commit 0047827

Browse files
committed
Merge branch 'staging'
2 parents 90a9b65 + 5d22eec commit 0047827

30 files changed

+1316
-44
lines changed

.gitlab-ci.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ analysis:static-analysis:
121121
extends:
122122
- .amd64
123123
- .ubuntu
124-
image: ubuntu:23.10
124+
image: ubuntu:24.04
125125
script:
126126
- DEBIAN_FRONTEND=noninteractive apt install -y clang-tools
127127
- ./make_deps.sh
@@ -202,12 +202,12 @@ staging:22.04:gcc-arm64-bundled-libs:
202202
rules:
203203
- if: $CI_COMMIT_BRANCH == 'staging'
204204

205-
staging:23.10:gcc-amd64-system-libs:
205+
staging:24.04:gcc-amd64-system-libs:
206206
stage: staging
207207
extends:
208208
- .amd64
209209
- .ubuntu
210-
image: ubuntu:23.10
210+
image: ubuntu:24.04
211211
script:
212212
- DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends libglm-dev
213213
libsnappy-dev libzmq3-dev
@@ -222,12 +222,12 @@ staging:23.10:gcc-amd64-system-libs:
222222
rules:
223223
- if: $CI_COMMIT_BRANCH == 'staging'
224224

225-
staging:23.10:clang-amd64-system-libs:
225+
staging:24.04:clang-amd64-system-libs:
226226
stage: staging
227227
extends:
228228
- .amd64
229229
- .ubuntu
230-
image: ubuntu:23.10
230+
image: ubuntu:24.04
231231
script:
232232
- DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends libglm-dev
233233
libsnappy-dev libzmq3-dev clang
@@ -372,11 +372,11 @@ package:debian:22.04:
372372
- if: $CI_COMMIT_TAG =~ /^\d+\.\d+\.\d+$/
373373
- if: $CI_COMMIT_BRANCH == 'master'
374374

375-
package:debian:23.10:
375+
package:debian:24.04:
376376
stage: package
377377
extends:
378378
- .ubuntu
379-
image: ubuntu:23.10
379+
image: ubuntu:24.04
380380
script:
381381
# Build package
382382
- ./make_deps.sh

CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ endif()
3030

3131
project(
3232
splash
33-
VERSION 0.10.6
33+
VERSION 0.10.8
3434
LANGUAGES C CXX
3535
)
3636

@@ -100,6 +100,7 @@ if (BUILD_CODE)
100100
pkg_search_module(GPHOTO libgphoto2)
101101
pkg_search_module(JACK jack)
102102
pkg_search_module(PORTAUDIO portaudio-2.0)
103+
pkg_search_module(SH4LT sh4lt-0.1)
103104
pkg_search_module(SHMDATA shmdata-1.3)
104105
pkg_search_module(CALIMIRO calimiro-0.2)
105106
endif()
@@ -127,6 +128,7 @@ endif()
127128
set(HAVE_GPHOTO ${GPHOTO_FOUND})
128129
set(HAVE_OPENCV ${OPENCV_FOUND})
129130
set(HAVE_PORTAUDIO ${PORTAUDIO_FOUND})
131+
set(HAVE_SH4LT ${SH4LT_FOUND})
130132
set(HAVE_SHMDATA ${SHMDATA_FOUND})
131133
set(HAVE_PYTHON ${Python3_FOUND})
132134
set(HAVE_CALIMIRO ${CALIMIRO_FOUND})
@@ -274,6 +276,7 @@ info_cfg_option(PORTAUDIO_VERSION)
274276
info_cfg_option(JACK_VERSION)
275277
info_cfg_option(Python3_VERSION)
276278
info_cfg_option(JSONCPP_VERSION)
279+
info_cfg_option(SH4LT_VERSION)
277280
info_cfg_option(SHMDATA_VERSION)
278281
info_cfg_option(CALIMIRO_VERSION)
279282
info_cfg_option(ZMQ_VERSION)

News.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,23 @@
11
Splash release notes
22
====================
33

4+
Splash 0.10.8 (2024-03-04)
5+
-------------------------
6+
Improvements:
7+
* Updated imgui to 1.90.4
8+
* Updated GLM to version 1.0.0
9+
* Updated Snappy to 1.1.10
10+
* Updated GLFW to version 3.4.0
11+
* Updated libltc to 1.3.2
12+
* Added support for Sh4lt memory sharing library
13+
* Replaced Ubuntu 23.10 for 24.04 in CI
14+
15+
Documentation:
16+
* Fixed typo in README.md
17+
18+
Bugs Fixed:
19+
* Fixed YUYV and UYVY decoding from shmdata sources
20+
421
Splash 0.10.6 (2024-02-05)
522
-------------------------
623
Improvements:

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ mkdir -p build && cd build
156156
# The BUILD_GENERIC_ARCH flag allows for building an executable which can run on any
157157
# sufficiently modern (less than 15 years) CPU. It is usually safe to remove it but
158158
# people had issues in the past with some arch-specific flags
159-
cmake -GNinja -GBUILD_GENERIC_ARCH=ON ..
159+
cmake -GNinja -DBUILD_GENERIC_ARCH=ON ..
160160
ninja
161161
```
162162

@@ -169,7 +169,7 @@ mkdir -p build && cd build
169169
# The BUILD_GENERIC_ARCH flag allows for building an executable which can run on any
170170
# sufficiently modern (less than 15 years) CPU. It is usually safe to remove it but
171171
# people had issues in the past with some arch-specific flags
172-
cmake -DUSE_SYSTEM_LIBS=ON -GBUILD_GENERIC_ARCH=ON ..
172+
cmake -DUSE_SYSTEM_LIBS=ON -DBUILD_GENERIC_ARCH=ON ..
173173
ninja
174174
```
175175

addons/blender/splash/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
bl_info = {
2121
"name": "Splash output",
2222
"author": "Splash authors",
23-
"version": (0, 10, 6),
23+
"version": (0, 10, 8),
2424
"blender": (2, 80, 0),
2525
"location": "3D View > Toolbox, File > Export",
2626
"description": "Utility tools to connect Blender to the Splash videomapper",

data/share/metainfo/xyz.splashmapper.Splash.metainfo.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<id>xyz.splashmapper.Splash</id>
55
<launchable type="desktop-id">xyz.splashmapper.Splash.desktop</launchable>
66
<content_rating type="oars-1.1" />
7+
<developer_name>Emmanuel Durand</developer_name>
78
<name>Splash</name>
89
<summary>Video-mapping software</summary>
910
<description>
@@ -31,6 +32,7 @@
3132
</screenshot>
3233
</screenshots>
3334
<releases>
35+
<release version="0.10.8" date="2024-03-04" />
3436
<release version="0.10.6" date="2024-02-05" />
3537
<release version="0.10.4" date="2024-01-08" />
3638
<release version="0.10.2" date="2023-12-05" />

external/glfw

external/glm

Submodule glm updated 1780 files

external/imgui

Submodule imgui updated 181 files

0 commit comments

Comments
 (0)