[MPlayer-dev-eng] [PATCH] configure cleanup, compiler warnings

[Dominik Mierzejewski]

mplayer-dir.patch:
	allows setting bindir and mandir from ./configure (instead
	of hardcoded paths in Makefile)

mplayer-warnings.patch:
	fixes "incompatible pointer type" messages and "SCALED_CPY redefined"
 
-- 
MPlayer RPMs maintainer: http://www.piorunek.pl/~dominik/linux/pkgs/mplayer/
"The Universe doesn't give you any points for doing things that are easy."
        -- Sheridan to Garibaldi in Babylon 5:"The Geometry of Shadows"
-------------- next part --------------
--- MPlayer-20020829/configure.dir	Thu Aug 29 23:19:37 2002
+++ MPlayer-20020829/configure	Fri Aug 30 00:02:44 2002
@@ -117,8 +117,12 @@
 
 Installation directories:
   --prefix=DIR           use this prefix for installing mplayer [/usr/local]
+  --bindir=DIR           use this prefix for installing mplayer binary
+                         [PREFIX/bin]
   --datadir=DIR          use this prefix for installing machine independent
                          data files (fonts, skins) [PREFIX/share/mplayer]
+  --mandir=DIR           use this prefix for installing manpages
+                         [PREFIX/share/man]
   --confdir=DIR          use this prefix for installing configuration files
                          [same as datadir]
   --libdir=DIR           use this prefix for object code libraries
@@ -1250,9 +1254,15 @@
   --prefix=*)
     _prefix=`echo $ac_option | cut -d '=' -f 2`
     ;;
+  --bindir=*)
+    _bindir=`echo $ac_option | cut -d '=' -f 2`
+    ;;
   --datadir=*)
     _datadir=`echo $ac_option | cut -d '=' -f 2`
     ;;
+  --mandir=*)
+    _mandir=`echo $ac_option | cut -d '=' -f 2`
+    ;;
   --confdir=*)
     _confdir=`echo $ac_option | cut -d '=' -f 2`
     ;;
@@ -1269,7 +1279,9 @@
 done
 
 # Atmos: moved this here, to be correct, if --prefix is specified
+test -z "$_bindir" && _bindir="$_prefix/bin"
 test -z "$_datadir" && _datadir="$_prefix/share/mplayer"
+test -z "$_mandir" && _mandir="$_prefix/share/man"
 test -z "$_confdir" && _confdir="$_prefix/etc/mplayer"
 test -z "$_libdir" && _libdir="$_prefix/lib"
 test -z "$_mlibdir" && _mlibdir="$MLIBHOME"
@@ -4239,7 +4251,9 @@
 TARGET_OS = $system_name
 DESTDIR =
 prefix = \$(DESTDIR)$_prefix
+BINDIR = \$(DESTDIR)$_bindir
 DATADIR = \$(DESTDIR)$_datadir
+MANDIR = \$(DESTDIR)$_mandir
 CONFDIR = \$(DESTDIR)$_confdir
 LIBDIR = \$(DESTDIR)$_libdir
 #AR = ar
--- MPlayer-20020829/Makefile.dir	Thu Aug 29 23:26:29 2002
+++ MPlayer-20020829/Makefile	Fri Aug 30 00:03:17 2002
@@ -23,11 +23,6 @@
 DO_MAKE = @ for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done
 endif
 
-#prefix = /usr/local
-BINDIR = ${prefix}/bin
-# BINDIR = /usr/local/bin
-MANDIR = ${prefix}/man
-
 # a BSD compatible 'install' program
 INSTALL = install
 
-------------- next part --------------
--- MPlayer-20020829/libmpcodecs/vd_svq1.c.warn	Thu Aug 29 01:34:28 2002
+++ MPlayer-20020829/libmpcodecs/vd_svq1.c	Thu Aug 29 12:07:04 2002
@@ -5,6 +5,9 @@
 #include "mp_msg.h"
 
 #include "vd_internal.h"
+#ifdef USE_LIBAVCODEC
+#include "../libavcodec/avcodec.h"
+#endif
 
 static vd_info_t info = {
 	"SVQ1 (Sorenson v1) Video decoder",
--- MPlayer-20020829/loader/dshow/allocator.c.warn	Wed Dec 12 00:29:24 2001
+++ MPlayer-20020829/loader/dshow/allocator.c	Thu Aug 29 12:07:04 2002
@@ -204,7 +204,7 @@
 					      /* [out] */ IMediaSample **ppBuffer,
 					      /* [in] */ REFERENCE_TIME *pStartTime,
 					      /* [in] */ REFERENCE_TIME *pEndTime,
-					      /* [in] */ DWORD dwFlags)
+					      /* [in] */ unsigned long dwFlags)
 {
     MemAllocator* me = (MemAllocator*)This;
     CMediaSample* sample;
--- MPlayer-20020829/loader/dshow/DS_Filter.c.warn	Thu Jul 25 22:59:18 2002
+++ MPlayer-20020829/loader/dshow/DS_Filter.c	Thu Aug 29 12:07:04 2002
@@ -113,7 +113,7 @@
 	struct IUnknown* object = NULL;
 	IEnumPins* enum_pins = 0;
 	IPin* array[256];
-	ULONG fetched;
+	unsigned long fetched;
         unsigned int i;
 
 	This->m_iHandle = LoadLibraryA(dllname);
--- MPlayer-20020829/loader/dshow/outputpin.c.warn	Wed Dec 12 00:29:24 2001
+++ MPlayer-20020829/loader/dshow/outputpin.c	Thu Aug 29 12:07:04 2002
@@ -26,9 +26,9 @@
 
 
 static HRESULT STDCALL CEnumMediaTypes_Next(IEnumMediaTypes * This,
-					    /* [in] */ ULONG cMediaTypes,
+					    /* [in] */ unsigned long cMediaTypes,
 					    /* [size_is][out] */ AM_MEDIA_TYPE **ppMediaTypes,
-					    /* [out] */ ULONG *pcFetched)
+					    /* [out] */ unsigned long *pcFetched)
 {
     AM_MEDIA_TYPE* type = &((CEnumMediaTypes*)This)->type;
     Debug printf("CEnumMediaTypes::Next(%p) called\n", This);
@@ -56,7 +56,7 @@
 
 /* I expect that these methods are unused. */
 static HRESULT STDCALL CEnumMediaTypes_Skip(IEnumMediaTypes * This,
-					    /* [in] */ ULONG cMediaTypes)
+					    /* [in] */ unsigned long cMediaTypes)
 {
     Debug unimplemented("CEnumMediaTypes::Skip", This);
     return E_NOTIMPL;
@@ -254,7 +254,7 @@
 
 static HRESULT STDCALL COutputPin_QueryInternalConnections(IPin * This,
 						     /* [out] */ IPin **apPin,
-						     /* [out][in] */ ULONG *nPin)
+						     /* [out][in] */ unsigned long *nPin)
 {
     Debug unimplemented("COutputPin_QueryInternalConnections", This);
     return E_NOTIMPL;
--- MPlayer-20020829/postproc/postprocess_template.c.warn	Sat Aug 10 18:57:12 2002
+++ MPlayer-20020829/postproc/postprocess_template.c	Thu Aug 29 13:28:44 2002
@@ -2449,6 +2449,8 @@
  * Copies a block from src to dst and fixes the blacklevel
  * levelFix == 0 -> dont touch the brighness & contrast
  */
+#undef SCALED_CPY
+
 static inline void RENAME(blockCopy)(uint8_t dst[], int dstStride, uint8_t src[], int srcStride,
 	int levelFix)
 {