[MPlayer-dev-eng] [PATCH] OpenBSD, small fixes.

[Björn Sandell]

Hi,

Here's a few small fixes, mainly reducing the number of compile time
warnings. 

Björn Sandell       DCE/DFS Sysadmin       IT department
Chalmers University of Technology    www.dce.chalmers.se
-------------- next part --------------
Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.464
diff -u -r1.464 configure
--- configure	10 May 2002 01:50:17 -0000	1.464
+++ configure	10 May 2002 23:12:43 -0000
@@ -1395,7 +1395,7 @@
   _def_malloc='#undef HAVE_MALLOC_H'
 fi
 # malloc.h emits a warning in FreeBSD
-freebsd && _def_malloc='#undef HAVE_MALLOC_H'
+(freebsd || openbsd) && _def_malloc='#undef HAVE_MALLOC_H'
 echores "$_malloc"
 
 
Index: liba52/parse.c
===================================================================
RCS file: /cvsroot/mplayer/main/liba52/parse.c,v
retrieving revision 1.4
diff -u -r1.4 parse.c
--- liba52/parse.c	8 Jan 2002 14:55:36 -0000	1.4
+++ liba52/parse.c	10 May 2002 23:12:43 -0000
@@ -35,9 +35,6 @@
 #ifdef HAVE_MEMALIGN
 /* some systems have memalign() but no declaration for it */
 void * memalign (size_t align, size_t size);
-#else
-/* assume malloc alignment is sufficient */
-#define memalign(align,size) malloc (size)
 #endif
 
 typedef struct {
Index: libdha/Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/libdha/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- libdha/Makefile	2 Feb 2002 12:14:56 -0000	1.8
+++ libdha/Makefile	10 May 2002 23:12:43 -0000
@@ -15,6 +15,10 @@
 OBJS=$(SRCS:.c=.o)
 
 CFLAGS  = $(OPTFLAGS) -fPIC -I. -I.. -Wall -W
+LIBS = 
+ifeq ($(TARGET_OS),OpenBSD)
+LIBS += -li386
+endif
 
 .SUFFIXES: .c .o
 
@@ -24,7 +28,7 @@
 	$(CC) -c $(CFLAGS) -o $@ $<
 
 $(LIBNAME):     $(OBJS)
-	$(CC) -shared -o $(LIBNAME) $(OBJS)
+	$(CC) -shared -o $(LIBNAME) $(OBJS) $(LIBS)
 	ln -sf $(LIBNAME) $(SHORTNAME)
 
 all:    $(LIBNAME) $(SHORTNAME)
@@ -52,8 +56,12 @@
 	mkdir -p $(prefix)/lib
 	install -m 755 -s -p $(LIBNAME) $(prefix)/lib/$(LIBNAME)
 	rm -f $(prefix)/lib/libdha.so
-	ln -sf $(LIBNAME) $(prefix)/lib/libdha.so
+	ln -sf $(LIBNAME) $(prefix)/lib/$(SHORTNAME)
+ifeq ($(TARGET_OS),OpenBSD)
+	ldconfig -R
+else
 	ldconfig
+endif
 
 #
 # include dependency files if they exist
Index: libdha/sysdep/pci_openbsd.c
===================================================================
RCS file: /cvsroot/mplayer/main/libdha/sysdep/pci_openbsd.c,v
retrieving revision 1.2
diff -u -r1.2 pci_openbsd.c
--- libdha/sysdep/pci_openbsd.c	15 Jan 2002 15:59:53 -0000	1.2
+++ libdha/sysdep/pci_openbsd.c	10 May 2002 23:12:43 -0000
@@ -5,6 +5,8 @@
 */
 
 #include <errno.h>
+#include <sys/types.h>
+#include <machine/sysarch.h>
 
 static __inline__ int enable_os_io(void)
 {
Index: libmpcodecs/vd.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd.c,v
retrieving revision 1.37
diff -u -r1.37 vd.c
--- libmpcodecs/vd.c	1 May 2002 17:39:46 -0000	1.37
+++ libmpcodecs/vd.c	10 May 2002 23:12:43 -0000
@@ -18,6 +18,7 @@
 #include "stream.h"
 #include "demuxer.h"
 #include "stheader.h"
+#include "dec_video.h"
 
 #include "vd.h"
 #include "vf.h"
Index: libvo/sub.h
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/sub.h,v
retrieving revision 1.16
diff -u -r1.16 sub.h
--- libvo/sub.h	17 Apr 2002 21:51:18 -0000	1.16
+++ libvo/sub.h	10 May 2002 23:12:43 -0000
@@ -102,6 +102,7 @@
 void vo_init_osd();
 int vo_update_osd(int dxs,int dys);
 int vo_osd_changed(int new_value);
+int vo_osd_check_range_update(int,int,int,int);
 
 extern int vo_osd_changed_flag;
 
Index: postproc/swscale.c
===================================================================
RCS file: /cvsroot/mplayer/main/postproc/swscale.c,v
retrieving revision 1.88
diff -u -r1.88 swscale.c
--- postproc/swscale.c	2 May 2002 10:58:27 -0000	1.88
+++ postproc/swscale.c	10 May 2002 23:12:43 -0000
@@ -55,6 +55,8 @@
 #include <assert.h>
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
+#else
+#include <stdlib.h>
 #endif
 #include "swscale.h"
 #include "../cpudetect.h"