diff -Nru vlc-1.1.0/debian/changelog vlc-1.1.0/debian/changelog --- vlc-1.1.0/debian/changelog 2010-07-11 03:56:12.000000000 +0200 +++ vlc-1.1.0/debian/changelog 2010-07-18 12:02:45.000000000 +0200 @@ -1,3 +1,13 @@ +vlc (1.1.0-4ubuntu1) maverick; urgency=low + + * Merge from debian unstable (LP: #606849), remaining changes: + - build and install the libx264 plugin + - add Xb-Npp header to vlc package + - Add apport hook to include more vlc dependencies in bug reports + - drop xulrunner 1.9.1 patch (502_xulrunner_191.diff) + + -- Lorenzo De Liso Sun, 18 Jul 2010 09:45:01 +0200 + vlc (1.1.0-4) unstable; urgency=low * also move udev to the list of linux specific features @@ -13,6 +23,16 @@ -- Reinhard Tartler Fri, 09 Jul 2010 15:18:08 -0400 +vlc (1.1.0-2ubuntu1) maverick; urgency=low + + * Merge from Debian unstable, remaining changes: + - build and install the libx264 plugin + - add Xb-Npp header to vlc package + - Add apport hook to include more vlc dependencies in bug reports + - drop xulrunner 1.9.1 patch (502_xulrunner_191.diff) + + -- Benjamin Drung Thu, 08 Jul 2010 11:18:06 +0200 + vlc (1.1.0-2) unstable; urgency=low * libdc1394 is linux specific. @@ -21,6 +41,17 @@ -- Christophe Mutricy Wed, 07 Jul 2010 22:52:17 +0100 +vlc (1.1.0-1ubuntu1) maverick; urgency=low + + * Merge from Debian unstable, remaining changes: + - build and install the libx264 plugin + - add Xb-Npp header to vlc package + - Add apport hook to include more vlc dependencies in bug reports + * Drop xulrunner patches. + * Drop 502_xulrunner_191.diff. + + -- Benjamin Drung Fri, 25 Jun 2010 01:09:16 +0200 + vlc (1.1.0-1) unstable; urgency=low [ Christophe Mutricy ] @@ -84,6 +115,29 @@ -- Christophe Mutricy Thu, 24 Jun 2010 22:01:26 +0100 +vlc (1.0.6-1ubuntu1.1) lucid-proposed; urgency=low + + * debian/vlc{,-nox}.install: + - Move libx264 plugin from vlc to vlc-nox (LP: #575054). + * debian/control: + - Adjust vlc-nox Replaces field properly. + + -- Alessio Treglia Tue, 04 May 2010 14:17:27 +0200 + +vlc (1.0.6-1ubuntu1) lucid; urgency=low + + * Merge from Debian unstable, remaining changes: + - build and install the libx264 plugin + - add Xb-Npp header to vlc package + - Add patches 519-526 to fix FTBFS with xulruner-1.9.2 from upstream + - Add 600-drop-OJI-xul-192.patch to drop OJI support as xulrunner-1.9.2 on + Linux doesn't support it + - Add apport hook to include more vlc dependencies in bug reports + - Drop --sourcedir=debian/tmp from dh_install to install apport hook + * Drop 527-spanish-desktop.patch (merged upstream). + + -- Benjamin Drung Fri, 23 Apr 2010 12:16:15 +0200 + vlc (1.0.6-1) unstable; urgency=low * New upstream version 1.0.6 @@ -95,6 +149,40 @@ -- Christophe Mutricy Fri, 23 Apr 2010 11:49:18 +0200 +vlc (1.0.5-2ubuntu3) lucid; urgency=low + + * debian/patches/527-spanish-desktop.patch: Add Spanish translation, + thanks Ricardo Pérez López (LP: #534312). + * Add apport hook to include more vlc dependencies in bug reports; + thanks to Brian Murray for it (LP: #538719). + * Drop --sourcedir=debian/tmp from dh_install to install apport hook. + + -- Benjamin Drung Thu, 15 Apr 2010 12:32:03 +0200 + +vlc (1.0.5-2ubuntu2) lucid; urgency=low + + * Add patches to fix FTBFS with xulruner-1.9.2 from upstream (LP: #558981) + - add debian/patches/519-Typedef-changes-from-xulrunner-1.9.1.patch + - add debian/patches/520-Don-t-hardcode-OJI-define-deprecated-xith-libxul-1.9.patch + - add debian/patches/521-Untracked-API-change-utf8-to-UTF8.patch + - add debian/patches/522-Mozilla-do-not-hard-code-autoconf-file-descriptors.patch + - add debian/patches/523-Require-xul-1.9.2-explicitly.patch + - add debian/patches/524-Mozilla-More-fixes-for-XulRunner-1.9.2.patch + - add debian/patches/525-Mozilla-more-fixes.patch + - add debian/patches/526-Mozilla-More-final-Win32-compile-fixes-for-XulRunner.patch + * Add patch to drop OJI support as xulrunner-1.9.2 on Linux doesn't support it + - add debian/patches/600-drop-OJI-xul-192.patch + + -- Micah Gersten Tue, 13 Apr 2010 10:09:58 -0500 + +vlc (1.0.5-2ubuntu1) lucid; urgency=low + + * Merge from Debian unstable, remaining changes: + - build and install the libx264 plugin + - add Xb-Npp header to vlc package + + -- Benjamin Drung Sun, 07 Mar 2010 16:26:55 +0100 + vlc (1.0.5-2) unstable; urgency=medium [ Christophe Mutricy ] @@ -110,6 +198,14 @@ -- Christophe Mutricy Tue, 02 Mar 2010 00:30:56 +0100 +vlc (1.0.5-1ubuntu1) lucid; urgency=low + + * Merge from Debian unstable, remaining changes: + - build and install the libx264 plugin + - add Xb-Npp header to vlc package + + -- Benjamin Drung Wed, 17 Feb 2010 13:38:29 +0100 + vlc (1.0.5-1) unstable; urgency=low * New upstream version 1.0.5 @@ -132,6 +228,20 @@ -- Christophe Mutricy Sat, 13 Feb 2010 15:52:30 +0000 +vlc (1.0.4-2ubuntu2) lucid; urgency=low + + * rebuild for ffmpeg versioned symbols + + -- Reinhard Tartler Tue, 19 Jan 2010 21:40:22 +0100 + +vlc (1.0.4-2ubuntu1) lucid; urgency=low + + * Merge from Debian unstable, remaining changes: + - build and install the libx264 plugin + - add Xb-Npp header to vlc package + + -- Benjamin Drung Wed, 06 Jan 2010 18:35:23 +0100 + vlc (1.0.4-2) unstable; urgency=low * Report libavutil50 presence the correct way @@ -144,6 +254,14 @@ -- Christophe Mutricy Tue, 05 Jan 2010 23:31:56 +0100 +vlc (1.0.4-1ubuntu1) lucid; urgency=low + + * merge from debian. Remaining changes: + - build and install the libx264 plugin + - add Xb-Npp header to vlc package + + -- Reinhard Tartler Wed, 30 Dec 2009 18:23:36 +0100 + vlc (1.0.4-1) unstable; urgency=low * New upstream release @@ -175,6 +293,31 @@ -- Christophe Mutricy Wed, 30 Dec 2009 12:56:49 +0100 +vlc (1.0.3-1ubuntu2) lucid; urgency=low + + [ Reinhard Tartler ] + * don't crash when cairo-dock is running. LP: #416294 + Very ugly patch from upstream to disable ARGB channel usage + in libqt4 + * enable and install the fb module on Linux systems. Closes: #556228 + + [ Whoopie ] + * enable CDDB in the CDDA module (LP: #439131) and enable + globalhotkeys module (LP: #439077) + + -- Reinhard Tartler Sat, 21 Nov 2009 22:11:48 +0100 + +vlc (1.0.3-1ubuntu1) lucid; urgency=low + + * Merge from Debian unstable (LP: #435524), remaining changes: + - build against xulrunner-dev instead of iceape-dev + - build against libx264-dev and install libx264 plugin + - add Xb-Npp header to vlc package + - recommend vlc-plugin-pulse for vlc + - backport patch "402_increase_pulseaudio_score.diff" + + -- Reinhard Tartler Thu, 12 Nov 2009 15:29:11 +0100 + vlc (1.0.3-1) unstable; urgency=low * New upstream release @@ -191,6 +334,22 @@ -- Christophe Mutricy Thu, 05 Nov 2009 12:39:35 +0100 +vlc (1.0.2-1ubuntu2) karmic; urgency=low + + * PulseAudio: higher priority than ALSA, LP: #402018 + + -- Reinhard Tartler Mon, 19 Oct 2009 21:19:26 +0200 + +vlc (1.0.2-1ubuntu1) karmic; urgency=low + + * Merge from Debian unstable (LP: #435524), remaining changes: + - build against xulrunner-dev instead of iceape-dev + - build against libx264-dev and install libx264 plugin + - add Xb-Npp header to vlc package + - recommend vlc-plugin-pulse for vlc + + -- Benjamin Drung Fri, 25 Sep 2009 14:44:17 +0200 + vlc (1.0.2-1) unstable; urgency=high * New upstream release @@ -206,6 +365,17 @@ -- Christophe Mutricy Sun, 20 Sep 2009 01:08:41 +0200 +vlc (1.0.1-2ubuntu1) karmic; urgency=low + + * Merge from Debian unstable (LP: #426693), remaining changes: + - build against xulrunner-dev instead of iceape-dev + - build against libx264-dev and install libx264 plugin + - add Xb-Npp header to vlc package + * Recommend vlc-plugin-pulse for vlc, so that pulse can be used as default + output. + + -- Benjamin Drung Wed, 09 Sep 2009 10:24:09 +0200 + vlc (1.0.1-2) unstable; urgency=low * Fix typo in debian/changelog @@ -219,6 +389,22 @@ -- Christophe Mutricy Sun, 06 Sep 2009 19:07:24 +0200 +vlc (1.0.1-1ubuntu2) karmic; urgency=low + + * No-change rebuild to pick up new ffmpeg shlibs file. + + -- Stefan Potyra Fri, 28 Aug 2009 22:02:06 +0200 + +vlc (1.0.1-1ubuntu1) karmic; urgency=low + + * Merge from Debian unstable (LP: #406602, #407570), remaining changes: + - build against xulrunner-dev instead of iceape-dev + - build against libass-dev and libx264-dev + - build against and install libx264 plugin + - add Xb-Npp header to vlc package + + -- أحمد المحمودي (Ahmed El-Mahmoudy) Sat, 01 Aug 2009 05:54:24 +0300 + vlc (1.0.1-1) unstable; urgency=low * New upstream bugfix version @@ -236,6 +422,16 @@ -- Christophe Mutricy Wed, 29 Jul 2009 00:21:39 +0200 +vlc (1.0.0-1ubuntu1) karmic; urgency=low + + * Remaining changes to debian: + - build against libxul-dev instead of iceape-dev + - build against libass-dev and libx264-dev + - build against and install libx264 plugin + - add Xb-Npp header to vlc package + + -- Reinhard Tartler Fri, 10 Jul 2009 16:18:23 +0200 + vlc (1.0.0-1) unstable; urgency=low * New Upstream Release @@ -256,6 +452,17 @@ -- Christophe Mutricy Thu, 09 Jul 2009 13:04:20 +0000 +vlc (1.0.0~rc2-1ubuntu1) karmic; urgency=low + + * New upstream version. + * tighten build-dependencies on libschroedinger-dev, fixes FTBFS. + * Following bugs have an associated and now closed upstream ticket in + Launchpad: LP: #281295, #73449, #282567, #117640, #172938, #260918, + #273685, #275043, #277834, #282394, #290753, #294136, #298925, #304265, + #309728, #311742, #314038 + + -- Reinhard Tartler Fri, 05 Jun 2009 12:28:15 +0200 + vlc (1.0.0~rc2-1) experimental; urgency=low * New Upstream Release Candidate @@ -302,6 +509,36 @@ -- Christophe Mutricy Sat, 06 Jun 2009 16:56:16 +0200 +vlc (0.9.9a-2ubuntu2) karmic; urgency=low + + * Rebuild for libass1 -> libass3 transistion. + + -- Steve Kowalik Mon, 25 May 2009 23:29:31 +1000 + +vlc (0.9.9a-2ubuntu1) jaunty; urgency=low + + * Merge from debian which includes a small security fix. + * Adjusted Vcs fields to point to pkg-multimedia's git branch. The + package is maintained in the 'jaunty' branch. + * Remaining changes to debian: + - build against libxul-dev instead of iceape-dev + - build against libass-dev and libx264-dev + - build against and install libx264 plugin + - add Xb-Npp header to vlc package + - debian/patches/301_DVD_media.diff: Change %U to %f + in VLC .desktop file, cf LP #275043 + - Remove arts from dependencies. (LP: #320915) + - debian/control: + - Remove libarts1-dev from build depends + - Don't build package vlc-plugin-arts + - Remove all notions of vlc-plugin-arts from packages descriptions + - debian/rules: + - Remove --enable-arts from confflags + - Delete debian/vlc-plugin-arts.install + - Delete debian/vlc-plugin-arts.links + + -- Reinhard Tartler Sat, 18 Apr 2009 19:52:57 +0200 + vlc (0.9.9a-2) unstable; urgency=medium * Security fix @@ -311,6 +548,29 @@ -- Christophe Mutricy Tue, 07 Apr 2009 23:06:48 +0200 +vlc (0.9.9a-1ubuntu1) jaunty; urgency=low + + * Merge from Debian. (LP: #356310) + * Remaining changes: + - build against libxul-dev instead of iceape-dev + - build against libass-dev and libx264-dev + - build against and install libx264 plugin + - adjust Vcs-Bzr Headers in debian/control + - add Xb-Npp header to vlc package + - debian/patches/301_DVD_media.diff: Change %U to %f + in VLC .desktop file, cf LP #275043 + - Remove arts from dependencies. (LP: #320915) + - debian/control: + - Remove libarts1-dev from build depends + - Don't build package vlc-plugin-arts + - Remove all notions of vlc-plugin-arts from packages descriptions + - debian/rules: + - Remove --enable-arts from confflags + - Delete debian/vlc-plugin-arts.install + - Delete debian/vlc-plugin-arts.links + + -- أحمد المحمودي (Ahmed El-Mahmoudy) Mon, 06 Apr 2009 13:58:06 +0200 + vlc (0.9.9a-1) unstable; urgency=low * New upstream version 0.9.9a @@ -362,6 +622,50 @@ -- Christophe Mutricy Tue, 24 Feb 2009 16:00:31 +0100 +vlc (0.9.8a-1ubuntu4) jaunty; urgency=low + + [ Cody Russell ] + * Check whether the server allows actions before trying to send them. + (LP: #328605) + + -- James Westby Wed, 25 Feb 2009 11:37:57 +0000 + +vlc (0.9.8a-1ubuntu3) jaunty; urgency=low + + [ Andreas Wenning ] + * Remove arts from dependencies. (LP: #320915) + - debian/control: + - Remove libarts1-dev from build depends + - Don't build package vlc-plugin-arts + - Remove all notions of vlc-plugin-arts from packages descriptions + - debian/rules: + - Remove --enable-arts from confflags + - Delete debian/vlc-plugin-arts.install + - Delete debian/vlc-plugin-arts.links + + -- Mario Limonciello Thu, 12 Feb 2009 14:58:45 -0600 + +vlc (0.9.8a-1ubuntu2) jaunty; urgency=low + + * no change rebuild to pick up new libx264, LP: #325720 + + -- Reinhard Tartler Sat, 07 Feb 2009 20:40:56 +0100 + +vlc (0.9.8a-1ubuntu1) jaunty; urgency=low + + * merge from debian. LP: #300328, #305100, #289263 + * Fixes CVE-2008-5276 + * remaining changes + - build against libxul-dev instead of iceape-dev + - build against libdca-dev, libass-dev and libx264-dev + - build against and install libx264 plugin + - adjust Vcs-Bzr Headers in debian/control + - add Xb-Npp header to vlc package + - debian/patches/301_DVD_media.diff: Change %U to %f + in VLC .desktop file, cf LP #275043 + + -- Reinhard Tartler Sun, 07 Dec 2008 23:12:27 +0100 + vlc (0.9.8a-1) experimental; urgency=low * New upstream release @@ -372,6 +676,20 @@ -- Christophe Mutricy Wed, 03 Dec 2008 20:20:52 +0100 +vlc (0.9.6-1ubuntu1) jaunty; urgency=low + + * merge from debian/experimental, fixes LP: #289263 + remaining changes: + - build against libxul-dev instead of iceape-dev + - build against libdca-dev, libass-dev and libx264-dev + - build against and install libx264 plugin + - adjust Vcs-Bzr Headers in debian/control + - add Xb-Npp header to vlc package + - debian/patches/301_DVD_media.diff: Change %U to %f + in VLC .desktop file, cf LP #275043 + + -- Reinhard Tartler Sat, 15 Nov 2008 15:45:06 +0100 + vlc (0.9.6-1) experimental; urgency=low [ Reinhard Tartler ] @@ -401,6 +719,38 @@ -- Christophe Mutricy Mon, 20 Oct 2008 23:23:46 +0200 +vlc (0.9.4-1ubuntu3) intrepid; urgency=low + + * link vlc to unicode enabled curses library. Thanks to Rafaël Carré for + reporting.(LP: #282644) + * enable emedded video (LP: #282582) + * Autodetect screen while using Xinerama to toggle fullscreen (LP: #115419) + + -- Reinhard Tartler Mon, 13 Oct 2008 21:47:13 +0200 + +vlc (0.9.4-1ubuntu2) intrepid; urgency=low + + * add new plugin database meta fields Xb-Npp-Description and Xb-Npp-File + - update debian/control + * link plugin binary to /usr/lib/xulrunner-addons/plugins/ + - update debian/mozilla-plugin-vlc.links + + -- Alexander Sack Mon, 13 Oct 2008 17:45:51 +0200 + +vlc (0.9.4-1ubuntu1) intrepid; urgency=low + + * merge from debian/experimental + * New upstream release fixes LP: #280081, #280378 + * remaining changes: + - build against libxul-dev instead of iceape-dev + - build against libdca-dev, libass-dev and libx264-dev + - adjust Vcs-Bzr Headers in debian/control + - add Xb-Npp header to vlc package + - debian/patches/301_DVD_media.diff: Change %U to %f + in VLC .desktop file, cf LP #275043 + + -- Reinhard Tartler Sun, 12 Oct 2008 11:37:03 +0200 + vlc (0.9.4-1) experimental; urgency=low * New upstream bugfix version @@ -425,6 +775,70 @@ -- Christophe Mutricy Fri, 26 Sep 2008 23:49:48 +0200 +vlc (0.9.3-0ubuntu1) intrepid; urgency=low + + [ Reinhard Tartler ] + * new upstream bugfix only Releases LP: #274721 + + Relevant fixes from NEWS file: + + Various bugfixes: + * Fixed DTS channel order on 5.1 systems + * Fixed pausing behavior for subtitles and for Audio-CD + * Multiple subtitles and podcast fixes + * Various crashes fixed in PS, SSA, mkv, xspf, freetype + * Fixed update system bugs + * Other bug fixes (dvd language selection, subtitle colours, HTTP keep-alive...) + + Qt4 interface: + * Added Faster/Slower icons to the controller panel + * Fixed lost playlist columns when switching the playlist view + * Added needed options to Simple preferences (to avoid NVIDIA drivers issues) + * Fullscreen controller: added time label, remembering of last position + * Fixed drag'n drop behaviour on the playlist + * Multiple other fixes (Enter hotkey in preferences, Skins selection...) + + [ Saïvann Carignan ] + * debian/patches/301_DVD_media.diff: Change %U to %f + in VLC .desktop file . (LP: #275043) + + -- Reinhard Tartler Sat, 27 Sep 2008 09:30:04 +0200 + +vlc (0.9.2-1ubuntu2) intrepid; urgency=low + + * remove spurious conflicts on libvlc2. LP: #274614 + * fix FTBFS on all archs other than i386/lpia and amd64. Patch from + pkg-multimedia svn, Closes: #499860 + + -- Reinhard Tartler Fri, 26 Sep 2008 08:35:29 +0200 + +vlc (0.9.2-1ubuntu1) intrepid; urgency=low + + * New Upstream Release, exception granted by + - dktrkranz, norsetto, Hobbsee (via irc). LP: #270404 + + Changes done in ubuntu: + + * add libxul-dev to build-depends + * make sure that vlc is build against libxul in configure. This doesn't + change anything in the package, but makes it more robust if building + in an 'unclean' chroot or when modifying the package. + * debian/control: make Vcs-* fields point to the motumedia branch + * add libx264-dev and libass-dev to build-depends + LP: #210354, #199870 + * actually enable libass support by passing --enable-libass to configure + * enable libdca: add libdca-dev to build depends and --enable-libdca + * install the x264 plugin. + + Changes already in the pkg-multimedia branch in debian: + + * don't install usr/share/vlc/mozilla in debian/mozilla-plugin-vlc.install + * new upstream .desktop file now registers flash video mimetype LP: #261567 + * add Xb-Npp-Applications to mozilla-plugin-vlc + * remove duplicate entries in debian/vlc-nox.install + + -- Reinhard Tartler Wed, 17 Sep 2008 21:56:14 +0200 + vlc (0.9.2-1) experimental; urgency=low [ Christophe Mutricy ] @@ -502,6 +916,7 @@ - Update and rename patch 050_bootstrap to 900_autoconf. -- Loic Minier Fri, 22 Aug 2008 19:13:30 +0200 + vlc (0.8.6.h-5) unstable; urgency=high * Acknowledge NMU by Nico Golde. Thanks. diff -Nru vlc-1.1.0/debian/control vlc-1.1.0/debian/control --- vlc-1.1.0/debian/control 2010-07-11 03:56:12.000000000 +0200 +++ vlc-1.1.0/debian/control 2010-07-13 19:32:02.000000000 +0200 @@ -1,7 +1,8 @@ Source: vlc Section: video Priority: optional -Maintainer: Debian multimedia packages maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian multimedia packages maintainers Uploaders: Sam Hocevar (Debian packages) , Clément Stenac , Loic Minier , @@ -77,6 +78,7 @@ libvorbis-dev, libx11-dev, libx11-xcb-dev, + libx264-dev, libxcb1-dev, libxcb-keysyms1-dev, libxcb-randr0-dev, @@ -161,6 +163,37 @@ vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} +Xb-Npp-Applications: ec8030f7-c20a-464f-9b0e-13a3a9e97384, + 92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a +Xb-Npp-Name: VLC Multimedia Plugin +Xb-Npp-Description: play video and audio in firefox using the VLC Multimedai Player +Xb-Npp-File: libvlcplugin.so +Xb-Npp-MimeType: audio/mpeg, + audio/x-mpeg, + video/mpeg, + video/x-mpeg, + video/mpeg-system, + video/x-mpeg-system, + video/mpeg4, + audio/mpeg4, + application/mpeg4-iod, + application/mpeg4-muxcodetable, + video/x-msvideo, + video/quicktime, + application/x-ogg, + application/ogg, + application/x-vlc-plugin, + video/x-ms-asf-plugin, + video/x-ms-asf, + application/x-mplayer2, + video/x-ms-wmv, + application/x-google-vlc-plugin, + audio/wav, + audio/x-wav, + audio/3gpp, + video/3gpp, + audio/3gpp2, + video/3gpp2 Description: multimedia plugin for web browsers based on VLC This plugin adds support for MPEG, MPEG2, DVD, DivX, Ogg/Vorbis and many more formats to your Gecko-based web browser (Firefox, Galeon, etc.). The @@ -229,7 +262,7 @@ Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} -Replaces: vlc (<< 1.0.4-2) +Replaces: vlc (<= 1.0.6-1ubuntu1) Provides: mp3-decoder Description: multimedia player and streamer (without X support) VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4, diff -Nru vlc-1.1.0/debian/gbp.conf vlc-1.1.0/debian/gbp.conf --- vlc-1.1.0/debian/gbp.conf 2010-07-11 03:56:12.000000000 +0200 +++ vlc-1.1.0/debian/gbp.conf 2010-07-13 19:32:02.000000000 +0200 @@ -1,4 +1,4 @@ [DEFAULT] -debian-branch = sid +debian-branch = maverick pristine-tar = True compression = bzip2 diff -Nru vlc-1.1.0/debian/patches/502_xulrunner_191.diff vlc-1.1.0/debian/patches/502_xulrunner_191.diff --- vlc-1.1.0/debian/patches/502_xulrunner_191.diff 2010-07-11 03:56:12.000000000 +0200 +++ vlc-1.1.0/debian/patches/502_xulrunner_191.diff 1970-01-01 01:00:00.000000000 +0100 @@ -1,1277 +0,0 @@ -Description: Make vlc compatible with xulrunner 1.9.1 -Author: Christophe Mutricy -Forwarded: not-needed - -Index: debian.git/config.h.in -=================================================================== ---- debian.git.orig/config.h.in 2010-06-21 01:50:57.000000000 +0200 -+++ debian.git/config.h.in 2010-06-23 00:47:04.664226507 +0200 -@@ -501,6 +501,9 @@ - /* Define to 1 if you have the header file. */ - #undef HAVE_NPAPI_H - -+/* Define to 1 if you have the header file. */ -+#undef HAVE_NPFUNCTIONS_H -+ - /* Define to 1 if you have the header file. */ - #undef HAVE_NPRUNTIME_H - -Index: debian.git/configure -=================================================================== ---- debian.git.orig/configure 2010-06-21 01:50:55.000000000 +0200 -+++ debian.git/configure 2010-06-23 00:47:04.674226144 +0200 -@@ -47000,33 +47000,39 @@ - found=1 - else - if test -n "$PKG_CONFIG"; then -- for i in "${with_mozilla_pkg}" libxul {seamonkey,iceape,xulrunner,firefox,iceweasel,mozilla}-plugin; do -+ for i in "${with_mozilla_pkg}" libxul {seamonkey,iceape,xulrunner,firefox,iceweasel,mozilla}-plugin; do - if test -n "$i" - then - echo "Trying to find $i package" >&5 -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $i >= 1.9.2" >&5 --$as_echo_n "checking for $i >= 1.9.2... " >&6; } -- if $PKG_CONFIG --exists --print-errors "$i >= 1.9.2" 2>&5 -+ if $PKG_CONFIG --exists --print-errors "$i" 2>&5 - then - echo "Using $i pkg-config package." >&5 - echo "Using $i package." >&6 - found=1 - MOZILLA_CFLAGS=$(eval $PKG_CONFIG --cflags "$i" ) - MOZILLA_LIBS=$(eval $PKG_CONFIG --libs "$i" ) -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } - break - fi -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } - fi -- done -+ done - fi - fi - if test $found = 1; then : - - CPPFLAGS="${CPPFLAGS_save} ${MOZILLA_CFLAGS}" - MOZILLA_REQUIRED_HEADERS=1 -+ for ac_header in npfunctions.h -+do : -+ ac_fn_cxx_check_header_mongrel "$LINENO" "npfunctions.h" "ac_cv_header_npfunctions_h" "$ac_includes_default" -+if test "x$ac_cv_header_npfunctions_h" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_NPFUNCTIONS_H 1 -+_ACEOF -+ -+fi -+ -+done -+ - for ac_header in npapi.h - do : - ac_fn_cxx_check_header_mongrel "$LINENO" "npapi.h" "ac_cv_header_npapi_h" "$ac_includes_default" -@@ -47060,7 +47066,7 @@ - done - - if test "${MOZILLA_REQUIRED_HEADERS}" = "0"; then -- as_fn_error "Please install the Firefox development tools; plugin/npapi.h and/or plugin/npruntime.h were not found." "$LINENO" 5 -+ as_fn_error "Please install the Firefox development tools; mozilla-config.h, plugin/npapi.h and plugin/npruntime.h were not found." "$LINENO" 5 - fi - MOZILLA_REQUIRED_HEADERS= - mozilla=: -@@ -47068,11 +47074,12 @@ - - - -- eval "CPPFLAGS_mozilla="'"$'"{CPPFLAGS_mozilla} -DXP_UNIX"'"' -+ -+ eval "CPPFLAGS_mozilla="'"$'"{CPPFLAGS_mozilla} -DXP_UNIX -DOJI"'"' - am_modules_with_cppflags="${am_modules_with_cppflags} mozilla" - - -- if test "${SYS}" != "darwin"; then : -+ if test "${SYS}" != "darwin"; then : - - - pkg_failed=no -@@ -47132,13 +47139,13 @@ - echo "$XPM_PKG_ERRORS" >&5 - - -- as_fn_error "Please install the libXpm and libXt development files." "$LINENO" 5 -+ as_fn_error "Please install the libXpm and libXt development files." "$LINENO" 5 - - elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - -- as_fn_error "Please install the libXpm and libXt development files." "$LINENO" 5 -+ as_fn_error "Please install the libXpm and libXt development files." "$LINENO" 5 - - else - XPM_CFLAGS=$pkg_cv_XPM_CFLAGS -@@ -47154,11 +47161,6 @@ - - - fi -- if test "${have_xcb_keysyms}" != "yes"; then : -- -- as_fn_error "Please install xcb-keysyms from xcb-utils." "$LINENO" 5 -- --fi - - fi - -@@ -47234,7 +47236,7 @@ - done - test -n "$MOZILLA_CONFIG" || MOZILLA_CONFIG="no" - -- test "${MOZILLA_CONFIG}" = "no" && as_fn_error "Please install the Mozilla development tools (version 1.9.2 or higher) or use --disable-mozilla." "$LINENO" 5 -+ test "${MOZILLA_CONFIG}" = "no" && as_fn_error "Please install the Mozilla development tools. mozilla-config was not found." "$LINENO" 5 - - - fi -@@ -47492,8 +47494,22 @@ - fi - - real_mozilla_sdk="`cd ${with_mozilla_sdk_path} 2>/dev/null && pwd`" -- CPPFLAGS="${CPPFLAGS_save} -I${real_mozilla_sdk}/include" -+ CPPFLAGS="${CPPFLAGS_save} -I${real_mozilla_sdk} -I${real_mozilla_sdk}/include" - MOZILLA_REQUIRED_HEADERS=1 -+ for ac_header in mozilla-config.h -+do : -+ ac_fn_cxx_check_header_mongrel "$LINENO" "mozilla-config.h" "ac_cv_header_mozilla_config_h" "$ac_includes_default" -+if test "x$ac_cv_header_mozilla_config_h" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_MOZILLA_CONFIG_H 1 -+_ACEOF -+ -+else -+ MOZILLA_REQUIRED_HEADERS=0 -+fi -+ -+done -+ - for ac_header in npapi.h - do : - ac_fn_cxx_check_header_mongrel "$LINENO" "npapi.h" "ac_cv_header_npapi_h" "$ac_includes_default" -@@ -47535,10 +47551,29 @@ - PLUGINS_BINDINGS="${PLUGINS_BINDINGS} mozilla" - - -- eval "CPPFLAGS_mozilla="'"$'"{CPPFLAGS_mozilla} -DXPCOM_GLUE -DHAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX -I${real_mozilla_sdk}/include"'"' -+ eval "CPPFLAGS_mozilla="'"$'"{CPPFLAGS_mozilla} -DXPCOM_GLUE -DHAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX -I${real_mozilla_sdk} -I${real_mozilla_sdk}/include -I${real_mozilla_sdk}/embedstring/include -I${real_mozilla_sdk}/xpcom/include -I${real_mozilla_sdk}/nspr/include -I${real_mozilla_sdk}/string/include -I${real_mozilla_sdk}/plugin/include -I${real_mozilla_sdk}/java/include"'"' - am_modules_with_cppflags="${am_modules_with_cppflags} mozilla" - - -+ if ${need_xpcom_libs}; then -+ -+ -+ eval "LIBS_mozilla="'"'"-L${real_mozilla_sdk}/embedstring/bin -L${real_mozilla_sdk}/xpcom/bin -L${real_mozilla_sdk}/nspr/bin -L${real_mozilla_sdk}/string/bin -L${real_mozilla_sdk}/lib -lnspr4 -lplds4 -lplc4 -lxpcomglue "'$'"{LIBS_mozilla}"'"' -+ am_modules_with_libs="${am_modules_with_libs} mozilla" -+ -+ -+ if test "${SYS}" = "mingw32"; then -+ if test -d "${real_mozilla_sdk}/embedstring/bin" -+ then -+ -+ -+ eval "LIBS_mozilla="'"'"-lembedstring "'$'"{LIBS_mozilla}"'"' -+ am_modules_with_libs="${am_modules_with_libs} mozilla" -+ -+ -+ fi -+ fi -+ fi - MOZILLA_SDK_PATH="${real_mozilla_sdk}" - - if test -n "${CYGPATH}"; then -Index: debian.git/configure.ac -=================================================================== ---- debian.git.orig/configure.ac 2010-06-20 22:17:11.000000000 +0200 -+++ debian.git/configure.ac 2010-06-23 00:47:04.684226299 +0200 -@@ -4550,29 +4550,27 @@ - found=1 - else - if test -n "$PKG_CONFIG"; then -- for i in "${with_mozilla_pkg}" libxul {seamonkey,iceape,xulrunner,firefox,iceweasel,mozilla}-plugin; do -+ for i in "${with_mozilla_pkg}" libxul {seamonkey,iceape,xulrunner,firefox,iceweasel,mozilla}-plugin; do - if test -n "$i" - then - echo "Trying to find $i package" >&AS_MESSAGE_LOG_FD -- AC_MSG_CHECKING([for $i >= 1.9.2]) -- if $PKG_CONFIG --exists --print-errors "$i >= 1.9.2" 2>&AS_MESSAGE_LOG_FD -+ if $PKG_CONFIG --exists --print-errors "$i" 2>&AS_MESSAGE_LOG_FD - then - echo "Using $i pkg-config package." >&AS_MESSAGE_LOG_FD - echo "Using $i package." >&AS_MESSAGE_FD - found=1 - MOZILLA_CFLAGS=$(eval $PKG_CONFIG --cflags "$i" ) - MOZILLA_LIBS=$(eval $PKG_CONFIG --libs "$i" ) -- AC_MSG_RESULT([yes]) - break - fi -- AC_MSG_RESULT([no]) - fi -- done -+ done - fi - fi - AS_IF( [test $found = 1],[ - CPPFLAGS="${CPPFLAGS_save} ${MOZILLA_CFLAGS}" - MOZILLA_REQUIRED_HEADERS=1 -+ AC_CHECK_HEADERS([npfunctions.h]) - AC_CHECK_HEADERS(npapi.h,,MOZILLA_REQUIRED_HEADERS=0) - AC_CHECK_HEADERS(npruntime.h,,MOZILLA_REQUIRED_HEADERS=0, - [#if HAVE_NPAPI_H -@@ -4580,24 +4578,22 @@ - #endif - ]) - if test "${MOZILLA_REQUIRED_HEADERS}" = "0"; then -- AC_MSG_ERROR([Please install the Firefox development tools; plugin/npapi.h and/or plugin/npruntime.h were not found.]) -+ AC_MSG_ERROR([Please install the Firefox development tools; mozilla-config.h, plugin/npapi.h and plugin/npruntime.h were not found.]) - fi - MOZILLA_REQUIRED_HEADERS= - mozilla=: - AS_IF([ test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"],[ -- VLC_ADD_CPPFLAGS([mozilla],[-DXP_UNIX]) -- AS_IF([ test "${SYS}" != "darwin"],[ -- PKG_CHECK_MODULES(XPM, [xpm xt],[ -- VLC_ADD_CPPFLAGS([mozilla],[-DMOZ_X11]) -- ],[ -- AC_MSG_ERROR([Please install the libXpm and libXt development files.]) -- ]) -- AS_IF([test "${have_xcb_keysyms}" != "yes"], [ -- AC_MSG_ERROR([Please install xcb-keysyms from xcb-utils.]) -- ]) -+ -+ VLC_ADD_CPPFLAGS([mozilla],[-DXP_UNIX -DOJI]) -+ AS_IF([ test "${SYS}" != "darwin"],[ -+ PKG_CHECK_MODULES(XPM, [xpm xt],[ -+ VLC_ADD_CPPFLAGS([mozilla],[-DMOZ_X11]) -+ ],[ -+ AC_MSG_ERROR([Please install the libXpm and libXt development files.]) -+ ]) - ]) - ]) -- VLC_ADD_CPPFLAGS([mozilla],[${CPPFLAGS} ${XPM_CFLAGS}]) -+ VLC_ADD_CPPFLAGS([mozilla],[${CPPFLAGS} ${XPM_CFLAGS}]) - VLC_ADD_LIBS([mozilla],[${MOZILLA_LIBS} ${XPM_LIBS}]) - VLC_ADD_PLUGIN([mozilla]) - PLUGINS_BINDINGS="${PLUGINS_BINDINGS} mozilla" -@@ -4606,9 +4602,9 @@ - ], - [ - AC_PATH_PROGS(MOZILLA_CONFIG, -- [mozilla-config seamonkey-config xulrunner-config], -+ [mozilla-config seamonkey-config xulrunner-config], - [no]) -- test "${MOZILLA_CONFIG}" = "no" && AC_MSG_ERROR([Please install the Mozilla development tools (version 1.9.2 or higher) or use --disable-mozilla.]) -+ test "${MOZILLA_CONFIG}" = "no" && AC_MSG_ERROR([Please install the Mozilla development tools. mozilla-config was not found.]) - ] - ) - dnl pkg-config failed but we might have found a mozilla-config -@@ -4664,8 +4660,9 @@ - fi - - real_mozilla_sdk="`cd ${with_mozilla_sdk_path} 2>/dev/null && pwd`" -- CPPFLAGS="${CPPFLAGS_save} -I${real_mozilla_sdk}/include" -+ CPPFLAGS="${CPPFLAGS_save} -I${real_mozilla_sdk} -I${real_mozilla_sdk}/include" - MOZILLA_REQUIRED_HEADERS=1 -+ AC_CHECK_HEADERS(mozilla-config.h,,MOZILLA_REQUIRED_HEADERS=0) - AC_CHECK_HEADERS(npapi.h,,MOZILLA_REQUIRED_HEADERS=0) - AC_CHECK_HEADERS(npruntime.h,,MOZILLA_REQUIRED_HEADERS=0, - [#if HAVE_NPAPI_H -@@ -4679,7 +4676,17 @@ - MOZILLA_REQUIRED_HEADERS= - mozilla=: - PLUGINS_BINDINGS="${PLUGINS_BINDINGS} mozilla" -- VLC_ADD_CPPFLAGS([mozilla],[-DXPCOM_GLUE -DHAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX -I${real_mozilla_sdk}/include]) -+ VLC_ADD_CPPFLAGS([mozilla],[-DXPCOM_GLUE -DHAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX -I${real_mozilla_sdk} -I${real_mozilla_sdk}/include -I${real_mozilla_sdk}/embedstring/include -I${real_mozilla_sdk}/xpcom/include -I${real_mozilla_sdk}/nspr/include -I${real_mozilla_sdk}/string/include -I${real_mozilla_sdk}/plugin/include -I${real_mozilla_sdk}/java/include]) -+ if ${need_xpcom_libs}; then -+ VLC_ADD_LIBS([mozilla],[-L${real_mozilla_sdk}/embedstring/bin -L${real_mozilla_sdk}/xpcom/bin -L${real_mozilla_sdk}/nspr/bin -L${real_mozilla_sdk}/string/bin -L${real_mozilla_sdk}/lib -lnspr4 -lplds4 -lplc4 -lxpcomglue]) -+ if test "${SYS}" = "mingw32"; then -+ dnl latest gecko sdk does not have embedstring -+ if test -d "${real_mozilla_sdk}/embedstring/bin" -+ then -+ VLC_ADD_LIBS([mozilla],[-lembedstring]) -+ fi -+ fi -+ fi - MOZILLA_SDK_PATH="${real_mozilla_sdk}" - - if test -n "${CYGPATH}"; then -Index: debian.git/projects/mozilla/Makefile.am -=================================================================== ---- debian.git.orig/projects/mozilla/Makefile.am 2010-04-27 23:44:27.000000000 +0200 -+++ debian.git/projects/mozilla/Makefile.am 2010-06-23 00:47:04.684226299 +0200 -@@ -67,7 +67,8 @@ - -F/System/Library/Frameworks/CoreFoundation.framework $(moz_CFLAGS) \ - -I/Developer/Headers/FlatCarbon -fno-common -fpascal-strings \ - -Wmost -Wno-four-char-constants -Wno-unknown-pragmas -DXP_MACOSX=1 \ -- -DNO_X11=1 -DUSE_SYSTEM_CONSOLE=1 -pipe -fmessage-length=0 -+ -DNO_X11=1 -DUSE_SYSTEM_CONSOLE=1 -pipe -fmessage-length=0 \ -+ -include mozilla-config.h - LDFLAGS_mozilla_EXTRA = -no-undefined -bundle -Wl,-read_only_relocs -Wl,suppress \ - -Wl,-headerpad_max_install_names -shrext $(LIBEXT) -Wl,-framework,Carbon -Wl,-framework,System - -Index: debian.git/projects/mozilla/Makefile.in -=================================================================== ---- debian.git.orig/projects/mozilla/Makefile.in 2010-06-21 01:51:16.000000000 +0200 -+++ debian.git/projects/mozilla/Makefile.in 2010-06-23 00:47:04.684226299 +0200 -@@ -740,7 +740,8 @@ - @BUILD_MOZILLA_TRUE@@HAVE_DARWIN_TRUE@@HAVE_WIN32_FALSE@ -F/System/Library/Frameworks/CoreFoundation.framework $(moz_CFLAGS) \ - @BUILD_MOZILLA_TRUE@@HAVE_DARWIN_TRUE@@HAVE_WIN32_FALSE@ -I/Developer/Headers/FlatCarbon -fno-common -fpascal-strings \ - @BUILD_MOZILLA_TRUE@@HAVE_DARWIN_TRUE@@HAVE_WIN32_FALSE@ -Wmost -Wno-four-char-constants -Wno-unknown-pragmas -DXP_MACOSX=1 \ --@BUILD_MOZILLA_TRUE@@HAVE_DARWIN_TRUE@@HAVE_WIN32_FALSE@ -DNO_X11=1 -DUSE_SYSTEM_CONSOLE=1 -pipe -fmessage-length=0 -+@BUILD_MOZILLA_TRUE@@HAVE_DARWIN_TRUE@@HAVE_WIN32_FALSE@ -DNO_X11=1 -DUSE_SYSTEM_CONSOLE=1 -pipe -fmessage-length=0 \ -+@BUILD_MOZILLA_TRUE@@HAVE_DARWIN_TRUE@@HAVE_WIN32_FALSE@ -include mozilla-config.h - - @BUILD_MOZILLA_TRUE@@HAVE_WIN32_TRUE@CPPFLAGS_mozilla_EXTRA = -DXP_WIN -DXP_WIN32 - @BUILD_MOZILLA_TRUE@@HAVE_DARWIN_TRUE@@HAVE_WIN32_FALSE@LDFLAGS_mozilla_EXTRA = -no-undefined -bundle -Wl,-read_only_relocs -Wl,suppress \ -Index: debian.git/projects/mozilla/control/npolibvlc.cpp -=================================================================== ---- debian.git.orig/projects/mozilla/control/npolibvlc.cpp 2010-04-27 23:44:27.000000000 +0200 -+++ debian.git/projects/mozilla/control/npolibvlc.cpp 2010-06-23 00:47:04.684226299 +0200 -@@ -28,6 +28,11 @@ - #include - #include - -+/* Mozilla stuff */ -+#ifdef HAVE_MOZILLA_CONFIG_H -+# include -+#endif -+ - #include "vlcplugin.h" - #include "npolibvlc.h" - -@@ -52,7 +57,7 @@ - NPVariant res; - - if (NPVARIANT_IS_STRING(original)) -- STRINGZ_TO_NPVARIANT(strdup(NPVARIANT_TO_STRING(original).UTF8Characters), res); -+ STRINGZ_TO_NPVARIANT(strdup(NPVARIANT_TO_STRING(original).utf8characters), res); - else if (NPVARIANT_IS_INT32(original)) - INT32_TO_NPVARIANT(NPVARIANT_TO_INT32(original), res); - else if (NPVARIANT_IS_DOUBLE(original)) -@@ -962,7 +967,7 @@ - void LibvlcPlaylistNPObject::parseOptions(const NPString &nps, - int *i_options, char*** ppsz_options) - { -- if( nps.UTF8Length ) -+ if( nps.utf8length ) - { - char *s = stringValue(nps); - char *val = s; -@@ -974,7 +979,7 @@ - { - int nOptions = 0; - -- char *end = val + nps.UTF8Length; -+ char *end = val + nps.utf8length; - while( val < end ) - { - // skip leading blanks -@@ -1634,7 +1639,7 @@ - - case ID_marquee_position: - if( !NPVARIANT_IS_STRING(value) || -- !position_byname( NPVARIANT_TO_STRING(value).UTF8Characters, i ) ) -+ !position_byname( NPVARIANT_TO_STRING(value).utf8characters, i ) ) - return INVOKERESULT_INVALID_VALUE; - - libvlc_video_set_marquee_int(p_md, libvlc_marquee_Position, i); -@@ -1780,7 +1785,7 @@ - - case ID_logo_position: - if( !NPVARIANT_IS_STRING(value) || -- !position_byname( NPVARIANT_TO_STRING(value).UTF8Characters, i ) ) -+ !position_byname( NPVARIANT_TO_STRING(value).utf8characters, i ) ) - return INVOKERESULT_INVALID_VALUE; - - libvlc_video_set_logo_int(p_md, libvlc_logo_position, i); -@@ -1838,7 +1843,7 @@ - { - if( !NPVARIANT_IS_STRING(args[i]) ) - return INVOKERESULT_INVALID_VALUE; -- len+=NPVARIANT_TO_STRING(args[i]).UTF8Length+1; -+ len+=NPVARIANT_TO_STRING(args[i]).utf8length+1; - } - - buf = (char *)malloc( len+1 ); -@@ -1848,8 +1853,8 @@ - for( h=buf,i=0;i - #include - -+/* Mozilla stuff */ -+#ifdef HAVE_MOZILLA_CONFIG_H -+# include -+#endif -+ - #include "nporuntime.h" - #include "vlcplugin.h" - - char* RuntimeNPObject::stringValue(const NPString &s) - { -- NPUTF8 *val = static_cast(malloc((s.UTF8Length+1) * sizeof(*val))); -+ NPUTF8 *val = static_cast(malloc((s.utf8length+1) * sizeof(*val))); - if( val ) - { -- strncpy(val, s.UTF8Characters, s.UTF8Length); -- val[s.UTF8Length] = '\0'; -+ strncpy(val, s.utf8characters, s.utf8length); -+ val[s.utf8length] = '\0'; - } - return val; - } -Index: debian.git/projects/mozilla/support/npmac.cpp -=================================================================== ---- debian.git.orig/projects/mozilla/support/npmac.cpp 2010-04-27 23:44:55.000000000 +0200 -+++ debian.git/projects/mozilla/support/npmac.cpp 2010-06-23 00:47:04.684226299 +0200 -@@ -76,13 +76,10 @@ - #undef XP_UNIX - #endif - --#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20) --#include "npupp.h" --// e.g. CALL_NPN(CallNPN_GetURLNotify, x, y, z) -> CallNPN_GetURLNotify(x, y, z); --#define CALL_NPN(__CallNPNFunc__, ...) (__CallNPNFunc__(__VA_ARGS__)) --#else -+#ifdef HAVE_NPFUNCTIONS_H - #include "npfunctions.h" --#define CALL_NPN(unused, FN, ...) ((*FN)(__VA_ARGS__)) -+#else -+#include "npupp.h" - #endif - - #include "../vlcshell.h" -@@ -218,7 +215,7 @@ - return functionGlue; - } - --#define HOST_TO_PLUGIN_GLUE(name, fp) ((UniversalProcPtr)(SetupTVtoFPGlue(&gNetscapeFuncsGlueTable.name, (void*)fp))) -+#define HOST_TO_PLUGIN_GLUE(name, fp) (SetupTVtoFPGlue(&gNetscapeFuncsGlueTable.name, (void*)fp)) - - #else - -@@ -265,7 +262,7 @@ - - if( navMinorVers >= NPVERS_HAS_NOTIFICATION ) - { -- err = CALL_NPN(CallNPN_GetURLNotifyProc, gNetscapeFuncs.geturlnotify, instance, url, window, notifyData); -+ err = CallNPN_GetURLNotifyProc(gNetscapeFuncs.geturlnotify, instance, url, window, notifyData); - } - else - { -@@ -276,7 +273,7 @@ - - NPError NPN_GetURL(NPP instance, const char* url, const char* window) - { -- return CALL_NPN(CallNPN_GetURLProc, gNetscapeFuncs.geturl, instance, url, window); -+ return CallNPN_GetURLProc(gNetscapeFuncs.geturl, instance, url, window); - } - - NPError NPN_PostURLNotify(NPP instance, const char* url, const char* window, uint32_t len, const char* buf, NPBool file, void* notifyData) -@@ -286,7 +283,7 @@ - - if( navMinorVers >= NPVERS_HAS_NOTIFICATION ) - { -- err = CALL_NPN(CallNPN_PostURLNotifyProc, gNetscapeFuncs.posturlnotify, instance, url, -+ err = CallNPN_PostURLNotifyProc(gNetscapeFuncs.posturlnotify, instance, url, - window, len, buf, file, notifyData); - } - else -@@ -298,12 +295,12 @@ - - NPError NPN_PostURL(NPP instance, const char* url, const char* window, uint32_t len, const char* buf, NPBool file) - { -- return CALL_NPN(CallNPN_PostURLProc, gNetscapeFuncs.posturl, instance, url, window, len, buf, file); -+ return CallNPN_PostURLProc(gNetscapeFuncs.posturl, instance, url, window, len, buf, file); - } - - NPError NPN_RequestRead(NPStream* stream, NPByteRange* rangeList) - { -- return CALL_NPN(CallNPN_RequestReadProc, gNetscapeFuncs.requestread, stream, rangeList); -+ return CallNPN_RequestReadProc(gNetscapeFuncs.requestread, stream, rangeList); - } - - NPError NPN_NewStream(NPP instance, NPMIMEType type, const char* window, NPStream** stream) -@@ -313,7 +310,7 @@ - - if( navMinorVers >= NPVERS_HAS_STREAMOUTPUT ) - { -- err = CALL_NPN(CallNPN_NewStreamProc, gNetscapeFuncs.newstream, instance, type, window, stream); -+ err = CallNPN_NewStreamProc(gNetscapeFuncs.newstream, instance, type, window, stream); - } - else - { -@@ -329,7 +326,7 @@ - - if( navMinorVers >= NPVERS_HAS_STREAMOUTPUT ) - { -- err = CALL_NPN(CallNPN_WriteProc, gNetscapeFuncs.write, instance, stream, len, buffer); -+ err = CallNPN_WriteProc(gNetscapeFuncs.write, instance, stream, len, buffer); - } - else - { -@@ -345,7 +342,7 @@ - - if( navMinorVers >= NPVERS_HAS_STREAMOUTPUT ) - { -- err = CALL_NPN(CallNPN_DestroyStreamProc, gNetscapeFuncs.destroystream, instance, stream, reason); -+ err = CallNPN_DestroyStreamProc(gNetscapeFuncs.destroystream, instance, stream, reason); - } - else - { -@@ -356,32 +353,32 @@ - - void NPN_Status(NPP instance, const char* message) - { -- CALL_NPN(CallNPN_StatusProc, gNetscapeFuncs.status, instance, message); -+ CallNPN_StatusProc(gNetscapeFuncs.status, instance, message); - } - - const char* NPN_UserAgent(NPP instance) - { -- return CALL_NPN(CallNPN_UserAgentProc, gNetscapeFuncs.uagent, instance); -+ return CallNPN_UserAgentProc(gNetscapeFuncs.uagent, instance); - } - - void* NPN_MemAlloc(uint32_t size) - { -- return CALL_NPN(CallNPN_MemAllocProc, gNetscapeFuncs.memalloc, size); -+ return CallNPN_MemAllocProc(gNetscapeFuncs.memalloc, size); - } - - void NPN_MemFree(void* ptr) - { -- CALL_NPN(CallNPN_MemFreeProc, gNetscapeFuncs.memfree, ptr); -+ CallNPN_MemFreeProc(gNetscapeFuncs.memfree, ptr); - } - - uint32_t NPN_MemFlush(uint32_t size) - { -- return CALL_NPN(CallNPN_MemFlushProc, gNetscapeFuncs.memflush, size); -+ return CallNPN_MemFlushProc(gNetscapeFuncs.memflush, size); - } - - void NPN_ReloadPlugins(NPBool reloadPages) - { -- CALL_NPN(CallNPN_ReloadPluginsProc, gNetscapeFuncs.reloadplugins, reloadPages); -+ CallNPN_ReloadPluginsProc(gNetscapeFuncs.reloadplugins, reloadPages); - } - - #ifdef OJI -@@ -398,27 +395,27 @@ - - NPError NPN_GetValue(NPP instance, NPNVariable variable, void *value) - { -- return CALL_NPN(CallNPN_GetValueProc, gNetscapeFuncs.getvalue, instance, variable, value); -+ return CallNPN_GetValueProc( gNetscapeFuncs.getvalue, instance, variable, value); - } - - NPError NPN_SetValue(NPP instance, NPPVariable variable, void *value) - { -- return CALL_NPN(CallNPN_SetValueProc, gNetscapeFuncs.setvalue, instance, variable, value); -+ return CallNPN_SetValueProc( gNetscapeFuncs.setvalue, instance, variable, value); - } - - void NPN_InvalidateRect(NPP instance, NPRect *rect) - { -- CALL_NPN(CallNPN_InvalidateRectProc, gNetscapeFuncs.invalidaterect, instance, rect); -+ CallNPN_InvalidateRectProc( gNetscapeFuncs.invalidaterect, instance, rect); - } - - void NPN_InvalidateRegion(NPP instance, NPRegion region) - { -- CALL_NPN(CallNPN_InvalidateRegionProc, gNetscapeFuncs.invalidateregion, instance, region); -+ CallNPN_InvalidateRegionProc( gNetscapeFuncs.invalidateregion, instance, region); - } - - void NPN_ForceRedraw(NPP instance) - { -- CALL_NPN(CallNPN_ForceRedrawProc, gNetscapeFuncs.forceredraw, instance); -+ CallNPN_ForceRedrawProc( gNetscapeFuncs.forceredraw, instance); - } - - NPIdentifier NPN_GetStringIdentifier(const NPUTF8 *name) -@@ -426,7 +423,7 @@ - int navMinorVers = gNetscapeFuncs.version & 0xFF; - if( navMinorVers >= 14 ) - { -- return CALL_NPN(CallNPN_GetStringIdentifierProc, gNetscapeFuncs.getstringidentifier, name); -+ return CallNPN_GetStringIdentifierProc( gNetscapeFuncs.getstringidentifier, name); - } - return NULL; - } -@@ -436,7 +433,7 @@ - int navMinorVers = gNetscapeFuncs.version & 0xFF; - if( navMinorVers >= 14 ) - { -- CALL_NPN(CallNPN_GetStringIdentifiersProc, gNetscapeFuncs.getstringidentifiers, names, nameCount, identifiers); -+ CallNPN_GetStringIdentifiersProc( gNetscapeFuncs.getstringidentifiers, names, nameCount, identifiers); - } - } - -@@ -445,7 +442,7 @@ - int navMinorVers = gNetscapeFuncs.version & 0xFF; - if( navMinorVers >= 14 ) - { -- return CALL_NPN(CallNPN_GetIntIdentifierProc, gNetscapeFuncs.getintidentifier, intid); -+ return CallNPN_GetIntIdentifierProc( gNetscapeFuncs.getintidentifier, intid); - } - return NULL; - } -@@ -455,7 +452,7 @@ - int navMinorVers = gNetscapeFuncs.version & 0xFF; - if( navMinorVers >= 14 ) - { -- return CALL_NPN(CallNPN_IdentifierIsStringProc, gNetscapeFuncs.identifierisstring, identifier); -+ return CallNPN_IdentifierIsStringProc( gNetscapeFuncs.identifierisstring, identifier); - } - return false; - } -@@ -465,7 +462,7 @@ - int navMinorVers = gNetscapeFuncs.version & 0xFF; - if( navMinorVers >= 14 ) - { -- return CALL_NPN(CallNPN_UTF8FromIdentifierProc, gNetscapeFuncs.utf8fromidentifier, identifier); -+ return CallNPN_UTF8FromIdentifierProc( gNetscapeFuncs.utf8fromidentifier, identifier); - } - return NULL; - } -@@ -475,7 +472,7 @@ - int navMinorVers = gNetscapeFuncs.version & 0xFF; - if( navMinorVers >= 14 ) - { -- return CALL_NPN(CallNPN_IntFromIdentifierProc, gNetscapeFuncs.intfromidentifier, identifier); -+ return CallNPN_IntFromIdentifierProc( gNetscapeFuncs.intfromidentifier, identifier); - } - return 0; - } -@@ -485,7 +482,7 @@ - int navMinorVers = gNetscapeFuncs.version & 0xFF; - if( navMinorVers >= 14 ) - { -- return CALL_NPN(CallNPN_CreateObjectProc, gNetscapeFuncs.createobject, instance, aClass); -+ return CallNPN_CreateObjectProc( gNetscapeFuncs.createobject, instance, aClass); - } - return NULL; - } -@@ -495,7 +492,7 @@ - int navMinorVers = gNetscapeFuncs.version & 0xFF; - if( navMinorVers >= 14 ) - { -- return CALL_NPN(CallNPN_RetainObjectProc, gNetscapeFuncs.retainobject, npobj); -+ return CallNPN_RetainObjectProc( gNetscapeFuncs.retainobject, npobj); - } - return NULL; - } -@@ -505,7 +502,7 @@ - int navMinorVers = gNetscapeFuncs.version & 0xFF; - if( navMinorVers >= 14 ) - { -- CALL_NPN(CallNPN_ReleaseObjectProc, gNetscapeFuncs.releaseobject, npobj); -+ CallNPN_ReleaseObjectProc( gNetscapeFuncs.releaseobject, npobj); - } - } - -@@ -514,7 +511,7 @@ - int navMinorVers = gNetscapeFuncs.version & 0xFF; - if( navMinorVers >= 14 ) - { -- return CALL_NPN(CallNPN_InvokeProc, gNetscapeFuncs.invoke, instance, npobj, methodName, args, argCount, result); -+ return CallNPN_InvokeProc( gNetscapeFuncs.invoke, instance, npobj, methodName, args, argCount, result); - } - return false; - } -@@ -524,7 +521,7 @@ - int navMinorVers = gNetscapeFuncs.version & 0xFF; - if( navMinorVers >= 14 ) - { -- return CALL_NPN(CallNPN_InvokeDefaultProc, gNetscapeFuncs.invokeDefault, instance, npobj, args, argCount, result); -+ return CallNPN_InvokeDefaultProc( gNetscapeFuncs.invokeDefault, instance, npobj, args, argCount, result); - } - return false; - } -@@ -534,7 +531,7 @@ - int navMinorVers = gNetscapeFuncs.version & 0xFF; - if( navMinorVers >= 14 ) - { -- return CALL_NPN(CallNPN_EvaluateProc, gNetscapeFuncs.evaluate, instance, npobj, script, result); -+ return CallNPN_EvaluateProc( gNetscapeFuncs.evaluate, instance, npobj, script, result); - } - return false; - } -@@ -544,7 +541,7 @@ - int navMinorVers = gNetscapeFuncs.version & 0xFF; - if( navMinorVers >= 14 ) - { -- return CALL_NPN(CallNPN_GetPropertyProc, gNetscapeFuncs.getproperty, instance, npobj, propertyName, result); -+ return CallNPN_GetPropertyProc( gNetscapeFuncs.getproperty, instance, npobj, propertyName, result); - } - return false; - } -@@ -554,7 +551,7 @@ - int navMinorVers = gNetscapeFuncs.version & 0xFF; - if( navMinorVers >= 14 ) - { -- return CALL_NPN(CallNPN_SetPropertyProc, gNetscapeFuncs.setproperty, instance, npobj, propertyName, value); -+ return CallNPN_SetPropertyProc( gNetscapeFuncs.setproperty, instance, npobj, propertyName, value); - } - return false; - } -@@ -564,7 +561,7 @@ - int navMinorVers = gNetscapeFuncs.version & 0xFF; - if( navMinorVers >= 14 ) - { -- return CALL_NPN(CallNPN_RemovePropertyProc, gNetscapeFuncs.removeproperty, instance, npobj, propertyName); -+ return CallNPN_RemovePropertyProc( gNetscapeFuncs.removeproperty, instance, npobj, propertyName); - } - return false; - } -@@ -574,7 +571,7 @@ - int navMinorVers = gNetscapeFuncs.version & 0xFF; - if( navMinorVers >= 14 ) - { -- return CALL_NPN(CallNPN_HasPropertyProc, gNetscapeFuncs.hasproperty, instance, npobj, propertyName); -+ return CallNPN_HasPropertyProc( gNetscapeFuncs.hasproperty, instance, npobj, propertyName); - } - return false; - } -@@ -584,7 +581,7 @@ - int navMinorVers = gNetscapeFuncs.version & 0xFF; - if( navMinorVers >= 14 ) - { -- return CALL_NPN(CallNPN_HasMethodProc, gNetscapeFuncs.hasmethod, instance, npobj, methodName); -+ return CallNPN_HasMethodProc( gNetscapeFuncs.hasmethod, instance, npobj, methodName); - } - return false; - } -@@ -594,7 +591,7 @@ - int navMinorVers = gNetscapeFuncs.version & 0xFF; - if( navMinorVers >= 14 ) - { -- CALL_NPN(CallNPN_ReleaseVariantValueProc, gNetscapeFuncs.releasevariantvalue, variant); -+ CallNPN_ReleaseVariantValueProc( gNetscapeFuncs.releasevariantvalue, variant); - } - } - -@@ -603,7 +600,7 @@ - int navMinorVers = gNetscapeFuncs.version & 0xFF; - if( navMinorVers >= 14 ) - { -- CALL_NPN(CallNPN_SetExceptionProc, gNetscapeFuncs.setexception, npobj, message); -+ CallNPN_SetExceptionProc( gNetscapeFuncs.setexception, npobj, message); - } - } - -@@ -634,9 +631,7 @@ - void Private_Print(NPP instance, NPPrint* platformPrint); - int16_t Private_HandleEvent(NPP instance, void* event); - void Private_URLNotify(NPP instance, const char* url, NPReason reason, void* notifyData); --#ifdef OJI - jobject Private_GetJavaClass(void); --#endif // OJI - - - NPError Private_Initialize(void) -@@ -896,22 +891,14 @@ - #endif - } - -+ - #ifdef __GNUC__ - // gcc requires that main have an 'int' return type --typedef int main_return_t; --#else --typedef NPError mainReturnType; --#endif -- --#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20) --typedef NPP_ShutdownUPP unloadupp_t; -+int main(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs, NPP_ShutdownUPP* unloadUpp); - #else --typedef NPP_ShutdownProcPtr unloadupp_t; -+NPError main(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs, NPP_ShutdownUPP* unloadUpp); - #endif - -- --main_return_t main(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs, unloadupp_t* unloadUpp); -- - #if !TARGET_API_MAC_CARBON - #pragma export on - -@@ -924,7 +911,11 @@ - #pragma export off - #endif /* !TARGET_API_MAC_CARBON */ - --DEFINE_API_C(main_return_t) main(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs, unloadupp_t* unloadUpp) -+#ifdef __GNUC__ -+DEFINE_API_C(int) main(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs, NPP_ShutdownUPP* unloadUpp) -+#else -+DEFINE_API_C(NPError) main(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs, NPP_ShutdownUPP* unloadUpp) -+#endif - { - EnterCodeResource(); - PLUGINDEBUGSTR("\pmain"); -@@ -968,55 +959,55 @@ - - gNetscapeFuncs.version = nsTable->version; - gNetscapeFuncs.size = nsTable->size; -- gNetscapeFuncs.posturl = HOST_TO_PLUGIN_GLUE(posturl, nsTable->posturl); -- gNetscapeFuncs.geturl = HOST_TO_PLUGIN_GLUE(geturl, nsTable->geturl); -- gNetscapeFuncs.requestread = HOST_TO_PLUGIN_GLUE(requestread, nsTable->requestread); -- gNetscapeFuncs.newstream = HOST_TO_PLUGIN_GLUE(newstream, nsTable->newstream); -- gNetscapeFuncs.write = HOST_TO_PLUGIN_GLUE(write, nsTable->write); -- gNetscapeFuncs.destroystream = HOST_TO_PLUGIN_GLUE(destroystream, nsTable->destroystream); -- gNetscapeFuncs.status = HOST_TO_PLUGIN_GLUE(status, nsTable->status); -- gNetscapeFuncs.uagent = HOST_TO_PLUGIN_GLUE(uagent, nsTable->uagent); -- gNetscapeFuncs.memalloc = HOST_TO_PLUGIN_GLUE(memalloc, nsTable->memalloc); -- gNetscapeFuncs.memfree = HOST_TO_PLUGIN_GLUE(memfree, nsTable->memfree); -- gNetscapeFuncs.memflush = HOST_TO_PLUGIN_GLUE(memflush, nsTable->memflush); -- gNetscapeFuncs.reloadplugins = HOST_TO_PLUGIN_GLUE(reloadplugins, nsTable->reloadplugins); -+ gNetscapeFuncs.posturl = (NPN_PostURLUPP)HOST_TO_PLUGIN_GLUE(posturl, nsTable->posturl); -+ gNetscapeFuncs.geturl = (NPN_GetURLUPP)HOST_TO_PLUGIN_GLUE(geturl, nsTable->geturl); -+ gNetscapeFuncs.requestread = (NPN_RequestReadUPP)HOST_TO_PLUGIN_GLUE(requestread, nsTable->requestread); -+ gNetscapeFuncs.newstream = (NPN_NewStreamUPP)HOST_TO_PLUGIN_GLUE(newstream, nsTable->newstream); -+ gNetscapeFuncs.write = (NPN_WriteUPP)HOST_TO_PLUGIN_GLUE(write, nsTable->write); -+ gNetscapeFuncs.destroystream = (NPN_DestroyStreamUPP)HOST_TO_PLUGIN_GLUE(destroystream, nsTable->destroystream); -+ gNetscapeFuncs.status = (NPN_StatusUPP)HOST_TO_PLUGIN_GLUE(status, nsTable->status); -+ gNetscapeFuncs.uagent = (NPN_UserAgentUPP)HOST_TO_PLUGIN_GLUE(uagent, nsTable->uagent); -+ gNetscapeFuncs.memalloc = (NPN_MemAllocUPP)HOST_TO_PLUGIN_GLUE(memalloc, nsTable->memalloc); -+ gNetscapeFuncs.memfree = (NPN_MemFreeUPP)HOST_TO_PLUGIN_GLUE(memfree, nsTable->memfree); -+ gNetscapeFuncs.memflush = (NPN_MemFlushUPP)HOST_TO_PLUGIN_GLUE(memflush, nsTable->memflush); -+ gNetscapeFuncs.reloadplugins = (NPN_ReloadPluginsUPP)HOST_TO_PLUGIN_GLUE(reloadplugins, nsTable->reloadplugins); - if( navMinorVers >= NPVERS_HAS_LIVECONNECT ) - { -- gNetscapeFuncs.getJavaEnv = HOST_TO_PLUGIN_GLUE(getJavaEnv, nsTable->getJavaEnv); -- gNetscapeFuncs.getJavaPeer = HOST_TO_PLUGIN_GLUE(getJavaPeer, nsTable->getJavaPeer); -+ gNetscapeFuncs.getJavaEnv = (NPN_GetJavaEnvUPP)HOST_TO_PLUGIN_GLUE(getJavaEnv, nsTable->getJavaEnv); -+ gNetscapeFuncs.getJavaPeer = (NPN_GetJavaPeerUPP)HOST_TO_PLUGIN_GLUE(getJavaPeer, nsTable->getJavaPeer); - } - if( navMinorVers >= NPVERS_HAS_NOTIFICATION ) - { -- gNetscapeFuncs.geturlnotify = HOST_TO_PLUGIN_GLUE(geturlnotify, nsTable->geturlnotify); -- gNetscapeFuncs.posturlnotify = HOST_TO_PLUGIN_GLUE(posturlnotify, nsTable->posturlnotify); -+ gNetscapeFuncs.geturlnotify = (NPN_GetURLNotifyUPP)HOST_TO_PLUGIN_GLUE(geturlnotify, nsTable->geturlnotify); -+ gNetscapeFuncs.posturlnotify = (NPN_PostURLNotifyUPP)HOST_TO_PLUGIN_GLUE(posturlnotify, nsTable->posturlnotify); - } -- gNetscapeFuncs.getvalue = HOST_TO_PLUGIN_GLUE(getvalue, nsTable->getvalue); -- gNetscapeFuncs.setvalue = HOST_TO_PLUGIN_GLUE(setvalue, nsTable->setvalue); -- gNetscapeFuncs.invalidaterect = HOST_TO_PLUGIN_GLUE(invalidaterect, nsTable->invalidaterect); -- gNetscapeFuncs.invalidateregion = HOST_TO_PLUGIN_GLUE(invalidateregion, nsTable->invalidateregion); -- gNetscapeFuncs.forceredraw = HOST_TO_PLUGIN_GLUE(forceredraw, nsTable->forceredraw); -+ gNetscapeFuncs.getvalue = (NPN_GetValueUPP)HOST_TO_PLUGIN_GLUE(getvalue, nsTable->getvalue); -+ gNetscapeFuncs.setvalue = (NPN_SetValueUPP)HOST_TO_PLUGIN_GLUE(setvalue, nsTable->setvalue); -+ gNetscapeFuncs.invalidaterect = (NPN_InvalidateRectUPP)HOST_TO_PLUGIN_GLUE(invalidaterect, nsTable->invalidaterect); -+ gNetscapeFuncs.invalidateregion = (NPN_InvalidateRegionUPP)HOST_TO_PLUGIN_GLUE(invalidateregion, nsTable->invalidateregion); -+ gNetscapeFuncs.forceredraw = (NPN_ForceRedrawUPP)HOST_TO_PLUGIN_GLUE(forceredraw, nsTable->forceredraw); - if( navMinorVers >= 14 ) - { - // NPRuntime support -- gNetscapeFuncs.getstringidentifier = HOST_TO_PLUGIN_GLUE(getstringidentifier, nsTable->getstringidentifier); -- gNetscapeFuncs.getstringidentifiers = HOST_TO_PLUGIN_GLUE(getstringidentifiers, nsTable->getstringidentifiers); -- gNetscapeFuncs.getintidentifier = HOST_TO_PLUGIN_GLUE(getintidentifier, nsTable->getintidentifier); -- gNetscapeFuncs.identifierisstring = HOST_TO_PLUGIN_GLUE(identifierisstring, nsTable->identifierisstring); -- gNetscapeFuncs.utf8fromidentifier = HOST_TO_PLUGIN_GLUE(utf8fromidentifier, nsTable->utf8fromidentifier); -- gNetscapeFuncs.intfromidentifier = HOST_TO_PLUGIN_GLUE(intfromidentifier, nsTable->intfromidentifier); -- gNetscapeFuncs.createobject = HOST_TO_PLUGIN_GLUE(createobject, nsTable->createobject); -- gNetscapeFuncs.retainobject = HOST_TO_PLUGIN_GLUE(retainobject, nsTable->retainobject); -- gNetscapeFuncs.releaseobject = HOST_TO_PLUGIN_GLUE(releaseobject, nsTable->releaseobject); -- gNetscapeFuncs.invoke = HOST_TO_PLUGIN_GLUE(invoke, nsTable->invoke); -- gNetscapeFuncs.invokeDefault = HOST_TO_PLUGIN_GLUE(invokeDefault, nsTable->invokeDefault); -- gNetscapeFuncs.evaluate = HOST_TO_PLUGIN_GLUE(evaluate, nsTable->evaluate); -- gNetscapeFuncs.getproperty = HOST_TO_PLUGIN_GLUE(getproperty, nsTable->getproperty); -- gNetscapeFuncs.setproperty = HOST_TO_PLUGIN_GLUE(setproperty, nsTable->setproperty); -- gNetscapeFuncs.removeproperty = HOST_TO_PLUGIN_GLUE(removeproperty, nsTable->removeproperty); -- gNetscapeFuncs.hasproperty = HOST_TO_PLUGIN_GLUE(hasproperty, nsTable->hasproperty); -- gNetscapeFuncs.hasmethod = HOST_TO_PLUGIN_GLUE(hasmethod, nsTable->hasmethod); -- gNetscapeFuncs.releasevariantvalue = HOST_TO_PLUGIN_GLUE(releasevariantvalue, nsTable->releasevariantvalue); -- gNetscapeFuncs.setexception = HOST_TO_PLUGIN_GLUE(setexception, nsTable->setexception); -+ gNetscapeFuncs.getstringidentifier = (NPN_GetStringIdentifierUPP)HOST_TO_PLUGIN_GLUE(getstringidentifier, nsTable->getstringidentifier); -+ gNetscapeFuncs.getstringidentifiers = (NPN_GetStringIdentifiersUPP)HOST_TO_PLUGIN_GLUE(getstringidentifiers, nsTable->getstringidentifiers); -+ gNetscapeFuncs.getintidentifier = (NPN_GetIntIdentifierUPP)HOST_TO_PLUGIN_GLUE(getintidentifier, nsTable->getintidentifier); -+ gNetscapeFuncs.identifierisstring = (NPN_IdentifierIsStringUPP)HOST_TO_PLUGIN_GLUE(identifierisstring, nsTable->identifierisstring); -+ gNetscapeFuncs.utf8fromidentifier = (NPN_UTF8FromIdentifierUPP)HOST_TO_PLUGIN_GLUE(utf8fromidentifier, nsTable->utf8fromidentifier); -+ gNetscapeFuncs.intfromidentifier = (NPN_IntFromIdentifierUPP)HOST_TO_PLUGIN_GLUE(intfromidentifier, nsTable->intfromidentifier); -+ gNetscapeFuncs.createobject = (NPN_CreateObjectUPP)HOST_TO_PLUGIN_GLUE(createobject, nsTable->createobject); -+ gNetscapeFuncs.retainobject = (NPN_RetainObjectUPP)HOST_TO_PLUGIN_GLUE(retainobject, nsTable->retainobject); -+ gNetscapeFuncs.releaseobject = (NPN_ReleaseObjectUPP)HOST_TO_PLUGIN_GLUE(releaseobject, nsTable->releaseobject); -+ gNetscapeFuncs.invoke = (NPN_InvokeUPP)HOST_TO_PLUGIN_GLUE(invoke, nsTable->invoke); -+ gNetscapeFuncs.invokeDefault = (NPN_InvokeDefaultUPP)HOST_TO_PLUGIN_GLUE(invokeDefault, nsTable->invokeDefault); -+ gNetscapeFuncs.evaluate = (NPN_EvaluateUPP)HOST_TO_PLUGIN_GLUE(evaluate, nsTable->evaluate); -+ gNetscapeFuncs.getproperty = (NPN_GetPropertyUPP)HOST_TO_PLUGIN_GLUE(getproperty, nsTable->getproperty); -+ gNetscapeFuncs.setproperty = (NPN_SetPropertyUPP)HOST_TO_PLUGIN_GLUE(setproperty, nsTable->setproperty); -+ gNetscapeFuncs.removeproperty = (NPN_RemovePropertyUPP)HOST_TO_PLUGIN_GLUE(removeproperty, nsTable->removeproperty); -+ gNetscapeFuncs.hasproperty = (NPN_HasPropertyUPP)HOST_TO_PLUGIN_GLUE(hasproperty, nsTable->hasproperty); -+ gNetscapeFuncs.hasmethod = (NPN_HasMethodUPP)HOST_TO_PLUGIN_GLUE(hasmethod, nsTable->hasmethod); -+ gNetscapeFuncs.releasevariantvalue = (NPN_ReleaseVariantValueUPP)HOST_TO_PLUGIN_GLUE(releasevariantvalue, nsTable->releasevariantvalue); -+ gNetscapeFuncs.setexception = (NPN_SetExceptionUPP)HOST_TO_PLUGIN_GLUE(setexception, nsTable->setexception); - } - - // -Index: debian.git/projects/mozilla/support/npunix.c -=================================================================== ---- debian.git.orig/projects/mozilla/support/npunix.c 2010-04-13 02:22:27.000000000 +0200 -+++ debian.git/projects/mozilla/support/npunix.c 2010-06-23 00:47:04.684226299 +0200 -@@ -46,12 +46,13 @@ - #include "config.h" - - #define XP_UNIX 1 -+#define OJI 1 - - #include --#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20) --#include "npupp.h" -+#ifdef HAVE_NPFUNCTIONS_H -+#include - #else --#include "npfunctions.h" -+#include - #endif - - #include "../vlcshell.h" -Index: debian.git/projects/mozilla/support/npwin.cpp -=================================================================== ---- debian.git.orig/projects/mozilla/support/npwin.cpp 2010-04-27 23:45:07.000000000 +0200 -+++ debian.git/projects/mozilla/support/npwin.cpp 2010-06-23 00:47:04.684226299 +0200 -@@ -30,15 +30,19 @@ - - //#define OJI 1 - --#include "../vlcplugin.h" -+#ifdef HAVE_MOZILLA_CONFIG_H -+# include -+#endif - - #ifndef _NPAPI_H_ - # include "npapi.h" - #endif --#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20) --#include "npupp.h" -+#ifdef HAVE_NPFUNCTIONS_H -+# include "npfunctions.h" - #else --#include "npfunctions.h" -+# ifndef _NPUPP_H_ -+# include "npupp.h" -+# endif - #endif - - #include "../vlcshell.h" -@@ -542,7 +546,7 @@ - /* allocates memory from the Navigator's memory space. Necessary so that - * saved instance data may be freed by Navigator when exiting. - */ --void *NPN_MemAlloc(uint32_t size) -+void *NPN_MemAlloc(uint32 size) - { - return g_pNavigatorFuncs->memalloc(size); - } -Index: debian.git/projects/mozilla/vlcplugin.cpp -=================================================================== ---- debian.git.orig/projects/mozilla/vlcplugin.cpp 2010-06-08 00:57:45.000000000 +0200 -+++ debian.git/projects/mozilla/vlcplugin.cpp 2010-06-23 00:47:04.684226299 +0200 -@@ -28,11 +28,14 @@ - *****************************************************************************/ - #include "config.h" - -+#ifdef HAVE_MOZILLA_CONFIG_H -+# include -+#endif -+ - #include "vlcplugin.h" - #include "control/npolibvlc.h" - - #include -- - #if defined(XP_UNIX) - # include - #elif defined(XP_WIN) -@@ -43,8 +46,6 @@ - #endif - - #include --#include --#include - - /***************************************************************************** - * utilitiy functions -@@ -104,11 +105,7 @@ - /***************************************************************************** - * VlcPlugin constructor and destructor - *****************************************************************************/ --#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20) - VlcPlugin::VlcPlugin( NPP instance, uint16 mode ) : --#else --VlcPlugin::VlcPlugin( NPP instance, uint16_t mode ) : --#endif - i_npmode(mode), - b_stream(0), - b_autoplay(1), -@@ -233,7 +230,7 @@ - - bool EventObj::insert(const NPString &s, NPObject *l, bool b) - { -- event_t e = find_event(s.UTF8Characters); -+ event_t e = find_event(s.utf8characters); - if( e>=maxbit() ) - return false; - -@@ -258,7 +255,7 @@ - - bool EventObj::remove(const NPString &s, NPObject *l, bool b) - { -- event_t e = find_event(s.UTF8Characters); -+ event_t e = find_event(s.utf8characters); - if( e>=maxbit() || !get(e) ) - return false; - -@@ -453,8 +450,8 @@ - NPString script; - NPVariant result; - -- script.UTF8Characters = docLocHref; -- script.UTF8Length = sizeof(docLocHref)-1; -+ script.utf8characters = docLocHref; -+ script.utf8length = sizeof(docLocHref)-1; - - if( NPN_Evaluate(p_browser, plugin, &script, &result) ) - { -@@ -462,11 +459,11 @@ - { - NPString &location = NPVARIANT_TO_STRING(result); - -- psz_baseURL = (char *) malloc(location.UTF8Length+1); -+ psz_baseURL = (char *) malloc(location.utf8length+1); - if( psz_baseURL ) - { -- strncpy(psz_baseURL, location.UTF8Characters, location.UTF8Length); -- psz_baseURL[location.UTF8Length] = '\0'; -+ strncpy(psz_baseURL, location.utf8characters, location.utf8length); -+ psz_baseURL[location.utf8length] = '\0'; - } - } - NPN_ReleaseVariantValue(&result); -Index: debian.git/projects/mozilla/vlcplugin.h -=================================================================== ---- debian.git.orig/projects/mozilla/vlcplugin.h 2010-05-20 18:25:11.000000000 +0200 -+++ debian.git/projects/mozilla/vlcplugin.h 2010-06-23 00:47:04.684226299 +0200 -@@ -30,16 +30,10 @@ - #define __VLCPLUGIN_H__ - - #include -+#include -+#include - --// Setup XP_MACOSX, XP_UNIX, XP_WIN --#if defined(_WIN32) --#define XP_WIN 1 --#elif defined(__APPLE__) --#define XP_MACOSX 1 --#else --#define XP_UNIX 1 --#define MOZ_X11 1 --#endif -+#include "control/nporuntime.h" - - #if !defined(XP_MACOSX) && !defined(XP_UNIX) && !defined(XP_WIN) - #define XP_UNIX 1 -@@ -49,7 +43,6 @@ - - #ifdef XP_WIN - /* Windows stuff */ --# include - # include - #endif - -@@ -78,12 +71,6 @@ - # define __MIN(a, b) ( ((a) < (b)) ? (a) : (b) ) - #endif - --#include --#include -- --#include "control/nporuntime.h" -- -- - typedef struct { - #if defined(XP_UNIX) - pthread_mutex_t mutex; -@@ -186,11 +173,7 @@ - class VlcPlugin - { - public: --#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20) - VlcPlugin( NPP, uint16 ); --#else -- VlcPlugin( NPP, uint16_t ); --#endif - virtual ~VlcPlugin(); - - NPError init(int argc, char* const argn[], char* const argv[]); -@@ -243,11 +226,7 @@ - vlc_toolbar_clicked_t getToolbarButtonClicked( int i_xpos, int i_ypos ); - #endif - --#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20) - uint16 i_npmode; /* either NP_EMBED or NP_FULL */ --#else -- uint16_t i_npmode; /* either NP_EMBED or NP_FULL */ --#endif - - /* plugin properties */ - int b_stream; -Index: debian.git/projects/mozilla/vlcshell.cpp -=================================================================== ---- debian.git.orig/projects/mozilla/vlcshell.cpp 2010-05-03 11:26:24.000000000 +0200 -+++ debian.git/projects/mozilla/vlcshell.cpp 2010-06-23 00:47:04.684226299 +0200 -@@ -31,6 +31,11 @@ - #include - #include - -+/* Mozilla stuff */ -+#ifdef HAVE_MOZILLA_CONFIG_H -+# include -+#endif -+ - /* This is from mozilla java, do we really need it? */ - #if 0 - #include -@@ -269,24 +274,17 @@ - return NPERR_NO_ERROR; - } - --#ifdef OJI - jref NPP_GetJavaClass( void ) - { - return NULL; - } --#endif - - void NPP_Shutdown( void ) - { - ; - } - --NPError NPP_New( NPMIMEType pluginType, NPP instance, --#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20) -- uint16 mode, int16 argc, --#else -- uint16_t mode, int16_t argc, --#endif -+NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc, - char* argn[], char* argv[], NPSavedData* saved ) - { - NPError status; -@@ -557,11 +555,7 @@ - } - - NPError NPP_NewStream( NPP instance, NPMIMEType type, NPStream *stream, --#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20) - NPBool seekable, uint16 *stype ) --#else -- NPBool seekable, uint16_t *stype ) --#endif - { - if( NULL == instance ) - { -@@ -590,23 +584,14 @@ - return NPERR_GENERIC_ERROR; - } - --#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20) - int32 NPP_WriteReady( NPP instance, NPStream *stream ) --#else --int32_t NPP_WriteReady( NPP instance, NPStream *stream ) --#endif - { - /* TODO */ - return 8*1024; - } - --#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20) - int32 NPP_Write( NPP instance, NPStream *stream, int32 offset, - int32 len, void *buffer ) --#else --int32_t NPP_Write( NPP instance, NPStream *stream, int32_t offset, -- int32_t len, void *buffer ) --#endif - { - /* TODO */ - return len; -Index: debian.git/projects/mozilla/vlcshell.h -=================================================================== ---- debian.git.orig/projects/mozilla/vlcshell.h 2010-04-27 23:44:27.000000000 +0200 -+++ debian.git/projects/mozilla/vlcshell.h 2010-06-23 00:47:04.684226299 +0200 -@@ -27,20 +27,11 @@ - char * NPP_GetMIMEDescription( void ); - - NPError NPP_Initialize( void ); -- --#ifdef OJI - jref NPP_GetJavaClass( void ); --#endif - void NPP_Shutdown( void ); - --#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20) - NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc, - char* argn[], char* argv[], NPSavedData* saved ); --#else --NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc, -- char* argn[], char* argv[], NPSavedData* saved ); --#endif -- - NPError NPP_Destroy( NPP instance, NPSavedData** save ); - - NPError NPP_GetValue( NPP instance, NPPVariable variable, void *value ); -@@ -49,34 +40,20 @@ - NPError NPP_SetWindow( NPP instance, NPWindow* window ); - - NPError NPP_NewStream( NPP instance, NPMIMEType type, NPStream *stream, --#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20) - NPBool seekable, uint16 *stype ); --#else -- NPBool seekable, uint16_t *stype ); --#endif - NPError NPP_DestroyStream( NPP instance, NPStream *stream, NPError reason ); - void NPP_StreamAsFile( NPP instance, NPStream *stream, const char* fname ); - --#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20) - int32 NPP_WriteReady( NPP instance, NPStream *stream ); - int32 NPP_Write( NPP instance, NPStream *stream, int32 offset, - int32 len, void *buffer ); --#else --int32_t NPP_WriteReady( NPP instance, NPStream *stream ); --int32_t NPP_Write( NPP instance, NPStream *stream, int32_t offset, -- int32_t len, void *buffer ); --#endif - - void NPP_URLNotify( NPP instance, const char* url, - NPReason reason, void* notifyData ); - void NPP_Print( NPP instance, NPPrint* printInfo ); - - #ifdef XP_MACOSX --#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20) - int16 NPP_HandleEvent( NPP instance, void * event ); --#else --int16_t NPP_HandleEvent( NPP instance, void * event ); --#endif - #endif - - #endif diff -Nru vlc-1.1.0/debian/patches/series vlc-1.1.0/debian/patches/series --- vlc-1.1.0/debian/patches/series 2010-07-11 03:56:12.000000000 +0200 +++ vlc-1.1.0/debian/patches/series 2010-07-13 19:32:03.000000000 +0200 @@ -3,6 +3,5 @@ 104_notify.diff 200_osdmenu_paths.diff 501_decrease_alsa_buffer.diff -502_xulrunner_191.diff 503_mpeg2_arm.diff 504_fix_kfreebsd_ftbfs_access_file_module.diff diff -Nru vlc-1.1.0/debian/rules vlc-1.1.0/debian/rules --- vlc-1.1.0/debian/rules 2010-07-11 03:56:12.000000000 +0200 +++ vlc-1.1.0/debian/rules 2010-07-13 19:32:02.000000000 +0200 @@ -93,6 +93,7 @@ --enable-vcd \ --enable-vcdx \ --enable-vorbis \ + --enable-x264 \ --enable-zvbi \ --with-kde-solid=/usr/share/kde4/apps/ \ --with-mozilla-pkg=libxul \ @@ -107,7 +108,6 @@ # projectm -> broken # sqlite -> still in development # telx -> incompatible with zvbi -# x264 -> not in Debian confflags += \ --disable-dxva2 \ --disable-gnomevfs \ @@ -118,7 +118,6 @@ --disable-projectm \ --disable-sqlite \ --disable-telx \ - --disable-x264 \ $(NULL) # Linux specific flags diff -Nru vlc-1.1.0/debian/source_vlc.py vlc-1.1.0/debian/source_vlc.py --- vlc-1.1.0/debian/source_vlc.py 1970-01-01 01:00:00.000000000 +0100 +++ vlc-1.1.0/debian/source_vlc.py 2010-07-08 11:16:16.000000000 +0200 @@ -0,0 +1,29 @@ +'''apport package hook for vlc + +(c) 2010 Canonical Ltd. +Author: Brian Murray +''' + +def add_info(report): + attach_related_packages(report, [ + "libaa1", + "libgl1-mesa-glx", + "libgl1", + "libglib2.0-0", + "libgtk2.0-0", + "libnotify1", + "libnotify1-gtk2.10", + "libqtcore4", + "libqtgui4", + "libsdl-image1.2", + "libsdl1.2debian", + "libtar", + "libx11-6", + "libx264-85", + "libxcb-keysyms1", + "libxcb1", + "libxext6", + "libxinerama1", + "libxv1", + "libxxf86vm1", + ] ) diff -Nru vlc-1.1.0/debian/vlc-nox.install vlc-1.1.0/debian/vlc-nox.install --- vlc-1.1.0/debian/vlc-nox.install 2010-07-11 03:56:12.000000000 +0200 +++ vlc-1.1.0/debian/vlc-nox.install 2010-07-13 19:32:02.000000000 +0200 @@ -72,6 +72,7 @@ usr/lib/vlc/plugins/codec/libtheora_plugin.so usr/lib/vlc/plugins/codec/libtwolame_plugin.so usr/lib/vlc/plugins/codec/libvorbis_plugin.so +usr/lib/vlc/plugins/codec/libx264_plugin.so usr/lib/vlc/plugins/control/libdbus_plugin.so usr/lib/vlc/plugins/control/libgestures_plugin.so usr/lib/vlc/plugins/control/libhotkeys_plugin.so @@ -161,3 +162,4 @@ usr/lib/vlc/plugins/visualization/libvisual_plugin.so usr/lib/vlc/vlc-cache-gen usr/share/man +debian/source_vlc.py usr/share/apport/package-hooks/