Wolfram Gloger wrote:
...
Please try the appended patch.
Regards,
Wolfram
--- src/dvbcut.cpp~ 2008-01-16 09:43:48.000000000 +0100
+++ src/dvbcut.cpp 2008-02-03 14:02:47.000000000 +0100
@@ -24,6 +24,7 @@
#include <cstdlib>
#include <climits>
#include <memory>
+#include <algorithm>
#include <qlabel.h>
#include <qpixmap.h>
Thanks Wolfram, you were spot on; that got me through the first set of
issues, and helped me find:
http://gcc.gnu.org/gcc-4.3/porting_to.html "Header Dependency Cleanup"
I also needed to add #includes in tsfile.cpp . At this point it
compiles, runs and operates OK {except for the audio preview/postview -
which notes that it wasn't compiles with mp2 support}. I now played with
commenting out the other includes, and found a few that do not stop the
compile|run|basic operation of dvbcut {for gcc 4.3}
I include an svn-diff with these changes. I imagine you can't apply them
to the svn - because that would stop compilation for the more common
gcc-4.1 users ?
Is it possible to special case the gcc version like ?:
if GCC<4.3
#include x
else
#include y
endif
sort of thing ? If so I'll work on a patch ?
DaveT.
Index: src/buffer.cpp
===================================================================
--- src/buffer.cpp (revision 112)
+++ src/buffer.cpp (working copy)
@@ -20,12 +20,12 @@
#define __STDC_LIMIT_MACROS // for INT64_MAX
-#include <sys/types.h>
-#include <sys/stat.h>
+// #include <sys/types.h>
+// #include <sys/stat.h>
#include <sys/mman.h>
#include <cerrno>
#include <fcntl.h>
-#include <unistd.h>
+// #include <unistd.h>
#include <cstring>
#include <cstdlib>
// #include <cstdio>
Index: src/dvbcut.cpp
===================================================================
--- src/dvbcut.cpp (revision 112)
+++ src/dvbcut.cpp (working copy)
@@ -18,12 +18,12 @@
/* $Id$ */
-#include <cstring>
+// #include <cstring>
#include <cerrno>
#include <cmath>
-#include <cstdlib>
-#include <climits>
+// #include <climits>
#include <memory>
+#include <algorithm>
#include <qlabel.h>
#include <qpixmap.h>
Index: src/avframe.cpp
===================================================================
--- src/avframe.cpp (revision 112)
+++ src/avframe.cpp (working copy)
@@ -20,7 +20,7 @@
#include <qimage.h>
#include <cstdlib>
-#include <cstdio>
+//#include <cstdio>
#include "avframe.h"
#ifdef HAVE_LIB_SWSCALE
Index: src/tsfile.cpp
===================================================================
--- src/tsfile.cpp (revision 112)
+++ src/tsfile.cpp (working copy)
@@ -21,8 +21,10 @@
#include "port.h"
#include "tsfile.h"
#include "streamhandle.h"
-#include <list>
-#include <utility>
+// #include <list>
+// #include <utility>
+#include <algorithm>
+#include <cstring>
tsfile::tsfile(inbuffer &b, int initial_offset) : mpgfile(b, initial_offset)
{
Index: SConstruct
===================================================================
--- SConstruct (revision 112)
+++ SConstruct (working copy)
@@ -7,9 +7,10 @@
opts=Options()
-opt=opts.Add(PathOption('PREFIX', 'Directory to install under', '/usr/local'))
+#opt=opts.Add(PathOption('PREFIX', 'Directory to install under', '/usr/local'))
+opt=opts.Add(PathOption('PREFIX', 'Directory to install under', '/usr'))
opt=opts.Add(PathOption('BINDIR', 'Directory to install under', os.path.join('$PREFIX','bin')))
-opt=opts.Add(PathOption('MANPATH', 'Directory to install under', os.path.join('$PREFIX','man')))
+opt=opts.Add(PathOption('MANPATH', 'Directory to install under', os.path.join('$PREFIX','share/man')))
### DEBUG MODE
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
DVBCUT-user mailing list
DVBCUT-user@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dvbcut-user
