Update to libXvMC 1.0.6. No functionnal change.

4 files changed, 13 insertions, 12 deletions

diff --git a/lib/libXvMC/src/Makefile.in b/lib/libXvMC/src/Makefile.in
index ae76d506e..cfa92b586 100644
--- a/lib/libXvMC/src/Makefile.in
+++ b/lib/libXvMC/src/Makefile.in
@@ -82,6 +82,7 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 APP_MAN_DIR = @APP_MAN_DIR@
 APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AR = @AR@
@@ -117,6 +118,7 @@ FFLAGS = @FFLAGS@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
+INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -138,6 +140,7 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
+MAN_SUBSTS = @MAN_SUBSTS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 NMEDIT = @NMEDIT@
@@ -157,6 +160,7 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
+XORG_MAN_PAGE = @XORG_MAN_PAGE@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
 XVMC_CFLAGS = @XVMC_CFLAGS@
 XVMC_LIBS = @XVMC_LIBS@
@@ -180,7 +184,6 @@ build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
 datarootdir = @datarootdir@
-distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -245,9 +248,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/Makefile
+	  $(AUTOMAKE) --foreign  src/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/lib/libXvMC/src/XvMC.c b/lib/libXvMC/src/XvMC.c
index 8db64098c..3bf5a43d8 100644
--- a/lib/libXvMC/src/XvMC.c
+++ b/lib/libXvMC/src/XvMC.c
@@ -1,7 +1,6 @@
-/* $XFree86: xc/lib/XvMC/XvMC.c,v 1.4 2001/11/14 21:54:38 mvojkovi Exp $ */
-
-#define NEED_REPLIES
-
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdio.h>
 #include "XvMClibint.h"
 #ifdef HAS_SHM
@@ -517,8 +516,8 @@ Status XvMCGetDRInfo(Display *dpy, XvPortID port,
      */
    
     if (req->shmKey >= 0) {
-	shMem = (CARD32 *) shmat(req->shmKey, 0, 0);
-	shmctl( req->shmKey, IPC_RMID, 0);
+	shMem = (CARD32 *) shmat(req->shmKey, NULL, 0);
+	shmctl( req->shmKey, IPC_RMID, NULL);
 	if ( shMem ) { 
 
 	    register volatile CARD32 *shMemC = shMem;
diff --git a/lib/libXvMC/src/XvMCWrapper.c b/lib/libXvMC/src/XvMCWrapper.c
index b9f97b294..d3800e7ec 100644
--- a/lib/libXvMC/src/XvMCWrapper.c
+++ b/lib/libXvMC/src/XvMCWrapper.c
@@ -44,7 +44,9 @@
   #include "config.h"
 #endif
 
+#include <X11/Xlib.h>
 #include <X11/extensions/XvMC.h>
+#include <X11/extensions/XvMClib.h>
 #include <X11/extensions/vldXvMC.h>
 #include <dlfcn.h>
 #include <stdio.h>
diff --git a/lib/libXvMC/src/XvMClibint.h b/lib/libXvMC/src/XvMClibint.h
index 3bbd78898..94c24adf4 100644
--- a/lib/libXvMC/src/XvMClibint.h
+++ b/lib/libXvMC/src/XvMClibint.h
@@ -1,8 +1,5 @@
-/* $XFree86: xc/lib/XvMC/XvMClibint.h,v 1.4 2001/07/25 15:04:54 dawes Exp $ */
-
 #ifndef _XVMCLIBINT_H
 #define _XVMCLIBINT_H
-#define NEED_REPLIES
 
 #include <X11/Xlibint.h>
 #include <X11/extensions/Xvproto.h>