public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #110743 from starcraft66/master 

obs-move-transition: 2.0.2 -> 2.3.0
This commit is contained in:
Sandro 2021-01-25 11:04:59 +01:00 committed by GitHub
parent ad445d3728 b91e555720
commit fac47806b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/video/obs-studio/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.0.2"; version = "2.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "exeldro"; owner = "exeldro";
repo = "obs-move-transition"; repo = "obs-move-transition";
rev = version; rev = version;
sha256 = "0kr868lxlanq0y98f2hb70y92ac2nla8khsj879kjf3z6dqdpd66"; sha256 = "0cl6z3cvdjmbisvfcy281pcg6rhxmyfs31rwv7q4x39352rcs1nw";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
@ -36,6 +36,7 @@ stdenv.mkDerivation rec {
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>'
substituteInPlace move-value-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 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>'
''; '';
# obs-studio expects the shared object to be located in bin/32bit or bin/64bit # obs-studio expects the shared object to be located in bin/32bit or bin/64bit

6
pkgs/applications/video/obs-studio/rename-obs-move-transition-cmake.patch
View File

@ -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.0.2) project(move-transition VERSION 2.3.0)
set(PROJECT_FULL_NAME "Move Transition") set(PROJECT_FULL_NAME "Move Transition")
+include(FindLibobs.cmake) +include(FindLibobs.cmake)
@ -17,9 +17,9 @@ index d116619..a1366ce 100644
+ "${LIBOBS_INCLUDE_DIR}/../plugins/obs-transitions" + "${LIBOBS_INCLUDE_DIR}/../plugins/obs-transitions"
+ "${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)
set(move-transition_HEADERS set(move-transition_HEADERS
move-transition.h
easing.h)
@@ -34,4 +45,10 @@ target_link_libraries(move-transition @@ -34,4 +45,10 @@ target_link_libraries(move-transition
libobs) libobs)