Merge pull request #209487 from bobby285271/upd/hypnotix
hypnotix: 3.1 -> 3.2
This commit is contained in:
commit
ffb8b2089b
|
@ -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 = ''
|
||||
|
|
|
@ -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:
|
Loading…
Reference in a new issue