diff options
| author | Tristan <starcraft66@gmail.com> | 2021-06-27 12:47:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-27 18:47:24 +0200 |
| commit | 34eb39f141bc925cdde2ea56d74b7ea82534dd46 (patch) | |
| tree | 1458be41abf9f04d3bc95a1d98269e5fef80d388 /pkgs/applications/video/obs-studio | |
| parent | 25d2223859d27063c8f7d7baa68568a63801bcad (diff) | |
| download | nixpkgs-34eb39f141bc925cdde2ea56d74b7ea82534dd46.tar nixpkgs-34eb39f141bc925cdde2ea56d74b7ea82534dd46.tar.gz nixpkgs-34eb39f141bc925cdde2ea56d74b7ea82534dd46.tar.bz2 nixpkgs-34eb39f141bc925cdde2ea56d74b7ea82534dd46.tar.lz nixpkgs-34eb39f141bc925cdde2ea56d74b7ea82534dd46.tar.xz nixpkgs-34eb39f141bc925cdde2ea56d74b7ea82534dd46.tar.zst nixpkgs-34eb39f141bc925cdde2ea56d74b7ea82534dd46.zip | |
obs-move-transition: 2.3.0 -> 2.4.3 (#128270)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
Diffstat (limited to 'pkgs/applications/video/obs-studio')
| -rw-r--r-- | pkgs/applications/video/obs-studio/0001-Use-FindLibobs.cmake.patch (renamed from pkgs/applications/video/obs-studio/plugins/rename-obs-move-transition-cmake.patch) | 7 | ||||
| -rw-r--r-- | pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/applications/video/obs-studio/plugins/rename-obs-move-transition-cmake.patch b/pkgs/applications/video/obs-studio/0001-Use-FindLibobs.cmake.patch index ed6df1d565d..db7d5b4b31f 100644 --- a/pkgs/applications/video/obs-studio/plugins/rename-obs-move-transition-cmake.patch +++ b/pkgs/applications/video/obs-studio/0001-Use-FindLibobs.cmake.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index d116619..a1366ce 100644 +index f6d8fa3..5f0657d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,17 @@ @@ -7,7 +7,7 @@ index d116619..a1366ce 100644 + cmake_policy(SET CMP0048 NEW) +endif (POLICY CMP0048) + - project(move-transition VERSION 2.3.0) + project(move-transition VERSION 2.4.3) set(PROJECT_FULL_NAME "Move Transition") +include(FindLibobs.cmake) @@ -18,9 +18,8 @@ index d116619..a1366ce 100644 + "${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 -@@ -34,4 +45,10 @@ target_link_libraries(move-transition +@@ -38,4 +49,10 @@ target_link_libraries(move-transition libobs) set_target_properties(move-transition PROPERTIES FOLDER "plugins/exeldro") 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 befc27dd5dc..90a0a56971a 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "obs-move-transition"; - version = "2.3.0"; + version = "2.4.3"; src = fetchFromGitHub { owner = "exeldro"; repo = "obs-move-transition"; rev = version; - sha256 = "0cl6z3cvdjmbisvfcy281pcg6rhxmyfs31rwv7q4x39352rcs1nw"; + sha256 = "sha256-/6PcNLOnBBqLZHVKMg1tdX9OktcllEEqnL93nXpuXL0="; }; nativeBuildInputs = [ cmake ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { cp ${obs-studio.src}/cmake/external/FindLibobs.cmake FindLibobs.cmake ''; - patches = [ ./rename-obs-move-transition-cmake.patch ]; + patches = [ ./0001-Use-FindLibobs.cmake.patch ]; postPatch = '' substituteInPlace move-source-filter.c --replace '<../UI/obs-frontend-api/obs-frontend-api.h>' '<obs-frontend-api.h>' |