Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 81c74a98)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

(cherry picked from commit 4d79e227)
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>

(cherry picked from commit c9e7c34b)
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>

(cherry picked from commit 829f7b96)
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>

Also include sys/param.h when trying to detect the presence of sys/mount.h so that the test works on OpenBSD, as documented by mount(2).
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
(cherry picked from commit 3bc47647)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

(cherry picked from commit 113cb994)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

(cherry picked from commit 68c78698)

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Removes the KDE scheduler hack.
(cherry picked from commit 725cf4eb)

Conflicts:

	bin/vlc.c

This fixes #3980, #4022 and #4025.
This reverts commit dd074f30.

The same check is already done in the dvdread, ps and vobsub modules.
(cherry picked from commit 8a497301)

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

(cherry picked from commit 63885438)
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>

(cherry picked from commit 07471c3c)
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>

Fixes warning
(cherry picked from commit a9e82f63)
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>

(cherry picked from commit bfd061bb)

(cherry picked from commit 421d5ae7)

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

(cherry picked from commit 0ad85b85)

(cherry picked from commit f3afae4f)

Handles "\\hostname" properly.
On Windows, error out on "X:directory" instead of aborting. Looking up
the current directory of the specified drive letter would be a better,
though.
(cherry picked from commit 615bcffe)

Conflicts:

	src/text/strings.c

(cherry picked from commit c0dccd6f)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Qt/EPG: Try to display intelligently the short and long event description with the dedicated widgets.

It depends of the channels. Some use only the short one, others only the long one and others both.
(cherry picked from commit ec1859e9)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

When an item gets sub-items, we have to run our own random-picking among
the new items.

Cherry-picked from commit: 2a4a8f9a