[Mplayer-cvslog] CVS: main Makefile,1.70,1.71 configure,1.171,1.172 vcd_read.c,1.8,1.9

[Arpi of Ize]

Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv31563

Modified Files:
	Makefile configure vcd_read.c 
Log Message:
BSD/OS support

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- Makefile	28 Sep 2001 00:13:30 -0000	1.70
+++ Makefile	5 Oct 2001 00:39:38 -0000	1.71
@@ -113,15 +113,19 @@
 	$(CC) $(CFLAGS) -g codec-cfg.c -o $(PRG_CFG) -DCODECS2HTML
 
 install: $(PRG) $(PRG_FIBMAP)
-	install -d $(BINDIR)
+	if [ ! -e $(BINDIR) ]; then \
+		mkdir -p $(BINDIR); \
+	fi
 	install -m 755 -s $(PRG) $(BINDIR)/$(PRG)
-	install -d $(prefix)/man/man1
-	install -m 644 DOCS/mplayer.1 $(prefix)/man/man1/mplayer.1
+	if [ ! -e $(prefix)/man/man1 ]; then \
+		mkdir -p $(prefix)/man/man1; \
+	fi
+	install -c -m 644 DOCS/mplayer.1 $(prefix)/man/man1/mplayer.1
 	@echo "Following task requires root privs. If it fails don't panic"
 	@echo "however it means you can't use fibmap_mplayer."
 	@echo "Without this (or without running mplayer as root) you won't be"
 	@echo "able to play encrypted DVDs."
-	install -o 0 -g 0 -m 4755 -s $(PRG_FIBMAP) $(BINDIR)/$(PRG_FIBMAP)
+	-install -o 0 -g 0 -m 4755 -s $(PRG_FIBMAP) $(BINDIR)/$(PRG_FIBMAP)
 
 clean:
 	rm -f *.o *~ $(OBJS)

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- configure	1 Oct 2001 09:56:53 -0000	1.171
+++ configure	5 Oct 2001 00:39:38 -0000	1.172
@@ -298,7 +298,7 @@
 # Determine OS dependent libs
 _confcygwin="TARGET_CYGWIN=no"
 _confwin32=
-if [ "$system_name" = "FreeBSD" -o "$system_name" = "OpenBSD" ]; then
+if [ "$system_name" = "FreeBSD" -o "$system_name" = "OpenBSD" -o "$system_name" = "BSD/OS" ]; then
     _archlibs="-rdynamic -pthread"
 elif [ `echo $system_name | sed 's/[cC][yY][gG][wW][iI][nN].*/CYGWIN/'` = "CYGWIN" ]; then
     _confcygwin="TARGET_CYGWIN=yes"
@@ -308,6 +308,10 @@
     _archlibs="-ldl -lpthread"
 fi
 
+if [ "$system_name" = "BSD/OS" ]; then
+	_archlibs="$_archlibs -ldvd"
+fi
+
 # LGB: temporary files
 
 TMPC="mplayer-conf-${RANDOM}-$$-${RANDOM}.c"
@@ -765,7 +769,7 @@
 
 $_cc $_extraincdir $_extralibdir $TMPC -o $TMPO -lvgagl -lvga > /dev/null 2>&1 && _svga=yes
 
-if [ "$system_name" = "FreeBSD" -o "$system_name" = "OpenBSD" ]; then
+if [ "$system_name" = "FreeBSD" -o "$system_name" = "OpenBSD" -o "$system_name" = "BSD/OS" ]; then
 $_cc $TMPC -o $TMPO -pthread > /dev/null 2>&1 || \
  { echo "Lib pthread not found."; rm -f $TMPC $TMPO $TMPS ; exit 1; }
 else
@@ -855,7 +859,7 @@
 if [ $_x11 = yes ]; then
 
 $_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lXdpms $_socklib > /dev/null 2>&1 && _xdpms_3=yes
-nm `echo $_x11libdir|cut -b 3-`/libXext.a | grep DPMSQueryExtension > /dev/null 2>&1 && _xdpms_4=yes
+nm `echo $_x11libdir|cut -c 3-`/libXext.a | grep DPMSQueryExtension > /dev/null 2>&1 && _xdpms_4=yes
 $_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lXv $_socklib > /dev/null 2>&1 && _xv=yes
 $_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lXxf86vm $_socklib > /dev/null 2>&1 && _vm=yes
 

Index: vcd_read.c
===================================================================
RCS file: /cvsroot/mplayer/main/vcd_read.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- vcd_read.c	26 Sep 2001 21:35:14 -0000	1.8
+++ vcd_read.c	5 Oct 2001 00:39:38 -0000	1.9
@@ -1,11 +1,13 @@
 //=================== VideoCD ==========================
-#if	defined(linux) || defined(sun)
+#if	defined(linux) || defined(sun) || defined(__bsdi__)
 
 #if	defined(linux)
 #include <linux/cdrom.h>
 #elif	defined(sun)
 #include <sys/cdio.h>
 static int sun_vcd_read(int, int*);
+#elif	defined(__bsdi__)
+#include <dvd.h>
 #endif
 
 
@@ -79,7 +81,7 @@
 static char vcd_buf[VCD_SECTOR_SIZE];
 
 static int vcd_read(int fd,char *mem){
-#if	defined(linux)
+#if	defined(linux) || defined(__bsdi__)
   memcpy(vcd_buf,&vcd_entry.cdte_addr.msf,sizeof(struct cdrom_msf));
   if(ioctl(fd,CDROMREADRAW,vcd_buf)==-1) return 0; // EOF?
   memcpy(mem,&vcd_buf[VCD_SECTOR_OFFS],VCD_SECTOR_DATA);
@@ -236,7 +238,7 @@
   ++vcd_cache_index;if(vcd_cache_index>=vcd_cache_size)vcd_cache_index=0;
   // read data!
   vcd_set_msf(vcd_cache_current);
-#if	defined(linux)
+#if	defined(linux) || defined(__bsdi__)
   memcpy(vcd_buf,&vcd_entry.cdte_addr.msf,sizeof(struct cdrom_msf));
   if(ioctl(fd,CDROMREADRAW,vcd_buf)==-1) return 0; // EOF?
   memcpy(mem,&vcd_buf[VCD_SECTOR_OFFS],VCD_SECTOR_DATA);