Skip to content

Commit 6bc34d8

Browse files
summeroffsummeroff
committed
merge fixes
1 parent 8eaf16a commit 6bc34d8

34 files changed

+284
-92
lines changed

‎CMakeLists.txt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,8 @@ if(WIN32)
158158
-P "${CMAKE_SOURCE_DIR}/slobs_CI/check_libraries.cmake" )
159159
endif()
160160

161-
#Configure 32-bit projects
161+
if(ENABLE_32_TARGETS)
162+
#Configure 32-bit projects
162163
if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
163164
#message(FATAL_ERROR "CURL_INCLUDE_DIR: ${CURL_INCLUDE_DIR}, CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX}, PREFIX_PATH_X86: ${PREFIX_PATH_X86}, OBS_VERSION: ${OBS_VERSION}, OBS_VERSION_OVERRIDE: ${OBS_VERSION_OVERRIDE}")
164165
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
@@ -193,3 +194,4 @@ if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
193194
RESULT_VARIABLE _process_result COMMAND_ERROR_IS_FATAL ANY)
194195
endif()
195196
endif()
197+
endif()

‎CMakePresets.json‎

Lines changed: 85 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": 3,
2+
"version": 5,
33
"cmakeMinimumRequired": {
44
"major": 3,
55
"minor": 22,
@@ -10,10 +10,10 @@
1010
"name": "environmentVars",
1111
"hidden": true,
1212
"cacheVariables": {
13-
"RESTREAM_CLIENTID": {"type": "STRING", "value": "$penv{RESTREAM_CLIENTID}"},
14-
"RESTREAM_HASH": {"type": "STRING", "value": "$penv{RESTREAM_HASH}"},
1513
"TWITCH_CLIENTID": {"type": "STRING", "value": "$penv{TWITCH_CLIENTID}"},
1614
"TWITCH_HASH": {"type": "STRING", "value": "$penv{TWITCH_HASH}"},
15+
"RESTREAM_CLIENTID": {"type": "STRING", "value": "$penv{RESTREAM_CLIENTID}"},
16+
"RESTREAM_HASH": {"type": "STRING", "value": "$penv{RESTREAM_HASH}"},
1717
"YOUTUBE_CLIENTID": {"type": "STRING", "value": "$penv{YOUTUBE_CLIENTID}"},
1818
"YOUTUBE_CLIENTID_HASH": {"type": "STRING", "value": "$penv{YOUTUBE_CLIENTID_HASH}"},
1919
"YOUTUBE_SECRET": {"type": "STRING", "value": "$penv{YOUTUBE_SECRET}"},
@@ -33,8 +33,16 @@
3333
"generator": "Xcode",
3434
"binaryDir": "${sourceDir}/build_macos",
3535
"cacheVariables": {
36+
"ENABLE_BROWSER": true,
3637
"CMAKE_OSX_DEPLOYMENT_TARGET": {"type": "STRING", "value": "11.0"},
37-
"ENABLE_BROWSER": true
38+
"OBS_CODESIGN_TEAM": {"type": "STRING", "value": "$penv{CODESIGN_TEAM}"},
39+
"OBS_CODESIGN_IDENTITY": {"type": "STRING", "value": "$penv{CODESIGN_IDENT}"},
40+
"OBS_PROVISIONING_PROFILE": {"type": "STRING", "value": "$penv{PROVISIONING_PROFILE}"},
41+
"VIRTUALCAM_DEVICE_UUID": {"type": "STRING", "value": ""},
42+
"VIRTUALCAM_SOURCE_UUID": {"type": "STRING", "value": ""},
43+
"VIRTUALCAM_SINK_UUID": {"type": "STRING", "value": ""},
44+
"SPARKLE_APPCAST_URL": {"type": "STRING", "value": ""},
45+
"SPARKLE_PUBLIC_KEY": {"type": "STRING", "value": ""}
3846
}
3947
},
4048
{
@@ -48,35 +56,75 @@
4856
}
4957
},
5058
{
51-
"name": "ubuntu",
52-
"displayName": "Ubuntu",
53-
"description": "obs-studio for Ubuntu",
59+
"name": "linux-aarch64",
60+
"displayName": "Linux aarch64",
61+
"description": "obs-studio for Linux (aarch64)",
5462
"inherits": ["environmentVars"],
5563
"condition": {
5664
"type": "equals",
5765
"lhs": "${hostSystemName}",
5866
"rhs": "Linux"
5967
},
60-
"binaryDir": "${sourceDir}/build_ubuntu",
68+
"binaryDir": "${sourceDir}/build_aarch64",
6169
"generator": "Ninja",
6270
"warnings": {"dev": true, "deprecated": true},
6371
"cacheVariables": {
64-
"CMAKE_BUILD_TYPE": "Debug",
65-
"CMAKE_INSTALL_LIBDIR": "lib/CMAKE_SYSTEM_PROCESSOR-linux-gnu",
66-
"OBS_CMAKE_VERSION": {"type": "STRING", "value": "3.0.0"},
67-
"ENABLE_AJA": false,
68-
"ENABLE_NATIVE_NVENC": false,
72+
"ENABLE_WAYLAND": true,
6973
"ENABLE_VLC": true,
74+
"CMAKE_BUILD_TYPE": "Debug"
75+
}
76+
},
77+
{
78+
"name": "linux-ci-aarch64",
79+
"inherits": ["linux-aarch64"],
80+
"hidden": true,
81+
"cacheVariables": {
82+
"CMAKE_BUILD_TYPE": "RelWithDebInfo"
83+
}
84+
},
85+
{
86+
"name": "linux-release-aarch64",
87+
"displayName": "Linux aarch64 (Release)",
88+
"description": "obs-studio for Linux (aarch64) - Release Configuration",
89+
"inherits": "linux-aarch64",
90+
"cacheVariables": {
91+
"ENABLE_RELEASE_BUILD": true
92+
}
93+
},
94+
{
95+
"name": "linux-x86_64",
96+
"displayName": "Linux x86_64",
97+
"description": "obs-studio for Linux (x86_64)",
98+
"inherits": ["environmentVars"],
99+
"condition": {
100+
"type": "equals",
101+
"lhs": "${hostSystemName}",
102+
"rhs": "Linux"
103+
},
104+
"binaryDir": "${sourceDir}/build_x86_64",
105+
"generator": "Ninja",
106+
"warnings": {"dev": true, "deprecated": true},
107+
"cacheVariables": {
70108
"ENABLE_WAYLAND": true,
71-
"ENABLE_WEBRTC": false
109+
"ENABLE_VLC": true,
110+
"CMAKE_BUILD_TYPE": {"type": "STRING", "value": "Debug"}
72111
}
73112
},
74113
{
75-
"name": "ubuntu-ci",
76-
"inherits": ["ubuntu"],
114+
"name": "linux-ci-x86_64",
115+
"inherits": ["linux-x86_64"],
77116
"cacheVariables": {
78-
"CMAKE_BUILD_TYPE": "RelWithDebInfo",
79-
"CMAKE_COMPILE_WARNING_AS_ERROR": true
117+
"CMAKE_BUILD_TYPE": "RelWithDebInfo"
118+
}
119+
},
120+
{
121+
"name": "linux-release-x86_64",
122+
"displayName": "Linux x86_64 (Release)",
123+
"description": "obs-studio for Linux (x86_64) - Release Configuration",
124+
"inherits": "linux-x86_64",
125+
"cacheVariables": {
126+
"ENABLE_RELEASE_BUILD": true,
127+
"ENABLE_BROWSER": true
80128
}
81129
},
82130
{
@@ -94,10 +142,12 @@
94142
"generator": "Visual Studio 17 2022",
95143
"cacheVariables": {
96144
"OBS_CMAKE_VERSION": {"type": "STRING", "value": "3.0.0"},
97-
"GPU_PRIORITY_VAL": {"type": "STRING", "value": "$penv{GPU_PRIORITY_VAL}"},
98-
"VIRTUALCAM_GUID": {"type": "STRING", "value": "A3FCE0F5-3493-419F-958A-ABA1250EC20B"},
99145
"ENABLE_BROWSER": true,
100-
"ENABLE_CCACHE": false
146+
"VIRTUALCAM_GUID": {"type": "STRING", "value": "A3FCE0F5-3493-419F-958A-ABA1250EC20B"},
147+
"GPU_PRIORITY_VAL": {"type": "STRING", "value": "$penv{GPU_PRIORITY_VAL}"},
148+
"ENABLE_CCACHE": false,
149+
"ENABLE_32_TARGETS": false,
150+
"ENABLE_UI": false
101151
}
102152
},
103153
{
@@ -113,6 +163,20 @@
113163
}
114164
],
115165
"buildPresets": [
166+
{
167+
"name": "linux-aarch64",
168+
"configurePreset": "linux-aarch64",
169+
"displayName": "Linux aarch64",
170+
"description": "Linux build for aarch64 (aka arm64)",
171+
"configuration": "RelWithDebInfo"
172+
},
173+
{
174+
"name": "linux-x86_64",
175+
"configurePreset": "linux-x86_64",
176+
"displayName": "Linux x86_64",
177+
"description": "Linux build for x86_64 (aka amd64)",
178+
"configuration": "RelWithDebInfo"
179+
},
116180
{
117181
"name": "windows-x64",
118182
"configurePreset": "windows-x64",

‎buildspec.json‎

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
}
1313
},
1414
"qt6": {
15-
"version": "2023-08-31sl1",
15+
"version": "2024-09-10v4",
1616
"baseUrl": "https://obs-studio-deployment.s3-us-west-2.amazonaws.com",
1717
"label": "Pre-Built Qt6",
1818
"hashes": {
@@ -27,18 +27,19 @@
2727
},
2828
"cef": {
2929
"version": "5060",
30-
"baseUrl": "https://cdn-fastly.obsproject.com/downloads",
30+
"baseUrl": "https://streamlabs-cef-dist.s3.us-west-2.amazonaws.com",
3131
"label": "Chromium Embedded Framework",
3232
"hashes": {
3333
"macos-x86_64": "7ef71717ff2e4ff4212274c33f0993729f47c109c464e499544fd3f63586a069",
3434
"macos-arm64": "a9da8909202aefc8f35509d03eff9a7c837b5d3b2ed3afb39b67121cb16d457b",
3535
"linux-x86_64": "bf4aa9388bab7e94fa945cc3bba16b6da63b6a30f9c0342d42235468b39d84bf",
3636
"linux-aarch64": "68d915c9ba2639cba762a54cd3430fce2527aa6355d831d3cfcb6157664206b0",
37-
"windows-x64": "c1b47beb7ee42e98f1a41b6d694c26842a4a3d452e44bdf6f758c9785696533d"
37+
"windows-x64": "7480e9ed5688e09919db67237d130eef9a4c24df32ba2a7b8a5587de45ff8e69"
3838
},
3939
"revision": {
40-
"macos-x86_64": 2,
41-
"macos-arm64": 2
40+
"macos-x86_64": 3,
41+
"macos-arm64": 3,
42+
"windows-x64": 3
4243
}
4344
},
4445
"vlc": {
@@ -49,13 +50,22 @@
4950
"windows-x64": "91f589ef69fce51645a3ecbb215b405c98db7b891479474ec3b5ed3b63c25e4a"
5051
}
5152
},
53+
"openssl": {
54+
"version": "1.1.1c",
55+
"baseUrl": "https://streamlabs-obs-updater-deps.s3.us-west-2.amazonaws.com",
56+
"label": "openssl",
57+
"hashes": {
58+
"windows-x64": "801CE178E86CB13A1485878DE053B6089C32941800CFD2440F33158117A58860"
59+
}
60+
},
5261
"libmediasoupclient": {
5362
"version": "3.4.3",
5463
"baseUrl": "https://obs-studio-deployment.s3-us-west-2.amazonaws.com",
5564
"label": "libmediasoupclient",
5665
"hashes": {
5766
"macos-x86_64": "D06CF8593EBFA2DAE3AB6A59EA889A931C1EE77586D76EB890AF93DB936D18C5",
58-
"macos-arm64": "DC4424D32A86306172C57E9D8D7EDD2CB3897C364A56F46318DEE5395B68474B"
67+
"macos-arm64": "DC4424D32A86306172C57E9D8D7EDD2CB3897C364A56F46318DEE5395B68474B",
68+
"windows-x64": "03E25130EDF6B49009404B6FE4B75D5DDC92885F1DAD2DF3ED0FB3068D98C682"
5969
}
6070
},
6171
"webrtc": {
@@ -64,8 +74,18 @@
6474
"label": "webrtc",
6575
"hashes": {
6676
"macos-x86_64": "5FAD4805BC81256BD3B7E06EE75FFF9BD2A8983DCCD5F31C1F500A214A3B08B2",
67-
"macos-arm64": "5D9FA128386DA4ADA0FF0AD2D092C2F9DD2B93A93FD85A50EE04358855680473"
77+
"macos-arm64": "5D9FA128386DA4ADA0FF0AD2D092C2F9DD2B93A93FD85A50EE04358855680473",
78+
"windows-x64": "0FCE7305A5C1D2A026157B2BEFFFABA25A4202CE403614F6A98965CECA15E2B0"
6879
}
80+
},
81+
"grpc": {
82+
"version": "v1.47.0",
83+
"baseUrl": "https://obs-studio-deployment.s3-us-west-2.amazonaws.com",
84+
"label": "gRPC",
85+
"hashes": {
86+
"windows-x64": "C83815ACCCAE80F07E545B569582E548EE6E4575B2E329B7B739509BD49D811C"
87+
},
88+
"distPath": "grpc_dist"
6989
}
7090
},
7191
"platformConfig": {

0 commit comments

Comments
 (0)