guix_mirror_bot pushed a commit to branch master
in repository guix.
commit 655abc943631d99270e7478e2e0a3153502f6161
Author: Steve George <[email protected]>
AuthorDate: Tue Dec 9 08:06:18 2025 +0000
gnu: obs-advanced-masks: Update to 1.5.4.
* gnu/packages/videos.scm (obs-advanced-masks): Update to 2.5.1.
[source]: Patch so that Cmakes uses local JSON. Update style.
[arguments]<phases>: Remove custom install phase.
[inputs]: change qtbase to use QT6.
* gnu/packages/patches/obs-advanced-masks-nlohmann-json.patch: New file.
Change-Id: I62ed28fc7978732e3754e9158d4add67aea8e2f7
Signed-off-by: Steve George <[email protected]>
---
.../patches/obs-advanced-masks-nlohmann-json.patch | 25 +++++++++++
gnu/packages/video.scm | 52 +++++++++-------------
2 files changed, 47 insertions(+), 30 deletions(-)
diff --git a/gnu/packages/patches/obs-advanced-masks-nlohmann-json.patch
b/gnu/packages/patches/obs-advanced-masks-nlohmann-json.patch
new file mode 100644
index 0000000000..ee38b9d4aa
--- /dev/null
+++ b/gnu/packages/patches/obs-advanced-masks-nlohmann-json.patch
@@ -0,0 +1,25 @@
+Description: search for nlohmann_json path
+Author: Joao Eriberto Mota Filho <[email protected]>
+Forwarded: https://github.com/FiniteSingularity/obs-advanced-masks/pull/86
+Last-Update: 2025-09-04
+Index: obs-advanced-masks/CMakeLists.txt
+===================================================================
+--- obs-advanced-masks.orig/CMakeLists.txt
++++ obs-advanced-masks/CMakeLists.txt
+@@ -73,9 +73,13 @@ if(BUILD_OUT_OF_TREE)
+ add_library(nlohmann_json INTERFACE)
+ target_include_directories(nlohmann_json INTERFACE
"${CMAKE_BINARY_DIR}/json/single_include")
+ else()
+- include(FetchContent)
+- FetchContent_Declare(json URL
https://github.com/nlohmann/json/releases/download/v3.11.3/json.tar.xz)
+- FetchContent_MakeAvailable(json)
++ # Try to find a system-installed nlohmann_json (Debian:
nlohmann-json3-dev)
++ find_package(nlohmann_json QUIET)
++ if(NOT nlohmann_json_FOUND)
++ include(FetchContent)
++ FetchContent_Declare(json URL
https://github.com/nlohmann/json/releases/download/v3.11.3/json.tar.xz)
++ FetchContent_MakeAvailable(json)
++ endif()
+ endif()
+ else()
+ if(OBS_VERSION VERSION_GREATER_EQUAL 30.1.0)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index ee19e1a095..bbb19f94bb 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -4315,16 +4315,17 @@ and JACK.")
(define-public obs-advanced-masks
(package
(name "obs-advanced-masks")
- (version "1.1.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url
"https://github.com/FiniteSingularity/obs-advanced-masks";)
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0vhilhzdfv0wa8hqz8ffavr272w3d5b75vvldf8rfy9pm5c8xn9n"))))
+ (version "1.5.4")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/FiniteSingularity/obs-advanced-masks";)
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1llmz42y2m2gpm1bp48dybi7iv4vafl7ya3rb259798ikwzva3fm"))
+ (patches (search-patches "obs-advanced-masks-nlohmann-json.patch"))))
(build-system cmake-build-system)
(arguments
(list
@@ -4334,27 +4335,17 @@ and JACK.")
#:configure-flags
#~(list (string-append "-DLIBOBS_INCLUDE_DIR="
#$(this-package-input "obs") "/lib")
- "-DBUILD_OUT_OF_TREE=On"
- "-Wno-dev")
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'install 'move-shaders
- (lambda _
- (mkdir-p
- (string-append
- #$output
- "/share/obs/obs-plugins/obs-advanced-masks"))
- (rename-file
- (string-append
- #$output
- "/data/obs-plugins/obs-advanced-masks/shaders")
- (string-append
- #$output
- "/share/obs/obs-plugins/obs-advanced-masks/shaders")))))))
- (inputs (list obs qtbase-5 simde))
+ "-DBUILD_OUT_OF_TREE=On" "-Wno-dev")))
+ (inputs (list curl
+ obs
+ nlohmann-json
+ qtbase
+ qtsvg
+ simde))
(home-page "https://github.com/FiniteSingularity/obs-advanced-masks";)
(synopsis "Advanced masking plugin for OBS")
- (description "OBS Advanced Masks is a project designed to expand the
+ (description
+ "OBS Advanced Masks is a project designed to expand the
masking functionalities within OBS Studio. This plug-in provides filters for
users to create intricate and customized masks for their OBS Scenes and
Sources.
@@ -4369,7 +4360,8 @@ any combination of the red, green, blue, or alpha
channels from said source.
@item Image Masks include all of the same functionality as Source Masks, but
applied via a static image (.png, .jpeg, etc).
@item Gradient Masks allow a fading mask using a user-specified gradient.
-@end itemize\n")
+@end itemize
+")
(license license:gpl2)))
(define-public obs-composite-blur
