[MPlayer-dev-eng] pre5?

[Joey Parrish]

On Thu, Jun 06, 2002 at 09:08:28PM +0200, Arpi wrote:
> i hope i didn't miss any importamt thing!
> if no objections, it will be pre5 (aka rc1) tomorrow.
> then we can start working on post-0.90 thigs in cvs, the soon-coming 0.90
> release will be a patched (critical fixes backported outside of cvs) pre5
> tarball.

I don't know how important it is to you, but if you like I've got a small
patch to fix some problems i've seen with cygwin and darwin.

hunk 1: adds unistd.h so that sys/cdio.h gets detected on darwin
hunk 2: adds -DSYS_DARWIN (i couldn't find this in any of the headers
            on the darwin box i have access to, and it does appear in
            the code in a few places.  where was it defined before?)
hunk 3: remove fcntl.h from demux_mov.c on cygwin. otherwise, gcc crashes.
hunk 4: add $(EXTRA_INC) to libmpdvdkit's Makefile, since it is needed
            in some cases and it probably ought to be there anyhow.

Thanks, and congrats on the upcoming release.

--Joey

-- 

"All you need is love." --Darth Vader
-------------- next part --------------
--- configure	Tue Jun  4 15:11:14 2002
+++ configure	Wed Jun  5 15:49:41 2002
@@ -1646,6 +1646,7 @@
 
 echocheck "sys/cdio.h"
 cat > $TMPC << EOF
+#include <unistd.h>
 #include <sys/cdio.h>
 int main(void) { return 0; }
 EOF
@@ -3725,7 +3725,7 @@
 fi
 if darwin ; then
   # use gnu style cpp on Darwin
-  CFLAGS="$CFLAGS -no-cpp-precomp"
+  CFLAGS="$CFLAGS -no-cpp-precomp -DSYS_DARWIN"
 fi
 # Thread support
 if linux ; then
--- libmpdemux/demux_mov.c	Sun May 19 22:51:57 2002
+++ libmpdemux/demux_mov.c	Wed Jun  5 15:49:14 2002
@@ -42,7 +42,9 @@
 #include <zlib.h>
 #endif
 
+#if !defined(__CYGWIN__)
 #include <fcntl.h>
+#endif
 
 #define BE_16(x) (be2me_16(*(unsigned short *)(x)))
 #define BE_32(x) (be2me_32(*(unsigned int *)(x)))
--- libmpdvdkit/Makefile	Thu May  9 20:50:17 2002
+++ libmpdvdkit/Makefile	Wed Jun  5 15:16:09 2002
@@ -18,7 +18,7 @@
 endif
 
 # -funroll-loops  removed, triggered gcc 3.0.4 (3.x?) bug
-CFLAGS= -I. $(OPTFLAGS) \
+CFLAGS= -I. $(OPTFLAGS) $(EXTRA_INC)\
 	-D_LARGEFILE64_SOURCE \
 	-DSYS_LINUX -D_FILE_OFFSET_BITS=64 -D__USE_UNIX98 -D_REENTRANT -D_GNU_SOURCE \
 	-ffast-math -fomit-frame-pointer