diff options
author | Marius Bakke <mbakke@fastmail.com> | 2020-05-02 17:31:28 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2020-05-02 17:31:28 +0200 |
commit | 50e6c1bf2ef2f006baa8cac80dfbb12ca2ba6d64 (patch) | |
tree | 64f16d207bad28a9dfda9cce95e6337483a40066 /gnu/packages/patches/vlc-fix-test_libvlc_slaves.patch | |
parent | a8cb1e72ef351330d1521833c1b270dcc0da593f (diff) | |
parent | afc57916e5398737e13d94b3823983783221eb63 (diff) | |
download | guix-patches-50e6c1bf2ef2f006baa8cac80dfbb12ca2ba6d64.tar guix-patches-50e6c1bf2ef2f006baa8cac80dfbb12ca2ba6d64.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/patches/vlc-fix-test_libvlc_slaves.patch')
-rw-r--r-- | gnu/packages/patches/vlc-fix-test_libvlc_slaves.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/gnu/packages/patches/vlc-fix-test_libvlc_slaves.patch b/gnu/packages/patches/vlc-fix-test_libvlc_slaves.patch deleted file mode 100644 index 9bc6d35f18..0000000000 --- a/gnu/packages/patches/vlc-fix-test_libvlc_slaves.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 4186c94104ee528abd6860611b49515f3e6ec644 Mon Sep 17 00:00:00 2001 -From: Thomas Guillem <thomas@gllm.fr> -Date: Fri, 18 Oct 2019 10:34:07 +0200 -Subject: [PATCH] input/item: sort before attaching slaves - -The order of readdir() is completely filesystem dependent. - -Slaves should be attached using the same order across multiple OSses/access -modules. - -This fixes the test_libvlc_slaves on some system when the entry order from -readdir() is different. - -This patch need to be backported to VLC 3.0. ---- - src/input/item.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/input/item.c b/src/input/item.c -index e8db39ca28..fbd74cc95f 100644 ---- a/src/input/item.c -+++ b/src/input/item.c -@@ -1809,8 +1809,8 @@ void vlc_readdir_helper_finish(struct vlc_readdir_helper *p_rdh, bool b_success) - { - if (b_success) - { -- rdh_attach_slaves(p_rdh, p_rdh->p_node); - rdh_sort(p_rdh->p_node); -+ rdh_attach_slaves(p_rdh, p_rdh->p_node); - } - free(p_rdh->psz_ignored_exts); - --- -2.20.1 - |