From 3bdadc381b5ada1d30a9c1ce0f5943beb0a66f97 Mon Sep 17 00:00:00 2001 From: Patrick Date: Tue, 5 Nov 2024 22:43:36 +0100 Subject: [PATCH] obs-studio-plugins.advanced-scene-switcher: 1.27.3 -> 1.28.1 --- .../advanced-scene-switcher/default.nix | 37 ++++++++++++++----- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix index 9037ccd0ac67..1c07eff5e7d2 100644 --- a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix @@ -1,6 +1,7 @@ { lib, fetchFromGitHub, + nix-update-script, cmake, ninja, @@ -15,33 +16,48 @@ procps, qtbase, stdenv, - tesseract, websocketpp, libXScrnSaver, + libusb1, + pkg-config, + fetchpatch, +# #FIXME: Could not get cmake to pick up on these dependencies +# Prevents cmake from building the OCR video capabilities +# Everything else should work just missing this on plugin +# tesseract, +# leptonica, }: - let httplib-src = fetchFromGitHub { owner = "yhirose"; repo = "cpp-httplib"; - rev = "v0.17.3"; - hash = "sha256-yvaPIbRqJGkiob3Nrv3H1ieFAC5b+h1tTncJWTy4dmk="; + rev = "v0.13.3"; + hash = "sha256-ESaH0+n7ycpOKM+Mnv/UgT16UEx86eFMQDHB3RVmgBw="; }; in stdenv.mkDerivation rec { pname = "advanced-scene-switcher"; - version = "1.27.2"; + version = "1.28.1"; src = fetchFromGitHub { owner = "WarmUpTill"; repo = "SceneSwitcher"; rev = version; - hash = "sha256-7IciHCe2KemKNJpD9QcYK4AtxHlYuWaPsBCcVuPVvgA="; + hash = "sha256-1U5quhfdhEBcCbEzW0uEpimYgvdbsIwaL2EdQ4cLF/M="; }; nativeBuildInputs = [ cmake ninja + pkg-config + ]; + + patches = [ + # https://github.com/WarmUpTill/SceneSwitcher/pull/1244 + (fetchpatch { + url = "https://github.com/WarmUpTill/SceneSwitcher/commit/e0c650574f9f7f6cae5626afa9abf8a838dc0858.diff"; + hash = "sha256-eXO8LdGYf60sd/kyxWVDSEpwyzp4Uu9TpPADg5ED4yU="; + }) ]; buildInputs = [ @@ -52,11 +68,13 @@ stdenv.mkDerivation rec { nlohmann_json obs-studio opencv + # tesseract + # leptonica procps qtbase - tesseract websocketpp libXScrnSaver + libusb1 ]; dontWrapQtApps = true; @@ -68,13 +86,14 @@ stdenv.mkDerivation rec { chmod -R +w $sourceRoot/deps/libremidi ''; - env.NIX_CFLAGS_COMPILE = "-Wno-error=stringop-overflow"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=stringop-overflow -Wno-error=deprecated-declarations"; + passthru.updateScript = nix-update-script { }; meta = with lib; { description = "Automated scene switcher for OBS Studio"; homepage = "https://github.com/WarmUpTill/SceneSwitcher"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ ]; + maintainers = with lib.maintainers; [ patrickdag ]; }; }