(cherry picked from commit 6e56b492f796a458e06dc21d29d534849af12fd8)

Conflicts:
	extras/package/macosx/Resources/English.lproj/MainMenu.xib

The code is far from being great, but it matches the Qt intf now.
(cherry picked from commit cd612818db02b7831bec1d72e0a864f968daed6a)

Conflicts:
	modules/gui/macosx/bookmarks.m

(cherry picked from commit 44488d6d4cd586d9cafc9f5a0a2325a6a5285be2)

VLC has a native parser with higher priority. So ModPlug only got to
parse the broken files that VLC rejected. ModPlug is not robust and it
crashes in that case.
(cherry picked from commit 76b15d4038e1f2200ab463c275c0854848de8671)

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

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

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

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

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

macosx/fspanel: allow continued clicks on the backward/forward buttons like we do in windowed mode (close #7258)
(cherry picked from commit 14cc1eed64be69186f1076136fcc5154123b5b36)

(cherry picked from commit 4ee68dda548ef30ebe63e747fef92544b42c256a)

Close #5583

Playlist is cached/updated locally within browser instead of
refreshing after each function call.
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

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

Ref #7210
(cherry picked from commit 2a8983fe255ba7e531ca9aeeca46617b295955d2)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Close #7251

vout_macosx: disable the VOUT_DISPLAY_HIDE_MOUSE event to not hide mouse cursor when we need it visible.
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 80fb36e480d7cba4d52bf858c76f905ff2d33b90)
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

Memory associated with a FcPattern is freed when the pattern is
destroyed, so copying the font filename needs to be done before
the call to FcPatternDestroy.
Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Modified-by: Rafaël Carré <funman@videolan.org> (simplify return)
Signed-off-by: Rafaël Carré <funman@videolan.org>
(cherry picked from commit ae3fd8273b0a16b6ab7f17e119b5d1beb79f4a14)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

macosx: fixed NSRangeException when triggering modifier keys without characters as enabled by some international keyboards (close #7268)
(cherry picked from commit c97faddc527a0455c93419982b23763a3d6485d8)

Conflicts:
	modules/gui/macosx/MainWindow.m
	modules/gui/macosx/intf.m

This should fix #6875
(cherry picked from commit a5c381a215d7b4deda2b338dbc7ab9c585399ee7)
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

Close #6879
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 73e246278f8ef609ab9ac07272343c3faba8d644)
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

(cherry picked from commit f8ac92544e8668a436f6c997275b989b0c5d7299)

The "item-change" callback is called with the playlist lock held in
at least one case: when the now playing meta is cleared while a new
input is created by the playlist.

playlist_CurrentInput() acquires the playlist lock. So the
"item-change" callback cannot call it. This bug is present in the
Growl, MSN and Telepathy modules since version 1.0.0. It got copied
into Notify in version 2.0.0.

This reverts commit fc56b92a.
This should fix #6641.
(cherry picked from commit 1e5f4b465a82745e8e7e5a5de491deac39554ed3)

no functional changes
(cherry picked from commit f7986362337e1af1b181b8cd0244894de6070db4)

Now, the detached window position is restored on relaunch. Furthermore, this fixes some positioning issue when switching from macosx-background to detached video view.

Manual backport of 41631564e91d928f762d0aa56417e93c32db0a52
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

macosx: make sure that the marquee is displayed correctly when enabled for the first time in a session
(cherry picked from commit 412b2d72b707eb84c6b0854cc07dfdc56ba0826b)

(cherry picked from commit edee0a568395174b107369624b145f90d069cc1d)

(cherry picked from commit 7f48cb43002663d67614c08315705c3e1ff5b66e)
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

(cherry picked from commit 23247a858d2826594ba37343b59a19fc16fecd33)
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

especially:
- don't show outdated items in sub menus
- disable unusable sub menus

close #6998
(cherry picked from commit 07e72e56f24d7184334bb7e25911c0a1dfdf2c3c)
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

(cherry picked from commit 18dee68f3ace8adfda6e5982daa41755103f9723)
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

(cherry picked from commit 9bd356e5608e5a13890f7f811bb7bd86f2328769)
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

(cherry picked from commit 304a1c0a)
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

(cherry picked from commit 729fe67e)
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
(cherry picked from commit 3f0d5d17820de59e73530d51530ce9d90ae7ef67)

Trust the ObjC runtime, it will do its job properly.
(cherry picked from commit 50329a43)

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

(cherry picked from commit 1904dbf5)

(cherry picked from commit 1ddac7d4)

(cherry picked from commit fbe71a66)