packages: vlc/vlc.spec, vlc/vlc-xulrunner.patch (NEW) - rel 4; fix for new ...
arekm
arekm at pld-linux.org
Fri Jan 29 23:25:50 CET 2010
Author: arekm Date: Fri Jan 29 22:25:50 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 4; fix for new xulrunner
---- Files affected:
packages/vlc:
vlc.spec (1.211 -> 1.212) , vlc-xulrunner.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/vlc/vlc.spec
diff -u packages/vlc/vlc.spec:1.211 packages/vlc/vlc.spec:1.212
--- packages/vlc/vlc.spec:1.211 Fri Jan 29 23:03:09 2010
+++ packages/vlc/vlc.spec Fri Jan 29 23:25:45 2010
@@ -37,7 +37,7 @@
Summary(pl.UTF-8): VLC - odtwarzacz multimedialny oraz serwer strumieni
Name: vlc
Version: 1.0.4
-Release: 3
+Release: 4
License: GPL
Group: X11/Applications/Multimedia
# use the bz2 src, its a 4mb difference
@@ -50,6 +50,7 @@
Patch4: %{name}-rtp_segv.patch
Patch5: %{name}-system-minizip.patch
Patch6: %{name}-libpng.patch
+Patch7: %{name}-xulrunner.patch
URL: http://www.videolan.org/vlc/
%{?with_directfb:BuildRequires: DirectFB-devel}
%{?with_galaktos:BuildRequires: OpenGL-GLU-devel}
@@ -263,6 +264,7 @@
%patch4 -p1
%patch5 -p1
%patch6 -p1
+%patch7 -p1
%build
cp -f /usr/share/automake/config.* .
@@ -799,6 +801,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.212 2010/01/29 22:25:45 arekm
+- rel 4; fix for new xulrunner
+
Revision 1.211 2010/01/29 22:03:09 arekm
- rel 3; libpng fix
================================================================
Index: packages/vlc/vlc-xulrunner.patch
diff -u /dev/null packages/vlc/vlc-xulrunner.patch:1.1
--- /dev/null Fri Jan 29 23:25:50 2010
+++ packages/vlc/vlc-xulrunner.patch Fri Jan 29 23:25:45 2010
@@ -0,0 +1,1079 @@
+diff -p -up vlc-1.0.4/projects/mozilla/control/npolibvlc.cpp~ vlc-1.0.4/projects/mozilla/control/npolibvlc.cpp
+--- vlc-1.0.4/projects/mozilla/control/npolibvlc.cpp~ 2009-12-07 22:12:58.000000000 +0100
++++ vlc-1.0.4/projects/mozilla/control/npolibvlc.cpp 2010-01-06 15:50:32.000000000 +0100
+@@ -949,7 +949,7 @@ LibvlcPlaylistNPObject::invoke(int index
+ 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::parseOption
+ {
+ int nOptions = 0;
+
+- char *end = val + nps.utf8length;
++ char *end = val + nps.UTF8Length;
+ while( val < end )
+ {
+ // skip leading blanks
+diff -p -up vlc-1.0.4/projects/mozilla/control/nporuntime.cpp~ vlc-1.0.4/projects/mozilla/control/nporuntime.cpp
+--- vlc-1.0.4/projects/mozilla/control/nporuntime.cpp~ 2009-12-07 22:12:58.000000000 +0100
++++ vlc-1.0.4/projects/mozilla/control/nporuntime.cpp 2010-01-06 15:51:12.000000000 +0100
+@@ -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;
+ }
+diff -p -up vlc-1.0.4/projects/mozilla/support/npunix.c~ vlc-1.0.4/projects/mozilla/support/npunix.c
+--- vlc-1.0.4/projects/mozilla/support/npunix.c~ 2009-12-05 10:03:25.000000000 +0100
++++ vlc-1.0.4/projects/mozilla/support/npunix.c 2010-01-06 15:43:03.000000000 +0100
+@@ -1,21 +1,17 @@
+ /* -*- 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 at 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.
+- *
+- * 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.
+- *
+- * 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 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/
++ *
++ * 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.
+ *
+ * The Original Code is mozilla.org code.
+ *
+@@ -27,7 +23,19 @@
+ * Contributor(s):
+ * Stephen Mak <smak at 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,19 +51,11 @@
+ *----------------------------------------------------------------------
+ */
+
+-#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 "../vlcshell.h"
++#include <stdio.h>
++#include "npapi.h"
++#include "npfunctions.h"
+
+ /*
+ * Define PLUGIN_TRACE to have the wrapper functions print
+@@ -69,6 +69,7 @@
+ #define PLUGINDEBUGSTR(msg)
+ #endif
+
++
+ /***********************************************************************
+ *
+ * Globals
+@@ -77,6 +78,7 @@
+
+ static NPNetscapeFuncs gNetscapeFuncs; /* Netscape Function table */
+
++
+ /***********************************************************************
+ *
+ * Wrapper functions : plugin calling Netscape Navigator
+@@ -103,502 +105,229 @@ NPN_Version(int* plugin_major, int* plug
+ 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)
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/vlc/vlc.spec?r1=1.211&r2=1.212&f=u
More information about the pld-cvs-commit
mailing list