Package: vlc
Followup-For: Bug #289923
Hi,
looking over this bug I don't think this is an change in the ABI of
wxWindows but rather a gcc update with stricter ansi c++ checking.
Attached is a patch that removes two default parameters each from the
ambigious calls resulting in g++ finding an unambigious one.
The patch compiles and runs (only divx/avi file tested) fine on amd64.
MfG
Goswin
-- System Information:
Debian Release: 3.1
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.8-frosties-1
Locale: LANG=en_US, LC_CTYPE=en_US
diff -u vlc-0.8.1/debian/changelog vlc-0.8.1/debian/changelog
--- vlc-0.8.1/debian/changelog
+++ vlc-0.8.1/debian/changelog
@@ -1,3 +1,11 @@
+vlc (0.8.1-3.1) unstable; urgency=low
+
+ * NMU by Goswin von Brederlow (Closes: #289923)
+ + debian/patches/30_ambiguity.dpatch: Remove default parameter to
+ avoid ambiguity
+
+ -- Goswin von Brederlow <[EMAIL PROTECTED]> Mon, 24 Jan 2005 11:25:02 +0100
+
vlc (0.8.1-3) unstable; urgency=low
* debian/control:
only in patch2:
unchanged:
--- vlc-0.8.1.orig/debian/patches/00list
+++ vlc-0.8.1/debian/patches/00list
@@ -1,2 +1,3 @@
20_ffmpeg
20_interfaces
+30_ambiguity
only in patch2:
unchanged:
--- vlc-0.8.1.orig/debian/patches/30_ambiguity.dpatch
+++ vlc-0.8.1/debian/patches/30_ambiguity.dpatch
@@ -0,0 +1,57 @@
+#! /bin/sh -e
+## 30_ambiguity.dpatch by <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Remove default parameter to avoid ambiguity
+
+if [ $# -lt 1 ]; then
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+ -patch) patch -p1 ${patch_opts} < $0;;
+ -unpatch) patch -R -p1 ${patch_opts} < $0;;
+ *)
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1;;
+esac
+
+exit 0
+
[EMAIL PROTECTED]@
+diff -Nurd vlc-0.8.1.orig vlc-0.8.1
+--- vlc-0.8.1.orig/modules/gui/wxwindows/streamout.cpp
++++ vlc-0.8.1/modules/gui/wxwindows/streamout.cpp
+@@ -168,7 +168,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));
+ 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")) );
+@@ -452,7 +452,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) );
+ wxButton *browse_button = new wxButton( access_subpanels[1],
+ FileBrowse_Event, wxU(_("Browse...")) );
+ subpanel_sizer->Add( label, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
+--- vlc-0.8.1.orig/modules/gui/wxwindows/subtitles.cpp
++++ vlc-0.8.1/modules/gui/wxwindows/subtitles.cpp
+@@ -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));
+ if( psz_subsfile ) free( psz_subsfile );
+ wxButton *browse_button = new wxButton( panel, FileBrowse_Event,
+ wxU(_("Browse...")) );
