Date: Tue, 30 May 2023 00:18:12 GMT From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: cd57f8a4bb07 - main - =?utf-8?Q?multimedia/obs-streamfx:=20Update=200.12.0b164=20=E2=86=92=200.12.0b299?= Message-ID: <202305300018.34U0ICFe047321@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=cd57f8a4bb07fe3dfbb899fe0ea921b70d274b15 commit cd57f8a4bb07fe3dfbb899fe0ea921b70d274b15 Author: Yuri Victorovich <yuri@FreeBSD.org> AuthorDate: 2023-05-30 00:07:44 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> CommitDate: 2023-05-30 00:18:08 +0000 multimedia/obs-streamfx: Update 0.12.0b164 → 0.12.0b299 --- multimedia/obs-streamfx/Makefile | 7 ++- multimedia/obs-streamfx/distinfo | 14 ++--- multimedia/obs-streamfx/files/patch-CMakeLists.txt | 18 +++---- ...ed.cpp => patch-source_encoders_ffmpeg_amf.cpp} | 6 +-- .../files/patch-source_sources_source-mirror.cpp | 12 +++++ .../obs-streamfx/files/patch-source_updater.cpp | 63 +++++++++++----------- multimedia/obs-streamfx/pkg-plist | 9 ---- 7 files changed, 65 insertions(+), 64 deletions(-) diff --git a/multimedia/obs-streamfx/Makefile b/multimedia/obs-streamfx/Makefile index 0f91c6a5b63b..c18de25a17c2 100644 --- a/multimedia/obs-streamfx/Makefile +++ b/multimedia/obs-streamfx/Makefile @@ -1,6 +1,5 @@ PORTNAME= obs-streamfx -DISTVERSION= 0.12.0b164 -PORTREVISION= 3 +DISTVERSION= 0.12.0b299 CATEGORIES= multimedia MAINTAINER= yuri@FreeBSD.org @@ -28,8 +27,8 @@ GH_PROJECT= obs-StreamFX GH_TUPLE= nlohmann:json:db78ac1d7716f56fc9f1b030b715f872f93964e4:nlohmann_json/third-party/nlohmann-json \ Xaymar:msvc-redist-helper:aa4665ccf68a382f1c2b115fb6c9668b6a8bd64d:Xaymar_msvc_redist_helper/third-party/msvc-redist-helper \ - NVIDIA:MAXINE-AR-SDK:cf68600:NVIDIA_MAXINE_AR_SDK/third-party/nvidia-maxine-ar-sdk \ - NVIDIA:MAXINE-VFX-SDK:3058988:NVIDIA_MAXINE_VFX_SDK/third-party/nvidia-maxine-vfx-sdk \ + NVIDIA:MAXINE-AR-SDK:ca10ac3:NVIDIA_MAXINE_AR_SDK/third-party/nvidia-maxine-ar-sdk \ + NVIDIA:MAXINE-VFX-SDK:f63d9d1:NVIDIA_MAXINE_VFX_SDK/third-party/nvidia-maxine-vfx-sdk \ Xaymar:cmake-clang:f249747:Xaymar_cmake_clang/cmake/clang \ Xaymar:cmake-version:16bfa95:Xaymar_cmake_version/cmake/version diff --git a/multimedia/obs-streamfx/distinfo b/multimedia/obs-streamfx/distinfo index 3ab50b133bb9..4c7fef481cef 100644 --- a/multimedia/obs-streamfx/distinfo +++ b/multimedia/obs-streamfx/distinfo @@ -1,14 +1,14 @@ -TIMESTAMP = 1672343749 -SHA256 (Xaymar-obs-StreamFX-0.12.0b164_GH0.tar.gz) = da75469cd3024e20993fa0c1c177e0ac19837a409a45a7d875253fc7ec58bef2 -SIZE (Xaymar-obs-StreamFX-0.12.0b164_GH0.tar.gz) = 14306323 +TIMESTAMP = 1685401462 +SHA256 (Xaymar-obs-StreamFX-0.12.0b299_GH0.tar.gz) = 4b2fe76c93238951509ba691eb21e204cc14c1f8a4b7558aa045fba62eba1109 +SIZE (Xaymar-obs-StreamFX-0.12.0b299_GH0.tar.gz) = 12997480 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-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 (NVIDIA-MAXINE-AR-SDK-ca10ac3_GH0.tar.gz) = 260c5a61d42f06fd9b5042e28c620561de0747c79a82dcbe7414fd7d883de72e +SIZE (NVIDIA-MAXINE-AR-SDK-ca10ac3_GH0.tar.gz) = 39652067 +SHA256 (NVIDIA-MAXINE-VFX-SDK-f63d9d1_GH0.tar.gz) = 56c5f6a52f03002ccb0d262c7512f2d1581475cda6317f490a9b9664fd539845 +SIZE (NVIDIA-MAXINE-VFX-SDK-f63d9d1_GH0.tar.gz) = 42595232 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 diff --git a/multimedia/obs-streamfx/files/patch-CMakeLists.txt b/multimedia/obs-streamfx/files/patch-CMakeLists.txt index 4d9be903a22c..a5c2ba46f40e 100644 --- a/multimedia/obs-streamfx/files/patch-CMakeLists.txt +++ b/multimedia/obs-streamfx/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2022-12-02 04:28:08 UTC +--- CMakeLists.txt.orig 2023-05-20 18:52:40 UTC +++ CMakeLists.txt -@@ -234,6 +234,9 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows") +@@ -71,6 +71,9 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows") elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux") set(D_PLATFORM_OS "linux") set(D_PLATFORM_LINUX 1) @@ -10,7 +10,7 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin") set(D_PLATFORM_OS "macos") set(D_PLATFORM_MAC 1) -@@ -368,7 +371,7 @@ endif() +@@ -345,7 +348,7 @@ endif() # Installation / Packaging if(STANDALONE) set(STRUCTURE_UNIFIED CACHE BOOL "Install for use in a Plugin Manager") @@ -19,7 +19,7 @@ set(STRUCTURE_PACKAGEMANAGER CACHE BOOL "Install for use in a Package Manager (system-wide installation)") elseif(D_PLATFORM_MAC) set(STRUCTURE_BUNDLE ON CACHE BOOL "Install as a Loadable Bundle (.plugin)") -@@ -931,7 +934,7 @@ if(TRUE) # OpenGL +@@ -930,7 +933,7 @@ if(TRUE) # OpenGL PRIVATE "${PROJECT_SOURCE_DIR}/third-party/khronos/glad/src/wgl.c" ) @@ -28,7 +28,7 @@ target_sources(khronos_glad PRIVATE "${PROJECT_SOURCE_DIR}/third-party/khronos/glad/src/glx.c" -@@ -1627,9 +1630,9 @@ if((CMAKE_C_COMPILER_ID STREQUAL "GNU") +@@ -1601,9 +1604,9 @@ if((CMAKE_C_COMPILER_ID STREQUAL "GNU") OR (CMAKE_C_COMPILER_ID STREQUAL "Clang") OR (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")) if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.0) @@ -41,16 +41,16 @@ endif() endif() -@@ -1812,7 +1815,7 @@ if(D_PLATFORM_WINDOWS AND ((CMAKE_CXX_COMPILER_ID STRE +@@ -1791,7 +1794,7 @@ if(D_PLATFORM_WINDOWS AND ((CMAKE_CXX_COMPILER_ID STRE foreach(FLAG ${FLAGS}) target_compile_options(${PROJECT_NAME} PRIVATE "$<$<CONFIG:Release,RelWithDebInfo,MinSizeRel>:${FLAG}>") endforeach() -elseif(D_PLATFORM_LINUX AND ((CMAKE_CXX_COMPILER_ID STREQUAL "Clang") OR (CMAKE_CXX_COMPILER_ID STREQUAL "GNU"))) +elseif((D_PLATFORM_LINUX OR D_PLATFORM_FREEBSD) AND ((CMAKE_CXX_COMPILER_ID STREQUAL "Clang") OR (CMAKE_CXX_COMPILER_ID STREQUAL "GNU"))) # GCC/Clang - message(STATUS "${LOGPREFIX}Applying custom flags for GCC/Clang style build.") + message(STATUS "Applying custom flags for GCC/Clang style build.") -@@ -2088,7 +2091,7 @@ if(STANDALONE) +@@ -2067,7 +2070,7 @@ if(STANDALONE) DESTINATION "data/" COMPONENT StreamFX ) endif() @@ -59,7 +59,7 @@ install( TARGETS ${PROJECT_NAME} RUNTIME DESTINATION "bin/linux-${D_PLATFORM_INSTR}-${D_PLATFORM_BITS}/" COMPONENT StreamFX -@@ -2139,7 +2142,7 @@ if(STANDALONE) +@@ -2118,7 +2121,7 @@ if(STANDALONE) DESTINATION "data/obs-plugins/${PROJECT_NAME}/" COMPONENT StreamFX ) endif() diff --git a/multimedia/obs-streamfx/files/patch-source_encoders_handlers_amf__shared.cpp b/multimedia/obs-streamfx/files/patch-source_encoders_ffmpeg_amf.cpp similarity index 61% rename from multimedia/obs-streamfx/files/patch-source_encoders_handlers_amf__shared.cpp rename to multimedia/obs-streamfx/files/patch-source_encoders_ffmpeg_amf.cpp index d299498d8aee..1c3635fb5ce2 100644 --- a/multimedia/obs-streamfx/files/patch-source_encoders_handlers_amf__shared.cpp +++ b/multimedia/obs-streamfx/files/patch-source_encoders_ffmpeg_amf.cpp @@ -1,6 +1,6 @@ ---- source/encoders/handlers/amf_shared.cpp.orig 2022-12-02 04:28:08 UTC -+++ source/encoders/handlers/amf_shared.cpp -@@ -113,7 +113,7 @@ bool streamfx::encoder::ffmpeg::handler::amf::is_avail +--- source/encoders/ffmpeg/amf.cpp.orig 2023-05-29 23:23:46 UTC ++++ source/encoders/ffmpeg/amf.cpp +@@ -136,7 +136,7 @@ bool streamfx::encoder::ffmpeg::amf::is_available() #else std::filesystem::path lib_name = std::filesystem::u8path("amfrt32.dll"); #endif diff --git a/multimedia/obs-streamfx/files/patch-source_sources_source-mirror.cpp b/multimedia/obs-streamfx/files/patch-source_sources_source-mirror.cpp new file mode 100644 index 000000000000..3a6b608c175a --- /dev/null +++ b/multimedia/obs-streamfx/files/patch-source_sources_source-mirror.cpp @@ -0,0 +1,12 @@ +--- source/sources/source-mirror.cpp.orig 2023-05-29 23:51:47 UTC ++++ source/sources/source-mirror.cpp +@@ -116,7 +116,8 @@ void mirror_instance::migrate(obs_data_t* data, uint64 + case 0: + obs_data_set_int(data, ST_KEY_SOURCE_AUDIO_LAYOUT, obs_data_get_int(data, "Source.Mirror.Audio.Layout")); + obs_data_unset_user_value(data, "Source.Mirror.Audio.Layout"); +- case STREAMFX_VERSION: ++ //case STREAMFX_VERSION: ++ default: // STREAMFX_VERSION is 0 so the above breaks the compiler, and upstream doesn't accept issues + break; + } + } diff --git a/multimedia/obs-streamfx/files/patch-source_updater.cpp b/multimedia/obs-streamfx/files/patch-source_updater.cpp index 7be675c05fec..ed7554f37c8f 100644 --- a/multimedia/obs-streamfx/files/patch-source_updater.cpp +++ b/multimedia/obs-streamfx/files/patch-source_updater.cpp @@ -1,18 +1,18 @@ ---- source/updater.cpp.orig 2022-12-29 20:11:04 UTC +--- source/updater.cpp.orig 2023-05-20 18:52:40 UTC +++ source/updater.cpp -@@ -94,7 +94,7 @@ void streamfx::from_json(const nlohmann::json& json, v +@@ -77,7 +77,7 @@ void streamfx::from_json(const nlohmann::json& json, v + stage = stage_from_string(json.get<std::string>()); } - 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() : major(0), minor(0), patch(0), tweak(0), stage(version_stage::STABLE), url(""), name("") {} ++streamfx::version_info::version_info() : 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)) { + { +@@ -90,8 +90,8 @@ streamfx::version_info::version_info(const std::string + static const std::regex re_version("([0-9]+)\\.([0-9]+)\\.([0-9]+)(([\\._abc]{1,1})([0-9]+|)|)(-g([0-9a-fA-F]{8,8})|)"); + 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)); @@ -20,7 +20,7 @@ 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 +@@ -105,8 +105,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(); @@ -31,7 +31,7 @@ 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 +@@ -119,8 +119,8 @@ void streamfx::from_json(const nlohmann::json& json, v { if (json.find("html_url") == json.end()) { auto version = json.at("version"); @@ -42,37 +42,36 @@ 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; +@@ -152,19 +152,19 @@ bool streamfx::version_info::is_older_than(const versi + + // Compare Major version: + // - Theirs is greater: Remote is newer. - 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_) + // - Ours is greater: Remote is older. +- if (major > other.major) ++ if (major_ > other.major_) return false; + // - Continue the check. + + // Compare Minor version: + // - Theirs is greater: Remote is newer. - if (minor < other.minor) + if (minor_ < other.minor_) return true; + // - Ours is greater: Remote is older. +- if (minor > other.minor) ++ if (minor_ > other.minor_) + return false; + // - Continue the check. - // 3. Compare Patch version: -@@ -219,11 +219,11 @@ streamfx::version_info::operator std::string() +@@ -209,10 +209,10 @@ 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); +- 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); diff --git a/multimedia/obs-streamfx/pkg-plist b/multimedia/obs-streamfx/pkg-plist index 61f5161a006f..d1db80949277 100644 --- a/multimedia/obs-streamfx/pkg-plist +++ b/multimedia/obs-streamfx/pkg-plist @@ -10,7 +10,6 @@ share/obs/obs-plugins/StreamFX/effects/color-grade.effect share/obs/obs-plugins/StreamFX/effects/color_conversion_rgb_hsl.effect share/obs/obs-plugins/StreamFX/effects/color_conversion_rgb_hsv.effect share/obs/obs-plugins/StreamFX/effects/color_conversion_rgb_yuv.effect -share/obs/obs-plugins/StreamFX/effects/displace.effect share/obs/obs-plugins/StreamFX/effects/lut-consumer.effect share/obs/obs-plugins/StreamFX/effects/lut-producer.effect share/obs/obs-plugins/StreamFX/effects/lut.effect @@ -50,14 +49,6 @@ share/obs/obs-plugins/StreamFX/examples/shaders/filter/vignette.effect share/obs/obs-plugins/StreamFX/examples/shaders/filter/wave.effect share/obs/obs-plugins/StreamFX/examples/shaders/filter/zigzag.effect share/obs/obs-plugins/StreamFX/examples/shaders/source/flip-ab-texture.effect -share/obs/obs-plugins/StreamFX/examples/shaders/source/shadertoy-3l23Rh.effect -share/obs/obs-plugins/StreamFX/examples/shaders/source/shadertoy-3tlXWS.effect -share/obs/obs-plugins/StreamFX/examples/shaders/source/shadertoy-MslGRn.effect -share/obs/obs-plugins/StreamFX/examples/shaders/source/shadertoy-MslfRn.effect -share/obs/obs-plugins/StreamFX/examples/shaders/source/shadertoy-MtcGD7.effect -share/obs/obs-plugins/StreamFX/examples/shaders/source/shadertoy-XljBW3.effect -share/obs/obs-plugins/StreamFX/examples/shaders/source/shadertoy-Xsl3RX.effect -share/obs/obs-plugins/StreamFX/examples/shaders/source/shadertoy-template.effect share/obs/obs-plugins/StreamFX/examples/shaders/transition/color-shift.effect share/obs/obs-plugins/StreamFX/examples/shaders/transition/luma-burn.effect share/obs/obs-plugins/StreamFX/examples/shaders/transition/pixelator.effect
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202305300018.34U0ICFe047321>