diff --git a/admin/mac/build-release-osx.sh b/admin/mac/build-release-osx.sh index 5f96e990b..bd0153ff5 100755 --- a/admin/mac/build-release-osx.sh +++ b/admin/mac/build-release-osx.sh @@ -58,11 +58,11 @@ VERSION=$1 # cp $ROOT/../admin/mac/Info.plist Contents/Info.plist header "Copying VLC plugins into bundle" - mkdir -p Contents/MacOS/plugins - cp -R /usr/local/Cellar/vlc-git/HEAD/lib/vlc/plugins/ Contents/MacOS/plugins - rm -rf Contents/MacOS/plugins/video_* Contents/MacOS/plugins/gui Contents/MacOS/plugins/*/libold* Contents/MacOS/plugins/*/libvcd* Contents/MacOS/plugins/*/libdvd* \ - Contents/MacOS/plugins/*/liblibass* Contents/MacOS/plugins/*/libx264* Contents/MacOS/plugins/*/libschroe* Contents/MacOS/plugins/*/liblibmpeg2* \ - Contents/MacOS/plugins/*/libstream_out_* Contents/MacOS/plugins/*/libmjpeg_plugin* Contents/MacOS/plugins/*/libh264_plugin* Contents/MacOS/plugins/*/libzvbi_plugin* Contents/MacOS/plugins/*/lib*sub* + mkdir -p Contents/plugins + cp -R /usr/local/Cellar/vlc-git/HEAD/lib/vlc/plugins/ Contents/plugins + rm -rf Contents/plugins/video_* Contents/plugins/gui Contents/plugins/*/libold* Contents/plugins/*/libvcd* Contents/plugins/*/libdvd* \ + Contents/plugins/*/liblibass* Contents/plugins/*/libx264* Contents/plugins/*/libschroe* Contents/plugins/*/liblibmpeg2* \ + Contents/plugins/*/libstream_out_* Contents/plugins/*/libmjpeg_plugin* Contents/plugins/*/libh264_plugin* Contents/plugins/*/libzvbi_plugin* Contents/plugins/*/lib*sub* header "Running install_name_tool" $ROOT/../admin/mac/deposx.sh diff --git a/admin/mac/deposx.sh b/admin/mac/deposx.sh index 192477817..596fbcc0c 100755 --- a/admin/mac/deposx.sh +++ b/admin/mac/deposx.sh @@ -23,7 +23,7 @@ cd Contents QTLIBS=`ls Frameworks | cut -d. -f1` LIBS=`cd MacOS && ls -fR1 | grep dylib` -PLUGINFOLDERS=`ls MacOS/plugins | cut -d. -f1` +PLUGINFOLDERS=`ls plugins | cut -d. -f1` ################################################################################ @@ -153,12 +153,12 @@ do done # now VLC plugins -for x in MacOS/plugins/$PLUGINFOLDERS +for x in plugins/$PLUGINFOLDERS do - for plugin in `ls MacOS/plugins/$x | cut -f1` + for plugin in `ls plugins/$x | cut -f1` do echo "Fixing VLC plugin: $plugin" - chmod 644 MacOS/plugins/$x/$plugin - deplib_change MacOS/plugins/$x/$plugin + chmod 644 plugins/$x/$plugin + deplib_change plugins/$x/$plugin done done diff --git a/admin/mac/qt.conf b/admin/mac/qt.conf index 64d729736..1c7b73536 100644 --- a/admin/mac/qt.conf +++ b/admin/mac/qt.conf @@ -1,2 +1,2 @@ [Paths] -Plugins = PlugIns +Plugins = plugins