Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
multimedia/obs-streamfx: Update 0.11.1 -> 0.12.0b164
- Loading branch information
Showing
9 changed files
with
159 additions
and
93 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,15 @@ | ||
| TIMESTAMP = 1655659058 | ||
| SHA256 (Xaymar-obs-StreamFX-0.11.1_GH0.tar.gz) = e3d05410e539dcaf2d5b0a3c096206ae04def178ccfe09056bda95acf896c823 | ||
| SIZE (Xaymar-obs-StreamFX-0.11.1_GH0.tar.gz) = 14232768 | ||
| SHA256 (Xaymar-cmake-clang-18ba565ff80cb5e6103a93e88a0265545c004707_GH0.tar.gz) = 6b953a328f25730f3c5885a6b89f172644481f2ae796afd85163ac96ff4aff46 | ||
| SIZE (Xaymar-cmake-clang-18ba565ff80cb5e6103a93e88a0265545c004707_GH0.tar.gz) = 4706 | ||
| SHA256 (Xaymar-cmake-codesign-d02ee94cb9c47ef6f8d2e9a5d67473b7e5cfc5bf_GH0.tar.gz) = f24c3c3a5063627d435e7ede199e323027346df24f279d431ce1178e143a1b90 | ||
| SIZE (Xaymar-cmake-codesign-d02ee94cb9c47ef6f8d2e9a5d67473b7e5cfc5bf_GH0.tar.gz) = 4377 | ||
| TIMESTAMP = 1672343749 | ||
| SHA256 (Xaymar-obs-StreamFX-0.12.0b164_GH0.tar.gz) = da75469cd3024e20993fa0c1c177e0ac19837a409a45a7d875253fc7ec58bef2 | ||
| SIZE (Xaymar-obs-StreamFX-0.12.0b164_GH0.tar.gz) = 14306323 | ||
| SHA256 (nlohmann-json-db78ac1d7716f56fc9f1b030b715f872f93964e4_GH0.tar.gz) = 048aa963b1d551b99c8a4c05d8e666d50c282ba745623ac1c98c6c3300af38cf | ||
| SIZE (nlohmann-json-db78ac1d7716f56fc9f1b030b715f872f93964e4_GH0.tar.gz) = 6883371 | ||
| SHA256 (Xaymar-msvc-redist-helper-aa4665ccf68a382f1c2b115fb6c9668b6a8bd64d_GH0.tar.gz) = 005c0492a840396be46f0a9bd4802e25aaf280176128bfde7c3ed3e18a6c9c8d | ||
| SIZE (Xaymar-msvc-redist-helper-aa4665ccf68a382f1c2b115fb6c9668b6a8bd64d_GH0.tar.gz) = 13129 | ||
| SHA256 (NVIDIA-MAXINE-AR-SDK-3bd2be62a4b309d56e270bbf05a622395ce95f04_GH0.tar.gz) = 438a1b680d4e95101f7adcea4ac347aea605500e552fcf86c83c5a01a2b672dd | ||
| SIZE (NVIDIA-MAXINE-AR-SDK-3bd2be62a4b309d56e270bbf05a622395ce95f04_GH0.tar.gz) = 35631489 | ||
| SHA256 (NVIDIA-MAXINE-VFX-SDK-7f69da2ee4dcb02e6b024b3f40c5892de84fcb45_GH0.tar.gz) = 9cc3a3a24d17dc263f8d2c400b1f8d3b3e08fb5492099ffae6a8b01752b3dd8c | ||
| SIZE (NVIDIA-MAXINE-VFX-SDK-7f69da2ee4dcb02e6b024b3f40c5892de84fcb45_GH0.tar.gz) = 35086564 | ||
| SHA256 (NVIDIA-MAXINE-AR-SDK-cf68600_GH0.tar.gz) = c98b4bd02088aec86dc0ea367b4ef32e51ad87a8773734dd6f0796d625c0f2c1 | ||
| SIZE (NVIDIA-MAXINE-AR-SDK-cf68600_GH0.tar.gz) = 39646304 | ||
| SHA256 (NVIDIA-MAXINE-VFX-SDK-3058988_GH0.tar.gz) = bc39cb36c14b2d24efd5a7573156db26b0d00a2a5be44c3298daf516551c1b4b | ||
| SIZE (NVIDIA-MAXINE-VFX-SDK-3058988_GH0.tar.gz) = 42588162 | ||
| SHA256 (Xaymar-cmake-clang-f249747_GH0.tar.gz) = 39a5d5affab7a4f4a5aaaf32527e36dc1102473310fd4da312380a8c0e3f8196 | ||
| SIZE (Xaymar-cmake-clang-f249747_GH0.tar.gz) = 5876 | ||
| SHA256 (Xaymar-cmake-version-16bfa95_GH0.tar.gz) = 4dbaa126bbd44217a142903eb50bc7e979fc9b8def951045180f5beceb0ab5de | ||
| SIZE (Xaymar-cmake-version-16bfa95_GH0.tar.gz) = 11258 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 0 additions & 12 deletions
12
multimedia/obs-streamfx/files/patch-cmake_modules_Architecture.cmake
This file was deleted.
Oops, something went wrong.
4 changes: 2 additions & 2 deletions
4
multimedia/obs-streamfx/files/patch-source_encoders_handlers_amf__shared.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| --- source/updater.cpp.orig 2022-12-29 20:11:04 UTC | ||
| +++ source/updater.cpp | ||
| @@ -94,7 +94,7 @@ void streamfx::from_json(const nlohmann::json& json, v | ||
| } | ||
|
|
||
| streamfx::version_info::version_info() | ||
| - : major(0), minor(0), patch(0), tweak(0), stage(version_stage::STABLE), url(""), name("") | ||
| + : major_(0), minor_(0), patch(0), tweak(0), stage(version_stage::STABLE), url(""), name("") | ||
| {} | ||
|
|
||
| streamfx::version_info::version_info(const std::string text) : version_info() | ||
| @@ -110,8 +110,8 @@ streamfx::version_info::version_info(const std::string | ||
| std::smatch matches; | ||
| if (std::regex_match(text, matches, re_version, | ||
| std::regex_constants::match_any | std::regex_constants::match_continuous)) { | ||
| - major = static_cast<uint16_t>(strtoul(matches[1].str().c_str(), nullptr, 10)); | ||
| - minor = static_cast<uint16_t>(strtoul(matches[2].str().c_str(), nullptr, 10)); | ||
| + major_ = static_cast<uint16_t>(strtoul(matches[1].str().c_str(), nullptr, 10)); | ||
| + minor_ = static_cast<uint16_t>(strtoul(matches[2].str().c_str(), nullptr, 10)); | ||
| patch = static_cast<uint16_t>(strtoul(matches[3].str().c_str(), nullptr, 10)); | ||
| if (matches.size() >= 5) { | ||
| stage = stage_from_string(matches[5].str()); | ||
| @@ -125,8 +125,8 @@ streamfx::version_info::version_info(const std::string | ||
| void streamfx::to_json(nlohmann::json& json, const version_info& info) | ||
| { | ||
| auto version = nlohmann::json::object(); | ||
| - version["major"] = info.major; | ||
| - version["minor"] = info.minor; | ||
| + version["major"] = info.major_; | ||
| + version["minor"] = info.minor_; | ||
| version["patch"] = info.patch; | ||
| version["type"] = info.stage; | ||
| version["tweak"] = info.tweak; | ||
| @@ -139,8 +139,8 @@ void streamfx::from_json(const nlohmann::json& json, v | ||
| { | ||
| if (json.find("html_url") == json.end()) { | ||
| auto version = json.at("version"); | ||
| - info.major = version.at("major").get<uint16_t>(); | ||
| - info.minor = version.at("minor").get<uint16_t>(); | ||
| + info.major_ = version.at("major").get<uint16_t>(); | ||
| + info.minor_ = version.at("minor").get<uint16_t>(); | ||
| info.patch = version.at("patch").get<uint16_t>(); | ||
| info.stage = version.at("type"); | ||
| info.tweak = version.at("tweak").get<uint16_t>(); | ||
| @@ -173,18 +173,18 @@ bool streamfx::version_info::is_older_than(const versi | ||
| // A. Ours is greater: Remote is older. | ||
| // B. Theirs is greater: Remote is newer. | ||
| // C. Continue the check. | ||
| - if (major > other.major) | ||
| + if (major_ > other.major_) | ||
| return false; | ||
| - if (major < other.major) | ||
| + if (major_ < other.major_) | ||
| return true; | ||
|
|
||
| // 2. Compare Minor version: | ||
| // A. Ours is greater: Remote is older. | ||
| // B. Theirs is greater: Remote is newer. | ||
| // C. Continue the check. | ||
| - if (minor > other.minor) | ||
| + if (minor_ > other.minor_) | ||
| return false; | ||
| - if (minor < other.minor) | ||
| + if (minor_ < other.minor_) | ||
| return true; | ||
|
|
||
| // 3. Compare Patch version: | ||
| @@ -219,11 +219,11 @@ streamfx::version_info::operator std::string() | ||
| std::vector<char> buffer(25, 0); | ||
| if (stage != version_stage::STABLE) { | ||
| auto types = stage_to_string(stage); | ||
| - int len = snprintf(buffer.data(), buffer.size(), "%" PRIu16 ".%" PRIu16 ".%" PRIu16 "%.1s%" PRIu16, major, | ||
| - minor, patch, types.data(), tweak); | ||
| + int len = snprintf(buffer.data(), buffer.size(), "%" PRIu16 ".%" PRIu16 ".%" PRIu16 "%.1s%" PRIu16, major_, | ||
| + minor_, patch, types.data(), tweak); | ||
| return std::string(buffer.data(), buffer.data() + len); | ||
| } else { | ||
| - int len = snprintf(buffer.data(), buffer.size(), "%" PRIu16 ".%" PRIu16 ".%" PRIu16, major, minor, patch); | ||
| + int len = snprintf(buffer.data(), buffer.size(), "%" PRIu16 ".%" PRIu16 ".%" PRIu16, major_, minor_, patch); | ||
| return std::string(buffer.data(), buffer.data() + len); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| --- source/updater.hpp.orig 2022-12-29 20:10:45 UTC | ||
| +++ source/updater.hpp | ||
| @@ -45,8 +45,8 @@ namespace streamfx { | ||
|
|
||
| struct version_info { | ||
| public: | ||
| - uint16_t major; | ||
| - uint16_t minor; | ||
| + uint16_t major_; | ||
| + uint16_t minor_; | ||
| uint16_t patch; | ||
| uint16_t tweak; | ||
| version_stage stage; |
19 changes: 19 additions & 0 deletions
19
multimedia/obs-streamfx/files/patch-templates_version.hpp.in
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| - workaround for https://github.com/Xaymar/obs-StreamFX/issues/999 | ||
|
|
||
| --- templates/version.hpp.in.orig 2022-12-29 20:03:59 UTC | ||
| +++ templates/version.hpp.in | ||
| @@ -32,10 +32,10 @@ | ||
| #define STREAMFX_MASK_COMPAT 0xFFFFFFFF00000000ull | ||
| #define STREAMFX_MASK_UPDATE 0xFFFFFFFFFFFF0000ull | ||
|
|
||
| -#define STREAMFX_VERSION_MAJOR @PROJECT_VERSION_MAJOR@u | ||
| -#define STREAMFX_VERSION_MINOR @PROJECT_VERSION_MINOR@u | ||
| -#define STREAMFX_VERSION_PATCH @PROJECT_VERSION_PATCH@u | ||
| -#define STREAMFX_VERSION_TWEAK @PROJECT_VERSION_TWEAK@u | ||
| +#define STREAMFX_VERSION_MAJOR @PROJECT_VERSION_MAJOR@ | ||
| +#define STREAMFX_VERSION_MINOR @PROJECT_VERSION_MINOR@ | ||
| +#define STREAMFX_VERSION_PATCH @PROJECT_VERSION_PATCH@ | ||
| +#define STREAMFX_VERSION_TWEAK @PROJECT_VERSION_TWEAK@ | ||
| #define STREAMFX_VERSION_PRERELEASE "@_VERSION_PRERELEASE@" | ||
| #define STREAMFX_VERSION_BUILD "@_VERSION_BUILD@" | ||
| #define STREAMFX_VERSION \ |