Skip to content

Commit 6c1a45d

Browse files
darbyjohnstondarbyjohnston
committed
Refactoring
1 parent 4ce23db commit 6c1a45d

File tree

9 files changed

+19
-28
lines changed

9 files changed

+19
-28
lines changed

‎.github/workflows/ci-workflow.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ jobs:
1111
TLRENDER_OCIO: ON
1212
TLRENDER_JPEG: ON
1313
TLRENDER_TIFF: ON
14-
TLRENDER_STB: ON
1514
TLRENDER_EXR: ON
1615
TLRENDER_FFMPEG: ON
1716
TLRENDER_FFMPEG_MINIMAL: ON
17+
TLRENDER_OIIO: ON
1818
TLRENDER_USD: OFF
1919
TLRENDER_BMD: OFF
2020
TLRENDER_BMD_SDK:
@@ -49,10 +49,10 @@ jobs:
4949
TLRENDER_OCIO: OFF
5050
TLRENDER_JPEG: ON
5151
TLRENDER_TIFF: ON
52-
TLRENDER_STB: ON
5352
TLRENDER_EXR: ON
5453
TLRENDER_FFMPEG: OFF
5554
TLRENDER_FFMPEG_MINIMAL: ON
55+
TLRENDER_OIIO: ON
5656
TLRENDER_USD: OFF
5757
TLRENDER_BMD: OFF
5858
TLRENDER_BMD_SDK:
@@ -88,10 +88,10 @@ jobs:
8888
TLRENDER_OCIO: ON
8989
TLRENDER_JPEG: ON
9090
TLRENDER_TIFF: ON
91-
TLRENDER_STB: ON
9291
TLRENDER_EXR: ON
9392
TLRENDER_FFMPEG: ON
9493
TLRENDER_FFMPEG_MINIMAL: ON
94+
TLRENDER_OIIO: ON
9595
TLRENDER_USD: ON
9696
TLRENDER_BMD: OFF
9797
TLRENDER_BMD_SDK:
@@ -135,10 +135,10 @@ jobs:
135135
TLRENDER_OCIO: ON
136136
TLRENDER_JPEG: ON
137137
TLRENDER_TIFF: ON
138-
TLRENDER_STB: ON
139138
TLRENDER_EXR: ON
140139
TLRENDER_FFMPEG: ON
141140
TLRENDER_FFMPEG_MINIMAL: ON
141+
TLRENDER_OIIO: ON
142142
TLRENDER_USD: OFF
143143
TLRENDER_BMD: OFF
144144
TLRENDER_BMD_SDK:
@@ -177,10 +177,10 @@ jobs:
177177
TLRENDER_OCIO: ON
178178
TLRENDER_JPEG: ON
179179
TLRENDER_TIFF: ON
180-
TLRENDER_STB: ON
181180
TLRENDER_EXR: ON
182181
TLRENDER_FFMPEG: ON
183182
TLRENDER_FFMPEG_MINIMAL: ON
183+
TLRENDER_OIIO: ON
184184
TLRENDER_USD: ON
185185
TLRENDER_BMD: OFF
186186
TLRENDER_BMD_SDK:
@@ -231,10 +231,10 @@ jobs:
231231
TLRENDER_OCIO: ON
232232
TLRENDER_JPEG: ON
233233
TLRENDER_TIFF: ON
234-
TLRENDER_STB: ON
235234
TLRENDER_EXR: ON
236235
TLRENDER_FFMPEG: ON
237236
TLRENDER_FFMPEG_MINIMAL: ON
237+
TLRENDER_OIIO: ON
238238
TLRENDER_USD: OFF
239239
TLRENDER_BMD: OFF
240240
TLRENDER_BMD_SDK:
@@ -272,10 +272,10 @@ jobs:
272272
TLRENDER_OCIO: ON
273273
TLRENDER_JPEG: ON
274274
TLRENDER_TIFF: ON
275-
TLRENDER_STB: ON
276275
TLRENDER_EXR: ON
277276
TLRENDER_FFMPEG: ON
278277
TLRENDER_FFMPEG_MINIMAL: ON
278+
TLRENDER_OIIO: ON
279279
TLRENDER_USD: ON
280280
TLRENDER_BMD: OFF
281281
TLRENDER_BMD_SDK:

‎etc/Linux/linux-build-gha.sh‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ cmake \
1616
-DTLRENDER_OCIO=$TLRENDER_OCIO \
1717
-DTLRENDER_JPEG=$TLRENDER_JPEG \
1818
-DTLRENDER_TIFF=$TLRENDER_TIFF \
19-
-DTLRENDER_STB=$TLRENDER_STB \
2019
-DTLRENDER_EXR=$TLRENDER_EXR \
2120
-DTLRENDER_FFMPEG=$TLRENDER_FFMPEG \
2221
-DTLRENDER_FFMPEG_MINIMAL=$TLRENDER_FFMPEG_MINIMAL \
2322
-DTLRENDER_USD=$TLRENDER_USD \
23+
-DTLRENDER_OIIO=$TLRENDER_OIIO \
2424
-DTLRENDER_BMD=$TLRENDER_BMD \
2525
-DTLRENDER_BMD_SDK=$TLRENDER_BMD_SDK \
2626
-Dftk_API=$FTK_API
@@ -34,14 +34,11 @@ cmake \
3434
-DCMAKE_PREFIX_PATH=$PWD/install-$BUILD_TYPE \
3535
-DTLRENDER_NET=$TLRENDER_NET \
3636
-DTLRENDER_OCIO=$TLRENDER_OCIO \
37-
-DTLRENDER_JPEG=$TLRENDER_JPEG \
38-
-DTLRENDER_TIFF=$TLRENDER_TIFF \
39-
-DTLRENDER_STB=$TLRENDER_STB \
4037
-DTLRENDER_EXR=$TLRENDER_EXR \
4138
-DTLRENDER_FFMPEG=$TLRENDER_FFMPEG \
39+
-DTLRENDER_OIIO=$TLRENDER_OIIO \
4240
-DTLRENDER_USD=$TLRENDER_USD \
4341
-DTLRENDER_BMD=$TLRENDER_BMD \
44-
-DTLRENDER_BMD_SDK=$TLRENDER_BMD_SDK \
4542
-Dftk_API=$FTK_API
4643
cmake --build build-$BUILD_TYPE -j $JOBS --config $BUILD_TYPE
4744
cmake --build build-$BUILD_TYPE --config $BUILD_TYPE --target install

‎etc/SuperBuild/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ set(TLRENDER_NET OFF CACHE BOOL "Enable network support")
1818
set(TLRENDER_OCIO ON CACHE BOOL "Enable support for OpenColorIO")
1919
set(TLRENDER_JPEG ON CACHE BOOL "Enable support for JPEG")
2020
set(TLRENDER_TIFF ON CACHE BOOL "Enable support for TIFF")
21-
set(TLRENDER_STB ON CACHE BOOL "Enable support for STB I/O (TGA, BMP, PSD)")
2221
set(TLRENDER_EXR ON CACHE BOOL "Enable support for OpenEXR")
2322
set(TLRENDER_FFMPEG ON CACHE BOOL "Enable support for FFmpeg (see the README for building FFmpeg on Windows)")
2423
set(TLRENDER_FFMPEG_MINIMAL OFF CACHE BOOL "Enable a minimal set of FFmpeg codecs")
24+
set(TLRENDER_OIIO ON CACHE BOOL "Enable support for OpenImageIO")
2525
set(TLRENDER_USD OFF CACHE BOOL "Enable support for USD")
2626
set(TLRENDER_USD_PYTHON python3 CACHE STRING "Python executable for building USD")
2727
set(TLRENDER_BMD OFF CACHE BOOL "Enable support for Blackmagic Design devices")

‎etc/SuperBuild/cmake/Modules/BuildtlRender.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
include(ExternalProject)
22

33
set(TLRENDER_GIT_REPOSITORY "https://github.com/darbyjohnston/tlRender.git")
4-
set(TLRENDER_GIT_TAG "379f2c4d5aadbe9e11ccccd1dd58cc959a14cbde")
4+
set(TLRENDER_GIT_TAG "5242d564697cb7b7d49ff7b8b2d67b7a572b25e6")
55

66
set(TLRENDER_DEPS)
77
set(TLRENDER_ARGS
@@ -10,10 +10,10 @@ set(TLRENDER_ARGS
1010
-DTLRENDER_OCIO=${TLRENDER_OCIO}
1111
-DTLRENDER_JPEG=${TLRENDER_JPEG}
1212
-DTLRENDER_TIFF=${TLRENDER_TIFF}
13-
-DTLRENDER_STB=${TLRENDER_STB}
1413
-DTLRENDER_EXR=${TLRENDER_EXR}
1514
-DTLRENDER_FFMPEG=${TLRENDER_FFMPEG}
1615
-DTLRENDER_FFMPEG_MINIMAL=${TLRENDER_FFMPEG_MINIMAL}
16+
-DTLRENDER_OIIO=${TLRENDER_OIIO}
1717
-DTLRENDER_USD=${TLRENDER_USD}
1818
-DTLRENDER_USD_PYTHON=${TLRENDER_USD_PYTHON}
1919
-DTLRENDER_BMD=${TLRENDER_BMD}

‎etc/Windows/windows-build-gha.bat‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ cmake ^
1212
-DTLRENDER_OCIO=%TLRENDER_OCIO% ^
1313
-DTLRENDER_JPEG=%TLRENDER_JPEG% ^
1414
-DTLRENDER_TIFF=%TLRENDER_TIFF% ^
15-
-DTLRENDER_STB=%TLRENDER_STB% ^
1615
-DTLRENDER_EXR=%TLRENDER_EXR% ^
1716
-DTLRENDER_FFMPEG=%TLRENDER_FFMPEG% ^
1817
-DTLRENDER_FFMPEG_MINIMAL=%TLRENDER_FFMPEG_MINIMAL% ^
18+
-DTLRENDER_OIIO=%TLRENDER_OIIO% ^
1919
-DTLRENDER_USD=%TLRENDER_USD% ^
2020
-DTLRENDER_BMD=%TLRENDER_BMD% ^
2121
-DTLRENDER_BMD_SDK=%TLRENDER_BMD_SDK% ^
@@ -30,14 +30,11 @@ cmake ^
3030
-DCMAKE_PREFIX_PATH=%CD%/install-%BUILD_TYPE% ^
3131
-DTLRENDER_NET=%TLRENDER_NET% ^
3232
-DTLRENDER_OCIO=%TLRENDER_OCIO% ^
33-
-DTLRENDER_JPEG=%TLRENDER_JPEG% ^
34-
-DTLRENDER_TIFF=%TLRENDER_TIFF% ^
35-
-DTLRENDER_STB=%TLRENDER_STB% ^
3633
-DTLRENDER_EXR=%TLRENDER_EXR% ^
3734
-DTLRENDER_FFMPEG=%TLRENDER_FFMPEG% ^
35+
-DTLRENDER_OIIO=%TLRENDER_OIIO% ^
3836
-DTLRENDER_USD=%TLRENDER_USD% ^
3937
-DTLRENDER_BMD=%TLRENDER_BMD% ^
40-
-DTLRENDER_BMD_SDK=%TLRENDER_BMD_SDK% ^
4138
-Dftk_API=%FTK_API%
4239
cmake --build build-%BUILD_TYPE% -j %JOBS% --config %BUILD_TYPE%
4340
cmake --build build-%BUILD_TYPE% --config %BUILD_TYPE% --target install

‎etc/macOS/macos-build-gha.sh‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ cmake \
1818
-DTLRENDER_OCIO=$TLRENDER_OCIO \
1919
-DTLRENDER_JPEG=$TLRENDER_JPEG \
2020
-DTLRENDER_TIFF=$TLRENDER_TIFF \
21-
-DTLRENDER_STB=$TLRENDER_STB \
2221
-DTLRENDER_EXR=$TLRENDER_EXR \
2322
-DTLRENDER_FFMPEG=$TLRENDER_FFMPEG \
2423
-DTLRENDER_FFMPEG_MINIMAL=$TLRENDER_FFMPEG_MINIMAL \
24+
-DTLRENDER_OIIO=$TLRENDER_OIIO \
2525
-DTLRENDER_USD=$TLRENDER_USD \
2626
-DTLRENDER_BMD=$TLRENDER_BMD \
2727
-DTLRENDER_BMD_SDK=$TLRENDER_BMD_SDK \
@@ -38,14 +38,11 @@ cmake \
3838
-DCMAKE_OSX_ARCHITECTURES=$CMAKE_OSX_ARCHITECTURES \
3939
-DTLRENDER_NET=$TLRENDER_NET \
4040
-DTLRENDER_OCIO=$TLRENDER_OCIO \
41-
-DTLRENDER_JPEG=$TLRENDER_JPEG \
42-
-DTLRENDER_TIFF=$TLRENDER_TIFF \
43-
-DTLRENDER_STB=$TLRENDER_STB \
4441
-DTLRENDER_EXR=$TLRENDER_EXR \
4542
-DTLRENDER_FFMPEG=$TLRENDER_FFMPEG \
43+
-DTLRENDER_OIIO=$TLRENDER_OIIO \
4644
-DTLRENDER_USD=$TLRENDER_USD \
4745
-DTLRENDER_BMD=$TLRENDER_BMD \
48-
-DTLRENDER_BMD_SDK=$TLRENDER_BMD_SDK \
4946
-Dftk_API=$FTK_API
5047
cmake --build build-$BUILD_TYPE -j $JOBS --config $BUILD_TYPE
5148
cmake --build build-$BUILD_TYPE --config $BUILD_TYPE --target install

‎sbuild-linux.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ export TLRENDER_NET=OFF
1313
export TLRENDER_OCIO=ON
1414
export TLRENDER_JPEG=ON
1515
export TLRENDER_TIFF=ON
16-
export TLRENDER_STB=ON
1716
export TLRENDER_EXR=ON
1817
export TLRENDER_FFMPEG=ON
1918
export TLRENDER_FFMPEG_MINIMAL=OFF
19+
export TLRENDER_OIIO=ON
2020
export TLRENDER_USD=OFF
2121
export TLRENDER_BMD=OFF
2222
export TLRENDER_BMD_SDK=

‎sbuild-macos.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ export TLRENDER_NET=OFF
1313
export TLRENDER_OCIO=ON
1414
export TLRENDER_JPEG=ON
1515
export TLRENDER_TIFF=ON
16-
export TLRENDER_STB=ON
1716
export TLRENDER_EXR=ON
1817
export TLRENDER_FFMPEG=ON
1918
export TLRENDER_FFMPEG_MINIMAL=OFF
19+
export TLRENDER_OIIO=ON
2020
export TLRENDER_USD=OFF
2121
export TLRENDER_BMD=OFF
2222
export TLRENDER_BMD_SDK=

‎sbuild-win.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ set TLRENDER_NET=OFF
77
set TLRENDER_OCIO=ON
88
set TLRENDER_JPEG=ON
99
set TLRENDER_TIFF=ON
10-
set TLRENDER_STB=ON
1110
set TLRENDER_EXR=ON
1211
set TLRENDER_FFMPEG=ON
1312
set TLRENDER_FFMPEG_MINIMAL=OFF
13+
set TLRENDER_OIIO=ON
1414
set TLRENDER_USD=OFF
1515
set TLRENDER_BMD=OFF
1616
set TLRENDER_BMD_SDK=

0 commit comments

Comments
 (0)