mirror of
https://github.com/Xaymar/obs-StreamFX
synced 2024-11-10 22:05:06 +00:00
cmake: Update for OBS Studio 27.0.0
* OBS Studio 27.0.0 supports ARM64 on MacOS directly. * Windows now uses "Detours" for hooking into Windows API functions.
This commit is contained in:
Michael Fabian 'Xaymar' Dirks
parent
aacbe53679
commit
8ab8d66977
2 changed files with 28 additions and 28 deletions
24
.github/workflows/main.yml
vendored
24
.github/workflows/main.yml
vendored
|
|
@ -12,7 +12,8 @@ on:
|
|||
|
||||
env:
|
||||
QT_VERSION: "5.15.2"
|
||||
OBS_VERSION: "27.0.0-rc2-ci"
|
||||
OBS_VERSION: "27.0.0-ci"
|
||||
OBSDEPS_VERSION: "27.0.0"
|
||||
|
||||
jobs:
|
||||
windows:
|
||||
|
|
@ -33,7 +34,6 @@ jobs:
|
|||
CMAKE_GENERATOR_PLATFORM: ${{ matrix.cmake_generator_platform }}
|
||||
CMAKE_GENERATOR_TOOLSET: "host=x64"
|
||||
CMAKE_SYSTEM_VERSION: ${{ matrix.windows_sdk }}
|
||||
OBSDEPS_VERSION: "26.1.0"
|
||||
steps:
|
||||
- name: "Clone"
|
||||
uses: actions/checkout@v2
|
||||
|
|
@ -73,11 +73,11 @@ jobs:
|
|||
-DPACKAGE_NAME="streamfx-${{ matrix.id }}" \
|
||||
-DPACKAGE_PREFIX="build/package" \
|
||||
-DDOWNLOAD_QT=ON \
|
||||
-DDOWNLOAD_OBS_URL="https://github.com/Xaymar/obs-studio/releases/download/${{ env.OBS_VERSION }}/obs-studio-x64-0.0.0.0-windows-64.7z" \
|
||||
-DDOWNLOAD_OBS_HASH="SHA256=0D5A1E208ECF90B2ADD8895941D95E2D403538E17CBBC9A6FF4246953662A98F" \
|
||||
-DDOWNLOAD_OBSDEPS_URL="https://github.com/Xaymar/obs-studio/releases/download/${{ env.OBSDEPS_VERSION }}/deps_windows_x86.7z" \
|
||||
-DDOWNLOAD_OBSDEPS_HASH="SHA256=F5F8F5A53FDB26FF8F4D24811CA0FEA891B3A0C8477515B886129669A81D37C2" \
|
||||
-DDOWNLOAD_QT_URL="https://github.com/Xaymar/obs-studio/releases/download/${{ env.OBSDEPS_VERSION }}/qt_${{ env.QT_VERSION }}_windows_64.7z" \
|
||||
-DDOWNLOAD_OBS_URL="https://github.com/Xaymar/obs-studio/releases/download/${{ env.OBS_VERSION }}/obs-studio-x64-0.0.0.0-windows-x86-64.7z" \
|
||||
-DDOWNLOAD_OBS_HASH="SHA256=EBF9853C8A553E16ECBCA22523F401E6CF1EB2E8DA93F1493FEF41D65BD06633" \
|
||||
-DDOWNLOAD_OBSDEPS_URL="https://github.com/Xaymar/obs-studio/releases/download/${{ env.OBSDEPS_VERSION }}/deps-windows-x86.7z" \
|
||||
-DDOWNLOAD_OBSDEPS_HASH="SHA256=B4AED165016F0B64A7E8B256CCC12EAF8AF087F61B0B239B9D3D00277485B5B5" \
|
||||
-DDOWNLOAD_QT_URL="https://github.com/Xaymar/obs-studio/releases/download/${{ env.OBSDEPS_VERSION }}/qt-${{ env.QT_VERSION }}-windows-x86-64.7z" \
|
||||
-DDOWNLOAD_QT_HASH="SHA256=109B9C21EF165B0C46DFAA9AD23124F2070ED4D74207C4AFB308183CB8D43BDD"
|
||||
- name: "StreamFX: Build"
|
||||
shell: bash
|
||||
|
|
@ -168,8 +168,8 @@ jobs:
|
|||
-DENABLE_FILTER_NVIDIA_FACE_TRACKING=FALSE \
|
||||
-DPACKAGE_NAME="streamfx-${{ matrix.id }}" \
|
||||
-DPACKAGE_PREFIX="build/package" \
|
||||
-DDOWNLOAD_OBS_URL="https://github.com/Xaymar/obs-studio/releases/download/${{ env.OBS_VERSION }}/obs-studio-x64-0.0.0.0-ubuntu-64.7z" \
|
||||
-DDOWNLOAD_OBS_HASH="SHA256=0AA62167EC8B6E2161EDD2E3A5C66190C4A416551288EC7F847D8612AF98D090"
|
||||
-DDOWNLOAD_OBS_URL="https://github.com/Xaymar/obs-studio/releases/download/${{ env.OBS_VERSION }}/obs-studio-x64-0.0.0.0-ubuntu-x86-64.7z" \
|
||||
-DDOWNLOAD_OBS_HASH="SHA256=0AF6C7262C37D80C24CB18523A851FD765C04E766D8EB0F4AC0F6E75D13A035F"
|
||||
- name: "StreamFX: Build"
|
||||
shell: bash
|
||||
run: |
|
||||
|
|
@ -242,9 +242,9 @@ jobs:
|
|||
-DPACKAGE_NAME="streamfx-${{ matrix.id }}" \
|
||||
-DPACKAGE_PREFIX="build/package" \
|
||||
-DQt5_DIR=$(brew --prefix)/Cellar/qt@5/${{ env.QT_VERSION }}/lib/cmake/Qt5 \
|
||||
-DDOWNLOAD_OBS_URL="https://github.com/Xaymar/obs-studio/releases/download/${{ env.OBS_VERSION }}/obs-studio-x64-0.0.0.0-macos-64.7z" \
|
||||
-DDOWNLOAD_OBS_HASH="SHA256=A87AA77FEEB451C5768647CFBE6E64230DB75FE2CD4AF899390C6D5B7199C832" \
|
||||
-DDOWNLOAD_OBSDEPS_URL="https://github.com/obsproject/obs-deps/releases/download/2021-03-25/macos-deps-x86_64-2021-03-25.tar.gz" \
|
||||
-DDOWNLOAD_OBS_URL="https://github.com/Xaymar/obs-studio/releases/download/${{ env.OBS_VERSION }}/obs-studio-x64-0.0.0.0-macos-x86-64.7z" \
|
||||
-DDOWNLOAD_OBS_HASH="SHA256=F15BC4CA8EB3F581A94372759CFE554E30D202B604B541445A5756B878E4E799" \
|
||||
-DDOWNLOAD_OBSDEPS_URL="https://github.com/Xaymar/obs-studio/releases/download/${{ env.OBSDEPS_VERSION }}/deps-macos-x86_64-2021-03-25.tar.gz" \
|
||||
-DDOWNLOAD_OBSDEPS_HASH="SHA256=1C409374BCAB9D5CEEAFC121AA327E13AB222096718AF62F2648302DF62898D6"
|
||||
- name: "StreamFX: Build"
|
||||
shell: bash
|
||||
|
|
|
|||
|
|
@ -359,12 +359,12 @@ if(NOT ${PREFIX}OBS_NATIVE)
|
|||
set(_DOWNLOAD_OBS_URL "${${PREFIX}DOWNLOAD_OBS_URL}")
|
||||
set(_DOWNLOAD_OBS_HASH "${${PREFIX}DOWNLOAD_OBS_HASH}")
|
||||
else()
|
||||
set(_DOWNLOAD_OBS_VERSION "27.0.0-rc2-ci")
|
||||
set(_DOWNLOAD_OBS_VERSION "27.0.0-ci")
|
||||
if (D_PLATFORM_WINDOWS)
|
||||
if (D_PLATFORM_ARCH_X86)
|
||||
set(_DOWNLOAD_OBS_URL "https://github.com/Xaymar/obs-studio/releases/download/${_DOWNLOAD_OBS_VERSION}/obs-studio-x64-0.0.0.0-windows-${D_PLATFORM_BITS}.7z")
|
||||
set(_DOWNLOAD_OBS_URL "https://github.com/Xaymar/obs-studio/releases/download/${_DOWNLOAD_OBS_VERSION}/obs-studio-x64-0.0.0.0-windows-${D_PLATFORM_ARCH}-${D_PLATFORM_BITS}.7z")
|
||||
if (D_PLATFORM_BITS EQUAL 64)
|
||||
set(_DOWNLOAD_OBS_HASH "SHA256=0D5A1E208ECF90B2ADD8895941D95E2D403538E17CBBC9A6FF4246953662A98F")
|
||||
set(_DOWNLOAD_OBS_HASH "SHA256=EBF9853C8A553E16ECBCA22523F401E6CF1EB2E8DA93F1493FEF41D65BD06633")
|
||||
else()
|
||||
message(FATAL_ERROR "${LOGPREFIX} Platform '${D_PLATFORM_OS}' with architecture '${D_PLATFORM_ARCH}' and bitness '${D_PLATFORM_BITS}' is not supported.")
|
||||
return()
|
||||
|
|
@ -375,9 +375,9 @@ if(NOT ${PREFIX}OBS_NATIVE)
|
|||
endif()
|
||||
elseif(D_PLATFORM_LINUX)
|
||||
if (D_PLATFORM_ARCH_X86)
|
||||
set(_DOWNLOAD_OBS_URL "https://github.com/Xaymar/obs-studio/releases/download/${_DOWNLOAD_OBS_VERSION}/obs-studio-x64-0.0.0.0-ubuntu-${D_PLATFORM_BITS}.7z")
|
||||
set(_DOWNLOAD_OBS_URL "https://github.com/Xaymar/obs-studio/releases/download/${_DOWNLOAD_OBS_VERSION}/obs-studio-x64-0.0.0.0-ubuntu-${D_PLATFORM_ARCH}-${D_PLATFORM_BITS}.7z")
|
||||
if (D_PLATFORM_BITS EQUAL 64)
|
||||
set(_DOWNLOAD_OBS_HASH "SHA256=0AA62167EC8B6E2161EDD2E3A5C66190C4A416551288EC7F847D8612AF98D090")
|
||||
set(_DOWNLOAD_OBS_HASH "SHA256=0AF6C7262C37D80C24CB18523A851FD765C04E766D8EB0F4AC0F6E75D13A035F")
|
||||
else()
|
||||
message(FATAL_ERROR "${LOGPREFIX} Platform '${D_PLATFORM_OS}' with architecture '${D_PLATFORM_ARCH}' and bitness '${D_PLATFORM_BITS}' is not supported.")
|
||||
return()
|
||||
|
|
@ -388,9 +388,9 @@ if(NOT ${PREFIX}OBS_NATIVE)
|
|||
endif()
|
||||
elseif(D_PLATFORM_MAC)
|
||||
if (D_PLATFORM_ARCH_X86)
|
||||
set(_DOWNLOAD_OBS_URL "https://github.com/Xaymar/obs-studio/releases/download/${_DOWNLOAD_OBS_VERSION}/obs-studio-x64-0.0.0.0-macos-${D_PLATFORM_BITS}.7z")
|
||||
set(_DOWNLOAD_OBS_URL "https://github.com/Xaymar/obs-studio/releases/download/${_DOWNLOAD_OBS_VERSION}/obs-studio-x64-0.0.0.0-macos-${D_PLATFORM_ARCH}-${D_PLATFORM_BITS}.7z")
|
||||
if (D_PLATFORM_BITS EQUAL 64)
|
||||
set(_DOWNLOAD_OBS_HASH "SHA256=A87AA77FEEB451C5768647CFBE6E64230DB75FE2CD4AF899390C6D5B7199C832")
|
||||
set(_DOWNLOAD_OBS_HASH "SHA256=F15BC4CA8EB3F581A94372759CFE554E30D202B604B541445A5756B878E4E799")
|
||||
else()
|
||||
message(FATAL_ERROR "${LOGPREFIX} Platform '${D_PLATFORM_OS}' with architecture '${D_PLATFORM_ARCH}' and bitness '${D_PLATFORM_BITS}' is not supported.")
|
||||
return()
|
||||
|
|
@ -437,11 +437,11 @@ if(STANDALONE AND NOT D_PLATFORM_LINUX)
|
|||
else()
|
||||
if (D_PLATFORM_WINDOWS)
|
||||
if (D_PLATFORM_ARCH_X86)
|
||||
set(_DOWNLOAD_OBSDEPS_URL "https://github.com/Xaymar/obs-studio/releases/download/26.1.0/deps_windows_x86.7z")
|
||||
set(_DOWNLOAD_OBSDEPS_URL "https://github.com/Xaymar/obs-studio/releases/download/27.0.0/deps-windows-x86.7z")
|
||||
if (D_PLATFORM_BITS EQUAL 64)
|
||||
set(_DOWNLOAD_OBSDEPS_HASH "SHA256=F5F8F5A53FDB26FF8F4D24811CA0FEA891B3A0C8477515B886129669A81D37C2")
|
||||
set(_DOWNLOAD_OBSDEPS_HASH "SHA256=B4AED165016F0B64A7E8B256CCC12EAF8AF087F61B0B239B9D3D00277485B5B5")
|
||||
elseif (D_PLATFORM_BITS EQUAL 32)
|
||||
set(_DOWNLOAD_OBSDEPS_HASH "SHA256=F5F8F5A53FDB26FF8F4D24811CA0FEA891B3A0C8477515B886129669A81D37C2")
|
||||
set(_DOWNLOAD_OBSDEPS_HASH "SHA256=B4AED165016F0B64A7E8B256CCC12EAF8AF087F61B0B239B9D3D00277485B5B5")
|
||||
else()
|
||||
message(FATAL_ERROR "${LOGPREFIX} Platform '${D_PLATFORM_OS}' with architecture '${D_PLATFORM_ARCH}' and bitness '${D_PLATFORM_BITS}' is not supported.")
|
||||
return()
|
||||
|
|
@ -453,7 +453,7 @@ if(STANDALONE AND NOT D_PLATFORM_LINUX)
|
|||
elseif(D_PLATFORM_MAC)
|
||||
if (D_PLATFORM_ARCH_X86)
|
||||
if (D_PLATFORM_BITS EQUAL 64)
|
||||
set(_DOWNLOAD_OBSDEPS_URL "https://github.com/obsproject/obs-deps/releases/download/2021-03-25/macos-deps-x86_64-2021-03-25.tar.gz")
|
||||
set(_DOWNLOAD_OBSDEPS_URL "https://github.com/Xaymar/obs-studio/releases/download/27.0.0/deps-macos-x86_64-2021-03-25.tar.gz")
|
||||
set(_DOWNLOAD_OBSDEPS_HASH "SHA256=1C409374BCAB9D5CEEAFC121AA327E13AB222096718AF62F2648302DF62898D6")
|
||||
else()
|
||||
message(FATAL_ERROR "${LOGPREFIX} Platform '${D_PLATFORM_OS}' with architecture '${D_PLATFORM_ARCH}' and bitness '${D_PLATFORM_BITS}' is not supported.")
|
||||
|
|
@ -461,7 +461,7 @@ if(STANDALONE AND NOT D_PLATFORM_LINUX)
|
|||
endif()
|
||||
elseif(D_PLATFORM_ARCH_ARM)
|
||||
if (D_PLATFORM_BITS EQUAL 64)
|
||||
set(_DOWNLOAD_OBSDEPS_URL "https://github.com/obsproject/obs-deps/releases/download/2021-03-25/macos-deps-arm64-2021-03-25.tar.gz")
|
||||
set(_DOWNLOAD_OBSDEPS_URL "https://github.com/Xaymar/obs-studio/releases/download/27.0.0/deps-macos-arm64-2021-03-25.tar.gz")
|
||||
set(_DOWNLOAD_OBSDEPS_HASH "SHA256=C0EC57D360AF190E372D6BB883134FA26B1A7E49840DD146B172B48D548B55BC")
|
||||
else()
|
||||
message(FATAL_ERROR "${LOGPREFIX} Platform '${D_PLATFORM_OS}' with architecture '${D_PLATFORM_ARCH}' and bitness '${D_PLATFORM_BITS}' is not supported.")
|
||||
|
|
@ -516,10 +516,10 @@ if(STANDALONE AND NOT D_PLATFORM_LINUX)
|
|||
if (D_PLATFORM_WINDOWS)
|
||||
if (D_PLATFORM_ARCH_X86)
|
||||
if (D_PLATFORM_BITS EQUAL 64)
|
||||
set(_DOWNLOAD_QT_URL "https://github.com/Xaymar/obs-studio/releases/download/26.1.0/qt_5.15.2_windows_64.7z")
|
||||
set(_DOWNLOAD_QT_URL "https://github.com/Xaymar/obs-studio/releases/download/27.0.0/qt-5.15.2-windows-x86-64.7z")
|
||||
set(_DOWNLOAD_QT_HASH "SHA256=109B9C21EF165B0C46DFAA9AD23124F2070ED4D74207C4AFB308183CB8D43BDD")
|
||||
elseif (D_PLATFORM_BITS EQUAL 32)
|
||||
set(_DOWNLOAD_QT_URL "https://github.com/Xaymar/obs-studio/releases/download/26.1.0/qt_5.15.2_windows_32.7z")
|
||||
set(_DOWNLOAD_QT_URL "https://github.com/Xaymar/obs-studio/releases/download/27.0.0/qt-5.15.2-windows-x86-32.7z")
|
||||
set(_DOWNLOAD_QT_HASH "SHA256=372E4FBF2A15DD4FDA955A07334D8B8AC6802990148C9CB4E766C90205F8F570")
|
||||
else()
|
||||
message(FATAL_ERROR "${LOGPREFIX} Platform '${D_PLATFORM_OS}' with architecture '${D_PLATFORM_ARCH}' and bitness '${D_PLATFORM_BITS}' is not supported.")
|
||||
|
|
@ -532,7 +532,7 @@ if(STANDALONE AND NOT D_PLATFORM_LINUX)
|
|||
elseif(D_PLATFORM_MAC)
|
||||
if (D_PLATFORM_ARCH_X86)
|
||||
if (D_PLATFORM_BITS EQUAL 64)
|
||||
set(_DOWNLOAD_QT_URL "https://github.com/obsproject/obs-deps/releases/download/2021-03-25/macos-qt-5.15.2_x86_64-2021-03-25.tar.gz")
|
||||
set(_DOWNLOAD_QT_URL "https://github.com/Xaymar/obs-studio/releases/download/27.0.0/qt-5.15.2-macos-x86_64-2021-03-25.tar.gz")
|
||||
set(_DOWNLOAD_QT_HASH "SHA256=FFABB54624B931EA3FCC06BED244895F50CEFC95DE09D792D280C46D4F91D4C5")
|
||||
else()
|
||||
message(FATAL_ERROR "${LOGPREFIX} Platform '${D_PLATFORM_OS}' with architecture '${D_PLATFORM_ARCH}' and bitness '${D_PLATFORM_BITS}' is not supported.")
|
||||
|
|
@ -540,7 +540,7 @@ if(STANDALONE AND NOT D_PLATFORM_LINUX)
|
|||
endif()
|
||||
elseif(D_PLATFORM_ARCH_ARM)
|
||||
if (D_PLATFORM_BITS EQUAL 64)
|
||||
set(_DOWNLOAD_QT_URL "https://github.com/obsproject/obs-deps/releases/download/2021-03-25/macos-qt-5.15.2_arm64-2021-03-25.tar.gz")
|
||||
set(_DOWNLOAD_QT_URL "https://github.com/Xaymar/obs-studio/releases/download/27.0.0/qt-5.15.2-macos-arm64-2021-03-25.tar.gz")
|
||||
set(_DOWNLOAD_QT_HASH "SHA256=366BA8AC0FA0CAC440AFB9ED1C2EF5932E50091DC43BDE8B5C4B490082B6F19F")
|
||||
else()
|
||||
message(FATAL_ERROR "${LOGPREFIX} Platform '${D_PLATFORM_OS}' with architecture '${D_PLATFORM_ARCH}' and bitness '${D_PLATFORM_BITS}' is not supported.")
|
||||
|
|
|
|||
Loading…
Reference in a new issue