Disable inhibit and screensaver plugins since they cause problems
when the dbus daemon is running Fix Help->About->Thanks dialog Unbreak after xulrunner update (patches adapted from archlinux) OK ajacoutot@, landry@
This commit is contained in:
dcoppa
parent
d4b8541828
commit
d0a569e14d
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.90 2010/05/16 08:37:48 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.91 2010/06/17 07:42:16 dcoppa Exp $
|
||||
|
||||
SHARED_ONLY= Yes
|
||||
|
||||
@ -6,7 +6,7 @@ COMMENT-main= VideoLAN client; multimedia player
|
||||
|
||||
V= 1.0.6
|
||||
DISTNAME= vlc-${V}
|
||||
PKGNAME-main= ${DISTNAME}p1
|
||||
PKGNAME-main= ${DISTNAME}p2
|
||||
CATEGORIES= x11
|
||||
MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${V}/
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
@ -47,8 +47,10 @@ LIB_DEPENDS-main=${LIB_DEPENDS} \
|
||||
x264::multimedia/x264 \
|
||||
schroedinger-1.0::multimedia/schroedinger \
|
||||
dvbpsi.>=3::graphics/libdvbpsi \
|
||||
gsm.>=1.0::audio/gsm \
|
||||
speex::audio/speex \
|
||||
tag::audio/taglib \
|
||||
vorbis.>=6,vorbisenc.>=2::audio/libvorbis \
|
||||
dca::audio/libdca \
|
||||
proxy::net/libproxy \
|
||||
notify::devel/libnotify
|
||||
@ -60,8 +62,8 @@ WANTLIB-main= GL GLU ICE SM SDL X11 Xau Xcomposite Xcursor Xdamage Xdmcp \
|
||||
gdk_pixbuf-2.0 gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 \
|
||||
gthread-2.0 gtk-x11-2.0 jpeg m mp3lame oil-0.3 ogg pango-1.0 \
|
||||
pangocairo-1.0 pangoft2-1.0 pcre pixman-1 pthread-stubs pthread \
|
||||
stdc++.>=46.0 sndio tiff usbhid vorbis vorbisenc xcb-keysyms \
|
||||
xcb-render xcb-render-util xcb z
|
||||
stdc++.>=46.0 sndio tiff usbhid xcb-keysyms xcb-render \
|
||||
xcb-render-util xcb z
|
||||
|
||||
USE_X11= Yes
|
||||
USE_GMAKE= Yes
|
||||
@ -116,17 +118,23 @@ FLAVOR?=
|
||||
.if !${FLAVOR:L:Mno_web}
|
||||
MULTI_PACKAGES+=-web
|
||||
COMMENT-web= Mozilla plugin for embedded media playback
|
||||
PKGNAME-web= vlc-web-${V}
|
||||
BUILD_DEPENDS+= :xulrunner-devel->=1.8,<1.9:devel/xulrunner/1.8,-devel
|
||||
CONFIGURE_ARGS+=--enable-mozilla
|
||||
CONFIGURE_ENV+= MOZILLA_CONFIG="${LOCALBASE}/bin/xulrunner-config" \
|
||||
with_mozilla_pkg="xulrunner-plugin"
|
||||
PORTPATH= ${WRKDIR}/bin:/usr/bin:/bin:/usr/sbin:/sbin:${DEPBASE}/bin:${LOCALBASE}/bin:${X11BASE}/bin:${LOCALBASE}/xulrunner
|
||||
PKGNAME-web= vlc-web-${V}p0
|
||||
BUILD_DEPENDS+= :xulrunner-devel->=1.9:devel/xulrunner/1.9,-devel
|
||||
CONFIGURE_ARGS+=--enable-mozilla --with-mozilla-sdk-path=${LOCALBASE}/xulrunner1.9
|
||||
CONFIGURE_ENV+= CPPFLAGS="-I${WRKSRC}/include -I${X11BASE}/include -I${LOCALBASE}/include \
|
||||
-I${LOCALBASE}/include/libpng \
|
||||
-I${LOCALBASE}/include/nspr \
|
||||
-I${LOCALBASE}/xulrunner1.9/include -DOPENBSD" \
|
||||
with_mozilla_pkg="libxul" \
|
||||
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \
|
||||
PKG_CONFIG_PATH="${LOCALBASE}/lib/qt4/pkgconfig" \
|
||||
LOCALBASE=${LOCALBASE}
|
||||
PORTPATH= ${WRKDIR}/bin:/usr/bin:/bin:/usr/sbin:/sbin:${DEPBASE}/bin:${LOCALBASE}/bin:${X11BASE}/bin:${LOCALBASE}/xulrunner1.9
|
||||
LIB_DEPENDS-web=${LIB_DEPENDS} \
|
||||
vlc,vlccore::${BASE_PKGPATH} \
|
||||
nspr4,plc4,plds4::devel/nspr
|
||||
RUN_DEPENDS-web=::${BUILD_PKGPATH}
|
||||
WANTLIB-web= ICE SM X11 Xau Xdmcp Xt Xpm m pthread-stubs xcb
|
||||
WANTLIB-web= ICE SM X11 Xau Xdmcp Xt Xpm m pthread-stubs stdc++.>=46.0 xcb
|
||||
.endif
|
||||
|
||||
.if !${FLAVOR:L:Mno_jack}
|
||||
@ -156,6 +164,9 @@ PKG_ARGS+=-Di386=1
|
||||
PKG_ARGS+=-Di386=0
|
||||
.endif
|
||||
|
||||
pre-configure:
|
||||
${SUBST_CMD} ${WRKSRC}/configure.ac
|
||||
|
||||
post-install:
|
||||
.for _img in 16x16 32x32 48x48 128x128
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/icons/hicolor/${_img}/apps
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-configure_ac,v 1.16 2010/05/09 00:16:26 sthen Exp $
|
||||
--- configure.ac.orig Sun Apr 18 09:03:54 2010
|
||||
+++ configure.ac Wed May 5 18:37:05 2010
|
||||
$OpenBSD: patch-configure_ac,v 1.17 2010/06/17 07:42:16 dcoppa Exp $
|
||||
--- configure.ac.orig Sun Apr 18 15:03:54 2010
|
||||
+++ configure.ac Sun Jun 13 11:21:06 2010
|
||||
@@ -826,6 +826,9 @@ if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"
|
||||
dnl Check for pthreads - borrowed from XMMS
|
||||
THREAD_LIB=error
|
||||
@ -38,3 +38,12 @@ $OpenBSD: patch-configure_ac,v 1.16 2010/05/09 00:16:26 sthen Exp $
|
||||
LDFLAGS="${LDFLAGS_save}"
|
||||
])
|
||||
fi
|
||||
@@ -5746,7 +5749,7 @@ then
|
||||
PLUGINS_BINDINGS="${PLUGINS_BINDINGS} mozilla"
|
||||
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])
|
||||
+ 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 ${LOCALBASE}/xulrunner1.9/libxpcomglue.a -L${X11BASE}/lib -lXt -lX11 -lSM -lICE -lXpm])
|
||||
if test "${SYS}" = "mingw32"; then
|
||||
dnl latest gecko sdk does not have embedstring
|
||||
if test -d "${real_mozilla_sdk}/embedstring/bin"
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-projects_mozilla_Makefile_in,v 1.1 2010/05/05 08:43:35 edd Exp $
|
||||
--- projects/mozilla/Makefile.in.orig Sun Jan 24 16:28:52 2010
|
||||
+++ projects/mozilla/Makefile.in Sun Jan 31 22:17:13 2010
|
||||
@@ -801,7 +801,7 @@ DIST_sources = $(SOURCES_mozilla_common) \
|
||||
@BUILD_MOZILLA_TRUE@@HAVE_DARWIN_TRUE@@HAVE_WIN32_FALSE@noinst_DATA = npvlc.rsrc VLC\ Plugin.plugin
|
||||
@BUILD_MOZILLA_TRUE@@HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@npvlc_LTLIBRARIES = libvlcplugin.la
|
||||
@BUILD_MOZILLA_TRUE@@HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@npvlc = libvlcplugin$(LIBEXT)
|
||||
-@BUILD_MOZILLA_TRUE@@HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@npvlcdir = $(libdir)/mozilla/plugins
|
||||
+@BUILD_MOZILLA_TRUE@@HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@npvlcdir = $(libdir)/mozilla-plugins
|
||||
@BUILD_MOZILLA_TRUE@@HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@libvlcplugin_la_SOURCES = $(SOURCES_mozilla_common) $(SOURCES_support)
|
||||
@BUILD_MOZILLA_TRUE@@HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@libvlcplugin_la_CFLAGS = `$(VLC_CONFIG) --cflags mozilla` $(CPPFLAGS_mozilla_EXTRA)
|
||||
@BUILD_MOZILLA_TRUE@@HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@libvlcplugin_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags mozilla` $(CPPFLAGS_mozilla_EXTRA)
|
||||
21
x11/vlc/patches/patch-projects_mozilla_control_npolibvlc_cpp
Normal file
21
x11/vlc/patches/patch-projects_mozilla_control_npolibvlc_cpp
Normal file
@ -0,0 +1,21 @@
|
||||
$OpenBSD: patch-projects_mozilla_control_npolibvlc_cpp,v 1.1 2010/06/17 07:42:16 dcoppa Exp $
|
||||
--- projects/mozilla/control/npolibvlc.cpp.orig Sun Mar 7 19:38:03 2010
|
||||
+++ projects/mozilla/control/npolibvlc.cpp Sat Jun 12 22:45:02 2010
|
||||
@@ -949,7 +949,7 @@ LibvlcPlaylistNPObject::invoke(int index, const NPVari
|
||||
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;
|
||||
@@ -961,7 +961,7 @@ void LibvlcPlaylistNPObject::parseOptions(const NPStri
|
||||
{
|
||||
int nOptions = 0;
|
||||
|
||||
- char *end = val + nps.utf8length;
|
||||
+ char *end = val + nps.UTF8Length;
|
||||
while( val < end )
|
||||
{
|
||||
// skip leading blanks
|
||||
@ -0,0 +1,18 @@
|
||||
$OpenBSD: patch-projects_mozilla_control_nporuntime_cpp,v 1.1 2010/06/17 07:42:16 dcoppa Exp $
|
||||
--- projects/mozilla/control/nporuntime.cpp.orig Sun Mar 7 19:38:03 2010
|
||||
+++ projects/mozilla/control/nporuntime.cpp Sat Jun 12 22:45:02 2010
|
||||
@@ -37,11 +37,11 @@
|
||||
|
||||
char* RuntimeNPObject::stringValue(const NPString &s)
|
||||
{
|
||||
- NPUTF8 *val = static_cast<NPUTF8*>(malloc((s.utf8length+1) * sizeof(*val)));
|
||||
+ NPUTF8 *val = static_cast<NPUTF8*>(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;
|
||||
}
|
||||
885
x11/vlc/patches/patch-projects_mozilla_support_npunix_c
Normal file
885
x11/vlc/patches/patch-projects_mozilla_support_npunix_c
Normal file
@ -0,0 +1,885 @@
|
||||
$OpenBSD: patch-projects_mozilla_support_npunix_c,v 1.1 2010/06/17 07:42:16 dcoppa Exp $
|
||||
--- projects/mozilla/support/npunix.c.orig Sun Mar 7 19:38:03 2010
|
||||
+++ projects/mozilla/support/npunix.c Sat Jun 12 23:34:44 2010
|
||||
@@ -1,22 +1,18 @@
|
||||
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
|
||||
*
|
||||
- * Mozilla/Firefox plugin for VLC
|
||||
- * Copyright (C) 2009, Jean-Paul Saman <jpsaman@videolan.org>
|
||||
+ * ***** BEGIN LICENSE BLOCK *****
|
||||
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
*
|
||||
- * This library is free software; you can redistribute it and/or
|
||||
- * modify it under the terms of the GNU Lesser General Public
|
||||
- * License as published by the Free Software Foundation; either
|
||||
- * version 2.1 of the License, or (at your option) any later version.
|
||||
+ * The contents of this file are subject to the Mozilla Public License Version
|
||||
+ * 1.1 (the "License"); you may not use this file except in compliance with
|
||||
+ * the License. You may obtain a copy of the License at
|
||||
+ * http://www.mozilla.org/MPL/
|
||||
*
|
||||
- * This library is distributed in the hope that it will be useful,
|
||||
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
- * Lesser General Public License for more details.
|
||||
+ * Software distributed under the License is distributed on an "AS IS" basis,
|
||||
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
+ * for the specific language governing rights and limitations under the
|
||||
+ * License.
|
||||
*
|
||||
- * You should have received a copy of the GNU Lesser General Public
|
||||
- * License along with this library; if not, write to the Free Software
|
||||
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
- *
|
||||
* The Original Code is mozilla.org code.
|
||||
*
|
||||
* The Initial Developer of the Original Code is
|
||||
@@ -27,7 +23,19 @@
|
||||
* Contributor(s):
|
||||
* Stephen Mak <smak@sun.com>
|
||||
*
|
||||
- */
|
||||
+ * Alternatively, the contents of this file may be used under the terms of
|
||||
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
|
||||
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
+ * in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
+ * of those above. If you wish to allow use of your version of this file only
|
||||
+ * under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
+ * use your version of this file under the terms of the MPL, indicate your
|
||||
+ * decision by deleting the provisions above and replace them with the notice
|
||||
+ * and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
+ * the provisions above, a recipient may use your version of this file under
|
||||
+ * the terms of any one of the MPL, the GPL or the LGPL.
|
||||
+ *
|
||||
+ * ***** END LICENSE BLOCK ***** */
|
||||
|
||||
/*
|
||||
* npunix.c
|
||||
@@ -43,20 +51,12 @@
|
||||
*----------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
-#include "config.h"
|
||||
-
|
||||
#define XP_UNIX 1
|
||||
-#define OJI 1
|
||||
|
||||
-#include <npapi.h>
|
||||
-#ifdef HAVE_NPFUNCTIONS_H
|
||||
-#include <npfunctions.h>
|
||||
-#else
|
||||
-#include <npupp.h>
|
||||
-#endif
|
||||
+#include <stdio.h>
|
||||
+#include "npapi.h"
|
||||
+#include "npfunctions.h"
|
||||
|
||||
-#include "../vlcshell.h"
|
||||
-
|
||||
/*
|
||||
* Define PLUGIN_TRACE to have the wrapper functions print
|
||||
* messages to stderr whenever they are called.
|
||||
@@ -103,500 +103,226 @@ NPN_Version(int* plugin_major, int* plugin_minor,
|
||||
NPError
|
||||
NPN_GetValue(NPP instance, NPNVariable variable, void *r_value)
|
||||
{
|
||||
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
|
||||
- return CallNPN_GetValueProc(gNetscapeFuncs.getvalue,
|
||||
- instance, variable, r_value);
|
||||
-#else
|
||||
return (*gNetscapeFuncs.getvalue)(instance, variable, r_value);
|
||||
-#endif
|
||||
}
|
||||
|
||||
NPError
|
||||
NPN_SetValue(NPP instance, NPPVariable variable, void *value)
|
||||
{
|
||||
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
|
||||
- return CallNPN_SetValueProc(gNetscapeFuncs.setvalue,
|
||||
- instance, variable, value);
|
||||
-#else
|
||||
return (*gNetscapeFuncs.setvalue)(instance, variable, value);
|
||||
-#endif
|
||||
}
|
||||
|
||||
NPError
|
||||
NPN_GetURL(NPP instance, const char* url, const char* window)
|
||||
{
|
||||
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
|
||||
- return CallNPN_GetURLProc(gNetscapeFuncs.geturl, instance, url, window);
|
||||
-#else
|
||||
return (*gNetscapeFuncs.geturl)(instance, url, window);
|
||||
-#endif
|
||||
}
|
||||
|
||||
NPError
|
||||
NPN_GetURLNotify(NPP instance, const char* url, const char* window, void* notifyData)
|
||||
{
|
||||
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
|
||||
- return CallNPN_GetURLNotifyProc(gNetscapeFuncs.geturlnotify, instance, url, window, notifyData);
|
||||
-#else
|
||||
return (*gNetscapeFuncs.geturlnotify)(instance, url, window, notifyData);
|
||||
-#endif
|
||||
}
|
||||
|
||||
NPError
|
||||
NPN_PostURL(NPP instance, const char* url, const char* window,
|
||||
uint32_t len, const char* buf, NPBool file)
|
||||
{
|
||||
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
|
||||
- return CallNPN_PostURLProc(gNetscapeFuncs.posturl, instance,
|
||||
- url, window, len, buf, file);
|
||||
-#else
|
||||
return (*gNetscapeFuncs.posturl)(instance, url, window, len, buf, file);
|
||||
-#endif
|
||||
}
|
||||
|
||||
NPError
|
||||
NPN_PostURLNotify(NPP instance, const char* url, const char* window, uint32_t len,
|
||||
const char* buf, NPBool file, void* notifyData)
|
||||
{
|
||||
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
|
||||
- return CallNPN_PostURLNotifyProc(gNetscapeFuncs.posturlnotify,
|
||||
- instance, url, window, len, buf, file, notifyData);
|
||||
-#else
|
||||
return (*gNetscapeFuncs.posturlnotify)(instance, url, window, len, buf, file, notifyData);
|
||||
-
|
||||
-#endif
|
||||
}
|
||||
|
||||
NPError
|
||||
NPN_RequestRead(NPStream* stream, NPByteRange* rangeList)
|
||||
{
|
||||
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
|
||||
- return CallNPN_RequestReadProc(gNetscapeFuncs.requestread,
|
||||
- stream, rangeList);
|
||||
-#else
|
||||
return (*gNetscapeFuncs.requestread)(stream, rangeList);
|
||||
-#endif
|
||||
}
|
||||
|
||||
NPError
|
||||
NPN_NewStream(NPP instance, NPMIMEType type, const char *window,
|
||||
NPStream** stream_ptr)
|
||||
{
|
||||
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
|
||||
- return CallNPN_NewStreamProc(gNetscapeFuncs.newstream, instance,
|
||||
- type, window, stream_ptr);
|
||||
-#else
|
||||
return (*gNetscapeFuncs.newstream)(instance, type, window, stream_ptr);
|
||||
-#endif
|
||||
}
|
||||
|
||||
int32_t
|
||||
NPN_Write(NPP instance, NPStream* stream, int32_t len, void* buffer)
|
||||
{
|
||||
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
|
||||
- return CallNPN_WriteProc(gNetscapeFuncs.write, instance,
|
||||
- stream, len, buffer);
|
||||
-#else
|
||||
return (*gNetscapeFuncs.write)(instance, stream, len, buffer);
|
||||
-#endif
|
||||
}
|
||||
|
||||
NPError
|
||||
NPN_DestroyStream(NPP instance, NPStream* stream, NPError reason)
|
||||
{
|
||||
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
|
||||
- return CallNPN_DestroyStreamProc(gNetscapeFuncs.destroystream,
|
||||
- instance, stream, reason);
|
||||
-#else
|
||||
return (*gNetscapeFuncs.destroystream)(instance, stream, reason);
|
||||
-#endif
|
||||
}
|
||||
|
||||
void
|
||||
NPN_Status(NPP instance, const char* message)
|
||||
{
|
||||
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
|
||||
- CallNPN_StatusProc(gNetscapeFuncs.status, instance, message);
|
||||
-#else
|
||||
(*gNetscapeFuncs.status)(instance, message);
|
||||
-#endif
|
||||
}
|
||||
|
||||
const char*
|
||||
NPN_UserAgent(NPP instance)
|
||||
{
|
||||
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
|
||||
- return CallNPN_UserAgentProc(gNetscapeFuncs.uagent, instance);
|
||||
-#else
|
||||
return (*gNetscapeFuncs.uagent)(instance);
|
||||
-#endif
|
||||
}
|
||||
|
||||
-void *NPN_MemAlloc(uint32_t size)
|
||||
+void*
|
||||
+NPN_MemAlloc(uint32_t size)
|
||||
{
|
||||
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
|
||||
- return CallNPN_MemAllocProc(gNetscapeFuncs.memalloc, size);
|
||||
-#else
|
||||
return (*gNetscapeFuncs.memalloc)(size);
|
||||
-#endif
|
||||
}
|
||||
|
||||
void NPN_MemFree(void* ptr)
|
||||
{
|
||||
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
|
||||
- CallNPN_MemFreeProc(gNetscapeFuncs.memfree, ptr);
|
||||
-#else
|
||||
(*gNetscapeFuncs.memfree)(ptr);
|
||||
-#endif
|
||||
}
|
||||
|
||||
uint32_t NPN_MemFlush(uint32_t size)
|
||||
{
|
||||
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
|
||||
- return CallNPN_MemFlushProc(gNetscapeFuncs.memflush, size);
|
||||
-#else
|
||||
return (*gNetscapeFuncs.memflush)(size);
|
||||
-#endif
|
||||
}
|
||||
|
||||
void NPN_ReloadPlugins(NPBool reloadPages)
|
||||
{
|
||||
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
|
||||
- CallNPN_ReloadPluginsProc(gNetscapeFuncs.reloadplugins, reloadPages);
|
||||
-#else
|
||||
(*gNetscapeFuncs.reloadplugins)(reloadPages);
|
||||
-#endif
|
||||
}
|
||||
|
||||
-#ifdef OJI
|
||||
-JRIEnv* NPN_GetJavaEnv()
|
||||
-{
|
||||
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
|
||||
- return CallNPN_GetJavaEnvProc(gNetscapeFuncs.getJavaEnv);
|
||||
-#else
|
||||
- return (*gNetscapeFuncs.getJavaEnv);
|
||||
-#endif
|
||||
-}
|
||||
-
|
||||
-jref NPN_GetJavaPeer(NPP instance)
|
||||
-{
|
||||
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
|
||||
- return CallNPN_GetJavaPeerProc(gNetscapeFuncs.getJavaPeer,
|
||||
- instance);
|
||||
-#else
|
||||
- return (*gNetscapeFuncs.getJavaPeer)(instance);
|
||||
-#endif
|
||||
-}
|
||||
-#endif
|
||||
-
|
||||
void
|
||||
NPN_InvalidateRect(NPP instance, NPRect *invalidRect)
|
||||
{
|
||||
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
|
||||
- CallNPN_InvalidateRectProc(gNetscapeFuncs.invalidaterect, instance,
|
||||
- invalidRect);
|
||||
-#else
|
||||
(*gNetscapeFuncs.invalidaterect)(instance, invalidRect);
|
||||
-#endif
|
||||
}
|
||||
|
||||
void
|
||||
NPN_InvalidateRegion(NPP instance, NPRegion invalidRegion)
|
||||
{
|
||||
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
|
||||
- CallNPN_InvalidateRegionProc(gNetscapeFuncs.invalidateregion, instance,
|
||||
- invalidRegion);
|
||||
-#else
|
||||
(*gNetscapeFuncs.invalidateregion)(instance, invalidRegion);
|
||||
-#endif
|
||||
}
|
||||
|
||||
void
|
||||
NPN_ForceRedraw(NPP instance)
|
||||
{
|
||||
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
|
||||
- CallNPN_ForceRedrawProc(gNetscapeFuncs.forceredraw, instance);
|
||||
-#else
|
||||
(*gNetscapeFuncs.forceredraw)(instance);
|
||||
-#endif
|
||||
}
|
||||
|
||||
void NPN_PushPopupsEnabledState(NPP instance, NPBool enabled)
|
||||
{
|
||||
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
|
||||
- CallNPN_PushPopupsEnabledStateProc(gNetscapeFuncs.pushpopupsenabledstate,
|
||||
- instance, enabled);
|
||||
-#else
|
||||
(*gNetscapeFuncs.pushpopupsenabledstate)(instance, enabled);
|
||||
-#endif
|
||||
}
|
||||
|
||||
void NPN_PopPopupsEnabledState(NPP instance)
|
||||
{
|
||||
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
|
||||
- CallNPN_PopPopupsEnabledStateProc(gNetscapeFuncs.poppopupsenabledstate,
|
||||
- instance);
|
||||
-#else
|
||||
(*gNetscapeFuncs.poppopupsenabledstate)(instance);
|
||||
-#endif
|
||||
}
|
||||
|
||||
NPIdentifier NPN_GetStringIdentifier(const NPUTF8 *name)
|
||||
{
|
||||
- int minor = gNetscapeFuncs.version & 0xFF;
|
||||
- if( minor >= 14 )
|
||||
- {
|
||||
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
|
||||
- return CallNPN_GetStringIdentifierProc(
|
||||
- gNetscapeFuncs.getstringidentifier, name);
|
||||
-#else
|
||||
- return (*gNetscapeFuncs.getstringidentifier)(name);
|
||||
-#endif
|
||||
- }
|
||||
- return NULL;
|
||||
+ return (*gNetscapeFuncs.getstringidentifier)(name);
|
||||
}
|
||||
|
||||
void NPN_GetStringIdentifiers(const NPUTF8 **names, int32_t nameCount,
|
||||
NPIdentifier *identifiers)
|
||||
{
|
||||
- int minor = gNetscapeFuncs.version & 0xFF;
|
||||
- if( minor >= 14 )
|
||||
- {
|
||||
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
|
||||
- CallNPN_GetStringIdentifiersProc(gNetscapeFuncs.getstringidentifiers,
|
||||
- names, nameCount, identifiers);
|
||||
-#else
|
||||
- (*gNetscapeFuncs.getstringidentifiers)(names, nameCount, identifiers);
|
||||
-#endif
|
||||
- }
|
||||
+ (*gNetscapeFuncs.getstringidentifiers)(names, nameCount, identifiers);
|
||||
}
|
||||
|
||||
NPIdentifier NPN_GetIntIdentifier(int32_t intid)
|
||||
{
|
||||
- int minor = gNetscapeFuncs.version & 0xFF;
|
||||
- if( minor >= 14 )
|
||||
- {
|
||||
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
|
||||
- return CallNPN_GetIntIdentifierProc(gNetscapeFuncs.getintidentifier, intid);
|
||||
-#else
|
||||
- return (*gNetscapeFuncs.getintidentifier)(intid);
|
||||
-#endif
|
||||
- }
|
||||
- return NULL;
|
||||
+ return (*gNetscapeFuncs.getintidentifier)(intid);
|
||||
}
|
||||
|
||||
bool NPN_IdentifierIsString(NPIdentifier identifier)
|
||||
{
|
||||
- int minor = gNetscapeFuncs.version & 0xFF;
|
||||
- if( minor >= 14 )
|
||||
- {
|
||||
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
|
||||
- return CallNPN_IdentifierIsStringProc(
|
||||
- gNetscapeFuncs.identifierisstring,
|
||||
- identifier);
|
||||
-#else
|
||||
- return (*gNetscapeFuncs.identifierisstring)(identifier);
|
||||
-#endif
|
||||
- }
|
||||
- return false;
|
||||
+ return (*gNetscapeFuncs.identifierisstring)(identifier);
|
||||
}
|
||||
|
||||
NPUTF8 *NPN_UTF8FromIdentifier(NPIdentifier identifier)
|
||||
{
|
||||
- int minor = gNetscapeFuncs.version & 0xFF;
|
||||
- if( minor >= 14 )
|
||||
- {
|
||||
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
|
||||
- return CallNPN_UTF8FromIdentifierProc(
|
||||
- gNetscapeFuncs.utf8fromidentifier,
|
||||
- identifier);
|
||||
-#else
|
||||
- return (*gNetscapeFuncs.utf8fromidentifier)(identifier);
|
||||
-#endif
|
||||
- }
|
||||
- return NULL;
|
||||
+ return (*gNetscapeFuncs.utf8fromidentifier)(identifier);
|
||||
}
|
||||
|
||||
int32_t NPN_IntFromIdentifier(NPIdentifier identifier)
|
||||
{
|
||||
- int minor = gNetscapeFuncs.version & 0xFF;
|
||||
- if( minor >= 14 )
|
||||
- {
|
||||
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
|
||||
- return CallNPN_IntFromIdentifierProc(
|
||||
- gNetscapeFuncs.intfromidentifier,
|
||||
- identifier);
|
||||
-#else
|
||||
- return (*gNetscapeFuncs.intfromidentifier)(identifier);
|
||||
-#endif
|
||||
- }
|
||||
- return 0;
|
||||
+ return (*gNetscapeFuncs.intfromidentifier)(identifier);
|
||||
}
|
||||
|
||||
NPObject *NPN_CreateObject(NPP npp, NPClass *aClass)
|
||||
{
|
||||
- int minor = gNetscapeFuncs.version & 0xFF;
|
||||
- if( minor >= 14 )
|
||||
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
|
||||
- return CallNPN_CreateObjectProc(gNetscapeFuncs.createobject, npp, aClass);
|
||||
-#else
|
||||
- return (*gNetscapeFuncs.createobject)(npp, aClass);
|
||||
-#endif
|
||||
- return NULL;
|
||||
+ return (*gNetscapeFuncs.createobject)(npp, aClass);
|
||||
}
|
||||
|
||||
NPObject *NPN_RetainObject(NPObject *obj)
|
||||
{
|
||||
- int minor = gNetscapeFuncs.version & 0xFF;
|
||||
- if( minor >= 14 )
|
||||
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
|
||||
- return CallNPN_RetainObjectProc(gNetscapeFuncs.retainobject, obj);
|
||||
-#else
|
||||
- return (*gNetscapeFuncs.retainobject)(obj);
|
||||
-#endif
|
||||
- return NULL;
|
||||
+ return (*gNetscapeFuncs.retainobject)(obj);
|
||||
}
|
||||
|
||||
void NPN_ReleaseObject(NPObject *obj)
|
||||
{
|
||||
- int minor = gNetscapeFuncs.version & 0xFF;
|
||||
- if( minor >= 14 )
|
||||
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
|
||||
- CallNPN_ReleaseObjectProc(gNetscapeFuncs.releaseobject, obj);
|
||||
-#else
|
||||
- (*gNetscapeFuncs.releaseobject)(obj);
|
||||
-#endif
|
||||
+ (*gNetscapeFuncs.releaseobject)(obj);
|
||||
}
|
||||
|
||||
bool NPN_Invoke(NPP npp, NPObject* obj, NPIdentifier methodName,
|
||||
const NPVariant *args, uint32_t argCount, NPVariant *result)
|
||||
{
|
||||
- int minor = gNetscapeFuncs.version & 0xFF;
|
||||
- if( minor >= 14 )
|
||||
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
|
||||
- return CallNPN_InvokeProc(gNetscapeFuncs.invoke, npp, obj, methodName,
|
||||
- args, argCount, result);
|
||||
-#else
|
||||
- return (*gNetscapeFuncs.invoke)(npp, obj, methodName, args, argCount, result);
|
||||
-#endif
|
||||
- return false;
|
||||
+ return (*gNetscapeFuncs.invoke)(npp, obj, methodName, args, argCount, result);
|
||||
}
|
||||
|
||||
bool NPN_InvokeDefault(NPP npp, NPObject* obj, const NPVariant *args,
|
||||
uint32_t argCount, NPVariant *result)
|
||||
{
|
||||
- int minor = gNetscapeFuncs.version & 0xFF;
|
||||
- if( minor >= 14 )
|
||||
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
|
||||
- return CallNPN_InvokeDefaultProc(gNetscapeFuncs.invokeDefault, npp, obj,
|
||||
- args, argCount, result);
|
||||
-#else
|
||||
- return (*gNetscapeFuncs.invokeDefault)(npp, obj, args, argCount, result);
|
||||
-#endif
|
||||
- return false;
|
||||
+ return (*gNetscapeFuncs.invokeDefault)(npp, obj, args, argCount, result);
|
||||
}
|
||||
|
||||
bool NPN_Evaluate(NPP npp, NPObject* obj, NPString *script,
|
||||
NPVariant *result)
|
||||
{
|
||||
- int minor = gNetscapeFuncs.version & 0xFF;
|
||||
- if( minor >= 14 )
|
||||
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
|
||||
- return CallNPN_EvaluateProc(gNetscapeFuncs.evaluate, npp, obj,
|
||||
- script, result);
|
||||
-#else
|
||||
- return (*gNetscapeFuncs.evaluate)(npp, obj, script, result);
|
||||
-#endif
|
||||
- return false;
|
||||
+ return (*gNetscapeFuncs.evaluate)(npp, obj, script, result);
|
||||
}
|
||||
|
||||
bool NPN_GetProperty(NPP npp, NPObject* obj, NPIdentifier propertyName,
|
||||
NPVariant *result)
|
||||
{
|
||||
- int minor = gNetscapeFuncs.version & 0xFF;
|
||||
- if( minor >= 14 )
|
||||
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
|
||||
- return CallNPN_GetPropertyProc(gNetscapeFuncs.getproperty, npp, obj,
|
||||
- propertyName, result);
|
||||
-#else
|
||||
- return (*gNetscapeFuncs.getproperty)(npp, obj, propertyName, result);
|
||||
-#endif
|
||||
- return false;
|
||||
+ return (*gNetscapeFuncs.getproperty)(npp, obj, propertyName, result);
|
||||
}
|
||||
|
||||
bool NPN_SetProperty(NPP npp, NPObject* obj, NPIdentifier propertyName,
|
||||
const NPVariant *value)
|
||||
{
|
||||
- int minor = gNetscapeFuncs.version & 0xFF;
|
||||
- if( minor >= 14 )
|
||||
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
|
||||
- return CallNPN_SetPropertyProc(gNetscapeFuncs.setproperty, npp, obj,
|
||||
- propertyName, value);
|
||||
-#else
|
||||
- return (*gNetscapeFuncs.setproperty)(npp, obj, propertyName, value);
|
||||
-#endif
|
||||
- return false;
|
||||
+ return (*gNetscapeFuncs.setproperty)(npp, obj, propertyName, value);
|
||||
}
|
||||
|
||||
bool NPN_RemoveProperty(NPP npp, NPObject* obj, NPIdentifier propertyName)
|
||||
{
|
||||
- int minor = gNetscapeFuncs.version & 0xFF;
|
||||
- if( minor >= 14 )
|
||||
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
|
||||
- return CallNPN_RemovePropertyProc(gNetscapeFuncs.removeproperty, npp, obj,
|
||||
- propertyName);
|
||||
-#else
|
||||
- return (*gNetscapeFuncs.removeproperty)(npp, obj, propertyName);
|
||||
-#endif
|
||||
- return false;
|
||||
+ return (*gNetscapeFuncs.removeproperty)(npp, obj, propertyName);
|
||||
}
|
||||
|
||||
bool NPN_HasProperty(NPP npp, NPObject* obj, NPIdentifier propertyName)
|
||||
{
|
||||
- int minor = gNetscapeFuncs.version & 0xFF;
|
||||
- if( minor >= 14 )
|
||||
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
|
||||
- return CallNPN_HasPropertyProc(gNetscapeFuncs.hasproperty, npp, obj,
|
||||
- propertyName);
|
||||
-#else
|
||||
- return (*gNetscapeFuncs.hasproperty)(npp, obj, propertyName);
|
||||
-#endif
|
||||
- return false;
|
||||
+ return (*gNetscapeFuncs.hasproperty)(npp, obj, propertyName);
|
||||
}
|
||||
|
||||
bool NPN_HasMethod(NPP npp, NPObject* obj, NPIdentifier methodName)
|
||||
{
|
||||
- int minor = gNetscapeFuncs.version & 0xFF;
|
||||
- if( minor >= 14 )
|
||||
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
|
||||
- return CallNPN_HasMethodProc(gNetscapeFuncs.hasmethod, npp,
|
||||
- obj, methodName);
|
||||
-#else
|
||||
- return (*gNetscapeFuncs.hasmethod)(npp, obj, methodName);
|
||||
-#endif
|
||||
- return false;
|
||||
+ return (*gNetscapeFuncs.hasmethod)(npp, obj, methodName);
|
||||
}
|
||||
|
||||
void NPN_ReleaseVariantValue(NPVariant *variant)
|
||||
{
|
||||
- int minor = gNetscapeFuncs.version & 0xFF;
|
||||
- if( minor >= 14 )
|
||||
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
|
||||
- CallNPN_ReleaseVariantValueProc(gNetscapeFuncs.releasevariantvalue, variant);
|
||||
-#else
|
||||
- (*gNetscapeFuncs.releasevariantvalue)(variant);
|
||||
-#endif
|
||||
+ (*gNetscapeFuncs.releasevariantvalue)(variant);
|
||||
}
|
||||
|
||||
void NPN_SetException(NPObject* obj, const NPUTF8 *message)
|
||||
{
|
||||
- int minor = gNetscapeFuncs.version & 0xFF;
|
||||
- if( minor >= 14 )
|
||||
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
|
||||
- CallNPN_SetExceptionProc(gNetscapeFuncs.setexception, obj, message);
|
||||
-#else
|
||||
- (*gNetscapeFuncs.setexception)(obj, message);
|
||||
-#endif
|
||||
+ (*gNetscapeFuncs.setexception)(obj, message);
|
||||
}
|
||||
|
||||
/***********************************************************************
|
||||
@@ -610,28 +336,6 @@ void NPN_SetException(NPObject* obj, const NPUTF8 *mes
|
||||
*
|
||||
***********************************************************************/
|
||||
|
||||
-/* Function prototypes */
|
||||
-NPError Private_New(NPMIMEType pluginType, NPP instance, uint16_t mode,
|
||||
- int16_t argc, char* argn[], char* argv[], NPSavedData* saved);
|
||||
-NPError Private_Destroy(NPP instance, NPSavedData** save);
|
||||
-NPError Private_SetWindow(NPP instance, NPWindow* window);
|
||||
-NPError Private_NewStream(NPP instance, NPMIMEType type, NPStream* stream,
|
||||
- NPBool seekable, uint16_t* stype);
|
||||
-int32_t Private_WriteReady(NPP instance, NPStream* stream);
|
||||
-int32_t Private_Write(NPP instance, NPStream* stream, int32_t offset,
|
||||
- int32_t len, void* buffer);
|
||||
-void Private_StreamAsFile(NPP instance, NPStream* stream, const char* fname);
|
||||
-NPError Private_DestroyStream(NPP instance, NPStream* stream, NPError reason);
|
||||
-void Private_URLNotify(NPP instance, const char* url,
|
||||
- NPReason reason, void* notifyData);
|
||||
-void Private_Print(NPP instance, NPPrint* platformPrint);
|
||||
-NPError Private_GetValue(NPP instance, NPPVariable variable, void *r_value);
|
||||
-NPError Private_SetValue(NPP instance, NPPVariable variable, void *r_value);
|
||||
-#ifdef OJI
|
||||
-JRIGlobalRef Private_GetJavaClass(void);
|
||||
-#endif
|
||||
-
|
||||
-/* function implementations */
|
||||
NPError
|
||||
Private_New(NPMIMEType pluginType, NPP instance, uint16_t mode,
|
||||
int16_t argc, char* argn[], char* argv[], NPSavedData* saved)
|
||||
@@ -719,33 +423,6 @@ Private_Print(NPP instance, NPPrint* platformPrint)
|
||||
NPP_Print(instance, platformPrint);
|
||||
}
|
||||
|
||||
-NPError
|
||||
-Private_GetValue(NPP instance, NPPVariable variable, void *r_value)
|
||||
-{
|
||||
- PLUGINDEBUGSTR("GetValue");
|
||||
- return NPP_GetValue(instance, variable, r_value);
|
||||
-}
|
||||
-
|
||||
-NPError
|
||||
-Private_SetValue(NPP instance, NPPVariable variable, void *r_value)
|
||||
-{
|
||||
- PLUGINDEBUGSTR("SetValue");
|
||||
- return NPP_SetValue(instance, variable, r_value);
|
||||
-}
|
||||
-
|
||||
-#ifdef OJI
|
||||
-JRIGlobalRef
|
||||
-Private_GetJavaClass(void)
|
||||
-{
|
||||
- jref clazz = NPP_GetJavaClass();
|
||||
- if (clazz) {
|
||||
- JRIEnv* env = NPN_GetJavaEnv();
|
||||
- return JRI_NewGlobalRef(env, clazz);
|
||||
- }
|
||||
- return NULL;
|
||||
-}
|
||||
-#endif
|
||||
-
|
||||
/***********************************************************************
|
||||
*
|
||||
* These functions are located automagically by netscape.
|
||||
@@ -753,6 +430,17 @@ Private_GetJavaClass(void)
|
||||
***********************************************************************/
|
||||
|
||||
/*
|
||||
+ * NP_GetPluginVersion [optional]
|
||||
+ * - The browser uses the return value to indicate to the user what version of
|
||||
+ * this plugin is installed.
|
||||
+ */
|
||||
+char *
|
||||
+NP_GetPluginVersion(void)
|
||||
+{
|
||||
+ return "1.0.0.15";
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
* NP_GetMIMEDescription
|
||||
* - Netscape needs to know about this symbol
|
||||
* - Netscape uses the return value to identify when an object instance
|
||||
@@ -830,12 +518,11 @@ NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs*
|
||||
* the whole structure, because the Netscape function table
|
||||
* could actually be bigger than what we expect.
|
||||
*/
|
||||
- int minor = nsTable->version & 0xFF;
|
||||
-
|
||||
gNetscapeFuncs.version = nsTable->version;
|
||||
gNetscapeFuncs.size = nsTable->size;
|
||||
gNetscapeFuncs.posturl = nsTable->posturl;
|
||||
gNetscapeFuncs.geturl = nsTable->geturl;
|
||||
+ gNetscapeFuncs.geturlnotify = nsTable->geturlnotify;
|
||||
gNetscapeFuncs.requestread = nsTable->requestread;
|
||||
gNetscapeFuncs.newstream = nsTable->newstream;
|
||||
gNetscapeFuncs.write = nsTable->write;
|
||||
@@ -846,85 +533,69 @@ NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs*
|
||||
gNetscapeFuncs.memfree = nsTable->memfree;
|
||||
gNetscapeFuncs.memflush = nsTable->memflush;
|
||||
gNetscapeFuncs.reloadplugins = nsTable->reloadplugins;
|
||||
-#ifdef OJI
|
||||
- if( minor >= NPVERS_HAS_LIVECONNECT )
|
||||
- {
|
||||
- gNetscapeFuncs.getJavaEnv = nsTable->getJavaEnv;
|
||||
- gNetscapeFuncs.getJavaPeer = nsTable->getJavaPeer;
|
||||
- }
|
||||
-#endif
|
||||
gNetscapeFuncs.getvalue = nsTable->getvalue;
|
||||
gNetscapeFuncs.setvalue = nsTable->setvalue;
|
||||
+ gNetscapeFuncs.posturlnotify = nsTable->posturlnotify;
|
||||
|
||||
- if( minor >= NPVERS_HAS_NOTIFICATION )
|
||||
- {
|
||||
- gNetscapeFuncs.geturlnotify = nsTable->geturlnotify;
|
||||
- gNetscapeFuncs.posturlnotify = nsTable->posturlnotify;
|
||||
- }
|
||||
-
|
||||
if (nsTable->size >= ((char *)&nsTable->setexception - (char *)nsTable))
|
||||
{
|
||||
- gNetscapeFuncs.invalidaterect = nsTable->invalidaterect;
|
||||
- gNetscapeFuncs.invalidateregion = nsTable->invalidateregion;
|
||||
- gNetscapeFuncs.forceredraw = nsTable->forceredraw;
|
||||
- /* npruntime support */
|
||||
- if (minor >= 14)
|
||||
- {
|
||||
- gNetscapeFuncs.getstringidentifier = nsTable->getstringidentifier;
|
||||
- gNetscapeFuncs.getstringidentifiers = nsTable->getstringidentifiers;
|
||||
- gNetscapeFuncs.getintidentifier = nsTable->getintidentifier;
|
||||
- gNetscapeFuncs.identifierisstring = nsTable->identifierisstring;
|
||||
- gNetscapeFuncs.utf8fromidentifier = nsTable->utf8fromidentifier;
|
||||
- gNetscapeFuncs.intfromidentifier = nsTable->intfromidentifier;
|
||||
- gNetscapeFuncs.createobject = nsTable->createobject;
|
||||
- gNetscapeFuncs.retainobject = nsTable->retainobject;
|
||||
- gNetscapeFuncs.releaseobject = nsTable->releaseobject;
|
||||
- gNetscapeFuncs.invoke = nsTable->invoke;
|
||||
- gNetscapeFuncs.invokeDefault = nsTable->invokeDefault;
|
||||
- gNetscapeFuncs.evaluate = nsTable->evaluate;
|
||||
- gNetscapeFuncs.getproperty = nsTable->getproperty;
|
||||
- gNetscapeFuncs.setproperty = nsTable->setproperty;
|
||||
- gNetscapeFuncs.removeproperty = nsTable->removeproperty;
|
||||
- gNetscapeFuncs.hasproperty = nsTable->hasproperty;
|
||||
- gNetscapeFuncs.hasmethod = nsTable->hasmethod;
|
||||
- gNetscapeFuncs.releasevariantvalue = nsTable->releasevariantvalue;
|
||||
- gNetscapeFuncs.setexception = nsTable->setexception;
|
||||
- }
|
||||
+ gNetscapeFuncs.invalidaterect = nsTable->invalidaterect;
|
||||
+ gNetscapeFuncs.invalidateregion = nsTable->invalidateregion;
|
||||
+ gNetscapeFuncs.forceredraw = nsTable->forceredraw;
|
||||
+ gNetscapeFuncs.getstringidentifier = nsTable->getstringidentifier;
|
||||
+ gNetscapeFuncs.getstringidentifiers = nsTable->getstringidentifiers;
|
||||
+ gNetscapeFuncs.getintidentifier = nsTable->getintidentifier;
|
||||
+ gNetscapeFuncs.identifierisstring = nsTable->identifierisstring;
|
||||
+ gNetscapeFuncs.utf8fromidentifier = nsTable->utf8fromidentifier;
|
||||
+ gNetscapeFuncs.intfromidentifier = nsTable->intfromidentifier;
|
||||
+ gNetscapeFuncs.createobject = nsTable->createobject;
|
||||
+ gNetscapeFuncs.retainobject = nsTable->retainobject;
|
||||
+ gNetscapeFuncs.releaseobject = nsTable->releaseobject;
|
||||
+ gNetscapeFuncs.invoke = nsTable->invoke;
|
||||
+ gNetscapeFuncs.invokeDefault = nsTable->invokeDefault;
|
||||
+ gNetscapeFuncs.evaluate = nsTable->evaluate;
|
||||
+ gNetscapeFuncs.getproperty = nsTable->getproperty;
|
||||
+ gNetscapeFuncs.setproperty = nsTable->setproperty;
|
||||
+ gNetscapeFuncs.removeproperty = nsTable->removeproperty;
|
||||
+ gNetscapeFuncs.hasproperty = nsTable->hasproperty;
|
||||
+ gNetscapeFuncs.hasmethod = nsTable->hasmethod;
|
||||
+ gNetscapeFuncs.releasevariantvalue = nsTable->releasevariantvalue;
|
||||
+ gNetscapeFuncs.setexception = nsTable->setexception;
|
||||
}
|
||||
else
|
||||
{
|
||||
- gNetscapeFuncs.invalidaterect = NULL;
|
||||
- gNetscapeFuncs.invalidateregion = NULL;
|
||||
- gNetscapeFuncs.forceredraw = NULL;
|
||||
- gNetscapeFuncs.getstringidentifier = NULL;
|
||||
- gNetscapeFuncs.getstringidentifiers = NULL;
|
||||
- gNetscapeFuncs.getintidentifier = NULL;
|
||||
- gNetscapeFuncs.identifierisstring = NULL;
|
||||
- gNetscapeFuncs.utf8fromidentifier = NULL;
|
||||
- gNetscapeFuncs.intfromidentifier = NULL;
|
||||
- gNetscapeFuncs.createobject = NULL;
|
||||
- gNetscapeFuncs.retainobject = NULL;
|
||||
- gNetscapeFuncs.releaseobject = NULL;
|
||||
- gNetscapeFuncs.invoke = NULL;
|
||||
- gNetscapeFuncs.invokeDefault = NULL;
|
||||
- gNetscapeFuncs.evaluate = NULL;
|
||||
- gNetscapeFuncs.getproperty = NULL;
|
||||
- gNetscapeFuncs.setproperty = NULL;
|
||||
- gNetscapeFuncs.removeproperty = NULL;
|
||||
- gNetscapeFuncs.hasproperty = NULL;
|
||||
- gNetscapeFuncs.releasevariantvalue = NULL;
|
||||
- gNetscapeFuncs.setexception = NULL;
|
||||
+ gNetscapeFuncs.invalidaterect = NULL;
|
||||
+ gNetscapeFuncs.invalidateregion = NULL;
|
||||
+ gNetscapeFuncs.forceredraw = NULL;
|
||||
+ gNetscapeFuncs.getstringidentifier = NULL;
|
||||
+ gNetscapeFuncs.getstringidentifiers = NULL;
|
||||
+ gNetscapeFuncs.getintidentifier = NULL;
|
||||
+ gNetscapeFuncs.identifierisstring = NULL;
|
||||
+ gNetscapeFuncs.utf8fromidentifier = NULL;
|
||||
+ gNetscapeFuncs.intfromidentifier = NULL;
|
||||
+ gNetscapeFuncs.createobject = NULL;
|
||||
+ gNetscapeFuncs.retainobject = NULL;
|
||||
+ gNetscapeFuncs.releaseobject = NULL;
|
||||
+ gNetscapeFuncs.invoke = NULL;
|
||||
+ gNetscapeFuncs.invokeDefault = NULL;
|
||||
+ gNetscapeFuncs.evaluate = NULL;
|
||||
+ gNetscapeFuncs.getproperty = NULL;
|
||||
+ gNetscapeFuncs.setproperty = NULL;
|
||||
+ gNetscapeFuncs.removeproperty = NULL;
|
||||
+ gNetscapeFuncs.hasproperty = NULL;
|
||||
+ gNetscapeFuncs.releasevariantvalue = NULL;
|
||||
+ gNetscapeFuncs.setexception = NULL;
|
||||
}
|
||||
if (nsTable->size >=
|
||||
((char *)&nsTable->poppopupsenabledstate - (char *)nsTable))
|
||||
{
|
||||
- gNetscapeFuncs.pushpopupsenabledstate = nsTable->pushpopupsenabledstate;
|
||||
- gNetscapeFuncs.poppopupsenabledstate = nsTable->poppopupsenabledstate;
|
||||
+ gNetscapeFuncs.pushpopupsenabledstate = nsTable->pushpopupsenabledstate;
|
||||
+ gNetscapeFuncs.poppopupsenabledstate = nsTable->poppopupsenabledstate;
|
||||
}
|
||||
else
|
||||
{
|
||||
- gNetscapeFuncs.pushpopupsenabledstate = NULL;
|
||||
- gNetscapeFuncs.poppopupsenabledstate = NULL;
|
||||
+ gNetscapeFuncs.pushpopupsenabledstate = NULL;
|
||||
+ gNetscapeFuncs.poppopupsenabledstate = NULL;
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -935,19 +606,6 @@ NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs*
|
||||
*/
|
||||
pluginFuncs->version = (NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR;
|
||||
pluginFuncs->size = sizeof(NPPluginFuncs);
|
||||
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
|
||||
- pluginFuncs->newp = NewNPP_NewProc(Private_New);
|
||||
- pluginFuncs->destroy = NewNPP_DestroyProc(Private_Destroy);
|
||||
- pluginFuncs->setwindow = NewNPP_SetWindowProc(Private_SetWindow);
|
||||
- pluginFuncs->newstream = NewNPP_NewStreamProc(Private_NewStream);
|
||||
- pluginFuncs->destroystream = NewNPP_DestroyStreamProc(Private_DestroyStream);
|
||||
- pluginFuncs->asfile = NewNPP_StreamAsFileProc(Private_StreamAsFile);
|
||||
- pluginFuncs->writeready = NewNPP_WriteReadyProc(Private_WriteReady);
|
||||
- pluginFuncs->write = NewNPP_WriteProc(Private_Write);
|
||||
- pluginFuncs->print = NewNPP_PrintProc(Private_Print);
|
||||
- pluginFuncs->getvalue = NewNPP_GetValueProc(Private_GetValue);
|
||||
- pluginFuncs->setvalue = NewNPP_SetValueProc(Private_SetValue);
|
||||
-#else
|
||||
pluginFuncs->newp = (NPP_NewProcPtr)(Private_New);
|
||||
pluginFuncs->destroy = (NPP_DestroyProcPtr)(Private_Destroy);
|
||||
pluginFuncs->setwindow = (NPP_SetWindowProcPtr)(Private_SetWindow);
|
||||
@@ -957,26 +615,13 @@ NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs*
|
||||
pluginFuncs->writeready = (NPP_WriteReadyProcPtr)(Private_WriteReady);
|
||||
pluginFuncs->write = (NPP_WriteProcPtr)(Private_Write);
|
||||
pluginFuncs->print = (NPP_PrintProcPtr)(Private_Print);
|
||||
- pluginFuncs->getvalue = (NPP_GetValueProcPtr)(Private_GetValue);
|
||||
- pluginFuncs->setvalue = (NPP_SetValueProcPtr)(Private_SetValue);
|
||||
-#endif
|
||||
+ pluginFuncs->urlnotify = (NPP_URLNotifyProcPtr)(Private_URLNotify);
|
||||
pluginFuncs->event = NULL;
|
||||
- if( minor >= NPVERS_HAS_NOTIFICATION )
|
||||
- {
|
||||
-#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
|
||||
- pluginFuncs->urlnotify = NewNPP_URLNotifyProc(Private_URLNotify);
|
||||
-#else
|
||||
- pluginFuncs->urlnotify = (NPP_URLNotifyProcPtr)(Private_URLNotify);
|
||||
-#endif
|
||||
- }
|
||||
-#ifdef OJI
|
||||
- if( minor >= NPVERS_HAS_LIVECONNECT )
|
||||
- pluginFuncs->javaClass = Private_GetJavaClass();
|
||||
- else
|
||||
- pluginFuncs->javaClass = NULL;
|
||||
-#else
|
||||
- pluginFuncs->javaClass = NULL;
|
||||
-#endif
|
||||
+ pluginFuncs->javaClass = NULL;
|
||||
+
|
||||
+ // This function is supposedly loaded magically, but that doesn't
|
||||
+ // seem to be true.
|
||||
+ pluginFuncs->getvalue = (NPP_GetValueProcPtr)(NP_GetValue);
|
||||
|
||||
err = NPP_Initialize();
|
||||
}
|
||||
37
x11/vlc/patches/patch-projects_mozilla_vlcplugin_cpp
Normal file
37
x11/vlc/patches/patch-projects_mozilla_vlcplugin_cpp
Normal file
@ -0,0 +1,37 @@
|
||||
$OpenBSD: patch-projects_mozilla_vlcplugin_cpp,v 1.1 2010/06/17 07:42:16 dcoppa Exp $
|
||||
--- projects/mozilla/vlcplugin.cpp.orig Sun Mar 7 19:38:03 2010
|
||||
+++ projects/mozilla/vlcplugin.cpp Sat Jun 12 22:45:02 2010
|
||||
@@ -35,6 +35,7 @@
|
||||
#include "vlcplugin.h"
|
||||
#include "control/npolibvlc.h"
|
||||
|
||||
+#include <cstdlib>
|
||||
#include <ctype.h>
|
||||
|
||||
/*****************************************************************************
|
||||
@@ -227,8 +228,8 @@ NPError VlcPlugin::init(int argc, char* const argn[],
|
||||
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) )
|
||||
{
|
||||
@@ -236,11 +237,11 @@ NPError VlcPlugin::init(int argc, char* const argn[],
|
||||
{
|
||||
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);
|
||||
12
x11/vlc/patches/patch-projects_mozilla_vlcplugin_h
Normal file
12
x11/vlc/patches/patch-projects_mozilla_vlcplugin_h
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-projects_mozilla_vlcplugin_h,v 1.1 2010/06/17 07:42:16 dcoppa Exp $
|
||||
--- projects/mozilla/vlcplugin.h.orig Sun Mar 7 19:38:03 2010
|
||||
+++ projects/mozilla/vlcplugin.h Sat Jun 12 22:45:02 2010
|
||||
@@ -30,6 +30,8 @@
|
||||
#define __VLCPLUGIN_H__
|
||||
|
||||
#include <vlc/vlc.h>
|
||||
+#include <nspr/prtypes.h>
|
||||
+#include <nspr/obsolete/protypes.h>
|
||||
#include <npapi.h>
|
||||
#include "control/nporuntime.h"
|
||||
|
||||
15
x11/vlc/patches/patch-projects_mozilla_vlcshell_cpp
Normal file
15
x11/vlc/patches/patch-projects_mozilla_vlcshell_cpp
Normal file
@ -0,0 +1,15 @@
|
||||
$OpenBSD: patch-projects_mozilla_vlcshell_cpp,v 1.1 2010/06/17 07:42:16 dcoppa Exp $
|
||||
--- projects/mozilla/vlcshell.cpp.orig Sun Mar 7 19:38:03 2010
|
||||
+++ projects/mozilla/vlcshell.cpp Sat Jun 12 22:52:27 2010
|
||||
@@ -265,11 +265,6 @@ NPError NPP_Initialize( void )
|
||||
return NPERR_NO_ERROR;
|
||||
}
|
||||
|
||||
-jref NPP_GetJavaClass( void )
|
||||
-{
|
||||
- return NULL;
|
||||
-}
|
||||
-
|
||||
void NPP_Shutdown( void )
|
||||
{
|
||||
;
|
||||
11
x11/vlc/patches/patch-projects_mozilla_vlcshell_h
Normal file
11
x11/vlc/patches/patch-projects_mozilla_vlcshell_h
Normal file
@ -0,0 +1,11 @@
|
||||
$OpenBSD: patch-projects_mozilla_vlcshell_h,v 1.1 2010/06/17 07:42:16 dcoppa Exp $
|
||||
--- projects/mozilla/vlcshell.h.orig Sun Mar 7 19:38:03 2010
|
||||
+++ projects/mozilla/vlcshell.h Sat Jun 12 22:52:43 2010
|
||||
@@ -27,7 +27,6 @@
|
||||
char * NPP_GetMIMEDescription( void );
|
||||
|
||||
NPError NPP_Initialize( void );
|
||||
-jref NPP_GetJavaClass( void );
|
||||
void NPP_Shutdown( void );
|
||||
|
||||
NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc,
|
||||
12
x11/vlc/patches/patch-src_Makefile_in
Normal file
12
x11/vlc/patches/patch-src_Makefile_in
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-src_Makefile_in,v 1.1 2010/06/17 07:42:16 dcoppa Exp $
|
||||
--- src/Makefile.in.orig Mon Jun 7 11:22:23 2010
|
||||
+++ src/Makefile.in Mon Jun 7 11:22:30 2010
|
||||
@@ -3609,7 +3609,7 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-pkgco
|
||||
cat $(top_srcdir)/COPYING | sed s/'"'/'\\"'/g | $(AWK) '{ print "\""$$0"\\n\"" }' >> "$@.tmp"
|
||||
echo ";" >> "$@.tmp"
|
||||
echo "static const char psz_thanks[] =" >> "$@.tmp"
|
||||
- grep -v '$$Id: patch-src_Makefile_in,v 1.1 2010/06/17 07:42:16 dcoppa Exp $(top_srcdir)/THANKS | sed s/'"'/'\\"'/g | $(AWK) '{ print "\""$$0"\\n\"" }'|sed s/"<.*.> "// >> "$@.tmp"
|
||||
+ grep -av '$$Id: patch-src_Makefile_in,v 1.1 2010/06/17 07:42:16 dcoppa Exp $(top_srcdir)/THANKS | sed s/'"'/'\\"'/g | $(AWK) '{ print "\""$$0"\\n\"" }'|sed s/"<.*.> "// >> "$@.tmp"
|
||||
echo ";" >> "$@.tmp"
|
||||
echo "static const char psz_authors[] =" >> "$@.tmp"
|
||||
grep N: $(top_srcdir)/AUTHORS | cut -d" " -f 2- | sed s/'"'/'\\"'/g | $(AWK) '{ print "\""$$0"\\n\"" }' >> "$@.tmp"
|
||||
@ -1,11 +1,11 @@
|
||||
$OpenBSD: patch-src_libvlc_c,v 1.1 2010/05/05 08:43:35 edd Exp $
|
||||
--- src/libvlc.c.orig Sun Mar 7 13:38:03 2010
|
||||
+++ src/libvlc.c Tue Apr 27 19:14:30 2010
|
||||
$OpenBSD: patch-src_libvlc_c,v 1.2 2010/06/17 07:42:16 dcoppa Exp $
|
||||
--- src/libvlc.c.orig Sun Mar 7 19:38:03 2010
|
||||
+++ src/libvlc.c Wed May 26 16:42:36 2010
|
||||
@@ -906,21 +906,25 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i
|
||||
&& config_GetInt( p_libvlc, "started-from-file" ) ) )
|
||||
libvlc_InternalAddIntf( p_libvlc, "dbus,none" );
|
||||
|
||||
+#ifdef __i386__
|
||||
+#if 0
|
||||
/* Prevents the power management daemon from suspending the system
|
||||
* when VLC is active */
|
||||
if( config_GetInt( p_libvlc, "inhibit" ) > 0 )
|
||||
@ -18,7 +18,7 @@ $OpenBSD: patch-src_libvlc_c,v 1.1 2010/05/05 08:43:35 edd Exp $
|
||||
* Currently, only for X
|
||||
*/
|
||||
#ifdef HAVE_X11_XLIB_H
|
||||
+#ifdef __i386__
|
||||
+#if 0
|
||||
if( config_GetInt( p_libvlc, "disable-screensaver" ) )
|
||||
{
|
||||
libvlc_InternalAddIntf( p_libvlc, "screensaver,none" );
|
||||
|
||||
@ -1,8 +1,9 @@
|
||||
@comment $OpenBSD: PLIST-web,v 1.2 2010/05/05 08:43:35 edd Exp $
|
||||
lib/mozilla-plugins/
|
||||
@comment lib/mozilla-plugins/libvlcplugin.a
|
||||
lib/mozilla-plugins/libvlcplugin.la
|
||||
lib/mozilla-plugins/libvlcplugin.so
|
||||
@comment $OpenBSD: PLIST-web,v 1.3 2010/06/17 07:42:16 dcoppa Exp $
|
||||
lib/mozilla/
|
||||
lib/mozilla/plugins/
|
||||
@comment lib/mozilla/plugins/libvlcplugin.a
|
||||
@comment lib/mozilla/plugins/libvlcplugin.la
|
||||
lib/mozilla/plugins/libvlcplugin.so
|
||||
share/vlc/mozilla/
|
||||
share/vlc/mozilla/fullscreen.xpm
|
||||
share/vlc/mozilla/pause.xpm
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user