macOS package: Change how VLC.app is created
authorMarvin Scholz <epirat07@gmail.com>
Mon, 27 Feb 2017 15:24:36 +0000 (16:24 +0100)
committerMarvin Scholz <epirat07@gmail.com>
Mon, 27 Feb 2017 16:15:36 +0000 (17:15 +0100)
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

extras/package/macosx/package.mak

index 1c35e92..f8867ad 100644 (file)
@@ -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 '{}' \;