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

f='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=7aafb3b324055fab42fa28fe527f86966e85de8e'>refs</a><a class='active' href='/guix/log/gnu/packages/pciutils.scm'>log</a><a href='/guix/tree/gnu/packages/pciutils.scm?id=7aafb3b324055fab42fa28fe527f86966e85de8e'>tree</a><a href='/guix/commit/gnu/packages/pciutils.scm?id=7aafb3b324055fab42fa28fe527f86966e85de8e'>commit</a><a href='/guix/diff/gnu/packages/pciutils.scm?id=7aafb3b324055fab42fa28fe527f86966e85de8e'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/pciutils.scm'>
<input type='hidden' name='id' value='7aafb3b324055fab42fa28fe527f86966e85de8e'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=7aafb3b324055fab42fa28fe527f86966e85de8e'>root</a>/<a href='/guix/log/gnu?id=7aafb3b324055fab42fa28fe527f86966e85de8e'>gnu</a>/<a href='/guix/log/gnu/packages?id=7aafb3b324055fab42fa28fe527f86966e85de8e'>packages</a>/<a href='/guix/log/gnu/packages/pciutils.scm?id=7aafb3b324055fab42fa28fe527f86966e85de8e'>pciutils.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/pciutils.scm?id=7aafb3b324055fab42fa28fe527f86966e85de8e&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2017-07-10 10:45:30 +0200'>2017-07-10</span></td><td><a href='/guix/commit/gnu/packages/pciutils.scm?id=a48da398b3ee279c54db7ea70b3c3195acf5c94b'>gnu: pciutils: Tweak description.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-07-10 10:37:48 +0200'>2017-07-10</span></td><td><a href='/guix/commit/gnu/packages/pciutils.scm?id=841e06af71d264b5fbec56f96aec8aa933fbeab2'>gnu: pciutils: Move 'pci.ids.gz' to 'share/hwdata'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-07-10 10:31:19 +0200'>2017-07-10</span></td><td><a href='/guix/commit/gnu/packages/pciutils.scm?id=539a68f938d734cc48c365a2f91521f4c4a4c1f0'>gnu: pciutils: Update to 3.5.5.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-02-27 00:03:37 +0100'>2017-02-27</span></td><td><a href='/guix/commit/gnu/packages/pciutils.scm?id=3ba43a2297eae9401364568522cb847bea376f3f'>gnu: pciutils: Update to 3.5.4.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2016-11-30 17:35:21 +0100'>2016-11-30</span></td><td><a href='/guix/commit/gnu/packages/pciutils.scm?id=873c469e743c9d411614216713dc1679db3f2ed4'>gnu: pciutils: Update to 3.5.2.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2016-05-29 22:07:47 +0300'>2016-05-29</span></td><td><a href='/guix/commit/gnu/packages/pciutils.scm?id=43ec6ca06e1c94432f35467f3455c9cfa8439aaf'>gnu: pciutils: Add kmod support.</a><span class='msg-avail'>...</span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2016-05-29 22:07:47 +0300'>2016-05-29</span></td><td><a href='/guix/commit/gnu/packages/pciutils.scm?id=0ef7a93d78b72153da168d4c356e5789f99f0869'>gnu: pciutils: Use 'modify-phases'.</a><span class='msg-avail'>...</span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2016-05-29 22:07:47 +0300'>2016-05-29</span></td><td><a href='/guix/commit/gnu/packages/pciutils.scm?id=fb3c855381eba87725da33fbd936bb9734a40ccf'>gnu: pciutils: Update to 3.5.1.</a><span class='msg-avail'>...</span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2015-09-14 20:01:13 +0800'>2015-09-14</span></td><td><a href='/guix/commit/gnu/packages/pciutils.scm?id=f56e8f5730645c8b9f1415ee705ce5ba021ea463'>gnu: pciutils: Update to 3.3.1.</a><span class='msg-avail'>...</span></td><td>宋文武</td></tr>