[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[641] mplayerxp/libvo2/video_out.h

[<nic...@us...>]

Revision: 641
          http://sourceforge.net/p/mplayerxp/code/641
Author:   nickols_k
Date:     2013-05-18 17:23:21 +0000 (Sat, 18 May 2013)
Log Message:
-----------
compilation fixed


about illegal-patch
====================

With mplayerxp has been happened the same situation as with beye. Hacked-gcc has been tuned and for
this project too:


------------------------ 8< ------------------ 8< ------------------------------------
GNU gdb (GDB) 7.6
Copyright (C) 2013 Free Software Foundation, Inc.
License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.  Type "show copying"
and "show warranty" for details.
This GDB was configured as "x86_64-unknown-linux-gnu".
For bug reporting instructions, please see:
<http://www.gnu.org/software/gdb/bugs/>...
Reading symbols from /mnt/Storage/Data/-SF.NET-/MPXP/mplayerxp/mplayerxp/mplayerxp...done.
(gdb) break main.cpp:850
(gdb) Breakpoint 1 at 0x4648c3: file main.cpp, line 850.
(gdb) run
(gdb) Starting program: /mnt/Storage/Data/-SF.NET-/MPXP/mplayerxp/mplayerxp/mplayerxp -vo fbdev -ao alsa /mnt/Storage/Data/MP3/Kipelov-ImFree.mp3
[Thread debugging using libthread_db enabled]
Using host libthread_db library "/usr/lib/libthread_db.so.1".

Breakpoint 1, usr::MPXPSystem::init_vobsub (this=this@entry=0x23661d0, filename="/mnt/Storage/Data/MP3/Kipelov-ImFree.mp3") at main.cpp:850
850	    if (mp_conf.vobsub_name){
(gdb) print filename
(gdb) $1 = "/mnt/Storage/Data/MP3/Kipelov-ImFree.mp3"
(gdb) print &filename
(gdb) $2 = (const std::string *) 0x7fffffffe850
(gdb) print *(&filename)
(gdb) $3 = "/mnt/Storage/Data/MP3/Kipelov-ImFree.mp3"
(gdb) q
(gdb) A debugging session is active.

	Inferior 1 [process 467] will be killed.

Quit anyway? (y or n)
------------------------ 8< ------------------ 8< ------------------------------------
that's clear that hacked-gcc converted:
int MPXPSystem::init_vobsub(const std::string& filename)
into
int MPXPSystem::init_vobsub(char* filename)

i suspect that there are no std::string at all :(

Modified Paths:
--------------
    mplayerxp/libvo2/video_out.h

Modified: mplayerxp/libvo2/video_out.h
===================================================================
--- mplayerxp/libvo2/video_out.h	2013-05-18 15:08:01 UTC (rev 640)
+++ mplayerxp/libvo2/video_out.h	2013-05-18 17:23:21 UTC (rev 641)
@@ -17,8 +17,10 @@
 #include <inttypes.h>
 #include <stdarg.h>
 
+#ifdef HAVE_X11
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
+#endif
 
 #include "dri_vo.h"
 #include "font_load.h"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.