From e668a93facc272be1587a657a090dfd58aea9f1d Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Fri, 25 Mar 2022 08:39:26 +0100 Subject: [PATCH] CI Linux: XIMEA install workaround patch --- .github/scripts/Linux/prepare.sh | 13 ++++++++----- .github/scripts/Linux/ximea.patch | 16 ++++++++++++++++ 2 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 .github/scripts/Linux/ximea.patch diff --git a/.github/scripts/Linux/prepare.sh b/.github/scripts/Linux/prepare.sh index d8703cc56..ac9f7e042 100755 --- a/.github/scripts/Linux/prepare.sh +++ b/.github/scripts/Linux/prepare.sh @@ -59,11 +59,13 @@ $GITHUB_WORKSPACE/.github/scripts/install-common-deps.sh sudo apt install qtbase5-dev sudo chmod 777 /usr/local -# Install XIMEA -wget --no-verbose https://www.ximea.com/downloads/recent/XIMEA_Linux_SP.tgz -tar xzf XIMEA_Linux_SP.tgz -cd package -sudo ./install +install_ximea() { + wget --no-verbose https://www.ximea.com/downloads/recent/XIMEA_Linux_SP.tgz + tar xzf XIMEA_Linux_SP.tgz + cd package + patch -p0 <$GITHUB_WORKSPACE/.github/scripts/Linux/ximea.patch # TOREMOVE when not needed + sudo ./install +} # Install AJA if [ -n "$SDK_URL" ]; then @@ -111,4 +113,5 @@ cd .. install_cineform install_ndi +install_ximea diff --git a/.github/scripts/Linux/ximea.patch b/.github/scripts/Linux/ximea.patch new file mode 100644 index 000000000..43282c584 --- /dev/null +++ b/.github/scripts/Linux/ximea.patch @@ -0,0 +1,16 @@ +--- scripts/install_steps.orig 2022-03-25 08:31:08.039585295 +0100 ++++ scripts/install_steps 2022-03-25 08:35:55.767545116 +0100 +@@ -378,11 +378,11 @@ + ldconfig + + echo Installing XIMEA-GenTL library +-cp libs/gentl/X$platform_bits/libXIMEA_GenTL.cti $optpath/lib/ ++#cp libs/gentl/X$platform_bits/libXIMEA_GenTL.cti $optpath/lib/ + Check + + echo Installing xiFapi-GenTL library +-cp libs/gentl/X$platform_bits/libxiFapi_GenTL.cti $optpath/lib/ ++#cp libs/gentl/X$platform_bits/libxiFapi_GenTL.cti $optpath/lib/ + Check + + if [ -e libs/xiapi_dng_store/X$platform_bits ]