Author: lisu Date: Tue Dec 6 11:03:27 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- deal with whether NPP_/NP_ GetMIMEDescription function returns const or not;
patch from upstream
---- Files affected:
packages/vlc:
vlc.spec (1.278 -> 1.279) , vlc-firefox-npapi-mime.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/vlc/vlc.spec
diff -u packages/vlc/vlc.spec:1.278 packages/vlc/vlc.spec:1.279
--- packages/vlc/vlc.spec:1.278 Sat Nov 12 15:49:58 2011
+++ packages/vlc/vlc.spec Tue Dec 6 12:03:22 2011
@@ -54,6 +54,7 @@
Patch3: %{name}-system-minizip.patch
Patch4: %{name}-upnp.patch
Patch5: %{name}-osdmenu_build.patch
+Patch6: %{name}-firefox-npapi-mime.patch
URL: http://www.videolan.org/vlc/
%{?with_directfb:BuildRequires: DirectFB-devel}
BuildRequires: OpenGL-devel
@@ -302,6 +303,7 @@
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1
%build
cp -f /usr/share/automake/config.* .
@@ -861,6 +863,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.279 2011/12/06 11:03:22 lisu
+- deal with whether NPP_/NP_ GetMIMEDescription function returns const or not;
patch from upstream
+
Revision 1.278 2011/11/12 14:49:58 gotar
- rel. 2 - rebuild with new libdvbpsi.so.7
================================================================
Index: packages/vlc/vlc-firefox-npapi-mime.patch
diff -u /dev/null packages/vlc/vlc-firefox-npapi-mime.patch:1.1
--- /dev/null Tue Dec 6 12:03:27 2011
+++ packages/vlc/vlc-firefox-npapi-mime.patch Tue Dec 6 12:03:22 2011
@@ -0,0 +1,45 @@
+From: Mathieu Trudel-Lapierre <[email protected]>
+Subject: NPP_GetMIMEDescription should be const char*.
+Last-Update: 2011-11-15
+
+... So that the definition matches with firefox's npapi.h.
+
+Index: vlc/projects/mozilla/vlcshell.cpp
+===================================================================
+--- vlc.orig/projects/mozilla/vlcshell.cpp 2011-11-15 14:51:04.298445000
-0500
++++ vlc/projects/mozilla/vlcshell.cpp 2011-11-15 17:52:44.416707114 -0500
+@@ -71,7 +71,7 @@
+
/******************************************************************************
+ * UNIX-only API calls
+
*****************************************************************************/
+-char * NPP_GetMIMEDescription( void )
++const char * NPP_GetMIMEDescription( void )
+ {
+ static char mimetype[] = PLUGIN_MIMETYPES;
+ return mimetype;
+Index: vlc/projects/mozilla/vlcshell.h
+===================================================================
+--- vlc.orig/projects/mozilla/vlcshell.h 2011-11-15 14:51:04.298445000
-0500
++++ vlc/projects/mozilla/vlcshell.h 2011-11-15 17:53:08.736706029 -0500
+@@ -24,7 +24,7 @@
+ #ifndef __VLCSHELL_H__
+ #define __VLCSHELL_H__
+
+-char * NPP_GetMIMEDescription( void );
++const char * NPP_GetMIMEDescription( void );
+
+ NPError NPP_Initialize( void );
+
+Index: vlc/projects/mozilla/support/npunix.cpp
+===================================================================
+--- vlc.orig/projects/mozilla/support/npunix.cpp 2011-11-15
14:51:04.298445000 -0500
++++ vlc/projects/mozilla/support/npunix.cpp 2011-11-15 18:06:53.972669237
-0500
+@@ -767,7 +767,7 @@
+ * - Netscape uses the return value to identify when an object instance
+ * of this plugin should be created.
+ */
+-char *
++const char *
+ NP_GetMIMEDescription(void)
+ {
+ return NPP_GetMIMEDescription();
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/vlc/vlc.spec?r1=1.278&r2=1.279&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
