[vlc-commits] macOS package: Change how VLC.app is created

[Marvin Scholz]

vlc | branch: master | Marvin Scholz <epirat07 at gmail.com> | Mon Feb 27 16:24:36 2017 +0100| [f6e51b027f3bd458af1626f90b05de36ad6621ef] | committer: Marvin Scholz

macOS package: Change how VLC.app is created

The build-package.sh is not longer requires, now that the rpath
and install_name it set correctly. Just copying from vlc_install_dir
is enough.

Fix #17725

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f6e51b027f3bd458af1626f90b05de36ad6621ef
---

 extras/package/macosx/package.mak | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/extras/package/macosx/package.mak b/extras/package/macosx/package.mak
index 1c35e92..f8867ad 100644
--- a/extras/package/macosx/package.mak
+++ b/extras/package/macosx/package.mak
@@ -49,7 +49,14 @@ endif
 		$@/Contents/Resources/$${i}.lproj/ ; \
 	done
 	printf "APPLVLC#" >| $@/Contents/PkgInfo
-	PRODUCT="$@" build_dir=$(top_builddir) sh $(srcdir)/extras/package/macosx/build-package.sh
+	## Copy libs
+	mkdir -p $@/Contents/MacOS/lib
+	find $(prefix)/lib -name 'libvlc*.dylib' -maxdepth 1 -exec cp -a {} $@/Contents/MacOS/lib \;
+	## Copy plugins
+	mkdir -p $@/Contents/MacOS/plugins
+	find $(prefix)/lib/vlc/plugins -name 'lib*_plugin.dylib' -maxdepth 2 -exec cp -a {} $@/Contents/MacOS/plugins \;
+	## Install binary
+	cp $(prefix)/bin/vlc $@/Contents/MacOS/VLC
 	## Generate plugin cache
 	bin/vlc-cache-gen $@/Contents/MacOS/plugins
 	find $@ -type d -exec chmod ugo+rx '{}' \;