pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/multimedia/mplayer-plugin Update upupp.h from gecko-me...
details: https://anonhg.NetBSD.org/pkgsrc/rev/bcfff3b70719
branches: trunk
changeset: 597401:bcfff3b70719
user: obache <obache%pkgsrc.org@localhost>
date: Thu Dec 22 12:11:15 2011 +0000
description:
Update upupp.h from gecko-mediaplayer-1.0.4 (and some modification),
and now recognized from modern Firefox (tested with 8.0). PR#45110.
diffstat:
multimedia/mplayer-plugin/Makefile | 4 +-
multimedia/mplayer-plugin/distinfo | 4 +-
multimedia/mplayer-plugin/patches/patch-ag | 1243 +++++++--------------------
3 files changed, 336 insertions(+), 915 deletions(-)
diffs (truncated from 1637 to 300 lines):
diff -r 595b32ee39cb -r bcfff3b70719 multimedia/mplayer-plugin/Makefile
--- a/multimedia/mplayer-plugin/Makefile Thu Dec 22 11:06:40 2011 +0000
+++ b/multimedia/mplayer-plugin/Makefile Thu Dec 22 12:11:15 2011 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2011/12/21 12:03:24 obache Exp $
+# $NetBSD: Makefile,v 1.13 2011/12/22 12:11:15 obache Exp $
#
DISTNAME= mplayerplug-in-3.55
PKGNAME= mplayer-plugin-3.55
-PKGREVISION= 8
+PKGREVISION= 9
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mplayerplug-in/}
diff -r 595b32ee39cb -r bcfff3b70719 multimedia/mplayer-plugin/distinfo
--- a/multimedia/mplayer-plugin/distinfo Thu Dec 22 11:06:40 2011 +0000
+++ b/multimedia/mplayer-plugin/distinfo Thu Dec 22 12:11:15 2011 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2011/07/01 13:25:02 obache Exp $
+$NetBSD: distinfo,v 1.4 2011/12/22 12:11:16 obache Exp $
SHA1 (mplayerplug-in-3.55.tar.gz) = 69726d4e16523b1a39c284efee081c31b0ea7f7f
RMD160 (mplayerplug-in-3.55.tar.gz) = e01224b14883a93211745be0a329a3f524f39d8c
@@ -6,4 +6,4 @@
SHA1 (patch-aa) = 66a7a7532677a33e653cc5a64b42a670c63a55df
SHA1 (patch-ae) = 885eafce6747ed1f682eb78a6e15a473806924e3
SHA1 (patch-af) = 812a4921c4a467fbf6163292f04ef5888ef6e8ed
-SHA1 (patch-ag) = f4b58bce0e3128e4cb8c7466ad33b97a1eeba2fe
+SHA1 (patch-ag) = 7d62d68f80e5047bd6b2bb11eabc779159aaccc5
diff -r 595b32ee39cb -r bcfff3b70719 multimedia/mplayer-plugin/patches/patch-ag
--- a/multimedia/mplayer-plugin/patches/patch-ag Thu Dec 22 11:06:40 2011 +0000
+++ b/multimedia/mplayer-plugin/patches/patch-ag Thu Dec 22 12:11:15 2011 +0000
@@ -1,16 +1,16 @@
-$NetBSD: patch-ag,v 1.2 2010/04/21 15:58:03 tnn Exp $
+$NetBSD: patch-ag,v 1.3 2011/12/22 12:11:16 obache Exp $
---- include/npupp.h.orig 2010-04-21 15:52:56.000000000 +0000
+--- include/npupp.h.orig 2011-12-22 11:04:05.000000000 +0000
+++ include/npupp.h
-@@ -0,0 +1,1298 @@
-+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+@@ -0,0 +1,719 @@
++/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
++ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
-+ * The contents of this file are subject to the Netscape 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/NPL/
++ * 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
@@ -19,31 +19,30 @@
+ *
+ * The Original Code is mozilla.org code.
+ *
-+ * The Initial Developer of the Original Code is
++ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
-+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either 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 NPL, indicate your
++ * 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 NPL, the GPL or the LGPL.
++ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+
+/*
-+ * npupp.h Revision: 1.2
++ * npupp.h Revision: 3.26
+ * function call mecahnics needed by platform specific glue code.
+ */
+
@@ -64,439 +63,133 @@
+#define int16 int16_t
+#define uint32 uint32_t
+#define int32 int32_t
++#include "npfunctions.h"
+
+#ifndef _NPAPI_H_
+#include "npapi.h"
+#endif
+
++#include "npruntime.h"
++
++
+/******************************************************************************************
+ plug-in function table macros
+ for each function in and out of the plugin API we define
+ typedef NPP_FooUPP
+ #define NewNPP_FooProc
+ #define CallNPP_FooProc
-+ for mac, define the UPP magic for PPC/68K calling
+ *******************************************************************************************/
+
+
+/* NPP_Initialize */
-+
-+#define _NPUPP_USE_UPP_ (TARGET_RT_MAC_CFM && !TARGET_API_MAC_CARBON)
-+
-+#if _NPUPP_USE_UPP_
-+typedef UniversalProcPtr NPP_InitializeUPP;
-+
-+enum {
-+ uppNPP_InitializeProcInfo = kThinkCStackBased
-+ | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(0))
-+ | RESULT_SIZE(SIZE_CODE(0))
-+};
-+
-+#define NewNPP_InitializeProc(FUNC) \
-+ (NPP_InitializeUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_InitializeProcInfo, GetCurrentArchitecture())
-+#define CallNPP_InitializeProc(FUNC) \
-+ (void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_InitializeProcInfo)
-+
-+#else
-+
-+typedef void (* NP_LOADDS NPP_InitializeUPP)(void);
++typedef void (*NP_LOADDS NPP_InitializeUPP) (void);
+#define NewNPP_InitializeProc(FUNC) \
+ ((NPP_InitializeUPP) (FUNC))
+#define CallNPP_InitializeProc(FUNC) \
+ (*(FUNC))()
+
-+#endif
-+
-+
+/* NPP_Shutdown */
-+
-+#if _NPUPP_USE_UPP_
-+typedef UniversalProcPtr NPP_ShutdownUPP;
-+
-+enum {
-+ uppNPP_ShutdownProcInfo = kThinkCStackBased
-+ | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(0))
-+ | RESULT_SIZE(SIZE_CODE(0))
-+};
-+
-+#define NewNPP_ShutdownProc(FUNC) \
-+ (NPP_ShutdownUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_ShutdownProcInfo, GetCurrentArchitecture())
-+#define CallNPP_ShutdownProc(FUNC) \
-+ (void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_ShutdownProcInfo)
-+
-+#else
-+
-+typedef void (* NP_LOADDS NPP_ShutdownUPP)(void);
++typedef void (*NP_LOADDS NPP_ShutdownUPP) (void);
+#define NewNPP_ShutdownProc(FUNC) \
+ ((NPP_ShutdownUPP) (FUNC))
+#define CallNPP_ShutdownProc(FUNC) \
+ (*(FUNC))()
+
-+#endif
-+
-+
+/* NPP_New */
-+
-+#if _NPUPP_USE_UPP_
-+typedef UniversalProcPtr NPP_NewUPP;
-+
-+enum {
-+ uppNPP_NewProcInfo = kThinkCStackBased
-+ | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPMIMEType)))
-+ | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPP)))
-+ | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(uint16)))
-+ | STACK_ROUTINE_PARAMETER(4, SIZE_CODE(sizeof(int16)))
-+ | STACK_ROUTINE_PARAMETER(5, SIZE_CODE(sizeof(char **)))
-+ | STACK_ROUTINE_PARAMETER(6, SIZE_CODE(sizeof(char **)))
-+ | STACK_ROUTINE_PARAMETER(7, SIZE_CODE(sizeof(NPSavedData *)))
-+ | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
-+};
-+
-+#define NewNPP_NewProc(FUNC) \
-+ (NPP_NewUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_NewProcInfo, GetCurrentArchitecture())
-+#define CallNPP_NewProc(FUNC, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6, ARG7) \
-+ (NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_NewProcInfo, \
-+ (ARG1), (ARG2), (ARG3), (ARG4), (ARG5), (ARG6), (ARG7))
-+#else
-+
-+typedef NPError (* NP_LOADDS NPP_NewUPP)(NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc, char* argn[], char* argv[], NPSavedData* saved);
++typedef NPError(*NP_LOADDS NPP_NewUPP) (NPMIMEType pluginType, NPP instance, uint16_t mode,
++ int16_t argc, char *argn[], char *argv[],
++ NPSavedData * saved);
+#define NewNPP_NewProc(FUNC) \
+ ((NPP_NewUPP) (FUNC))
+#define CallNPP_NewProc(FUNC, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6, ARG7) \
+ (*(FUNC))((ARG1), (ARG2), (ARG3), (ARG4), (ARG5), (ARG6), (ARG7))
+
-+#endif
-+
-+
+/* NPP_Destroy */
-+
-+#if _NPUPP_USE_UPP_
-+
-+typedef UniversalProcPtr NPP_DestroyUPP;
-+enum {
-+ uppNPP_DestroyProcInfo = kThinkCStackBased
-+ | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-+ | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPSavedData **)))
-+ | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
-+};
-+#define NewNPP_DestroyProc(FUNC) \
-+ (NPP_DestroyUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_DestroyProcInfo, GetCurrentArchitecture())
-+#define CallNPP_DestroyProc(FUNC, ARG1, ARG2) \
-+ (NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_DestroyProcInfo, (ARG1), (ARG2))
-+#else
-+
-+typedef NPError (* NP_LOADDS NPP_DestroyUPP)(NPP instance, NPSavedData** save);
++typedef NPError(*NP_LOADDS NPP_DestroyUPP) (NPP instance, NPSavedData ** save);
+#define NewNPP_DestroyProc(FUNC) \
+ ((NPP_DestroyUPP) (FUNC))
+#define CallNPP_DestroyProc(FUNC, ARG1, ARG2) \
+ (*(FUNC))((ARG1), (ARG2))
+
-+#endif
-+
-+
+/* NPP_SetWindow */
-+
-+#if _NPUPP_USE_UPP_
-+
-+typedef UniversalProcPtr NPP_SetWindowUPP;
-+enum {
-+ uppNPP_SetWindowProcInfo = kThinkCStackBased
-+ | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-+ | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPWindow *)))
-+ | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
-+};
-+#define NewNPP_SetWindowProc(FUNC) \
-+ (NPP_SetWindowUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_SetWindowProcInfo, GetCurrentArchitecture())
-+#define CallNPP_SetWindowProc(FUNC, ARG1, ARG2) \
-+ (NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_SetWindowProcInfo, (ARG1), (ARG2))
-+
-+#else
-+
-+typedef NPError (* NP_LOADDS NPP_SetWindowUPP)(NPP instance, NPWindow* window);
++typedef NPError(*NP_LOADDS NPP_SetWindowUPP) (NPP instance, NPWindow * window);
+#define NewNPP_SetWindowProc(FUNC) \
+ ((NPP_SetWindowUPP) (FUNC))
+#define CallNPP_SetWindowProc(FUNC, ARG1, ARG2) \
+ (*(FUNC))((ARG1), (ARG2))
+
-+#endif
-+
-+
+/* NPP_NewStream */
-+
-+#if _NPUPP_USE_UPP_
-+
-+typedef UniversalProcPtr NPP_NewStreamUPP;
-+enum {
-+ uppNPP_NewStreamProcInfo = kThinkCStackBased
-+ | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-+ | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPMIMEType)))
-+ | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(NPStream *)))
-+ | STACK_ROUTINE_PARAMETER(4, SIZE_CODE(sizeof(NPBool)))
-+ | STACK_ROUTINE_PARAMETER(5, SIZE_CODE(sizeof(uint16 *)))
-+ | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
-+};
-+#define NewNPP_NewStreamProc(FUNC) \
-+ (NPP_NewStreamUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_NewStreamProcInfo, GetCurrentArchitecture())
-+#define CallNPP_NewStreamProc(FUNC, ARG1, ARG2, ARG3, ARG4, ARG5) \
-+ (NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_NewStreamProcInfo, (ARG1), (ARG2), (ARG3), (ARG4), (ARG5))
-+#else
-+
-+typedef NPError (* NP_LOADDS NPP_NewStreamUPP)(NPP instance, NPMIMEType type, NPStream* stream, NPBool seekable, uint16* stype);
++typedef NPError(*NP_LOADDS NPP_NewStreamUPP) (NPP instance, NPMIMEType type, NPStream * stream,
++ NPBool seekable, uint16_t * stype);
+#define NewNPP_NewStreamProc(FUNC) \
+ ((NPP_NewStreamUPP) (FUNC))
+#define CallNPP_NewStreamProc(FUNC, ARG1, ARG2, ARG3, ARG4, ARG5) \
+ (*(FUNC))((ARG1), (ARG2), (ARG3), (ARG4), (ARG5))
-+#endif
-+
+
+/* NPP_DestroyStream */
-+
-+#if _NPUPP_USE_UPP_
Home |
Main Index |
Thread Index |
Old Index