- backported [15463]

Makefile.am

@@ -847,6 +847,19 @@ package-macosx:
 # Clean up
 	rm -Rf "$(top_builddir)/vlc-${VERSION}" ;
 
+package-macosx-plugin:
+if BUILD_MOZILLA
+	rm -rf "$(top_builddir)/macosx-plugin-instdata/"
+	mkdir -p "$(top_builddir)/macosx-plugin-instdata"
+	cp -R "$(top_builddir)/mozilla/VLC Plugin.plugin" "$(top_builddir)/macosx-plugin-instdata"
+	rm -rf "$(top_builddir)/VLC Internet Plug-In.pkg"
+	/Developer/Tools/packagemaker -build -ds -p "$(top_builddir)/VLC Internet Plug-In.pkg" \
+	-f "$(top_builddir)/macosx-plugin-instdata" \
+	-i "$(srcdir)/extras/MacOSX/plugin/InstallerInfo.plist" \
+	-d "$(srcdir)/extras/MacOSX/plugin/InstallerDescription.plist"; true
+	rm -rf "$(top_builddir)/macosx-plugin-instdata/"
+endif
+
 package-translations:
 	@if test -e "$(srcdir)/vlc-translations-${VERSION}"; then \
 	  echo "Error: please remove $(srcdir)/vlc-translations-${VERSION}, it is in the way"; \

extras/MacOSX/plugin/English.lproj/InfoPlist.strings

 /* Localized versions of Info.plist keys */

extras/MacOSX/plugin/Info.plist

@@ -6,16 +6,22 @@
 	<string>English</string>
 	<key>CFBundleExecutable</key>
 	<string>VLC Plugin</string>
+	<key>CFBundleGetInfoString</key>
+	<string>Copyright 2002-2006 The VideoLAN Team. All Rights Reserved</string>
 	<key>CFBundleIdentifier</key>
 	<string>com.netscape.vlc</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>VideoLAN VLC Plug-in</string>
 	<key>CFBundlePackageType</key>
 	<string>BRPL</string>
 	<key>CFBundleSignature</key>
 	<string>MOSS</string>
 	<key>CFBundleVersion</key>
 	<string>0.12</string>
+	<key>CFBundleShortVersionString</key>
+	<string>0.12</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 </dict>

extras/MacOSX/plugin/InstallerDescription.plist

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IFPkgDescriptionDescription</key>
+	<string>Safari and Firefox Plug-In for the VideoLAN VLC Multimedia player.</string>
+	<key>IFPkgDescriptionTitle</key>
+	<string>VideoLAN VLC Internet Plug-In</string>
+</dict>
+</plist>

extras/MacOSX/plugin/InstallerInfo.plist

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleGetInfoString</key>
+	<string>0.8.5, The VideoLAN Team, All Rights Reserved.</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.videolan.vlc</string>
+	<key>CFBundleShortVersionString</key>
+	<string>0.8.5</string>
+	<key>IFMajorVersion</key>
+	<integer>0</integer>
+	<key>IFMinorVersion</key>
+	<integer>8</integer>
+	<key>IFPkgFlagAllowBackRev</key>
+	<false/>
+	<key>IFPkgFlagAuthorizationAction</key>
+	<string>AdminAuthorization</string>
+	<key>IFPkgFlagBackgroundAlignment</key>
+	<string>topleft</string>
+	<key>IFPkgFlagBackgroundScaling</key>
+	<string>none</string>
+	<key>IFPkgFlagDefaultLocation</key>
+	<string>/Library/Internet Plug-Ins</string>
+	<key>IFPkgFlagFollowLinks</key>
+	<true/>
+	<key>IFPkgFlagInstallFat</key>
+	<false/>
+	<key>IFPkgFlagInstalledSize</key>
+	<integer>30212</integer>
+	<key>IFPkgFlagIsRequired</key>
+	<false/>
+	<key>IFPkgFlagOverwritePermissions</key>
+	<false/>
+	<key>IFPkgFlagRelocatable</key>
+	<false/>
+	<key>IFPkgFlagRestartAction</key>
+	<string>NoRestart</string>
+	<key>IFPkgFlagRootVolumeOnly</key>
+	<true/>
+	<key>IFPkgFlagUpdateInstalledLanguages</key>
+	<false/>
+	<key>IFPkgFormatVersion</key>
+	<real>0.10000000149011612</real>
+</dict>
+</plist>

mozilla/vlc.r

@@ -13,8 +13,9 @@ data 'carb' (0)
 resource 'STR#' (126)
 {
     {
-        "VideoLAN WWW: http://videolan.org"
-        "VLC multimedia plugin"
+        "Version 0.8.5, Copyright 2006, The VideoLAN Team"
+        "<BR><A HREF='http://www.videolan.org'>http://www.videolan.org</A>",
+        "VLC Multimedia Plugin"
     };
 };
 
@@ -41,7 +42,9 @@ resource 'STR#' (127)
         "ASF stream",
         "",
         "",
-        "Google VLC Plugin"
+        "Google VLC Plugin",
+        "WAV audio",
+        "WAV audio"
     };
 };
 
@@ -69,6 +72,8 @@ resource 'STR#' (128,"MIME Type")
         "application/x-mplayer2", "",
         "video/x-ms-wmv", "",
         "video/x-google-vlc-plugin", "",
+        "audio/wav", "wav",
+        "audio/x-wav", "wav",
     };
 };