packages/mplayer/* : remove the now obsolete versions of mplayer and

mplayer-atty. Cleaning up loose patches and stuff. Update svn version
in line with latest release version.

27 files changed, 150 insertions, 1180 deletions

diff --git a/packages/mplayer/files/Makefile-codec-cfg.patch b/packages/mplayer/files/Makefile-codec-cfg.patch
new file mode 100644
index 0000000000..8eec79f291
--- /dev/null
+++ b/packages/mplayer/files/Makefile-codec-cfg.patch
@@ -0,0 +1,11 @@
+--- trunk/Makefile.orig	2006-07-24 09:55:12.000000000 +0100
++++ trunk/Makefile	2006-07-24 09:56:18.000000000 +0100
+@@ -410,7 +410,7 @@
+ endif
+ 
+ codec-cfg: codec-cfg.c codec-cfg.h help_mp.h
+-	$(HOST_CC) -I. -DCODECS2HTML codec-cfg.c -o $@
++	$(BUILD_CC) -Ilibmpdemux -Iloader -Ilibvo -I. -DCODECS2HTML codec-cfg.c -o $@
+ 
+ codecs.conf.h: codec-cfg etc/codecs.conf
+ 	./codec-cfg ./etc/codecs.conf > $@
diff --git a/packages/mplayer/files/libfaad-fixed.patch b/packages/mplayer/files/libfaad-fixed.patch
deleted file mode 100644
index 2b85179038..0000000000
--- a/packages/mplayer/files/libfaad-fixed.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- mplayer-1.1.5/libfaad2/Makefile.orig	2006-05-12 14:45:49.000000000 +0100
-+++ mplayer-1.1.5/libfaad2/Makefile	2006-05-12 14:46:36.000000000 +0100
-@@ -6,11 +6,11 @@
- SRCS    = bits.c cfft.c common.c decoder.c drc.c error.c filtbank.c hcr.c huffman.c ic_predict.c is.c lt_predict.c mdct.c mp4.c ms.c output.c pns.c ps_dec.c ps_syntax.c  pulse.c rvlc.c sbr_dct.c sbr_dec.c sbr_e_nf.c sbr_fbt.c sbr_hfadj.c sbr_hfgen.c sbr_huff.c sbr_qmf.c sbr_syntax.c sbr_tf_grid.c specrec.c ssr.c ssr_fb.c ssr_ipqf.c syntax.c tns.c
- OBJS	= $(SRCS:.c=.o)
- 
--CFLAGS  = -I. $(OPTFLAGS) 
-+#CFLAGS  = -I. $(OPTFLAGS) 
- 
- # Uncomment this to use the FIXED_POINT implementation of FAAD2.
- # This should improve performance, especially for SBR files.
--#CFLAGS  = -I. $(OPTFLAGS) -DFIXED_POINT
-+CFLAGS  = -I. $(OPTFLAGS) -DFIXED_POINT
- 
- .SUFFIXES: .c .o
- 
diff --git a/packages/mplayer/mplayer-1.0pre8/libmpcodecs-ogg-include.patch b/packages/mplayer/files/libmpcodecs-ogg-include.patch
index 619c4b0cd2..619c4b0cd2 100644
--- a/packages/mplayer/mplayer-1.0pre8/libmpcodecs-ogg-include.patch
+++ b/packages/mplayer/files/libmpcodecs-ogg-include.patch
diff --git a/packages/mplayer/files/libmpdemux-ogg-include-svn.patch b/packages/mplayer/files/libmpdemux-ogg-include-svn.patch
new file mode 100644
index 0000000000..52b7029bc5
--- /dev/null
+++ b/packages/mplayer/files/libmpdemux-ogg-include-svn.patch
@@ -0,0 +1,11 @@
+--- trunk/libmpdemux/Makefile.orig	2006-07-24 10:11:06.000000000 +0100
++++ trunk/libmpdemux/Makefile	2006-07-24 10:12:02.000000000 +0100
+@@ -208,7 +208,7 @@
+ OBJS	= $(SRCS:.c=.o)
+ OBJS   += $(CPLUSPLUSSRCS:.cpp=.o)
+ INCLUDE = -I.. -I../loader $(LIBAV_INC)
+-CFLAGS  = $(OPTFLAGS) $(INCLUDE) $(XMMS_CFLAGS) $(CDPARANOIA_INC) $(DVB_INC)
++CFLAGS  = $(INCLUDE) $(OPTFLAGS) $(XMMS_CFLAGS) $(CDPARANOIA_INC) $(DVB_INC)
+ CPLUSPLUSFLAGS  = $(CFLAGS) $(CPLUSPLUSINCLUDE) -D__STDC_LIMIT_MACROS
+ CPLUSPLUS = $(CC)
+ 
diff --git a/packages/mplayer/mplayer-1.0pre8/libmpdemux-ogg-include.patch b/packages/mplayer/files/libmpdemux-ogg-include.patch
index 541f4a03ee..541f4a03ee 100644
--- a/packages/mplayer/mplayer-1.0pre8/libmpdemux-ogg-include.patch
+++ b/packages/mplayer/files/libmpdemux-ogg-include.patch
diff --git a/packages/mplayer/files/mplayer-1.0_pre7-gcc4.patch b/packages/mplayer/files/mplayer-1.0_pre7-gcc4.patch
deleted file mode 100644
index d5a7a30505..0000000000
--- a/packages/mplayer/files/mplayer-1.0_pre7-gcc4.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-diff -bBur MPlayer-20050413-orig/configure MPlayer-20050413/configure
---- MPlayer-20050413-orig/configure	2005-04-06 14:57:08.000000000 +0300
-+++ MPlayer-20050413/configure	2005-04-14 16:20:41.000000000 +0300
-@@ -604,7 +604,7 @@
-       cc_version="v. ?.??, bad"
-       cc_verc_fail=yes
-       ;;
--    2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9])
-+    2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9]|4.*)
-       _cc_major=`echo $cc_version | cut -d '.' -f 1`
-       _cc_minor=`echo $cc_version | cut -d '.' -f 2`
-       _cc_mini=`echo $cc_version | cut -d '.' -f 3`
-diff -bBur MPlayer-20050413-orig/liba52/imdct.c MPlayer-20050413/liba52/imdct.c
---- MPlayer-20050413-orig/liba52/imdct.c	2005-03-23 01:27:18.000000000 +0200
-+++ MPlayer-20050413/liba52/imdct.c	2005-04-14 16:48:54.000000000 +0300
-@@ -937,7 +937,8 @@
-     /* 4-7. iterations */
-     for (m=3; m < 7; m++) {
- 	two_m = (1 << m);
--	two_m_plus_one = two_m<<1;
-+	int two_m_plus_four=two_m<<4;
-+	complex_t* buf_plus_128=buf+128;
- 	asm volatile(
- 		"movl %0, %%esi				\n\t"
- 		".balign 16				\n\t"
-@@ -963,7 +964,7 @@
- 		"addl %2, %%esi				\n\t"
- 		"cmpl %1, %%esi				\n\t"
- 		" jb 1b					\n\t"
--		:: "g" (buf), "m" (buf+128), "m" (two_m_plus_one<<3), "r" (two_m<<3),
-+		:: "g" (buf), "m" (buf_plus_128), "m" (two_m_plus_four), "r" (two_m<<3),
- 		   "r" (sseW[m])
- 		: "%esi", "%edi", "%edx"
- 	);
-diff -bBur MPlayer-20050413-orig/libavcodec/libpostproc/postprocess_template.c MPlayer-20050413/libavcodec/libpostproc/postprocess_template.c
---- MPlayer-20050413-orig/libavcodec/libpostproc/postprocess_template.c	2005-02-27 10:56:26.000000000 +0200
-+++ MPlayer-20050413/libavcodec/libpostproc/postprocess_template.c	2005-04-14 16:35:07.000000000 +0300
-@@ -2648,6 +2648,8 @@
- static always_inline void RENAME(do_a_deblock)(uint8_t *src, int step, int stride, PPContext *c){
- 	int64_t dc_mask, eq_mask;
- 	int64_t sums[10*8*2];
-+	int64_t dc_and_eq_mask;
-+
- 	src+= step*3; // src points to begin of the 8x8 Block
- //START_TIMER
- asm volatile(
-@@ -2754,8 +2756,9 @@
- 		: "r" (src), "r" ((long)step), "m" (c->pQPb), "m"(c->ppMode.flatnessThreshold)
- 		: "%"REG_a
- 		);
-+	dc_and_eq_mask=dc_mask & eq_mask;
- 
--	if(dc_mask & eq_mask){
-+	if(dc_and_eq_mask){
- 		long offset= -8*step;
- 		int64_t *temp_sums= sums;
- 
-@@ -2930,7 +2933,7 @@
- 		" js 1b						\n\t"
- 
- 		: "+r"(offset), "+r"(temp_sums)
--		: "r" ((long)step), "r"(src - offset), "m"(dc_mask & eq_mask)
-+		: "r" ((long)step), "r"(src - offset), "m"(dc_and_eq_mask)
- 		);
- 	}else
- 		src+= step; // src points to begin of the 8x8 Block
-diff -bBur MPlayer-20050413-orig/libmpdemux/frequencies.h MPlayer-20050413/libmpdemux/frequencies.h
---- MPlayer-20050413-orig/libmpdemux/frequencies.h	2001-11-17 00:06:48.000000000 +0200
-+++ MPlayer-20050413/libmpdemux/frequencies.h	2005-04-14 16:36:51.000000000 +0300
-@@ -104,7 +104,7 @@
- /* --------------------------------------------------------------------- */
- 
- extern struct CHANLISTS   chanlists[];
--extern struct STRTAB chanlist_names[];
-+/* extern struct STRTAB chanlist_names[]; */
- 
- extern int                chantab;
- extern struct CHANLIST   *chanlist;
-diff -bBur MPlayer-20050413-orig/mmx.h MPlayer-20050413/mmx.h
---- MPlayer-20050413-orig/mmx.h	2001-10-28 13:47:21.000000000 +0200
-+++ MPlayer-20050413/mmx.h	2005-04-14 16:22:54.000000000 +0300
-@@ -353,11 +353,11 @@
- #define	mmx_m2r(op, mem, reg) \
- 	__asm__ __volatile__ (#op " %0, %%" #reg \
- 			      : /* nothing */ \
--			      : "X" (mem))
-+			      : "m" (mem))
- 
- #define	mmx_r2m(op, reg, mem) \
- 	__asm__ __volatile__ (#op " %%" #reg ", %0" \
--			      : "=X" (mem) \
-+			      : "=m" (mem) \
- 			      : /* nothing */ )
- 
- #define	mmx_r2r(op, regs, regd) \
-@@ -367,8 +367,8 @@
- 	__asm__ __volatile__ ("movq %0, %%mm0\n\t" \
- 			      #op " %1, %%mm0\n\t" \
- 			      "movq %%mm0, %0" \
--			      : "=X" (memd) \
--			      : "X" (mems))
-+			      : "=m" (memd) \
-+			      : "m" (mems))
- 
- #endif
- 
-diff -bBur MPlayer-20050413-orig/postproc/swscale_template.c MPlayer-20050413/postproc/swscale_template.c
---- MPlayer-20050413-orig/postproc/swscale_template.c	2005-02-17 01:47:00.000000000 +0200
-+++ MPlayer-20050413/postproc/swscale_template.c	2005-04-14 16:46:12.000000000 +0300
-@@ -2136,6 +2136,7 @@
- 	else
- 	{
- 		long counter= -2*dstW;
-+		uint8_t* ptr=src+filterSize;
- //		filter-= counter*filterSize/2;
- 		filterPos-= counter/2;
- 		dst-= counter/2;
-@@ -2177,7 +2178,7 @@
- 			" jnc 1b			\n\t"
- 
- 			: "+r" (counter), "+r" (filter)
--			: "m" (filterPos), "m" (dst), "m"(src+filterSize),
-+			: "m" (filterPos), "m" (dst), "m"(ptr),
- 			  "m" (src), "r" ((long)filterSize*2)
- 			: "%"REG_b, "%"REG_a, "%"REG_c
- 		);
-@@ -2320,6 +2321,8 @@
- 	{
- #endif
- 	//NO MMX just normal asm ...
-+	  int xInc_hi=xInc>>16;
-+	  int xInc_lo=xInc&0xffff;
- 	asm volatile(
- 		"xor %%"REG_a", %%"REG_a"	\n\t" // i
- 		"xor %%"REG_b", %%"REG_b"	\n\t" // xx
-@@ -2356,7 +2359,7 @@
- 		" jb 1b				\n\t"
- 
- 
--		:: "r" (src), "m" (dst), "m" (dstWidth), "m" (xInc>>16), "m" (xInc&0xFFFF)
-+		:: "r" (src), "m" (dst), "m" (dstWidth), "m" (xInc_hi), "m" (xInc_lo)
- 		: "%"REG_a, "%"REG_b, "%ecx", "%"REG_D, "%esi"
- 		);
- #ifdef HAVE_MMX2
-@@ -2515,6 +2518,8 @@
- 	else
- 	{
- #endif
-+	  int xInc_hi=xInc>>16;
-+	  int xInc_lo=xInc&0xffff;
- 	asm volatile(
- 		"xor %%"REG_a", %%"REG_a"	\n\t" // i
- 		"xor %%"REG_b", %%"REG_b"		\n\t" // xx
-@@ -2548,7 +2553,7 @@
- 		"cmp %2, %%"REG_a"		\n\t"
- 		" jb 1b				\n\t"
- 
--		:: "m" (src1), "m" (dst), "m" ((long)dstWidth), "m" ((long)(xInc>>16)), "m" ((xInc&0xFFFF)),
-+		:: "m" (src1), "m" (dst), "m" ((long)dstWidth), "m" ((long)(xInc_hi)), "m" ((xInc_lo)),
- 		"r" (src2)
- 		: "%"REG_a, "%"REG_b, "%ecx", "%"REG_D, "%esi"
- 		);
-
---- MPlayer-1.0pre7/libvo/aclib_template.c	2005-04-25 08:26:11.000000000 +0000
-+++ MPlayer-1.0pre7.az/libvo/aclib_template.c	2005-04-25 08:26:17.000000000 +0000
-@@ -249,8 +249,8 @@
- 		MOVNTQ" %%mm6, 48(%1)\n"
- 		MOVNTQ" %%mm7, 56(%1)\n"
- 		:: "r" (from), "r" (to) : "memory");
--		((const unsigned char *)from)+=64;
--		((unsigned char *)to)+=64;
-+		from=((const unsigned char *)from)+64;
-+		to=((unsigned char *)to)+64;
- 	}
- 
- //	printf(" %d %d\n", (int)from&1023, (int)to&1023);
-@@ -338,8 +338,8 @@
- 		MOVNTQ" %%mm6, 48(%1)\n"
- 		MOVNTQ" %%mm7, 56(%1)\n"
- 		:: "r" (from), "r" (to) : "memory");
--		((const unsigned char *)from)+=64;
--		((unsigned char *)to)+=64;
-+		from=((const unsigned char *)from)+64;
-+		to=((unsigned char *)to)+64;
- 	}
- 
- #endif /* Have SSE */
diff --git a/packages/mplayer/mplayer-1.0pre7/.mtn2git_empty b/packages/mplayer/mplayer-1.0pre7/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/mplayer/mplayer-1.0pre7/.mtn2git_empty
+++ /dev/null
diff --git a/packages/mplayer/mplayer-1.0pre7/Makefile-vidix.patch b/packages/mplayer/mplayer-1.0pre7/Makefile-vidix.patch
deleted file mode 100644
index 9c84bdd05c..0000000000
--- a/packages/mplayer/mplayer-1.0pre7/Makefile-vidix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./vidix/drivers/Makefile	2004-09-24 19:05:49.000000000 +0930
-+++ ./vidix/drivers/Makefile~mplayer-w100_1.0pre3.1.modified.diff	2003-10-23 02:15:33.000000000 +0930
-@@ -151,7 +138,7 @@
- 
- install:
- 	mkdir -p $(LIBDIR)/mplayer/vidix
--	-install -m 755 -s -p *.so $(LIBDIR)/mplayer/vidix
-+	-install -m 755 -p *.so $(LIBDIR)/mplayer/vidix
- uninstall:
- 	rm -f $(LIBDIR)/mplayer/vidix/*.so
- 	rmdir -p --ignore-fail-on-non-empty $(LIBDIR)/mplayer/vidix
diff --git a/packages/mplayer/mplayer-1.0pre7/Makefile.patch b/packages/mplayer/mplayer-1.0pre7/Makefile.patch
deleted file mode 100644
index 07d8cd1cea..0000000000
--- a/packages/mplayer/mplayer-1.0pre7/Makefile.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- MPlayer-1.0pre7/Makefile.orig	2005-04-18 09:01:02.021562376 +0100
-+++ MPlayer-1.0pre7/Makefile	2005-04-18 09:11:13.018676696 +0100
-@@ -8,11 +8,6 @@
- 
- PRG_CFG = codec-cfg
- 
--# Do not strip the binaries at installation
--ifeq ($(STRIPBINARIES),yes)
--INSTALLSTRIP = -s
--endif
--
- # These subdirectories require installation due to binaries within them.
- ifeq ($(VIDIX),yes)
- SUBDIRS += libdha vidix
-@@ -244,7 +239,7 @@
-     ifeq ($(TARGET_WIN32),yes)
- 	windres -o osdep/mplayer-rc.o osdep/mplayer.rc
-     endif
--	$(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) libvo/libvo.a libao2/libao2.a $(MENU_LIBS) $(VIDIX_LIBS) $(GUI_LIBS) $(COMMON_LIBS) $(GTK_LIBS) $(VO_LIBS) $(AO_LIBS) $(EXTRA_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(STATIC_LIB) $(ARCH_LIB) $(I18NLIBS) $(MATH_LIB)
-+	$(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) libvo/libvo.a libao2/libao2.a $(MENU_LIBS) $(VIDIX_LIBS) $(GUI_LIBS) $(COMMON_LIBS) $(GTK_LIBS) $(VO_LIBS) $(AO_LIBS) $(EXTRA_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(STATIC_LIB) $(ARCH_LIB) $(I18NLIBS) $(MATH_LIB) -ljpeg -lpng $(LDFLAGS)
- 
- mplayer.exe.spec.c: libmpcodecs/libmpcodecs.a
- 	winebuild -fPIC -o mplayer.exe.spec.c -exe mplayer.exe -mcui \
-@@ -277,7 +272,7 @@
- $(MENCODER_DEP): version.h help_mp.h
- 
- $(PRG_CFG): version.h codec-cfg.c codec-cfg.h
--	$(HOST_CC) $(HOST_CFLAGS) -I. -g codec-cfg.c mp_msg.c -o $(PRG_CFG) -DCODECS2HTML $(EXTRA_LIB) $(EXTRA_INC) $(I18NLIBS)
-+	$(BUILD_CC) -Ilibmpdemux -Iloader -Ilibvo -I. -g codec-cfg.c mp_msg.c -o $(PRG_CFG) -DCODECS2HTML $(EXTRA_LIB) $(EXTRA_INC) $(I18NLIBS)
- 
- install: $(ALL_PRG)
- ifeq ($(VIDIX),yes)
-@@ -365,7 +360,6 @@
- 	@for a in $(PARTS); do $(MAKE) -C $$a distclean; done
- 
- strip:
--	strip -s $(ALL_PRG)
- 
- dep:	depend
- 
diff --git a/packages/mplayer/mplayer-1.0pre7/libmpcodecs-ogg-include.patch b/packages/mplayer/mplayer-1.0pre7/libmpcodecs-ogg-include.patch
deleted file mode 100644
index 9ca1266c4b..0000000000
--- a/packages/mplayer/mplayer-1.0pre7/libmpcodecs-ogg-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- MPlayer-1.0pre7/libmpcodecs/Makefile.orig	2005-04-19 12:09:24.313075760 +0100
-+++ MPlayer-1.0pre7/libmpcodecs/Makefile	2005-04-19 12:09:55.204379568 +0100
-@@ -50,7 +50,7 @@
- SRCS2=$(ENCODER_SRCS)
- OBJS2=$(SRCS2:.c=.o)
- 
--CFLAGS  = $(OPTFLAGS) -I. -Inative -I.. -I../libmpdemux -I../loader $(EXTRA_INC) $(X264_INC) -D_GNU_SOURCE
-+CFLAGS  = -I.. $(OPTFLAGS) -I. -Inative -I../libmpdemux -I../loader $(EXTRA_INC) $(X264_INC) -D_GNU_SOURCE
- 
- .SUFFIXES: .c .o
- 
diff --git a/packages/mplayer/mplayer-1.0pre7/libmpdemux-ogg-include.patch b/packages/mplayer/mplayer-1.0pre7/libmpdemux-ogg-include.patch
deleted file mode 100644
index 059a397926..0000000000
--- a/packages/mplayer/mplayer-1.0pre7/libmpdemux-ogg-include.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- MPlayer-1.0pre7/libmpdemux/Makefile.orig	2005-04-19 12:03:18.032758832 +0100
-+++ MPlayer-1.0pre7/libmpdemux/Makefile	2005-04-19 12:04:01.934084816 +0100
-@@ -36,8 +36,8 @@
- 
- OBJS	= $(SRCS:.c=.o)
- OBJS   += $(CPLUSPLUSSRCS:.cpp=.o)
--INCLUDE = -I.. -I../loader $(CSS_INC) $(EXTRA_INC) $(LIBAV_INC)
--CFLAGS  = $(OPTFLAGS) $(INCLUDE) $(XMMS_CFLAGS) $(CDPARANOIA_INC) $(DVB_INC)
-+INCLUDE = -I../loader $(CSS_INC) $(EXTRA_INC) $(LIBAV_INC)
-+CFLAGS  = -I.. $(OPTFLAGS) $(INCLUDE) $(XMMS_CFLAGS) $(CDPARANOIA_INC) $(DVB_INC)
- CPLUSPLUSFLAGS  = $(CFLAGS) $(CPLUSPLUSINCLUDE)
- CPLUSPLUS = $(CC)
- 
diff --git a/packages/mplayer/mplayer-1.0pre7/mplayer-w100_1.0pre3.1.modified.diff b/packages/mplayer/mplayer-1.0pre7/mplayer-w100_1.0pre3.1.modified.diff
deleted file mode 100644
index cabfcf8c41..0000000000
--- a/packages/mplayer/mplayer-1.0pre7/mplayer-w100_1.0pre3.1.modified.diff
+++ /dev/null
@@ -1,446 +0,0 @@
-diff -ruN MPlayer-1.0pre3/Makefile MPlayer-1.0pre3.custom/Makefile
---- MPlayer-1.0pre3.orig/Makefile    Tue Dec  9 06:33:31 2003
-+++ MPlayer-1.0pre3/Makefile     Thu Dec 11 16:18:27 2003
-@@ -17,7 +17,7 @@
-
- # These subdirectories require installation due to binaries within them.
- ifeq ($(VIDIX),yes)
--SUBDIRS += libdha vidix
-+SUBDIRS += vidix
- DO_MAKE = @ for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done
- endif
-
-@@ -45,7 +45,7 @@
- PARTS += libfaad2
- endif
- ifeq ($(VIDIX),yes)
--PARTS += libdha vidix
-+PARTS += vidix
- endif
- ifeq ($(FAME),yes)
- PARTS += libfame
-@@ -81,7 +81,7 @@
- COMMON_DEPS += libfaad2/libfaad2.a
- endif
- ifeq ($(VIDIX),yes)
--COMMON_DEPS += libdha/libdha.so vidix/libvidix.a
-+COMMON_DEPS += vidix/libvidix.a
- endif
- ifeq ($(FAME),yes)
- COMMON_DEPS += libfame/libfame.a
-diff -ruN MPlayer-1.0pre3.orig/configure MPlayer-1.0pre3/configure
---- MPlayer-1.0pre3.orig/configure	Tue Dec  9 06:33:31 2003
-+++ MPlayer-1.0pre3/configure	Thu Dec 11 17:29:38 2003
-@@ -2151,7 +2151,7 @@
- #include <sys/types.h>
- int main(void) { printf("%d\n", sizeof(size_t)*8); return 0; }
- EOF
--cc_check && _wordsize=`$TMPO` && _mp_wordsize="#define MP_WORDSIZE $_wordsize"
-+cc_check && _wordsize="32" && _mp_wordsize="#define MP_WORDSIZE $_wordsize"
- echores "$_wordsize"
- 
- 
-@@ -2289,6 +2289,8 @@
- EOF
- if mingw32 ; then
-   _ld_pthread=''
-+elif true ; then
-+  _ld_pthread='-lpthread'
- elif ( cc_check && $TMPO ) ; then              # QNX
-   _ld_pthread=''
- elif ( cc_check -lpthread && $TMPO ) ; then
-diff -ruN MPlayer-1.0pre3.orig/vidix/drivers/Makefile MPlayer-1.0pre3/vidix/drivers/Makefile
---- MPlayer-1.0pre3.orig/vidix/drivers/Makefile	Thu Oct 23 01:45:33 2003
-+++ MPlayer-1.0pre3/vidix/drivers/Makefile	Thu Dec 11 17:13:01 2003
-@@ -124,6 +131,12 @@
- 
- $(SIS_VID):     $(SIS_OBJS)
- 	$(CC) -shared $(SIS_OBJS) $(SIS_LIBS) -Wl,-soname,$(SIS_VID) -o $(SIS_VID) 
-+
-+$(W100_OBJS):    $(W100_SRCS)
-+	$(CC) -c $(W100_CFLAGS) -o $@ $<
-+
-+$(W100_VID):     $(W100_OBJS)
-+	$(CC) -shared $(W100_OBJS) $(W100_LIBS) -Wl,-soname,$(W100_VID) -o $(W100_VID)
- 
- clean:
- 	rm -f *.o *.so *~
-diff -ruN MPlayer-1.0pre3.orig/vidix/drivers/w100_vid.c MPlayer-1.0pre3/vidix/drivers/w100_vid.c
---- MPlayer-1.0pre3.orig/vidix/drivers/w100_vid.c	Thu Jan  1 09:00:00 1970
-+++ MPlayer-1.0pre3/vidix/drivers/w100_vid.c	Thu Dec 11 16:24:01 2003
-@@ -0,0 +1,375 @@
-+#include <errno.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <inttypes.h>
-+#include <unistd.h>
-+
-+#include "../vidix.h"
-+#include "../fourcc.h"
-+#include "../../config.h"
-+#include "aticore.h"
-+
-+#define UNUSED(v) ((void)(v))
-+
-+static uint16_t st_overlayHandle;
-+
-+static vidix_capability_t w100_cap =
-+{
-+    "ATI W100 driver",
-+    "AGAWA Koji <kaoru-K@self-core.org>",
-+    TYPE_OUTPUT,
-+    { 0, 0, 0, 0 },                     /* reserved */
-+    480,                                /* max width */
-+    640,                                /* max height */
-+    4,                                  /* min width */
-+    4,                                  /* min height */
-+    -1,                                 /* max framerate */
-+    FLAG_EQUALIZER,                     /* flags */
-+    0x1002,                             /* VENDOR_ATI(libdha/pci_vendors.h) */
-+    -1,                                 /* device id */
-+    { 0, 0, 0, 0 }                      /* reserved */
-+};
-+
-+unsigned int vixGetVersion(void)
-+{
-+    return VIDIX_VERSION;
-+}
-+
-+int vixProbe(int verbose, int force)
-+{
-+    UNUSED(verbose);
-+    UNUSED(force);
-+    return 0;
-+}
-+
-+int vixInit(void)
-+{
-+    if (AtiCore_ProcessAttach()) {
-+        if (AtiCore_AllocOverlay(&st_overlayHandle))
-+            return 0;
-+    }
-+
-+    return ENOSYS;
-+}
-+
-+void vixDestroy(void)
-+{
-+    AtiCore_SetOverlayOnOff(st_overlayHandle, 0);
-+    AtiCore_ReleaseOverlay(st_overlayHandle);
-+    AtiCore_ProcessDetach();
-+}
-+
-+int vixGetCapability(vidix_capability_t *to)
-+{
-+    memcpy(to, &w100_cap, sizeof(vidix_capability_t));
-+    return 0;
-+}
-+
-+static int is_supported_fourcc(uint32_t fourcc)
-+{
-+    switch(fourcc) {
-+    case IMGFMT_YV12:
-+        return 1;
-+    default:
-+        return 0;
-+    }
-+}
-+
-+int vixQueryFourcc(vidix_fourcc_t *to)
-+{
-+    if (is_supported_fourcc(to->fourcc)) {
-+        to->depth = VID_DEPTH_1BPP | VID_DEPTH_2BPP |
-+            VID_DEPTH_4BPP | VID_DEPTH_8BPP |
-+            VID_DEPTH_12BPP| VID_DEPTH_15BPP|
-+            VID_DEPTH_16BPP| VID_DEPTH_24BPP|
-+            VID_DEPTH_32BPP;
-+        to->flags = VID_CAP_EXPAND | VID_CAP_SHRINK;
-+/*         to->flags = VID_CAP_EXPAND | VID_CAP_SHRINK | VID_CAP_COLORKEY; */
-+        return 0;
-+    } else
-+        to->depth = to->flags = 0;
-+
-+    return ENOSYS;
-+}
-+
-+int vixGetGrKeys(vidix_grkey_t *grkey)
-+{
-+    UNUSED(grkey);
-+    return 0;
-+}
-+
-+int vixSetGrKeys(const vidix_grkey_t *grkey)
-+{
-+    UNUSED(grkey);
-+    return 0;
-+}
-+
-+static vidix_video_eq_t st_equal =
-+{
-+    VEQ_CAP_BRIGHTNESS,
-+    0, 0, 0, 0, 0, 0, 0, 0
-+};
-+
-+int vixPlaybackGetEq(vidix_video_eq_t * eq)
-+{
-+    memcpy(eq, &st_equal, sizeof(st_equal));
-+    return 0;
-+}
-+
-+int vixPlaybackSetEq(const vidix_video_eq_t * eq)
-+{
-+    int br;
-+
-+    if (eq->cap & VEQ_CAP_BRIGHTNESS)
-+        st_equal.brightness = eq->brightness;
-+    if (eq->cap & VEQ_CAP_CONTRAST)
-+        st_equal.contrast = eq->contrast;
-+    if (eq->cap & VEQ_CAP_SATURATION)
-+        st_equal.saturation = eq->saturation;
-+    if (eq->cap & VEQ_CAP_HUE)
-+        st_equal.hue = eq->hue;
-+    if (eq->cap & VEQ_CAP_RGB_INTENSITY) {
-+        st_equal.red_intensity   = eq->red_intensity;
-+        st_equal.green_intensity = eq->green_intensity;
-+        st_equal.blue_intensity  = eq->blue_intensity;
-+    }
-+    st_equal.flags = eq->flags;
-+
-+    br = (st_equal.brightness + 1000) * 127 / 2000;
-+    if (br < 0)
-+        br = 0;
-+    if (br > 127)
-+        br = 127;
-+    if (br > 64)
-+        br -= 64;
-+    else
-+        br += 64;
-+
-+    AtiCore_SetDisplayBrightness(br);
-+
-+    return 0;
-+}
-+
-+static uint32_t st_frameOffsets[VID_PLAY_MAXFRAMES];
-+static vidix_playback_t st_playbackInfo;
-+static ATI_OVERLAYPROP st_overlayProp;
-+
-+int vixConfigPlayback(vidix_playback_t *info)
-+{
-+    int src_w, src_h;
-+    int drw_w, drw_h;
-+    int y_pitch, uv_pitch;
-+    int i, ret, newNumFrames;
-+    ATI_CLIPRECT clipRect;
-+    uint32_t base;
-+    uint32_t internalVramSize, internalVramAddr;
-+    uint32_t externalVramSize, externalVramAddr;
-+    int useExternalVram = 0;
-+
-+    if (!is_supported_fourcc(info->fourcc))
-+        return -1;
-+
-+    src_w = info->src.w;
-+    src_h = info->src.h;
-+    drw_w = info->dest.w;
-+    drw_h = info->dest.h;
-+
-+    switch (info->fourcc) {
-+    case IMGFMT_YV12:
-+        y_pitch = (src_w + 15) & ~15;
-+        uv_pitch = ((src_w / 2) + 7) & ~7;
-+        info->offset.y = 0;
-+        info->offset.v = y_pitch * src_h;
-+        info->offset.u = info->offset.v + uv_pitch * (src_h / 2);
-+        info->frame_size = y_pitch * src_h + 2 * uv_pitch * (src_h / 2);
-+        break;
-+    default:
-+        return -1;
-+    }
-+/*     fprintf(stderr, "w100_vid: num_frames:%d\n", info->num_frames); */
-+/*     fprintf(stderr, "w100_vid: y_pitch:%d\n", y_pitch); */
-+
-+/*     fprintf(stderr, "w100_vid: struct info {\n"); */
-+/*     fprintf(stderr, "w100_vid:   src.x:%d. src.y:%d. src.w:%d, src.h:%d,\n", */
-+/*             info->src.x, info->src.y, info->src.w, info->src.h); */
-+/*     fprintf(stderr, "w100_vid:   dest.x:%d. dest.y:%d. dest.w:%d, dest.h:%d,\n", */
-+/*             info->dest.x, info->dest.y, info->dest.w, info->dest.h); */
-+/*     fprintf(stderr, "w100_vid:   offset.y:%d, offset.v:%d offset.y:%d\n", */
-+/*             info->offset.y, info->offset.v, info->offset.u); */
-+/*     fprintf(stderr, "w100_vid:   frame_size:%d,\n", info->frame_size); */
-+
-+    GetAvailableVideoMem(&internalVramSize, &externalVramSize);
-+    AtiCore_SetupMemoryTransfer(0, &internalVramAddr);
-+    AtiCore_TerminateMemoryTransfer();
-+    AtiCore_SetupMemoryTransfer(0xF000000, &externalVramAddr);
-+    AtiCore_TerminateMemoryTransfer();
-+
-+/*     info->num_frames = 1; */
-+    useExternalVram =  (getenv("MPLAYER_W100_USEEXTVRAM") ? 1 : 0);
-+
-+    if (useExternalVram) {
-+        /* $B%U%l!<%`%P%C%U%!$H$7$FMxMQ$5$l$F$$$kItJ,$O;H$o$J$$(B */
-+        base = 640 * 480 * 2;
-+        newNumFrames = (externalVramSize - (640 * 480 * 2))
-+            / info->frame_size;
-+
-+        /* FIXME: $B30It(B VRAM $B$K%*!<%P%l%$$r3NJ]$9$k$H!"(BVGA/QVGA $BLd$o$:(B
-+         $BI=<($,GH>u$KMp$l$k!#(B @SL-C700/C750 */
-+    } else {
-+        /* $B%U%l!<%`%P%C%U%!It$b;H$o$J$$$H!"(BVRAM $BMFNL$,B-$j$J$$(B */
-+/*         base = 320 * 240 * 2; */
-+        base = 320 * 4 * 2;
-+        memset((void *)internalVramAddr, 0x00, 320 * 4 * 2);
-+        newNumFrames = internalVramSize / info->frame_size;
-+    }
-+
-+    if (newNumFrames > info->num_frames)
-+        newNumFrames = info->num_frames;
-+    if (newNumFrames > VID_PLAY_MAXFRAMES)
-+        newNumFrames = VID_PLAY_MAXFRAMES;
-+    info->num_frames = newNumFrames;
-+
-+    info->dga_addr =
-+        (void *)(useExternalVram ? externalVramAddr : internalVramAddr);
-+/*     fprintf(stderr, "w100_vid:   num_frames:%d,\n", info->num_frames); */
-+
-+    info->dest.pitch.y = 16;
-+    info->dest.pitch.u = 16;
-+    info->dest.pitch.v = 16;
-+
-+/*     fprintf(stderr, "w100_vid: }\n"); */
-+/*     fprintf(stderr, "w100_vid: base:%d\n", base); */
-+
-+    for (i = 0; i < info->num_frames; ++i) {
-+        info->offsets[i] = base + info->frame_size * i;
-+        st_frameOffsets[i] = info->offsets[i]
-+            + (useExternalVram ? 0xF000000 : 0);
-+    }
-+
-+    st_overlayProp.lpSrcBitmap = (void *)st_frameOffsets[0];
-+    st_overlayProp.XCoord = 0;
-+    st_overlayProp.YCoord = 0;
-+    st_overlayProp.SrcPitch = y_pitch;
-+    st_overlayProp.SrcHeight = src_h;
-+    st_overlayProp.OverlayWidth = y_pitch;
-+    st_overlayProp.OverlayHeight = src_h;
-+    st_overlayProp.lpOverlayKey = 0;
-+    st_overlayProp.OverlayFormat = OVLTYPE_YUV420;
-+
-+    ret = AtiCore_SetupOverlay(st_overlayHandle, &st_overlayProp);
-+/*     printf("w100_vid: AtiCore_SetupOverlay: ret=%d\n", ret); */
-+
-+    clipRect.X_Top_Left = 0;
-+    clipRect.Y_Top_Left = 0;
-+    clipRect.X_Bottom_Right = st_overlayProp.SrcPitch;
-+    clipRect.Y_Bottom_Right = st_overlayProp.SrcHeight;
-+    AtiCore_SetDstClippingRect(&clipRect);
-+    clipRect.X_Bottom_Right = info->src.w;
-+    clipRect.Y_Bottom_Right = info->src.h;
-+    AtiCore_SetSrcClippingRect(&clipRect);
-+
-+/*     AtiCore_SetOverlayPos(st_overlayHandle, info->dest.x, info->dest.y); */
-+    AtiCore_SetOverlayPos(st_overlayHandle, 4, 0);
-+
-+    AtiCore_SetRopOperation(ROP3_SRCCOPY);
-+    AtiCore_SetDstType(DSTTYPE_8BPP);
-+    AtiCore_SetSrcType(SRCTYPE_EQU_DST);
-+
-+    vixPlaybackSetEq(&st_equal);
-+
-+    memcpy(&st_playbackInfo, info, sizeof(*info));
-+
-+/*     fprintf(stderr, "w100_vid: ---- vixConfigPlayback complete.\n"); */
-+
-+    return 0;
-+}
-+
-+int vixPlaybackOn(void)
-+{
-+    AtiCore_SetOverlayOnOff(st_overlayHandle, 1);
-+
-+    return 0;
-+}
-+
-+int vixPlaybackOff(void)
-+{
-+    AtiCore_SetOverlayOnOff(st_overlayHandle, 0);
-+
-+    return 0;
-+}
-+
-+int vixPlaybackFrameSelect(unsigned int frame)
-+{
-+    st_overlayProp.lpSrcBitmap = (void *)st_frameOffsets[frame];
-+    AtiCore_SetupOverlay(st_overlayHandle, &st_overlayProp);
-+
-+#if 0
-+    ATI_STRETCH stretchOptions;
-+    ATI_POINT dpPoint;
-+    ATI_RECT srcRect, dstRect;
-+    int ret;
-+
-+/*     fprintf(stderr, "w100_vid: vixPlaybackFrameSelect(frame=%d)\n", frame); */
-+/*     fprintf(stderr, "w100_vid:   dga_addr:0x%08x, offset:%d,\n", */
-+/*             st_playbackInfo.dga_addr, st_frameOffsets[frame]); */
-+
-+    stretchOptions.Count = 1;
-+    stretchOptions.ScaleXFactor = 4;
-+    stretchOptions.ScaleYFactor = 4;
-+    stretchOptions.BlendOn = 0;
-+    stretchOptions.dummy1 = 0;
-+
-+    dpPoint.XCoord = 0;
-+    dpPoint.YCoord = 0;
-+
-+    srcRect.XCoord = st_playbackInfo.src.x;
-+    srcRect.YCoord = st_playbackInfo.src.y;
-+    srcRect.Width = st_playbackInfo.src.w;
-+    srcRect.Height = st_playbackInfo.src.h;
-+    fprintf(stderr, "%d, %d, %d, %d\n", srcRect.XCoord, srcRect.YCoord,
-+            srcRect.Width, srcRect.Height);
-+
-+    dstRect.XCoord = 0;
-+    dstRect.YCoord = 0;
-+    dstRect.Width = 432;//st_playbackInfo.src.w;
-+    dstRect.Height = 592;//st_playbackInfo.src.h;
-+
-+#if 1