Skip to content

Commit 95180fa

Browse files
committed
CI: build dynamic version of Cineform
doesn't need to be patched Also, the dynamic version may be slightly better because it is separated from UG, eg. also because the uv binary and reflector both link with this so not linking twice (increasing overall size).
1 parent 42afa56 commit 95180fa

File tree

2 files changed

+19
-10
lines changed

2 files changed

+19
-10
lines changed
Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
1-
From 0bd8bc0873b908f4e13470933fe09f97096922da Mon Sep 17 00:00:00 2001
1+
From 89d51a173bd0fb83635acf5fcac9a820f6df378e Mon Sep 17 00:00:00 2001
22
From: Martin Pulec <[email protected]>
3-
Date: Thu, 3 Feb 2022 11:01:47 +0100
3+
Date: Mon, 15 Sep 2025 11:37:25 +0200
44
Subject: [PATCH] CMakeList.txt: remove output lib name force (UNIX)
55

66
Currently the actual library name libCFHDCodec.a disagrees with the name
77
generated in .pc file (-lCFHDCodecStatic) so this names the library with
88
the default name libCFHDCodecStatic.a (similarly for shared).
9+
10+
(similarly for shared)
911
---
10-
CMakeLists.txt | 3 ---
11-
1 file changed, 3 deletions(-)
12+
CMakeLists.txt | 4 ----
13+
1 file changed, 4 deletions(-)
1214

1315
diff --git a/CMakeLists.txt b/CMakeLists.txt
14-
index cb0ded3..f247302 100644
16+
index cb0ded3..66b882c 100644
1517
--- a/CMakeLists.txt
1618
+++ b/CMakeLists.txt
1719
@@ -57,9 +57,6 @@ if (BUILD_LIBS)
@@ -24,6 +26,14 @@ index cb0ded3..f247302 100644
2426

2527
target_link_libraries(CFHDCodecStatic)
2628
endif (BUILD_SEPARATED)
29+
@@ -79,7 +76,6 @@ if (BUILD_LIBS)
30+
target_compile_definitions(CFHDCodecShared PUBLIC -DDYNAMICLIB=1 -DCODECCOMBINED=1)
31+
target_link_libraries(CFHDCodecShared)
32+
set_target_properties(CFHDCodecShared PROPERTIES POSITION_INDEPENDENT_CODE ON)
33+
- set_target_properties(CFHDCodecShared PROPERTIES OUTPUT_NAME CFHDCodec)
34+
endif (BUILD_SEPARATED)
35+
endif (BUILD_STATIC)
36+
endif (BUILD_LIBS)
2737
--
28-
2.37.3
38+
2.51.0
2939

.github/scripts/install-common-deps.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,9 @@ download_install_cineform() {(
2929
git clone --depth 1 https://github.com/gopro/cineform-sdk
3030
cd cineform-sdk
3131
git apply "$curdir/0001-CMakeList.txt-remove-output-lib-name-force-UNIX.patch"
32-
mkdir build && cd build
33-
cmake -DBUILD_TOOLS=OFF ..
34-
cmake --build . --parallel "$(nproc)"
35-
sudo cmake --install .
32+
cmake -DBUILD_STATIC=OFF -DBUILD_TOOLS=OFF -B build -S .
33+
cmake --build build --parallel "$(nproc)"
34+
sudo cmake --install build
3635
)}
3736

3837
download_build_aja() {

0 commit comments

Comments
 (0)