scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-21 04:40:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

GitHub CI: support for NDI 5

Browse Source 
macOS and Linux would still compile with NDI 4, Windows requires NDI 5
now.
This commit is contained in:
Martin Pulec
2021-07-20 10:33:53 +02:00
parent 2e3a78ff0f
commit 5286918f14
4 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/scripts/Linux/prepare.sh vendored
View File

@@ -65,7 +65,7 @@ fi
if [ -n "$SDK_URL" -a "$GITHUB_REF" = refs/heads/ndi-build ]; then
curl -f -S $SDK_URL/NDISDK_Linux.tar.gz -O
tar -C /var/tmp -xzf NDISDK_Linux.tar.gz
yes | PAGER=cat /var/tmp/InstallNDI*sh
yes | PAGER=cat /var/tmp/Install*NDI*sh
sudo cp -r NDI\ SDK\ for\ Linux/include/* /usr/local/include
cat NDI\ SDK\ for\ Linux/Version.txt | sed 's/\(.*\)/\#define NDI_VERSION \"\1\"/' | sudo tee /usr/local/include/ndi_version.h
sudo cp -r NDI\ SDK\ for\ Linux/lib/x86_64-linux-gnu/* /usr/local/lib

4
.github/scripts/Windows/prepare.ps1 vendored
View File

@@ -25,8 +25,8 @@ if (${env:SDK_URL} -and ${env:GITHUB_REF} -eq "refs/heads/ndi-build") {
#Start-Process -FilePath "C:\ndi.exe" -ArgumentList "/VERYSILENT" -Wait -NoNewWindow
Start-Process -FilePath "C:\ndi.exe" -ArgumentList "/VERYSILENT"
Sleep 10
$sdk=(dir "C:\Program Files\NewTek" -Filter *SDK -Name)
echo "C:\Program Files\NewTek\$sdk\Bin\x64" >> ${env:GITHUB_PATH}
$sdk=(dir "C:\Program Files\NDI" -Filter *SDK -Name)
echo "C:\Program Files\NDI\$sdk\Bin\x64" >> ${env:GITHUB_PATH}
#Remove-Item C:\ndi.exe
}

4
.github/scripts/Windows/prepare_msys.sh vendored
View File

@@ -15,8 +15,8 @@ if test -d "$CUDA_D"; then
export CPATH=$CPATH:$CUDA_D/include
fi
if test -d /c/Program\ Files/NewTek; then
NDI_D=$(ls -d /c/Program\ Files/NewTek/*SDK)
if test -d /c/Program\ Files/NDI; then
NDI_D=$(ls -d /c/Program\ Files/NDI/*SDK)
export CPATH=$CPATH:$NDI_D/Include
export LIBRARY_PATH=$LIBRARY_PATH:$NDI_D/Lib/x64
cat $NDI_D/Version.txt | sed 's/\(.*\)/\#define NDI_VERSION \"\1\"/' | tee /usr/local/include/ndi_version.h

17
.github/scripts/macOS/prepare.sh vendored
View File

@@ -55,14 +55,19 @@ fi
# Install NDI
if [ -f $SDK_NONFREE_PATH/NDISDK_Apple.pkg ]; then
sudo installer -pkg $SDK_NONFREE_PATH/NDISDK_Apple.pkg -target /
sudo mv "/Library/NDI SDK for Apple/" /Library/NDI
sudo mv /Library/NDI\ SDK\ for\ * /Library/NDI
cat /Library/NDI/Version.txt | sed 's/\(.*\)/\#define NDI_VERSION \"\1\"/' | sudo tee /usr/local/include/ndi_version.h
cd /Library/NDI/lib/x64
sudo ln -s libndi.?.dylib libndi.dylib
if [ -d /Library/NDI/lib/x64 ]; then # NDI 4
cd /Library/NDI/lib/x64
sudo ln -s libndi.?.dylib libndi.dylib
NDI_LIB=/Library/NDI/lib/x64
else # NDI 5
NDI_LIB=/Library/NDI/lib/macOS
fi
export CPATH=${CPATH:+"$CPATH:"}/Library/NDI/include
export DYLIBBUNDLER_FLAGS="${DYLIBBUNDLER_FLAGS:+$DYLIBBUNDLER_FLAGS }-s /Library/NDI/lib/x64"
export LIBRARY_PATH=${LIBRARY_PATH:+"$LIBRARY_PATH:"}/Library/NDI/lib/x64
export MY_DYLD_LIBRARY_PATH="${MY_DYLD_LIBRARY_PATH:+$MY_DYLD_LIBRARY_PATH:}/Library/NDI/lib/x64"
export DYLIBBUNDLER_FLAGS="${DYLIBBUNDLER_FLAGS:+$DYLIBBUNDLER_FLAGS }-s $NDI_LIB"
export LIBRARY_PATH=${LIBRARY_PATH:+"$LIBRARY_PATH:"}$NDI_LIB
export MY_DYLD_LIBRARY_PATH="${MY_DYLD_LIBRARY_PATH:+$MY_DYLD_LIBRARY_PATH:}$NDI_LIB"
echo "CPATH=$CPATH" >> $GITHUB_ENV
echo "DYLIBBUNDLER_FLAGS=$DYLIBBUNDLER_FLAGS" >> $GITHUB_ENV
echo "LIBRARY_PATH=$LIBRARY_PATH" >> $GITHUB_ENV