[vlc-devel] Re: OSX Intel patch, again

[Damien Fouilleul]

Charles,

Thanks for your patch, I have applied it to the main development branch 
(0.8.6-svn)

BTW, have you managed to run the mozilla plugin natively on Safari for 
OS X/Intel ?

Damien

Charles Duffy wrote:
> Without this patch, PPC-only glue is used on Intel, causing the plugin 
> to crash at runtime whenever its callbacks are invoked. This version 
> leaves libvlc_internal.h alone, as the offending include has been 
> removed outright.
> ------------------------------------------------------------------------
>
> Index: include/libvlc_internal.h
> ===================================================================
> --- include/libvlc_internal.h	(revision 16319)
> +++ include/libvlc_internal.h	(working copy)
> @@ -32,8 +32,10 @@
>  #include <vlc/vlc.h>
>  
>  #ifndef WIN32
> +#ifndef XP_MACOSX
>  #include <X11/Xlib.h>
>  #endif
> +#endif
>      
>  struct libvlc_instance_t
>  {
> Index: mozilla/support/npmac.cpp
> ===================================================================
> --- mozilla/support/npmac.cpp	(revision 16319)
> +++ mozilla/support/npmac.cpp	(working copy)
> @@ -94,8 +94,7 @@
>  #endif
>  
>  
> -#ifdef XP_MACOSX && !TARGET_RT_MAC_CFM
> -
> +#if defined(XP_MACOSX) && defined (__POWERPC__) && (!defined(TARGET_RT_MAC_CFM))
>  // glue for mapping outgoing Macho function pointers to TVectors
>  struct TFPtoTVGlue{
>      void* glue[2];
> @@ -1156,7 +1155,7 @@
>  
>      pluginFuncs->version    = (NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR;
>      pluginFuncs->size       = sizeof(NPPluginFuncs);
> -    pluginFuncs->newp       = Private_New;
> +    pluginFuncs->newp       = NewNPP_NewProc(Private_New);
>      pluginFuncs->destroy    = NewNPP_DestroyProc(Private_Destroy);
>      pluginFuncs->setwindow  = NewNPP_SetWindowProc(Private_SetWindow);
>      pluginFuncs->newstream  = NewNPP_NewStreamProc(Private_NewStream);
>   

-- 
This is the vlc-devel mailing-list, see http://www.videolan.org/vlc/
To unsubscribe, please read http://developers.videolan.org/lists.html