>Number:         32670
>Category:       pkg
>Synopsis:       multimedia/vlc (in pkgsrc-2005Q4) does not compile [with fix]
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Mon Jan 30 20:20:00 +0000 2006
>Originator:     Rhialto
>Release:        NetBSD 3.0, pkgsrc-2005Q4
>Organization:
	
>Environment:
System: NetBSD radl.falu.nl 3.0 NetBSD 3.0 (Radls Doordringend Onjuiste Akkoord) #0: Sat Jan 28 16:44:07 CET 2006 root@radl.falu.nl:/usr/src/sys/arch/amd64/compile/RADL amd64
Architecture: x86_64
Machine: amd64
>Description:
	vlc is outdated and does not compile: c++ ambiguity errors.

	It would be better to apply pkg/30797 to update it (and then update
	to the latest version) but in the mean time maybe the patches
	below help to make the current old version compile.
	That it doesn't even compile on the pkgsrc-2005Q4 is kind of sad.
>How-To-Repeat:

>Fix:
	These 4 patches:
	
$NetBSD$

--- modules/gui/wxwindows/open.cpp.dist	2005-10-04 20:53:11.000000000 +0000
+++ modules/gui/wxwindows/open.cpp	2005-10-04 20:52:50.000000000 +0000
@@ -382,7 +382,7 @@
                                                 wxU(_("Open:")) );
     mrl_combo = new wxComboBox( panel, MRL_Event, wxT(""),
                                 wxPoint(20,25), wxSize(120, -1),
-                                0, NULL );
+                                0, (const wxString*)NULL );
     mrl_combo->SetToolTip( wxU(_("You can use this field directly by typing "
         "the full MRL you want to open.\n""Alternatively, the field will be "
         "filled automatically when you use the controls below.")) );
@@ -563,7 +563,7 @@
     wxBoxSizer *file_sizer = new wxBoxSizer( wxHORIZONTAL );
 
     file_combo = new wxComboBox( panel, FileName_Event, wxT(""),
-                                 wxPoint(20,25), wxSize(200, -1), 0, NULL );
+                                 wxPoint(20,25), wxSize(200, -1), 0, (const wxString*)NULL );
     wxButton *browse_button = new wxButton( panel, FileBrowse_Event,
                                             wxU(_("Browse...")) );
     file_sizer->Add( file_combo, 1, wxALL, 5 );



$NetBSD$

--- modules/gui/wxwindows/streamout.cpp.dist	2004-05-16 11:42:29.000000000 +0000
+++ modules/gui/wxwindows/streamout.cpp	2005-10-04 21:12:15.000000000 +0000
@@ -166,7 +166,7 @@
     wxStaticText *mrl_label = new wxStaticText( panel, -1,
                                                 wxU(_("Destination Target:")));
     mrl_combo = new wxComboBox( panel, MRL_Event, wxT(""),
-                                wxPoint(20,25), wxSize(120, -1), 0, NULL );
+                                wxPoint(20,25), wxSize(120, -1), 0, (const wxString*)NULL );
     mrl_combo->SetToolTip( wxU(_("You can use this field directly by typing "
         "the full MRL you want to open.\n""Alternatively, the field will be "
         "filled automatically when you use the controls below")) );
@@ -447,7 +447,7 @@
     subpanel_sizer = new wxFlexGridSizer( 3, 2, 20 );
     label = new wxStaticText( access_subpanels[1], -1, wxU(_("Filename")) );
     file_combo = new wxComboBox( access_subpanels[1], FileName_Event, wxT(""),
-                                 wxPoint(20,25), wxSize(200, -1), 0, NULL );
+                                 wxPoint(20,25), wxSize(200, -1), 0, (const wxString*)NULL );
     wxButton *browse_button = new wxButton( access_subpanels[1],
                                   FileBrowse_Event, wxU(_("Browse...")) );
     subpanel_sizer->Add( label, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );



$NetBSD$

--- modules/gui/wxwindows/subtitles.cpp.dist	2005-10-04 21:27:59.000000000 +0000
+++ modules/gui/wxwindows/subtitles.cpp	2005-10-04 21:15:09.000000000 +0000
@@ -85,7 +85,7 @@
     char *psz_subsfile = config_GetPsz( p_intf, "sub-file" );
     if( !psz_subsfile ) psz_subsfile = strdup("");
     file_combo = new wxComboBox( panel, -1, wxL2U(psz_subsfile),
-                                 wxPoint(20,25), wxSize(300, -1), 0, NULL );
+                                 wxPoint(20,25), wxSize(300, -1), 0, (const wxString *)NULL );
     if( psz_subsfile ) free( psz_subsfile );
     wxButton *browse_button = new wxButton( panel, FileBrowse_Event,
                                             wxU(_("Browse...")) );

-Olaf.
-- 
___ Olaf 'Rhialto' Seibert      -- You author it, and I'll reader it.
\X/ rhialto/at/xs4all.nl        -- Cetero censeo "authored" delendum esse.