mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 09:49:18 -04:00
- Add missing deps.
- Add clang fixes cherry-picked from git head. [1] PR: ports/186894 Submitted by: Mitja <lumiwa@gmail.com> Obtained from: http://git.videolan.org/?p=npapi-vlc.git;a=log [1]
This commit is contained in:
Juergen Lock
parent
1a87e82241
commit
f98f27680c
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=347330
3 changed files with 126 additions and 2 deletions
|
|
@ -9,14 +9,17 @@ MASTER_SITES= http://download.videolan.org/pub/videolan/vlc-webplugins/${PORTVER
|
||||||
MAINTAINER= ports@FreeBSD.org
|
MAINTAINER= ports@FreeBSD.org
|
||||||
COMMENT= Embeds vlc-player in web-browsers
|
COMMENT= Embeds vlc-player in web-browsers
|
||||||
|
|
||||||
LIB_DEPENDS= libvlc.so:${PORTSDIR}/multimedia/vlc
|
LIB_DEPENDS= libvlc.so:${PORTSDIR}/multimedia/vlc \
|
||||||
|
libxul.so:${PORTSDIR}/www/libxul
|
||||||
|
|
||||||
USES= webplugin:native
|
USES= webplugin:native pkgconfig
|
||||||
USE_XZ= yes
|
USE_XZ= yes
|
||||||
|
USE_GNOME= gtk20
|
||||||
WEBPLUGIN_NAME= #
|
WEBPLUGIN_NAME= #
|
||||||
WEBPLUGIN_FILES=libvlcplugin.so
|
WEBPLUGIN_FILES=libvlcplugin.so
|
||||||
GNU_CONFIGURE= yes
|
GNU_CONFIGURE= yes
|
||||||
PLIST_FILES= ${WEBPLUGIN_DIR:S,^${PREFIX}/,,}${WEBPLUGIN_FILES}
|
PLIST_FILES= ${WEBPLUGIN_DIR:S,^${PREFIX}/,,}${WEBPLUGIN_FILES}
|
||||||
|
PATCH_STRIP= -p1
|
||||||
|
|
||||||
do-install:
|
do-install:
|
||||||
${MKDIR} ${STAGEDIR}${WEBPLUGIN_DIR}
|
${MKDIR} ${STAGEDIR}${WEBPLUGIN_DIR}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,92 @@
|
||||||
|
From: Felix Paul Kuehne <fkuehne@videolan.org>
|
||||||
|
Date: Wed, 12 Feb 2014 12:15:21 +0000 (+0100)
|
||||||
|
Subject: nporuntime: move protected definitions to public as they are accessed by out of class...
|
||||||
|
X-Git-Url: http://git.videolan.org/?p=npapi-vlc.git;a=commitdiff_plain;h=be7ae9d9f73b45decd63c8e90d992800b5a882f8
|
||||||
|
|
||||||
|
nporuntime: move protected definitions to public as they are accessed by out of class selectors
|
||||||
|
|
||||||
|
Fix compilation with clang++, part 2
|
||||||
|
---
|
||||||
|
|
||||||
|
diff --git a/npapi/control/nporuntime.h b/npapi/control/nporuntime.h
|
||||||
|
index b279ade..6bb89ca 100644
|
||||||
|
--- a/npapi/control/nporuntime.h
|
||||||
|
+++ b/npapi/control/nporuntime.h
|
||||||
|
@@ -74,6 +74,31 @@ public:
|
||||||
|
static char* stringValue(const NPString &v);
|
||||||
|
static char* stringValue(const NPVariant &v);
|
||||||
|
|
||||||
|
+ bool isValid()
|
||||||
|
+ {
|
||||||
|
+ return _instance != NULL;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ enum InvokeResult
|
||||||
|
+ {
|
||||||
|
+ INVOKERESULT_NO_ERROR = 0, /* returns no error */
|
||||||
|
+ INVOKERESULT_GENERIC_ERROR = 1, /* returns error */
|
||||||
|
+ INVOKERESULT_NO_SUCH_METHOD = 2, /* throws method does not exist */
|
||||||
|
+ INVOKERESULT_INVALID_ARGS = 3, /* throws invalid arguments */
|
||||||
|
+ INVOKERESULT_INVALID_VALUE = 4, /* throws invalid value in assignment */
|
||||||
|
+ INVOKERESULT_OUT_OF_MEMORY = 5, /* throws out of memory */
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ virtual InvokeResult getProperty(int index, NPVariant &result);
|
||||||
|
+ virtual InvokeResult setProperty(int index, const NPVariant &value);
|
||||||
|
+ virtual InvokeResult removeProperty(int index);
|
||||||
|
+ virtual InvokeResult invoke(int index, const NPVariant *args, uint32_t argCount, NPVariant &result);
|
||||||
|
+ virtual InvokeResult invokeDefault(const NPVariant *args, uint32_t argCount, NPVariant &result);
|
||||||
|
+
|
||||||
|
+ bool returnInvokeResult(InvokeResult result);
|
||||||
|
+
|
||||||
|
+ static InvokeResult invokeResultString(const char *,NPVariant &);
|
||||||
|
+
|
||||||
|
protected:
|
||||||
|
void *operator new(size_t n)
|
||||||
|
{
|
||||||
|
@@ -89,11 +114,6 @@ protected:
|
||||||
|
NPN_MemFree(p);
|
||||||
|
};
|
||||||
|
|
||||||
|
- bool isValid()
|
||||||
|
- {
|
||||||
|
- return _instance != NULL;
|
||||||
|
- };
|
||||||
|
-
|
||||||
|
RuntimeNPObject(NPP instance, const NPClass *aClass) :
|
||||||
|
_instance(instance)
|
||||||
|
{
|
||||||
|
@@ -102,16 +122,6 @@ protected:
|
||||||
|
};
|
||||||
|
virtual ~RuntimeNPObject() {};
|
||||||
|
|
||||||
|
- enum InvokeResult
|
||||||
|
- {
|
||||||
|
- INVOKERESULT_NO_ERROR = 0, /* returns no error */
|
||||||
|
- INVOKERESULT_GENERIC_ERROR = 1, /* returns error */
|
||||||
|
- INVOKERESULT_NO_SUCH_METHOD = 2, /* throws method does not exist */
|
||||||
|
- INVOKERESULT_INVALID_ARGS = 3, /* throws invalid arguments */
|
||||||
|
- INVOKERESULT_INVALID_VALUE = 4, /* throws invalid value in assignment */
|
||||||
|
- INVOKERESULT_OUT_OF_MEMORY = 5, /* throws out of memory */
|
||||||
|
- };
|
||||||
|
-
|
||||||
|
friend void RuntimeNPClassDeallocate(NPObject *npobj);
|
||||||
|
friend void RuntimeNPClassInvalidate(NPObject *npobj);
|
||||||
|
template <class RuntimeNPObject> static bool RuntimeNPClassGetProperty(NPObject *npobj, NPIdentifier name, NPVariant *result);
|
||||||
|
@@ -125,16 +135,6 @@ protected:
|
||||||
|
uint32_t argCount,
|
||||||
|
NPVariant *result);
|
||||||
|
|
||||||
|
- virtual InvokeResult getProperty(int index, NPVariant &result);
|
||||||
|
- virtual InvokeResult setProperty(int index, const NPVariant &value);
|
||||||
|
- virtual InvokeResult removeProperty(int index);
|
||||||
|
- virtual InvokeResult invoke(int index, const NPVariant *args, uint32_t argCount, NPVariant &result);
|
||||||
|
- virtual InvokeResult invokeDefault(const NPVariant *args, uint32_t argCount, NPVariant &result);
|
||||||
|
-
|
||||||
|
- bool returnInvokeResult(InvokeResult result);
|
||||||
|
-
|
||||||
|
- static InvokeResult invokeResultString(const char *,NPVariant &);
|
||||||
|
-
|
||||||
|
bool isPluginRunning()
|
||||||
|
{
|
||||||
|
return (_instance->pdata != NULL);
|
||||||
|
|
@ -0,0 +1,29 @@
|
||||||
|
From: Felix Paul Kuehne <fkuehne@videolan.org>
|
||||||
|
Date: Wed, 12 Feb 2014 12:12:07 +0000 (+0100)
|
||||||
|
Subject: nporuntime: do not mix friend declarations with static implementations
|
||||||
|
X-Git-Url: http://git.videolan.org/?p=npapi-vlc.git;a=commitdiff_plain;h=f4a86b5994a797a36d94bb4cc8033efad3e7632b
|
||||||
|
|
||||||
|
nporuntime: do not mix friend declarations with static implementations
|
||||||
|
|
||||||
|
Fix compilation with clang++, part one
|
||||||
|
---
|
||||||
|
|
||||||
|
diff --git a/npapi/control/nporuntime.h b/npapi/control/nporuntime.h
|
||||||
|
index d67ec8c..b279ade 100644
|
||||||
|
--- a/npapi/control/nporuntime.h
|
||||||
|
+++ b/npapi/control/nporuntime.h
|
||||||
|
@@ -114,10 +114,10 @@ protected:
|
||||||
|
|
||||||
|
friend void RuntimeNPClassDeallocate(NPObject *npobj);
|
||||||
|
friend void RuntimeNPClassInvalidate(NPObject *npobj);
|
||||||
|
- template <class RuntimeNPObject> friend bool RuntimeNPClassGetProperty(NPObject *npobj, NPIdentifier name, NPVariant *result);
|
||||||
|
- template <class RuntimeNPObject> friend bool RuntimeNPClassSetProperty(NPObject *npobj, NPIdentifier name, const NPVariant *value);
|
||||||
|
- template <class RuntimeNPObject> friend bool RuntimeNPClassRemoveProperty(NPObject *npobj, NPIdentifier name);
|
||||||
|
- template <class RuntimeNPObject> friend bool RuntimeNPClassInvoke(NPObject *npobj, NPIdentifier name,
|
||||||
|
+ template <class RuntimeNPObject> static bool RuntimeNPClassGetProperty(NPObject *npobj, NPIdentifier name, NPVariant *result);
|
||||||
|
+ template <class RuntimeNPObject> static bool RuntimeNPClassSetProperty(NPObject *npobj, NPIdentifier name, const NPVariant *value);
|
||||||
|
+ template <class RuntimeNPObject> static bool RuntimeNPClassRemoveProperty(NPObject *npobj, NPIdentifier name);
|
||||||
|
+ template <class RuntimeNPObject> static bool RuntimeNPClassInvoke(NPObject *npobj, NPIdentifier name,
|
||||||
|
const NPVariant *args, uint32_t argCount,
|
||||||
|
NPVariant *result);
|
||||||
|
friend bool RuntimeNPClassInvokeDefault(NPObject *npobj,
|
||||||
Loading…
Add table
Reference in a new issue