push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,12 @@
diff -Naur source/src/CMakeLists.txt source-new/src/CMakeLists.txt
--- source/src/CMakeLists.txt 1969-12-31 21:00:01.000000000 -0300
+++ source-new/src/CMakeLists.txt 2023-11-30 09:39:45.442332463 -0300
@@ -231,7 +231,7 @@
target_compile_definitions(openshot PUBLIC USE_IMAGEMAGICK=1)
# Link with ImageMagick library
- target_link_libraries(openshot PUBLIC ImageMagick::Magick++)
+ target_link_libraries(openshot PUBLIC ImageMagick::Magick++ ImageMagick::MagickCore)
set(HAVE_IMAGEMAGICK TRUE CACHE BOOL "Building with ImageMagick support" FORCE)
mark_as_advanced(HAVE_IMAGEMAGICK)