From 1d4a350159f290ee97c4b083522e48b9ec52da2f Mon Sep 17 00:00:00 2001
From: Martin Pulec <martin.pulec@cesnet.cz>
Date: Fri, 1 May 2020 15:02:27 +0200
Subject: [PATCH] Bump to new Cineform

Use version v10.0.2a.

+ do not build Cineform tools - not needed and current Cineform master
  (not this one checked) fails to compile the tools in MSW
---
 .github/scripts/Linux/prepare.sh        | 2 +-
 .github/scripts/Windows/prepare_msys.sh | 2 +-
 .github/scripts/macOS/prepare.sh        | 2 +-
 .github/workflows/ccpp.yml              | 2 +-
 cineform-sdk                            | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/scripts/Linux/prepare.sh b/.github/scripts/Linux/prepare.sh
index 5f525dd58..e5b9a747e 100755
--- a/.github/scripts/Linux/prepare.sh
+++ b/.github/scripts/Linux/prepare.sh
@@ -27,7 +27,7 @@ sudo apt install libavcodec-dev libavformat-dev libavutil-dev libswscale-dev
 sudo apt install libopencv-dev
 sudo apt install libglib2.0-dev libcurl4-nss-dev
 ( mkdir gpujpeg/build && cd gpujpeg/build && CC=$CUDA_HOST_COMPILER cmake .. && make && sudo make install && sudo ldconfig )
-( sudo apt install uuid-dev && cd cineform-sdk/ && cmake . && make CFHDCodecStatic )
+( sudo apt install uuid-dev && cd cineform-sdk/ && cmake -DBUILD_TOOLS=OFF . && make CFHDCodecStatic )
 sudo apt install qtbase5-dev
 sudo chmod 777 /usr/local
 
diff --git a/.github/scripts/Windows/prepare_msys.sh b/.github/scripts/Windows/prepare_msys.sh
index 1c81e7596..dcdc6af1b 100644
--- a/.github/scripts/Windows/prepare_msys.sh
+++ b/.github/scripts/Windows/prepare_msys.sh
@@ -69,5 +69,5 @@ wget --no-verbose https://ffmpeg.zeranoe.com/builds/win64/dev/ffmpeg-latest-win6
 ( cd gpujpeg && nvcc -I. -DGPUJPEG_EXPORTS -o gpujpeg.dll --shared src/gpujpeg_*c src/gpujpeg*cu && cp gpujpeg.lib /usr/local/lib && cp gpujpeg.dll /usr/local/bin && cp -r libgpujpeg /usr/local/include )
 
 # Build CineForm
-( cd cineform-sdk && cmake -DBUILD_STATIC=false -A x64 && MSBuild.exe CineFormSDK.sln -property:Configuration=Release && cp Release/CFHDCodec.dll /usr/local/bin && cp Release/CFHDCodec.lib /usr/local/lib && cp Common/* /usr/local/include && cp libcineformsdk.pc /usr/local/lib/pkgconfig )
+( cd cineform-sdk && cmake -DBUILD_STATIC=false -DBUILD_TOOLS=false -A x64 && MSBuild.exe CineFormSDK.sln -property:Configuration=Release && cp Release/CFHDCodec.dll /usr/local/bin && cp Release/CFHDCodec.lib /usr/local/lib && cp Common/* /usr/local/include && cp libcineformsdk.pc /usr/local/lib/pkgconfig )
 
diff --git a/.github/scripts/macOS/prepare.sh b/.github/scripts/macOS/prepare.sh
index 0470e96d3..d6335cb32 100755
--- a/.github/scripts/macOS/prepare.sh
+++ b/.github/scripts/macOS/prepare.sh
@@ -17,7 +17,7 @@ brew install autoconf automake cppunit dylibbundler libtool pkg-config
 brew install ffmpeg portaudio sdl2
 brew install imagemagick jack opencv openssl
 brew install ossp-uuid # for cineform
-( cd cineform-sdk/ && cmake . && make CFHDCodecStatic )
+( cd cineform-sdk/ && cmake -DBUILD_TOOLS=OFF . && make CFHDCodecStatic )
 brew install qt
 
 mkdir $TEMP_INST
diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index 433e85b3d..5b0d9058b 100644
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -171,7 +171,7 @@ jobs:
       uses: actions/cache@v1
       with:
         path: C:\msys64
-        key: cache-msys2-6
+        key: cache-msys2-7
     - name: bootsrap MSYS2
       if: steps.cache-msys2.outputs.cache-hit != 'true'
       run: |
diff --git a/cineform-sdk b/cineform-sdk
index 39a43b812..bf1b09ff1 160000
--- a/cineform-sdk
+++ b/cineform-sdk
@@ -1 +1 @@
-Subproject commit 39a43b8120a92318997dcc9ed936786d8c1bd7db
+Subproject commit bf1b09ff1c33589b92c76e653b3acb2b5c50e5a2