ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-01 18:17:21 +03:00
Code Issues Projects Releases Wiki Activity

obs-move-transition: 2.3.0 -> 2.4.3 (#128270)

Browse Source 
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
This commit is contained in:
Tristan 2021-06-27 12:47:24 -04:00 committed by GitHub
parent 25d2223859
commit 34eb39f141
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/video/obs-studio/plugins/rename-obs-move-transition-cmake.patch → pkgs/applications/video/obs-studio/0001-Use-FindLibobs.cmake.patch
View File

@ -1,5 +1,5 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index d116619..a1366ce 100644 index f6d8fa3..5f0657d 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -1,6 +1,17 @@ @@ -1,6 +1,17 @@
@ -7,7 +7,7 @@ index d116619..a1366ce 100644
+ cmake_policy(SET CMP0048 NEW) + cmake_policy(SET CMP0048 NEW)
+endif (POLICY CMP0048) +endif (POLICY CMP0048)
+ +
project(move-transition VERSION 2.3.0) project(move-transition VERSION 2.4.3)
set(PROJECT_FULL_NAME "Move Transition") set(PROJECT_FULL_NAME "Move Transition")
+include(FindLibobs.cmake) +include(FindLibobs.cmake)
@ -18,9 +18,8 @@ index d116619..a1366ce 100644
+ "${LIBOBS_INCLUDE_DIR}/../UI/obs-frontend-api") + "${LIBOBS_INCLUDE_DIR}/../UI/obs-frontend-api")
+ +
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_SOURCE_DIR}/version.h) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_SOURCE_DIR}/version.h)
set(move-transition_HEADERS set(move-transition_HEADERS
@@ -34,4 +45,10 @@ target_link_libraries(move-transition @@ -38,4 +49,10 @@ target_link_libraries(move-transition
libobs) libobs)
set_target_properties(move-transition PROPERTIES FOLDER "plugins/exeldro") set_target_properties(move-transition PROPERTIES FOLDER "plugins/exeldro")

6
pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix
View File

@ -9,13 +9,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "obs-move-transition"; pname = "obs-move-transition";
version = "2.3.0"; version = "2.4.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "exeldro"; owner = "exeldro";
repo = "obs-move-transition"; repo = "obs-move-transition";
rev = version; rev = version;
sha256 = "0cl6z3cvdjmbisvfcy281pcg6rhxmyfs31rwv7q4x39352rcs1nw"; sha256 = "sha256-/6PcNLOnBBqLZHVKMg1tdX9OktcllEEqnL93nXpuXL0=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
cp ${obs-studio.src}/cmake/external/FindLibobs.cmake FindLibobs.cmake cp ${obs-studio.src}/cmake/external/FindLibobs.cmake FindLibobs.cmake
''; '';
patches = [ ./rename-obs-move-transition-cmake.patch ]; patches = [ ./0001-Use-FindLibobs.cmake.patch ];
postPatch = '' postPatch = ''
substituteInPlace move-source-filter.c --replace '<../UI/obs-frontend-api/obs-frontend-api.h>' '<obs-frontend-api.h>' substituteInPlace move-source-filter.c --replace '<../UI/obs-frontend-api/obs-frontend-api.h>' '<obs-frontend-api.h>'