diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-01-08 16:34:30 +0100 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-01-08 16:34:30 +0100 |
| commit | 4d65509504f9a08f67bcf47dd93feb7a1098084c (patch) | |
| tree | bc5a75853654c6be09992cce0c39222535e2fde2 /pkgs/applications/video | |
| parent | 08d449ce6df035fcf7a5c6efb525c32ac0a9e355 (diff) | |
| parent | 194b1690e7a94880b74abe538f43a371ec8b4f37 (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/hypnotix/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/video/hypnotix/fix-deprecated-mpv-detach-destroy.patch | 22 |
2 files changed, 2 insertions, 28 deletions
diff --git a/pkgs/applications/video/hypnotix/default.nix b/pkgs/applications/video/hypnotix/default.nix index c210743f6eaeb..ee62a711398bd 100644 --- a/pkgs/applications/video/hypnotix/default.nix +++ b/pkgs/applications/video/hypnotix/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "hypnotix"; - version = "3.1"; + version = "3.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = "hypnotix"; rev = version; - hash = "sha256-hCVItxvYTE0G5inI/A4w4FYfSfrACINBSaKXhA1mh4A="; + hash = "sha256-R9bp1RQHHCrIE/3rIAHzWHXpXBUDUpJTkO53n+xZw3Q="; }; patches = [ @@ -26,10 +26,6 @@ stdenv.mkDerivation rec { src = ./libmpv-path.patch; libmpv = "${lib.getLib mpv}/lib/libmpv${stdenv.hostPlatform.extensions.sharedLibrary}"; }) - - # Fix launching with mpv 0.35.0 (ubuntu 22.04 doesn't have libmpv.so.2) - # https://github.com/linuxmint/hypnotix/issues/254 - ./fix-deprecated-mpv-detach-destroy.patch ]; postPatch = '' diff --git a/pkgs/applications/video/hypnotix/fix-deprecated-mpv-detach-destroy.patch b/pkgs/applications/video/hypnotix/fix-deprecated-mpv-detach-destroy.patch deleted file mode 100644 index 06c971b51520d..0000000000000 --- a/pkgs/applications/video/hypnotix/fix-deprecated-mpv-detach-destroy.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/usr/lib/hypnotix/mpv.py b/usr/lib/hypnotix/mpv.py -index f42a3be..db94bf6 100644 ---- a/usr/lib/hypnotix/mpv.py -+++ b/usr/lib/hypnotix/mpv.py -@@ -528,7 +528,7 @@ _mpv_create = backend.mpv_create - _handle_func('mpv_create_client', [c_char_p], MpvHandle, notnull_errcheck) - _handle_func('mpv_client_name', [], c_char_p, errcheck=None) - _handle_func('mpv_initialize', [], c_int, ec_errcheck) --_handle_func('mpv_detach_destroy', [], None, errcheck=None) -+_handle_func('mpv_destroy', [], None, errcheck=None) - _handle_func('mpv_terminate_destroy', [], None, errcheck=None) - _handle_func('mpv_load_config_file', [c_char_p], c_int, ec_errcheck) - _handle_func('mpv_get_time_us', [], c_ulonglong, errcheck=None) -@@ -881,7 +881,7 @@ class MPV(object): - self._message_handlers[target](*args) - - if eid == MpvEventID.SHUTDOWN: -- _mpv_detach_destroy(self._event_handle) -+ _mpv_destroy(self._event_handle) - return - - except Exception as e: |