Merge pull request #195051 from SebTM/update/obs-move-transition_264

2 files changed, 7 insertions, 50 deletions

diff --git a/pkgs/applications/video/obs-studio/plugins/obs-move-transition-use-FindLibobs.cmake.patch b/pkgs/applications/video/obs-studio/plugins/obs-move-transition-use-FindLibobs.cmake.patch
deleted file mode 100644
index bc082de0bd5e3..0000000000000
--- a/pkgs/applications/video/obs-studio/plugins/obs-move-transition-use-FindLibobs.cmake.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f6d8fa3..5f0657d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,6 +1,17 @@
-+if (POLICY CMP0048)
-+	cmake_policy(SET CMP0048 NEW)
-+endif (POLICY CMP0048)
-+
- project(move-transition VERSION 2.4.3)
- set(PROJECT_FULL_NAME "Move Transition")
- 
-+include(FindLibobs.cmake)
-+find_package(LibObs REQUIRED)
-+
-+include_directories(
-+	"${LIBOBS_INCLUDE_DIR}/../plugins/obs-transitions"
-+	"${LIBOBS_INCLUDE_DIR}/../UI/obs-frontend-api")
-+
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_SOURCE_DIR}/version.h)
-
- set(move-transition_HEADERS
-@@ -38,4 +49,10 @@ target_link_libraries(move-transition
- 	libobs)
- 
- set_target_properties(move-transition PROPERTIES FOLDER "plugins/exeldro")
--install_obs_plugin_with_data(move-transition data)
-+set_target_properties(move-transition PROPERTIES PREFIX "")
-+
-+install(TARGETS move-transition
-+	LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/obs-plugins)
-+
-+install(DIRECTORY data/locale/
-+	DESTINATION "${CMAKE_INSTALL_PREFIX}/share/obs/obs-plugins/move-transition/locale")
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix
index 80bcb6d41b9de..c7d7c8596ef8f 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix
@@ -7,35 +7,26 @@
 
 stdenv.mkDerivation rec {
   pname = "obs-move-transition";
-  version = "2.4.3";
+  version = "2.6.4";
 
   src = fetchFromGitHub {
     owner = "exeldro";
     repo = "obs-move-transition";
     rev = version;
-    sha256 = "sha256-/6PcNLOnBBqLZHVKMg1tdX9OktcllEEqnL93nXpuXL0=";
+    sha256 = "sha256-+kAdCM5PEFNxKNmJmf2ASTyUKA7xnbMAA7kP/emoaeI=";
   };
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ obs-studio ];
 
-  cmakeFlags = with lib; [
-    "-DLIBOBS_INCLUDE_DIR=${obs-studio.src}/libobs"
-    "-Wno-dev"
-  ];
-
   preConfigure = ''
-    cp ${obs-studio.src}/cmake/external/FindLibobs.cmake FindLibobs.cmake
+    cp ${obs-studio.src}/cmake/external/ObsPluginHelpers.cmake cmake/
   '';
 
-  patches = [ ./obs-move-transition-use-FindLibobs.cmake.patch ];
-
-  postPatch = ''
-    substituteInPlace move-source-filter.c --replace '<../UI/obs-frontend-api/obs-frontend-api.h>' '<obs-frontend-api.h>'
-    substituteInPlace move-value-filter.c --replace '<../UI/obs-frontend-api/obs-frontend-api.h>' '<obs-frontend-api.h>'
-    substituteInPlace move-transition.c --replace '<../UI/obs-frontend-api/obs-frontend-api.h>' '<obs-frontend-api.h>'
-    substituteInPlace audio-move.c --replace '<../UI/obs-frontend-api/obs-frontend-api.h>' '<obs-frontend-api.h>'
-  '';
+  cmakeFlags = [
+    "-DBUILD_OUT_OF_TREE=On"
+    "-Wno-dev"
+  ];
 
   meta = with lib; {
     description = "Plugin for OBS Studio to move source to a new position during scene transition";