[SCM] VLC media player packaging branch, lucid, updated. debian/1.0.5-2ubuntu1-4-ga7c45d0
bdrung-guest at users.alioth.debian.org
bdrung-guest at users.alioth.debian.org
Thu Apr 15 10:40:30 UTC 2010
The following commit has been merged in the lucid branch:
commit e96a80544deb550881947eb8cd02449261f6639d
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Thu Apr 15 10:49:36 2010 +0200
Import 1.0.5-2ubuntu2
* Add patches to fix FTBFS with xulruner-1.9.2 from upstream (LP: #558981)
- add debian/patches/519-Typedef-changes-from-xulrunner-1.9.1.patch
- add debian/patches/520-Don-t-hardcode-OJI-define-deprecated-xith-libxul-1.9.patch
- add debian/patches/521-Untracked-API-change-utf8-to-UTF8.patch
- add debian/patches/522-Mozilla-do-not-hard-code-autoconf-file-descriptors.patch
- add debian/patches/523-Require-xul-1.9.2-explicitly.patch
- add debian/patches/524-Mozilla-More-fixes-for-XulRunner-1.9.2.patch
- add debian/patches/525-Mozilla-more-fixes.patch
- add debian/patches/526-Mozilla-More-final-Win32-compile-fixes-for-XulRunner.patch
* Add patch to drop OJI support as xulrunner-1.9.2 on Linux doesn't support it
- add debian/patches/600-drop-OJI-xul-192.patch
diff --git a/debian/changelog b/debian/changelog
index c3f1963..8345798 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+vlc (1.0.5-2ubuntu2) lucid; urgency=low
+
+ * Add patches to fix FTBFS with xulruner-1.9.2 from upstream (LP: #558981)
+ - add debian/patches/519-Typedef-changes-from-xulrunner-1.9.1.patch
+ - add debian/patches/520-Don-t-hardcode-OJI-define-deprecated-xith-libxul-1.9.patch
+ - add debian/patches/521-Untracked-API-change-utf8-to-UTF8.patch
+ - add debian/patches/522-Mozilla-do-not-hard-code-autoconf-file-descriptors.patch
+ - add debian/patches/523-Require-xul-1.9.2-explicitly.patch
+ - add debian/patches/524-Mozilla-More-fixes-for-XulRunner-1.9.2.patch
+ - add debian/patches/525-Mozilla-more-fixes.patch
+ - add debian/patches/526-Mozilla-More-final-Win32-compile-fixes-for-XulRunner.patch
+ * Add patch to drop OJI support as xulrunner-1.9.2 on Linux doesn't support it
+ - add debian/patches/600-drop-OJI-xul-192.patch
+
+ -- Micah Gersten <micahg at ubuntu.com> Tue, 13 Apr 2010 10:09:58 -0500
+
vlc (1.0.5-2ubuntu1) lucid; urgency=low
* Merge from Debian unstable, remaining changes:
diff --git a/debian/patches/519-Typedef-changes-from-xulrunner-1.9.1.patch b/debian/patches/519-Typedef-changes-from-xulrunner-1.9.1.patch
new file mode 100644
index 0000000..5e6b84a
--- /dev/null
+++ b/debian/patches/519-Typedef-changes-from-xulrunner-1.9.1.patch
@@ -0,0 +1,151 @@
+From 46cdf014fe622a27d986acd859a70e91ec606cb1 Mon Sep 17 00:00:00 2001
+From: Nicolas Chauvet <kwizart at gmail.com>
+Date: Mon, 29 Mar 2010 23:45:48 +0200
+Subject: [PATCH] Typedef changes from xulrunner 1.9.1
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>
+---
+ projects/mozilla/vlcplugin.h | 8 ++++++++
+ projects/mozilla/vlcshell.cpp | 20 +++++++++++++++++++-
+ projects/mozilla/vlcshell.h | 19 +++++++++++++++++++
+ 3 files changed, 46 insertions(+), 1 deletions(-)
+
+diff --git a/projects/mozilla/vlcplugin.h b/projects/mozilla/vlcplugin.h
+index 754118b..a34fd69 100644
+--- a/projects/mozilla/vlcplugin.h
++++ b/projects/mozilla/vlcplugin.h
+@@ -173,7 +173,11 @@ private:
+ class VlcPlugin
+ {
+ public:
++#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
+ VlcPlugin( NPP, uint16 );
++#else
++ VlcPlugin( NPP, uint16_t );
++#endif
+ virtual ~VlcPlugin();
+
+ NPError init(int argc, char* const argn[], char* const argv[]);
+@@ -226,7 +230,11 @@ public:
+ vlc_toolbar_clicked_t getToolbarButtonClicked( int i_xpos, int i_ypos );
+ #endif
+
++#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
+ uint16 i_npmode; /* either NP_EMBED or NP_FULL */
++#else
++ uint16_t i_npmode; /* either NP_EMBED or NP_FULL */
++#endif
+
+ /* plugin properties */
+ int b_stream;
+diff --git a/projects/mozilla/vlcshell.cpp b/projects/mozilla/vlcshell.cpp
+index 5de1ed0..774c0a7 100644
+--- a/projects/mozilla/vlcshell.cpp
++++ b/projects/mozilla/vlcshell.cpp
+@@ -284,7 +284,12 @@ void NPP_Shutdown( void )
+ ;
+ }
+
+-NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc,
++NPError NPP_New( NPMIMEType pluginType, NPP instance,
++#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
++ uint16 mode, int16 argc,
++#else
++ uint16_t mode, int16_t argc,
++#endif
+ char* argn[], char* argv[], NPSavedData* saved )
+ {
+ NPError status;
+@@ -555,7 +560,11 @@ NPError NPP_SetWindow( NPP instance, NPWindow* window )
+ }
+
+ NPError NPP_NewStream( NPP instance, NPMIMEType type, NPStream *stream,
++#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
+ NPBool seekable, uint16 *stype )
++#else
++ NPBool seekable, uint16_t *stype )
++#endif
+ {
+ if( NULL == instance )
+ {
+@@ -584,14 +593,23 @@ NPError NPP_NewStream( NPP instance, NPMIMEType type, NPStream *stream,
+ return NPERR_GENERIC_ERROR;
+ }
+
++#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
+ int32 NPP_WriteReady( NPP instance, NPStream *stream )
++#else
++int32_t NPP_WriteReady( NPP instance, NPStream *stream )
++#endif
+ {
+ /* TODO */
+ return 8*1024;
+ }
+
++#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
+ int32 NPP_Write( NPP instance, NPStream *stream, int32 offset,
+ int32 len, void *buffer )
++#else
++int32_t NPP_Write( NPP instance, NPStream *stream, int32_t offset,
++ int32_t len, void *buffer )
++#endif
+ {
+ /* TODO */
+ return len;
+diff --git a/projects/mozilla/vlcshell.h b/projects/mozilla/vlcshell.h
+index 114865a..ecd868d 100644
+--- a/projects/mozilla/vlcshell.h
++++ b/projects/mozilla/vlcshell.h
+@@ -24,6 +24,11 @@
+ #ifndef __VLCSHELL_H__
+ #define __VLCSHELL_H__
+
++/* Mozilla stuff */
++#ifdef HAVE_MOZILLA_CONFIG_H
++# include <mozilla-config.h>
++#endif
++
+ char * NPP_GetMIMEDescription( void );
+
+ NPError NPP_Initialize( void );
+@@ -43,20 +48,34 @@ NPError NPP_SetValue( NPP instance, NPNVariable variable, void *value );
+ NPError NPP_SetWindow( NPP instance, NPWindow* window );
+
+ NPError NPP_NewStream( NPP instance, NPMIMEType type, NPStream *stream,
++#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
+ NPBool seekable, uint16 *stype );
++#else
++ NPBool seekable, uint16_t *stype );
++#endif
+ NPError NPP_DestroyStream( NPP instance, NPStream *stream, NPError reason );
+ void NPP_StreamAsFile( NPP instance, NPStream *stream, const char* fname );
+
++#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
+ int32 NPP_WriteReady( NPP instance, NPStream *stream );
+ int32 NPP_Write( NPP instance, NPStream *stream, int32 offset,
+ int32 len, void *buffer );
++#else
++int32_t NPP_WriteReady( NPP instance, NPStream *stream );
++int32_t NPP_Write( NPP instance, NPStream *stream, int32_t offset,
++ int32_t len, void *buffer );
++#endif
+
+ void NPP_URLNotify( NPP instance, const char* url,
+ NPReason reason, void* notifyData );
+ void NPP_Print( NPP instance, NPPrint* printInfo );
+
+ #ifdef XP_MACOSX
++#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
+ int16 NPP_HandleEvent( NPP instance, void * event );
++#else
++int16_t NPP_HandleEvent( NPP instance, void * event );
++#endif
+ #endif
+
+ #endif
+--
+1.7.0
+
diff --git a/debian/patches/520-Don-t-hardcode-OJI-define-deprecated-xith-libxul-1.9.patch b/debian/patches/520-Don-t-hardcode-OJI-define-deprecated-xith-libxul-1.9.patch
new file mode 100644
index 0000000..b4ab779
--- /dev/null
+++ b/debian/patches/520-Don-t-hardcode-OJI-define-deprecated-xith-libxul-1.9.patch
@@ -0,0 +1,62 @@
+From 6dbe4986f7c11370c2bc275491d4502f5f4c3c60 Mon Sep 17 00:00:00 2001
+From: Nicolas Chauvet <kwizart at gmail.com>
+Date: Mon, 29 Mar 2010 23:45:46 +0200
+Subject: [PATCH] - Don't hardcode OJI define - deprecated xith libxul 1.9.2
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>
+---
+ projects/mozilla/support/npunix.c | 1 -
+ projects/mozilla/vlcshell.cpp | 2 ++
+ projects/mozilla/vlcshell.h | 3 +++
+ 3 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/projects/mozilla/support/npunix.c b/projects/mozilla/support/npunix.c
+index 9596c27..9eb851c 100644
+--- a/projects/mozilla/support/npunix.c
++++ b/projects/mozilla/support/npunix.c
+@@ -46,7 +46,6 @@
+ #include "config.h"
+
+ #define XP_UNIX 1
+-#define OJI 1
+
+ #include <npapi.h>
+ #if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
+diff --git a/projects/mozilla/vlcshell.cpp b/projects/mozilla/vlcshell.cpp
+index bff669d..5de1ed0 100644
+--- a/projects/mozilla/vlcshell.cpp
++++ b/projects/mozilla/vlcshell.cpp
+@@ -272,10 +272,12 @@ NPError NPP_Initialize( void )
+ return NPERR_NO_ERROR;
+ }
+
++#ifdef OJI
+ jref NPP_GetJavaClass( void )
+ {
+ return NULL;
+ }
++#endif
+
+ void NPP_Shutdown( void )
+ {
+diff --git a/projects/mozilla/vlcshell.h b/projects/mozilla/vlcshell.h
+index 6dd1561..114865a 100644
+--- a/projects/mozilla/vlcshell.h
++++ b/projects/mozilla/vlcshell.h
+@@ -27,7 +27,10 @@
+ char * NPP_GetMIMEDescription( void );
+
+ NPError NPP_Initialize( void );
++
++#ifdef OJI
+ jref NPP_GetJavaClass( void );
++#endif
+ void NPP_Shutdown( void );
+
+ NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc,
+--
+1.7.0
+
diff --git a/debian/patches/521-Untracked-API-change-utf8-to-UTF8.patch b/debian/patches/521-Untracked-API-change-utf8-to-UTF8.patch
new file mode 100644
index 0000000..02e6b0c
--- /dev/null
+++ b/debian/patches/521-Untracked-API-change-utf8-to-UTF8.patch
@@ -0,0 +1,89 @@
+From 9fa62a2c395d481e5df3667fc3d200e82e14b4b0 Mon Sep 17 00:00:00 2001
+From: Nicolas Chauvet <kwizart at gmail.com>
+Date: Sat, 10 Apr 2010 16:10:20 +0300
+Subject: [PATCH] Untracked API change utf8 to UTF8
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>
+---
+ projects/mozilla/control/npolibvlc.cpp | 4 ++--
+ projects/mozilla/control/nporuntime.cpp | 6 +++---
+ projects/mozilla/vlcplugin.cpp | 10 +++++-----
+ 3 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/projects/mozilla/control/npolibvlc.cpp b/projects/mozilla/control/npolibvlc.cpp
+index 6fb6132..4affd41 100644
+--- a/projects/mozilla/control/npolibvlc.cpp
++++ b/projects/mozilla/control/npolibvlc.cpp
+@@ -967,7 +967,7 @@ LibvlcPlaylistNPObject::invoke(int index, const NPVariant *args,
+ 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;
+@@ -979,7 +979,7 @@ void LibvlcPlaylistNPObject::parseOptions(const NPString &nps,
+ {
+ int nOptions = 0;
+
+- char *end = val + nps.utf8length;
++ char *end = val + nps.UTF8Length;
+ while( val < end )
+ {
+ // skip leading blanks
+diff --git a/projects/mozilla/control/nporuntime.cpp b/projects/mozilla/control/nporuntime.cpp
+index b237fbd..cced74a 100644
+--- a/projects/mozilla/control/nporuntime.cpp
++++ b/projects/mozilla/control/nporuntime.cpp
+@@ -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 --git a/projects/mozilla/vlcplugin.cpp b/projects/mozilla/vlcplugin.cpp
+index 41ecab2..caeabda 100644
+--- a/projects/mozilla/vlcplugin.cpp
++++ b/projects/mozilla/vlcplugin.cpp
+@@ -449,8 +449,8 @@ NPError VlcPlugin::init(int argc, char* const argn[], char* const argv[])
+ 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) )
+ {
+@@ -458,11 +458,11 @@ NPError VlcPlugin::init(int argc, char* const argn[], char* const argv[])
+ {
+ 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);
+--
+1.7.0
+
diff --git a/debian/patches/522-Mozilla-do-not-hard-code-autoconf-file-descriptors.patch b/debian/patches/522-Mozilla-do-not-hard-code-autoconf-file-descriptors.patch
new file mode 100644
index 0000000..5d9566d
--- /dev/null
+++ b/debian/patches/522-Mozilla-do-not-hard-code-autoconf-file-descriptors.patch
@@ -0,0 +1,40 @@
+Original Patch From 9eb581755a1502c5d8fde90355c134fea9668f5d Mon Sep 17 00:00:00 2001
+Refreshed against vlc 1.0.5 by Micah Gersten <micahg at ubuntu.com>
+From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi at remlab.net>
+Date: Sat, 10 Apr 2010 16:38:52 +0300
+Subject: [PATCH] Mozilla: do not hard-code autoconf file descriptors
+
+---
+ configure.ac | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+Index: vlc-1.0.5/configure.ac
+===================================================================
+--- vlc-1.0.5.orig/configure.ac
++++ vlc-1.0.5/configure.ac
+@@ -5621,21 +5621,21 @@
+ AC_MSG_NOTICE([Checking for Mozilla])
+ found=0
+ if test -n "$MOZILLA_CFLAGS" -a -n "$MOZILLA_LIBS"
+ then
+ found=1
+ else
+ if test -n "$PKG_CONFIG"; then
+ for i in "${with_mozilla_pkg}" libxul {seamonkey,iceape,xulrunner,firefox,iceweasel,mozilla}-plugin; do
+- echo "Trying to find $i.pc files" >&5
+- if $PKG_CONFIG --exists --print-errors "$i" 2>&5
++ echo "Trying to find $i package" >&AS_MESSAGE_LOG_FD
++ if $PKG_CONFIG --exists --print-errors "$i" 2>&AS_MESSAGE_LOG_FD
+ then
+- echo "Using $i.pc files." >&5
+- echo "Using $i.pc files." >&6
++ echo "Using $i pkg-config package." >&AS_MESSAGE_LOG_FD
++ echo "Using $i package." >&AS_MESSAGE_FD
+ found=1
+ MOZILLA_CFLAGS=$(eval $PKG_CONFIG --cflags "$i" )
+ MOZILLA_LIBS=$(eval $PKG_CONFIG --libs "$i" )
+ break
+ fi
+ done
+ fi
+ fi
diff --git a/debian/patches/523-Require-xul-1.9.2-explicitly.patch b/debian/patches/523-Require-xul-1.9.2-explicitly.patch
new file mode 100644
index 0000000..f83ef6c
--- /dev/null
+++ b/debian/patches/523-Require-xul-1.9.2-explicitly.patch
@@ -0,0 +1,78 @@
+From 464c5784caf9462a021505775cdc94ee2404475d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi at remlab.net>
+Date: Sat, 10 Apr 2010 16:53:36 +0300
+Subject: [PATCH] Require xul >= 1.9.2 explicitly
+
+---
+ configure.ac | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+Index: vlc-1.0.5/configure.ac
+===================================================================
+--- vlc-1.0.5.orig/configure.ac
++++ vlc-1.0.5/configure.ac
+@@ -5622,40 +5622,43 @@
+ found=0
+ if test -n "$MOZILLA_CFLAGS" -a -n "$MOZILLA_LIBS"
+ then
+ found=1
+ else
+ if test -n "$PKG_CONFIG"; then
+ for i in "${with_mozilla_pkg}" libxul {seamonkey,iceape,xulrunner,firefox,iceweasel,mozilla}-plugin; do
+ echo "Trying to find $i package" >&AS_MESSAGE_LOG_FD
+- if $PKG_CONFIG --exists --print-errors "$i" 2>&AS_MESSAGE_LOG_FD
++ AC_MSG_CHECKING([for $i >= 1.9.2])
++ if $PKG_CONFIG --exists --print-errors "$i >= 1.9.2" 2>&AS_MESSAGE_LOG_FD
+ then
+ echo "Using $i pkg-config package." >&AS_MESSAGE_LOG_FD
+ echo "Using $i package." >&AS_MESSAGE_FD
+ found=1
+ MOZILLA_CFLAGS=$(eval $PKG_CONFIG --cflags "$i" )
+ MOZILLA_LIBS=$(eval $PKG_CONFIG --libs "$i" )
++ AC_MSG_RESULT([yes])
+ break
+ fi
++ AC_MSG_RESULT([no])
+ done
+ fi
+ fi
+ AS_IF( [test $found = 1],[
+ CPPFLAGS="${CPPFLAGS_save} ${MOZILLA_CFLAGS}"
+ MOZILLA_REQUIRED_HEADERS=1
+ AC_CHECK_HEADERS([npfunctions.h])
+ AC_CHECK_HEADERS(npapi.h,,MOZILLA_REQUIRED_HEADERS=0)
+ AC_CHECK_HEADERS(npruntime.h,,MOZILLA_REQUIRED_HEADERS=0,
+ [#if HAVE_NPAPI_H
+ # include <npapi.h>
+ #endif
+ ])
+ if test "${MOZILLA_REQUIRED_HEADERS}" = "0"; then
+- AC_MSG_ERROR([Please install the Firefox development tools; mozilla-config.h, plugin/npapi.h and plugin/npruntime.h were not found.])
++ AC_MSG_ERROR([Please install the Firefox development tools; plugin/npapi.h and/or plugin/npruntime.h were not found.])
+ fi
+ MOZILLA_REQUIRED_HEADERS=
+ mozilla=:
+ AS_IF([ test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"],[
+ VLC_ADD_CPPFLAGS([mozilla],[-DXP_UNIX -DOJI])
+ AS_IF([ test "${SYS}" != "darwin"],[
+ PKG_CHECK_MODULES(XPM, [xpm xt],[
+ VLC_ADD_CPPFLAGS([mozilla],[-DMOZ_X11])
+@@ -5670,17 +5673,17 @@
+ PLUGINS_BINDINGS="${PLUGINS_BINDINGS} mozilla"
+ MOZILLA_CONFIG=
+ CPPFLAGS="${CPPFLAGS_save}"
+ ],
+ [
+ AC_PATH_PROGS(MOZILLA_CONFIG,
+ [mozilla-config seamonkey-config xulrunner-config],
+ [no])
+- test "${MOZILLA_CONFIG}" = "no" && AC_MSG_ERROR([Please install the Mozilla development tools. mozilla-config was not found.])
++ test "${MOZILLA_CONFIG}" = "no" && AC_MSG_ERROR([Please install the Mozilla development tools (version 1.9.2 or higher) or use --disable-mozilla.])
+ ]
+ )
+ dnl pkg-config failed but we might have found a mozilla-config
+ AS_IF( [test ! -z "${MOZILLA_CONFIG}"],[
+ if ${MOZILLA_CONFIG} --defines | grep -q 'MOZ_X11=1'; then
+ LDFLAGS="${LDFLAGS_save} ${X_LIBS} ${X_PRE_LIBS}"
+ AC_CHECK_LIB(Xt,XtStrings,
+ [
diff --git a/debian/patches/524-Mozilla-More-fixes-for-XulRunner-1.9.2.patch b/debian/patches/524-Mozilla-More-fixes-for-XulRunner-1.9.2.patch
new file mode 100644
index 0000000..46c4231
--- /dev/null
+++ b/debian/patches/524-Mozilla-More-fixes-for-XulRunner-1.9.2.patch
@@ -0,0 +1,72 @@
+From 4eea1289d83879fcafed7bb0e1f37966961f43e3 Mon Sep 17 00:00:00 2001
+Refreshed against vlc 1.0.5
+From: Jean-Baptiste Kempf <jb at videolan.org>
+Date: Sat, 10 Apr 2010 16:17:09 +0200
+Subject: [PATCH 520/522] Mozilla: More fixes for XulRunner 1.9.2
+
+---
+ projects/mozilla/vlcplugin.cpp | 5 +++++
+ projects/mozilla/vlcshell.h | 7 +++++++
+ 2 files changed, 12 insertions(+)
+
+Index: vlc-1.0.5/projects/mozilla/vlcplugin.cpp
+===================================================================
+--- vlc-1.0.5.orig/projects/mozilla/vlcplugin.cpp
++++ vlc-1.0.5/projects/mozilla/vlcplugin.cpp
+@@ -31,21 +31,26 @@
+ #ifdef HAVE_MOZILLA_CONFIG_H
+ # include <mozilla-config.h>
+ #endif
+
+ #include "vlcplugin.h"
+ #include "control/npolibvlc.h"
+
+ #include <ctype.h>
++#include <assert.h>
+
+ /*****************************************************************************
+ * VlcPlugin constructor and destructor
+ *****************************************************************************/
++#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
+ VlcPlugin::VlcPlugin( NPP instance, uint16 mode ) :
++#else
++VlcPlugin::VlcPlugin( NPP instance, uint16_t mode ) :
++#endif
+ i_npmode(mode),
+ b_stream(0),
+ b_autoplay(1),
+ b_toolbar(0),
+ psz_target(NULL),
+ playlist_index(-1),
+ libvlc_instance(NULL),
+ libvlc_media_list(NULL),
+Index: vlc-1.0.5/projects/mozilla/vlcshell.h
+===================================================================
+--- vlc-1.0.5.orig/projects/mozilla/vlcshell.h
++++ vlc-1.0.5/projects/mozilla/vlcshell.h
+@@ -33,18 +33,25 @@
+
+ NPError NPP_Initialize( void );
+
+ #ifdef OJI
+ jref NPP_GetJavaClass( void );
+ #endif
+ void NPP_Shutdown( void );
+
++#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
+ NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc,
+ char* argn[], char* argv[], NPSavedData* saved );
++#else
++NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc,
++ char* argn[], char* argv[], NPSavedData* saved );
++#endif
++
++
+ NPError NPP_Destroy( NPP instance, NPSavedData** save );
+
+ NPError NPP_GetValue( NPP instance, NPPVariable variable, void *value );
+ NPError NPP_SetValue( NPP instance, NPNVariable variable, void *value );
+
+ NPError NPP_SetWindow( NPP instance, NPWindow* window );
+
+ NPError NPP_NewStream( NPP instance, NPMIMEType type, NPStream *stream,
diff --git a/debian/patches/525-Mozilla-more-fixes.patch b/debian/patches/525-Mozilla-more-fixes.patch
new file mode 100644
index 0000000..27f9f93
--- /dev/null
+++ b/debian/patches/525-Mozilla-more-fixes.patch
@@ -0,0 +1,24 @@
+From 2903fb7906863ef1344f4b62228875952aa64497 Mon Sep 17 00:00:00 2001
+From: Jean-Baptiste Kempf <jb at videolan.org>
+Date: Sat, 10 Apr 2010 16:22:30 +0200
+Subject: [PATCH 521/522] Mozilla: more fixes
+
+---
+ projects/mozilla/vlcplugin.cpp | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/projects/mozilla/vlcplugin.cpp b/projects/mozilla/vlcplugin.cpp
+index 48a287b..7e4a88d 100644
+--- a/projects/mozilla/vlcplugin.cpp
++++ b/projects/mozilla/vlcplugin.cpp
+@@ -47,6 +47,7 @@
+
+ #include <stdio.h>
+ #include <assert.h>
++#include <stdlib.h>
+
+ /*****************************************************************************
+ * utilitiy functions
+--
+1.7.0
+
diff --git a/debian/patches/526-Mozilla-More-final-Win32-compile-fixes-for-XulRunner.patch b/debian/patches/526-Mozilla-More-final-Win32-compile-fixes-for-XulRunner.patch
new file mode 100644
index 0000000..0ebbcc5
--- /dev/null
+++ b/debian/patches/526-Mozilla-More-final-Win32-compile-fixes-for-XulRunner.patch
@@ -0,0 +1,108 @@
+From 68a032f9ff344ee45e0ca7d0e75620d155ae1019 Mon Sep 17 00:00:00 2001
+From: Jean-Baptiste Kempf <jb at videolan.org>
+Date: Sat, 10 Apr 2010 16:50:02 +0200
+Subject: [PATCH 522/522] Mozilla: More (final?) Win32 compile fixes for XulRunner 1.9.2
+
+---
+ projects/mozilla/control/npolibvlc.cpp | 12 ++++++------
+ projects/mozilla/support/npwin.cpp | 2 +-
+ projects/mozilla/vlcplugin.cpp | 5 +++--
+ 3 files changed, 10 insertions(+), 9 deletions(-)
+
+diff --git a/projects/mozilla/control/npolibvlc.cpp b/projects/mozilla/control/npolibvlc.cpp
+index 4affd41..5bc8534 100644
+--- a/projects/mozilla/control/npolibvlc.cpp
++++ b/projects/mozilla/control/npolibvlc.cpp
+@@ -57,7 +57,7 @@ NPVariant copyNPVariant(const NPVariant& original)
+ NPVariant res;
+
+ if (NPVARIANT_IS_STRING(original))
+- STRINGZ_TO_NPVARIANT(strdup(NPVARIANT_TO_STRING(original).utf8characters), res);
++ STRINGZ_TO_NPVARIANT(strdup(NPVARIANT_TO_STRING(original).UTF8Characters), res);
+ else if (NPVARIANT_IS_INT32(original))
+ INT32_TO_NPVARIANT(NPVARIANT_TO_INT32(original), res);
+ else if (NPVARIANT_IS_DOUBLE(original))
+@@ -1639,7 +1639,7 @@ LibvlcMarqueeNPObject::setProperty(int index, const NPVariant &value)
+
+ case ID_marquee_position:
+ if( !NPVARIANT_IS_STRING(value) ||
+- !position_byname( NPVARIANT_TO_STRING(value).utf8characters, i ) )
++ !position_byname( NPVARIANT_TO_STRING(value).UTF8Characters, i ) )
+ return INVOKERESULT_INVALID_VALUE;
+
+ libvlc_video_set_marquee_int(p_md, libvlc_marquee_Position, i);
+@@ -1785,7 +1785,7 @@ LibvlcLogoNPObject::setProperty(int index, const NPVariant &value)
+
+ case ID_logo_position:
+ if( !NPVARIANT_IS_STRING(value) ||
+- !position_byname( NPVARIANT_TO_STRING(value).utf8characters, i ) )
++ !position_byname( NPVARIANT_TO_STRING(value).UTF8Characters, i ) )
+ return INVOKERESULT_INVALID_VALUE;
+
+ libvlc_video_set_logo_int(p_md, libvlc_logo_position, i);
+@@ -1843,7 +1843,7 @@ LibvlcLogoNPObject::invoke(int index, const NPVariant *args,
+ {
+ if( !NPVARIANT_IS_STRING(args[i]) )
+ return INVOKERESULT_INVALID_VALUE;
+- len+=NPVARIANT_TO_STRING(args[i]).utf8length+1;
++ len+=NPVARIANT_TO_STRING(args[i]).UTF8Length+1;
+ }
+
+ buf = (char *)malloc( len+1 );
+@@ -1853,8 +1853,8 @@ LibvlcLogoNPObject::invoke(int index, const NPVariant *args,
+ for( h=buf,i=0;i<argCount;++i )
+ {
+ if(i) *h++=';';
+- len=NPVARIANT_TO_STRING(args[i]).utf8length;
+- memcpy(h,NPVARIANT_TO_STRING(args[i]).utf8characters,len);
++ len=NPVARIANT_TO_STRING(args[i]).UTF8Length;
++ memcpy(h,NPVARIANT_TO_STRING(args[i]).UTF8Characters,len);
+ h+=len;
+ }
+ *h='\0';
+diff --git a/projects/mozilla/support/npwin.cpp b/projects/mozilla/support/npwin.cpp
+index 4674194..77f540f 100644
+--- a/projects/mozilla/support/npwin.cpp
++++ b/projects/mozilla/support/npwin.cpp
+@@ -544,7 +544,7 @@ const char* NPN_UserAgent(NPP instance)
+ /* allocates memory from the Navigator's memory space. Necessary so that
+ * saved instance data may be freed by Navigator when exiting.
+ */
+-void *NPN_MemAlloc(uint32 size)
++void *NPN_MemAlloc(uint32_t size)
+ {
+ return g_pNavigatorFuncs->memalloc(size);
+ }
+diff --git a/projects/mozilla/vlcplugin.cpp b/projects/mozilla/vlcplugin.cpp
+index 7e4a88d..b7794a4 100644
+--- a/projects/mozilla/vlcplugin.cpp
++++ b/projects/mozilla/vlcplugin.cpp
+@@ -36,6 +36,7 @@
+ #include "control/npolibvlc.h"
+
+ #include <ctype.h>
++
+ #if defined(XP_UNIX)
+ # include <pthread.h>
+ #elif defined(XP_WIN)
+@@ -236,7 +237,7 @@ inline EventObj::event_t EventObj::find_event(const char *s) const
+
+ bool EventObj::insert(const NPString &s, NPObject *l, bool b)
+ {
+- event_t e = find_event(s.utf8characters);
++ event_t e = find_event(s.UTF8Characters);
+ if( e>=maxbit() )
+ return false;
+
+@@ -261,7 +262,7 @@ bool EventObj::insert(const NPString &s, NPObject *l, bool b)
+
+ bool EventObj::remove(const NPString &s, NPObject *l, bool b)
+ {
+- event_t e = find_event(s.utf8characters);
++ event_t e = find_event(s.UTF8Characters);
+ if( e>=maxbit() || !get(e) )
+ return false;
+
+--
+1.7.0
+
diff --git a/debian/patches/600-drop-OJI-xul-192.patch b/debian/patches/600-drop-OJI-xul-192.patch
new file mode 100644
index 0000000..f543668
--- /dev/null
+++ b/debian/patches/600-drop-OJI-xul-192.patch
@@ -0,0 +1,51 @@
+---
+ configure | 2 +-
+ configure.ac | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+Index: vlc-1.0.5/configure.ac
+===================================================================
+--- vlc-1.0.5.orig/configure.ac
++++ vlc-1.0.5/configure.ac
+@@ -5653,17 +5653,17 @@
+ #endif
+ ])
+ if test "${MOZILLA_REQUIRED_HEADERS}" = "0"; then
+ AC_MSG_ERROR([Please install the Firefox development tools; plugin/npapi.h and/or plugin/npruntime.h were not found.])
+ fi
+ MOZILLA_REQUIRED_HEADERS=
+ mozilla=:
+ AS_IF([ test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"],[
+- VLC_ADD_CPPFLAGS([mozilla],[-DXP_UNIX -DOJI])
++ VLC_ADD_CPPFLAGS([mozilla],[-DXP_UNIX])
+ AS_IF([ test "${SYS}" != "darwin"],[
+ PKG_CHECK_MODULES(XPM, [xpm xt],[
+ VLC_ADD_CPPFLAGS([mozilla],[-DMOZ_X11])
+ ],[
+ AC_MSG_ERROR([Please install the libXpm and libXt development files.])
+ ])
+ ])
+ ])
+Index: vlc-1.0.5/configure
+===================================================================
+--- vlc-1.0.5.orig/configure
++++ vlc-1.0.5/configure
+@@ -43187,17 +43187,17 @@
+ as_fn_error "Please install the Firefox development tools; mozilla-config.h, plugin/npapi.h and plugin/npruntime.h were not found." "$LINENO" 5
+ fi
+ MOZILLA_REQUIRED_HEADERS=
+ mozilla=:
+ if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then :
+
+
+ for element in mozilla; do
+- eval "CPPFLAGS_${element}="'"$'"{CPPFLAGS_${element}} -DXP_UNIX -DOJI"'"'
++ eval "CPPFLAGS_${element}="'"$'"{CPPFLAGS_${element}} -DXP_UNIX"'"'
+ am_modules_with_cppflags="${am_modules_with_cppflags} ${element}"
+ done
+
+ if test "${SYS}" != "darwin"; then :
+
+
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XPM" >&5
diff --git a/debian/patches/series b/debian/patches/series
index 38fa83d..a003b1f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,11 @@
503_jack_input.diff
504-rtmp-crash.patch
505-ftp-crash.patch
+519-Typedef-changes-from-xulrunner-1.9.1.patch
+520-Don-t-hardcode-OJI-define-deprecated-xith-libxul-1.9.patch
+521-Untracked-API-change-utf8-to-UTF8.patch
+522-Mozilla-do-not-hard-code-autoconf-file-descriptors.patch
+523-Require-xul-1.9.2-explicitly.patch
+524-Mozilla-More-fixes-for-XulRunner-1.9.2.patch
+525-Mozilla-more-fixes.patch
+600-drop-OJI-xul-192.patch
--
VLC media player packaging
More information about the pkg-multimedia-commits
mailing list