Ok for this?
cheers,
david
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/vlc/Makefile,v
retrieving revision 1.90
diff -u -p -r1.90 Makefile
--- Makefile 16 May 2010 08:37:48 -0000 1.90
+++ Makefile 31 May 2010 13:24:37 -0000
@@ -116,17 +116,25 @@ FLAVOR?=
.if !${FLAVOR:L:Mno_web}
MULTI_PACKAGES+=-web
COMMENT-web= Mozilla plugin for embedded media playback
-PKGNAME-web= vlc-web-${V}
-BUILD_DEPENDS+= :xulrunner-devel->=1.8,<1.9:devel/xulrunner/1.8,-devel
-CONFIGURE_ARGS+=--enable-mozilla
-CONFIGURE_ENV+= MOZILLA_CONFIG="${LOCALBASE}/bin/xulrunner-config" \
- with_mozilla_pkg="xulrunner-plugin"
-PORTPATH=
${WRKDIR}/bin:/usr/bin:/bin:/usr/sbin:/sbin:${DEPBASE}/bin:${LOCALBASE}/bin:${X11BASE}/bin:${LOCALBASE}/xulrunner
+PKGNAME-web= vlc-web-${V}p0
+BUILD_DEPENDS+= :xulrunner-devel->=1.9:devel/xulrunner/1.9,-devel
+CONFIGURE_ARGS+=--enable-mozilla
--with-mozilla-sdk-path=${LOCALBASE}/xulrunner-1.9
+CONFIGURE_ENV+= CPPFLAGS="-I${WRKSRC}/include -I${X11BASE}/include
-I${LOCALBASE}/include \
+ -I${LOCALBASE}/include/libpng \
+ -I${LOCALBASE}/include/nspr \
+ -I${LOCALBASE}/xulrunner1.9/include \
+ -I${LOCALBASE}/xulrunner1.9/include/java \
+ -I${LOCALBASE}/xulrunner1.9/include/plugin -DOPENBSD \
+ -I${LOCALBASE}/xulrunner1.9/include/pref" \
+ LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \
+ PKG_CONFIG_PATH="${LOCALBASE}/lib/qt4/pkgconfig" \
+ LOCALBASE=${LOCALBASE}
+PORTPATH=
${WRKDIR}/bin:/usr/bin:/bin:/usr/sbin:/sbin:${DEPBASE}/bin:${LOCALBASE}/bin:${X11BASE}/bin:${LOCALBASE}/xulrunner1.9
LIB_DEPENDS-web=${LIB_DEPENDS} \
vlc,vlccore::${BASE_PKGPATH} \
nspr4,plc4,plds4::devel/nspr
RUN_DEPENDS-web=::${BUILD_PKGPATH}
-WANTLIB-web= ICE SM X11 Xau Xdmcp Xt Xpm m pthread-stubs xcb
+WANTLIB-web= m stdc++.>=46.0
.endif
.if !${FLAVOR:L:Mno_jack}
@@ -155,6 +163,9 @@ PKG_ARGS+=-Di386=1
.else
PKG_ARGS+=-Di386=0
.endif
+
+pre-configure:
+ ${SUBST_CMD} ${WRKSRC}/configure.ac
post-install:
.for _img in 16x16 32x32 48x48 128x128
Index: patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/x11/vlc/patches/patch-configure_ac,v
retrieving revision 1.16
diff -u -p -r1.16 patch-configure_ac
--- patches/patch-configure_ac 9 May 2010 00:16:26 -0000 1.16
+++ patches/patch-configure_ac 31 May 2010 13:24:37 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-configure_ac,v 1.16 2010/05/09 00:16:26 sthen Exp $
---- configure.ac.orig Sun Apr 18 09:03:54 2010
-+++ configure.ac Wed May 5 18:37:05 2010
+--- configure.ac.orig Sun Apr 18 15:03:54 2010
++++ configure.ac Sat May 29 23:19:39 2010
@@ -826,6 +826,9 @@ if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"
dnl Check for pthreads - borrowed from XMMS
THREAD_LIB=error
@@ -38,3 +38,12 @@ $OpenBSD: patch-configure_ac,v 1.16 2010
LDFLAGS="${LDFLAGS_save}"
])
fi
+@@ -5746,7 +5749,7 @@ then
+ PLUGINS_BINDINGS="${PLUGINS_BINDINGS} mozilla"
+ VLC_ADD_CPPFLAGS([mozilla],[-DXPCOM_GLUE
-DHAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX -I${real_mozilla_sdk}
-I${real_mozilla_sdk}/include -I${real_mozilla_sdk}/embedstring/include
-I${real_mozilla_sdk}/xpcom/include -I${real_mozilla_sdk}/nspr/include
-I${real_mozilla_sdk}/string/include -I${real_mozilla_sdk}/plugin/include
-I${real_mozilla_sdk}/java/include])
+ if ${need_xpcom_libs}; then
+- VLC_ADD_LIBS([mozilla],[-L${real_mozilla_sdk}/embedstring/bin
-L${real_mozilla_sdk}/xpcom/bin -L${real_mozilla_sdk}/nspr/bin
-L${real_mozilla_sdk}/string/bin -L${real_mozilla_sdk}/lib -lnspr4 -lplds4
-lplc4 -lxpcomglue])
++ VLC_ADD_LIBS([mozilla],[-L${real_mozilla_sdk}/embedstring/bin
-L${real_mozilla_sdk}/xpcom/bin -L${real_mozilla_sdk}/nspr/bin
-L${real_mozilla_sdk}/string/bin -L${real_mozilla_sdk}/lib -lnspr4 -lplds4
-lplc4 ${LOCALBASE}/xulrunner1.9/libxpcomglue.a])
+ if test "${SYS}" = "mingw32"; then
+ dnl latest gecko sdk does not have embedstring
+ if test -d "${real_mozilla_sdk}/embedstring/bin"
Index: patches/patch-projects_mozilla_support_npunix_c
===================================================================
RCS file: patches/patch-projects_mozilla_support_npunix_c
diff -N patches/patch-projects_mozilla_support_npunix_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-projects_mozilla_support_npunix_c 31 May 2010 13:24:37
-0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+--- projects/mozilla/support/npunix.c.orig Fri May 28 17:15:04 2010
++++ projects/mozilla/support/npunix.c Fri May 28 17:15:45 2010
+@@ -49,10 +49,10 @@
+ #define OJI 1
+
+ #include <npapi.h>
+-#ifdef HAVE_NPFUNCTIONS_H
+-#include <npfunctions.h>
+-#else
++#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
+ #include <npupp.h>
++#else
++#include <npfunctions.h>
+ #endif
+
+ #include "../vlcshell.h"
Index: patches/patch-projects_mozilla_vlcplugin_cpp
===================================================================
RCS file: patches/patch-projects_mozilla_vlcplugin_cpp
diff -N patches/patch-projects_mozilla_vlcplugin_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-projects_mozilla_vlcplugin_cpp 31 May 2010 13:24:37
-0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+--- projects/mozilla/vlcplugin.cpp.orig Sun Mar 7 19:38:03 2010
++++ projects/mozilla/vlcplugin.cpp Mon May 31 12:49:02 2010
+@@ -36,11 +36,12 @@
+ #include "control/npolibvlc.h"
+
+ #include <ctype.h>
++#include <stdlib.h>
+
+ /*****************************************************************************
+ * VlcPlugin constructor and destructor
+
*****************************************************************************/
+-VlcPlugin::VlcPlugin( NPP instance, uint16 mode ) :
++VlcPlugin::VlcPlugin( NPP instance, uint16_t mode ) :
+ i_npmode(mode),
+ b_stream(0),
+ b_autoplay(1),
Index: patches/patch-projects_mozilla_vlcplugin_h
===================================================================
RCS file: patches/patch-projects_mozilla_vlcplugin_h
diff -N patches/patch-projects_mozilla_vlcplugin_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-projects_mozilla_vlcplugin_h 31 May 2010 13:24:37 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- projects/mozilla/vlcplugin.h.orig Sun Mar 7 19:38:03 2010
++++ projects/mozilla/vlcplugin.h Mon May 31 12:49:02 2010
+@@ -82,7 +82,7 @@ typedef enum vlc_toolbar_clicked_e {
+ class VlcPlugin
+ {
+ public:
+- VlcPlugin( NPP, uint16 );
++ VlcPlugin( NPP, uint16_t );
+ virtual ~VlcPlugin();
+
+ NPError init(int argc, char* const argn[], char* const
argv[]);
+@@ -135,7 +135,7 @@ class VlcPlugin (public)
+ vlc_toolbar_clicked_t getToolbarButtonClicked( int i_xpos, int i_ypos );
+ #endif
+
+- uint16 i_npmode; /* either NP_EMBED or NP_FULL */
++ uint16_t i_npmode; /* either NP_EMBED or NP_FULL */
+
+ /* plugin properties */
+ int b_stream;
Index: patches/patch-projects_mozilla_vlcshell_cpp
===================================================================
RCS file: patches/patch-projects_mozilla_vlcshell_cpp
diff -N patches/patch-projects_mozilla_vlcshell_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-projects_mozilla_vlcshell_cpp 31 May 2010 13:24:37 -0000
@@ -0,0 +1,39 @@
+$OpenBSD$
+--- projects/mozilla/vlcshell.cpp.orig Sun Mar 7 19:38:03 2010
++++ projects/mozilla/vlcshell.cpp Mon May 31 12:49:02 2010
+@@ -275,7 +275,7 @@ void NPP_Shutdown( void )
+ ;
+ }
+
+-NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc,
++NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t
argc,
+ char* argn[], char* argv[], NPSavedData* saved )
+ {
+ NPError status;
+@@ -579,7 +579,7 @@ NPError NPP_SetWindow( NPP instance, NPWindow* window
+ }
+
+ NPError NPP_NewStream( NPP instance, NPMIMEType type, NPStream *stream,
+- NPBool seekable, uint16 *stype )
++ NPBool seekable, uint16_t *stype )
+ {
+ if( NULL == instance )
+ {
+@@ -608,14 +608,14 @@ NPError NPP_NewStream( NPP instance, NPMIMEType type,
+ return NPERR_GENERIC_ERROR;
+ }
+
+-int32 NPP_WriteReady( NPP instance, NPStream *stream )
++int32_t NPP_WriteReady( NPP instance, NPStream *stream )
+ {
+ /* TODO */
+ return 8*1024;
+ }
+
+-int32 NPP_Write( NPP instance, NPStream *stream, int32 offset,
+- int32 len, void *buffer )
++int32_t NPP_Write( NPP instance, NPStream *stream, int32_t offset,
++ int32_t len, void *buffer )
+ {
+ /* TODO */
+ return len;
Index: patches/patch-projects_mozilla_vlcshell_h
===================================================================
RCS file: patches/patch-projects_mozilla_vlcshell_h
diff -N patches/patch-projects_mozilla_vlcshell_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-projects_mozilla_vlcshell_h 31 May 2010 13:24:37 -0000
@@ -0,0 +1,38 @@
+$OpenBSD$
+--- projects/mozilla/vlcshell.h.orig Sun Mar 7 19:38:03 2010
++++ projects/mozilla/vlcshell.h Mon May 31 12:49:23 2010
+@@ -30,7 +30,7 @@ NPError NPP_Initialize( void );
+ jref NPP_GetJavaClass( void );
+ void NPP_Shutdown( void );
+
+-NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc,
++NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t
argc,
+ char* argn[], char* argv[], NPSavedData* saved );
+ NPError NPP_Destroy( NPP instance, NPSavedData** save );
+
+@@ -40,20 +40,20 @@ NPError NPP_SetValue( NPP instance, NPNVariable variab
+ NPError NPP_SetWindow( NPP instance, NPWindow* window );
+
+ NPError NPP_NewStream( NPP instance, NPMIMEType type, NPStream *stream,
+- NPBool seekable, uint16 *stype );
++ NPBool seekable, uint16_t *stype );
+ NPError NPP_DestroyStream( NPP instance, NPStream *stream, NPError reason );
+ void NPP_StreamAsFile( NPP instance, NPStream *stream, const char* fname );
+
+-int32 NPP_WriteReady( NPP instance, NPStream *stream );
+-int32 NPP_Write( NPP instance, NPStream *stream, int32 offset,
+- int32 len, void *buffer );
++int32_t NPP_WriteReady( NPP instance, NPStream *stream );
++int32_t NPP_Write( NPP instance, NPStream *stream, int32_t offset,
++ int32_t len, void *buffer );
+
+ void NPP_URLNotify( NPP instance, const char* url,
+ NPReason reason, void* notifyData );
+ void NPP_Print( NPP instance, NPPrint* printInfo );
+
+ #ifdef XP_MACOSX
+-int16 NPP_HandleEvent( NPP instance, void * event );
++int16_t NPP_HandleEvent( NPP instance, void * event );
+ #endif
+
+ #endif
