diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-01-25 11:04:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-25 11:04:59 +0100 |
| commit | fac47806b15a57f68029f9a25ab054a57ab5d8cf (patch) | |
| tree | a069257346628cbdff7857d4828d0c3b17be55cd /pkgs/applications | |
| parent | ad445d3728a3e58e3f94812c89d581872e0ee892 (diff) | |
| parent | b91e555720e2ed83674a2450e4cbf57a1d4aa0f9 (diff) | |
| download | nixpkgs-fac47806b15a57f68029f9a25ab054a57ab5d8cf.tar nixpkgs-fac47806b15a57f68029f9a25ab054a57ab5d8cf.tar.gz nixpkgs-fac47806b15a57f68029f9a25ab054a57ab5d8cf.tar.bz2 nixpkgs-fac47806b15a57f68029f9a25ab054a57ab5d8cf.tar.lz nixpkgs-fac47806b15a57f68029f9a25ab054a57ab5d8cf.tar.xz nixpkgs-fac47806b15a57f68029f9a25ab054a57ab5d8cf.tar.zst nixpkgs-fac47806b15a57f68029f9a25ab054a57ab5d8cf.zip | |
Merge pull request #110743 from starcraft66/master
obs-move-transition: 2.0.2 -> 2.3.0
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/video/obs-studio/obs-move-transition.nix | 5 | ||||
| -rw-r--r-- | pkgs/applications/video/obs-studio/rename-obs-move-transition-cmake.patch | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/applications/video/obs-studio/obs-move-transition.nix b/pkgs/applications/video/obs-studio/obs-move-transition.nix index 70985b438c6..9a896c7320a 100644 --- a/pkgs/applications/video/obs-studio/obs-move-transition.nix +++ b/pkgs/applications/video/obs-studio/obs-move-transition.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "obs-move-transition"; - version = "2.0.2"; + version = "2.3.0"; src = fetchFromGitHub { owner = "exeldro"; repo = "obs-move-transition"; rev = version; - sha256 = "0kr868lxlanq0y98f2hb70y92ac2nla8khsj879kjf3z6dqdpd66"; + sha256 = "0cl6z3cvdjmbisvfcy281pcg6rhxmyfs31rwv7q4x39352rcs1nw"; }; 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-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>' ''; # obs-studio expects the shared object to be located in bin/32bit or bin/64bit diff --git a/pkgs/applications/video/obs-studio/rename-obs-move-transition-cmake.patch b/pkgs/applications/video/obs-studio/rename-obs-move-transition-cmake.patch index 24c1848c10b..ed6df1d565d 100644 --- a/pkgs/applications/video/obs-studio/rename-obs-move-transition-cmake.patch +++ b/pkgs/applications/video/obs-studio/rename-obs-move-transition-cmake.patch @@ -7,7 +7,7 @@ index d116619..a1366ce 100644 + cmake_policy(SET CMP0048 NEW) +endif (POLICY CMP0048) + - project(move-transition VERSION 2.0.2) + project(move-transition VERSION 2.3.0) set(PROJECT_FULL_NAME "Move Transition") +include(FindLibobs.cmake) @@ -17,9 +17,9 @@ index d116619..a1366ce 100644 + "${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 - move-transition.h - easing.h) @@ -34,4 +45,10 @@ target_link_libraries(move-transition libobs) |