From 5d4ed1bca4d216beac7773cefed294dc51865ff6 Mon Sep 17 00:00:00 2001 From: Jon Hermansen Date: Tue, 11 Nov 2025 03:30:57 -0500 Subject: [PATCH] obs-studio-plugins.obs-vertical-canvas: 1.4.10 -> 1.6.1 --- .../plugins/obs-vertical-canvas.diff | 30 ++++++++----------- .../plugins/obs-vertical-canvas.nix | 11 ++++--- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.diff b/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.diff index b4b2fa22aa0d..ddd2fc4c234c 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.diff +++ b/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.diff @@ -1,17 +1,13 @@ -diff --color -urpN obs-vertical-canvas.bak/file-updater.c obs-vertical-canvas/file-updater.c ---- obs-vertical-canvas.bak/file-updater.c 2025-07-18 18:32:13.239718611 -0400 -+++ obs-vertical-canvas/file-updater.c 2025-07-18 18:32:30.732020377 -0400 -@@ -67,10 +67,10 @@ static bool do_http_request(struct updat - curl_easy_setopt(info->curl, CURLOPT_ERRORBUFFER, info->error); - curl_easy_setopt(info->curl, CURLOPT_WRITEFUNCTION, http_write); - curl_easy_setopt(info->curl, CURLOPT_WRITEDATA, info); -- curl_easy_setopt(info->curl, CURLOPT_FAILONERROR, true); -- curl_easy_setopt(info->curl, CURLOPT_NOSIGNAL, 1); -+ curl_easy_setopt(info->curl, CURLOPT_FAILONERROR, 1L); -+ curl_easy_setopt(info->curl, CURLOPT_NOSIGNAL, 1L); - curl_easy_setopt(info->curl, CURLOPT_ACCEPT_ENCODING, ""); -- curl_easy_setopt(info->curl, CURLOPT_SSL_OPTIONS, CURLSSLOPT_REVOKE_BEST_EFFORT); -+ curl_easy_setopt(info->curl, CURLOPT_SSL_OPTIONS, (long)CURLSSLOPT_REVOKE_BEST_EFFORT); - - code = curl_easy_perform(info->curl); - if (code != CURLE_OK) { +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 10ef443..5db6d37 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -28,7 +28,7 @@ endif() + find_package(Qt6 COMPONENTS Widgets Core) + if(BUILD_OUT_OF_TREE) + if(OS_LINUX OR OS_FREEBSD OR OS_OPENBSD) +- find_package(Qt6 REQUIRED Gui) ++ find_package(Qt6 REQUIRED GuiPrivate) + endif() + endif() + target_link_libraries(${PROJECT_NAME} PRIVATE Qt::Core Qt::Widgets) diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix b/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix index fffbea3e20d9..b1dfad17ada0 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix @@ -10,16 +10,16 @@ stdenv.mkDerivation rec { pname = "obs-vertical-canvas"; - version = "1.4.10"; + version = "1.6.1"; src = fetchFromGitHub { owner = "Aitum"; repo = "obs-vertical-canvas"; rev = version; - sha256 = "sha256-0XfJ8q8n2ANO0oDtLZhZjRunZ5S1EouQ6Ak/pxEQYOQ="; + sha256 = "sha256-tvoNdv0HkGch8FZCiK7S4BR7iWOqLvTj0blFxyyUjQE="; }; - # Remove after https://github.com/Aitum/obs-vertical-canvas/pull/25 is released :) + # Remove after https://github.com/Aitum/obs-vertical-canvas/pull/26 is released :) patches = [ ./obs-vertical-canvas.diff ]; nativeBuildInputs = [ cmake ]; @@ -45,7 +45,10 @@ stdenv.mkDerivation rec { meta = { description = "Plugin for OBS Studio to add vertical canvas"; homepage = "https://github.com/Aitum/obs-vertical-canvas"; - maintainers = with lib.maintainers; [ flexiondotorg ]; + maintainers = with lib.maintainers; [ + flexiondotorg + jonhermansen + ]; license = lib.licenses.gpl2Plus; inherit (obs-studio.meta) platforms; };