[EMAIL PROTECTED] wrote:
----------------------------------------------------------------------------
Changes committed by danielk on Sat Apr 23 02:04:33 2005
Modified Files:
in mythtv/libs/libmyth:
DisplayRes.cpp DisplayRes.h settings.h
in mythtv/libs/libmythtv:
NuppelVideoPlayer.cpp NuppelVideoPlayer.h avformatdecoder.cpp
avformatdecoder.h decoderbase.h libmythtv.pro tv_play.cpp
videobuffers.cpp videobuffers.h videoout_directfb.cpp
videoout_directfb.h videoout_dx.cpp videoout_dx.h
videoout_null.cpp videoout_null.h videoout_quartz.cpp
videoout_quartz.h videoout_xv.cpp videoout_xv.h
videooutbase.cpp videooutbase.h
in mythtv/programs/mythfrontend:
globalsettings.cpp
Removed Files:
in mythtv/libs/libmythtv:
videoout_xvmc.cpp videoout_xvmc.h
Log Message:
NOTE: I recommend a make distclean...
This is the fabled XV/XvMC merge patch. Of course, it does a
little more than that.
cd libmyth && make -f Makefile
/home/bjm/m/test/mythtv/libs/libmyth
make[2]: Entering directory `/home/bjm/m/test/mythtv/libs/libmyth'
g++ -c -pipe -march=pentiumpro -mmmx -Wall -W -O3 -Wall -Wno-switch -fomit-frame-pointer
-D_REENTRANT -DPIC -fPIC -DMMX -D_GNU_SOURCE
-D_FILE_OFFSET_BITS=64-DPREFIX=\"/usr/local\" -DUSING_OSS -DUSE_ALSA
-DQT_NO_DEBUG -DQT_THREAD_SUPPORT -DQT_SHARED -I/usr/share/qt3/mkspecs/default -I.
-I/usr/local/include -I../libmythsamplerate -I../libmythsoundtouch -I../..
-I/usr/include/qt3 -o moc_settings.o moc_settings.cpp
moc_settings.cpp:1827: error: syntax error before `::' token
moc_settings.cpp:1832: error: syntax error before `::' token
moc_settings.cpp:1833: error: `XvMCHostCheckBox' was not declared in this scope
moc_settings.cpp:1833: error: parse error before `::' token
moc_settings.cpp:1836: error: syntax error before `::' token
moc_settings.cpp:1844: error: syntax error before `::' token
moc_settings.cpp:1855: error: syntax error before `::' token
moc_settings.cpp:1867: error: ISO C++ forbids declaration of `metaObj' with no
type
moc_settings.cpp:1875: error: invalid conversion from `QMetaObject*' to `int'
moc_settings.cpp:1876: error: syntax error before `.' token
moc_settings.cpp:1880: error: syntax error before `::' token
moc_settings.cpp:1887: error: syntax error before `::' token
moc_settings.cpp:1897: error: syntax error before `::' token
moc_settings.cpp:1903: error: syntax error before `::' token
moc_settings.cpp:1908: error: syntax error before `::' token
moc_settings.cpp:1833: warning: `QMetaObjectCleanUp
cleanUp_XvMCHostCheckBox(...)' declared `static' but never defined
make[2]: *** [moc_settings.o] Error 1
make[2]: Leaving directory `/home/bjm/m/test/mythtv/libs/libmyth'
make[1]: *** [sub-libmyth] Error 2
make[1]: Leaving directory `/home/bjm/m/test/mythtv/libs'
make: *** [sub-libs] Error 2
: [EMAIL PROTECTED] ;
_______________________________________________
mythtv-dev mailing list
[email protected]
http://mythtv.org/cgi-bin/mailman/listinfo/mythtv-dev
