(cherry picked from commit c2979734)

Conflicts:

	extras/package/macosx/package.mak
Signed-off-by: Rafaël Carré <funman@videolan.org>