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
-+    while (AtiCore_WaitComplete(100) != 1)
-+        ;
-+
-+	AtiCore_SetRopOperation( ROP3_SRCCOPY );
-+	AtiCore_SetDstType( DSTTYPE_8BPP );
-+	AtiCore_SetSrcType( SRCTYPE_EQU_DST );
-+
-+    ret = AtiCore_SetSrcPitchOffset(st_playbackInfo.src.w,
-+                                    st_frameOffsets[frame]);
-+    fprintf(stderr, "AtiCore_SetSrcPitchOffset(%d, %x) %d\n",
-+            st_playbackInfo.src.w, st_frameOffsets[frame], ret);
-+    ret = AtiCore_SetDstPitchOffset(432, 0);
-+/*     printf("AtiCore_SetDstPitchOffset: ret=%d\n", ret); */
-+
-+/*     ret = AtiCore_BitBltFilpRotate(0, &srcRect, &dstRect); */
-+    ret = AtiCore_StretchBlt(&stretchOptions, &dpPoint, &srcRect);
-+    fprintf(stderr, "AtiCore_StretchBlt: ret=%d\n", ret);
-+
-+#else
-+    {
-+        int y, srcOffset = 0, dstOffset = 0;
-+        fprintf(stderr, "%d %d %d\n", st_playbackInfo.src.h,
-+                st_playbackInfo.src.w, 0);
-+        for (y = 0; y < st_playbackInfo.src.h; ++y) {
-+            memcpy(
-+                0xF1100000 + dstOffset,
-+                st_playbackInfo.dga_addr + st_playbackInfo.offsets[frame] + srcOffset,
-+                st_playbackInfo.src.w);
-+            srcOffset += st_playbackInfo.src.w;
-+            dstOffset += 432;
-+        }
-+    }
-+#endif
-+#endif
-+
-+    return 0;
-+}
diff --git a/packages/mplayer/mplayer-1.0pre7/sdl.patch b/packages/mplayer/mplayer-1.0pre7/sdl.patch
deleted file mode 100644
index d74c8397b9..0000000000
--- a/packages/mplayer/mplayer-1.0pre7/sdl.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- ./configure.orig	2004-09-24 19:09:56.000000000 +0930
-+++ ./configure	2004-09-24 19:22:21.000000000 +0930
-@@ -3554,38 +3554,6 @@
- #################
- 
- 
--echocheck "SDL"
--if test -z "$_sdlconfig" ; then
--  if ( sdl-config --version ) >>"$TMPLOG" 2>&1 ; then
--    _sdlconfig="sdl-config"
--  elif ( sdl11-config --version ) >>"$TMPLOG" 2>&1 ; then
--    _sdlconfig="sdl11-config"
--  else
--    _sdlconfig=false
--  fi
--fi
--if test "$_sdl" = auto || test "$_sdl" = yes ; then
--  cat > $TMPC << EOF
--#include <SDL.h>
--int main(int argc, char *argv[]) { return 0; }
--EOF
--  _sdl=no
--  if "$_sdlconfig" --version >>"$TMPLOG" 2>&1 ; then
--    if cc_check `$_sdlconfig --cflags` `$_sdlconfig --libs` >>"$TMPLOG" 2>&1 ; then
--      _sdlversion=`$_sdlconfig --version | sed 's/[^0-9]//g'`
--        if test "$_sdlversion" -gt 116 ; then
--          if test "$_sdlversion" -lt 121 ; then
--            _def_sdlbuggy='#define BUGGY_SDL'
--          else
--            _def_sdlbuggy='#undef BUGGY_SDL'
--          fi
--          _sdl=yes
--        else
--          _sdl=outdated
--        fi
--     fi
--  fi
--fi
- if test "$_sdl" = yes ; then
-   _def_sdl='#define HAVE_SDL 1'
-   if cygwin ; then
diff --git a/packages/mplayer/mplayer-1.0pre7/vidix-drivers-w100.patch b/packages/mplayer/mplayer-1.0pre7/vidix-drivers-w100.patch
deleted file mode 100644
index 2c8df9aa3b..0000000000
--- a/packages/mplayer/mplayer-1.0pre7/vidix-drivers-w100.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- MPlayer-1.0pre6a/vidix/drivers/Makefile.orig	2005-04-05 14:17:28.130812264 +0000
-+++ MPlayer-1.0pre6a/vidix/drivers/Makefile	2005-04-05 14:18:09.294554424 +0000
-@@ -70,7 +70,13 @@
- SAVAGE_LIBS=-L../../libdha -ldha -lm
- SAVAGE_CFLAGS=$(OPTFLAGS) -fPIC -I. -I..
- 
--all:    $(CYBERBLADE_VID) $(RADEON_VID) $(RAGE128_VID) $(MACH64_VID) $(NVIDIA_VID) $(GENFB_VID) $(MGA_VID) $(MGA_CRTC2_VID) $(PM3_VID) $(SIS_VID) $(UNICHROME_VID) $(SAVAGE_VID)
-+W100_VID=w100_vid.so
-+W100_SRCS=w100_vid.c
-+W100_OBJS=w100_vid.o
-+W100_LIBS=-L$(QPEDIR)/lib -laticore
-+W100_CFLAGS=$(OPTFLAGS) -fPIC -I. -I..
-+
-+all:    $(W100_VID)
- 
- 
- .SUFFIXES: .c .o
diff --git a/packages/mplayer/mplayer-1.0pre7/zlib.patch b/packages/mplayer/mplayer-1.0pre7/zlib.patch
deleted file mode 100644
index 6e0918d8ed..0000000000
--- a/packages/mplayer/mplayer-1.0pre7/zlib.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./configure.old	2004-09-24 01:03:55.000000000 +0930
-+++ ./configure	2004-09-24 01:04:18.000000000 +0930
-@@ -4313,13 +4313,7 @@
- echores "$_fribidi"
- 
- 
--echocheck "zlib"
--cat > $TMPC << EOF
--#include <zlib.h>
--int main(void) { (void) inflate(0, Z_NO_FLUSH); return 0; }
--EOF
--_zlib=no
--cc_check -lz && _zlib=yes
-+_zlib=yes
- if test "$_zlib" = yes ; then
-   _def_zlib='#define HAVE_ZLIB 1'
-   _ld_zlib='-lz'
diff --git a/packages/mplayer/mplayer-1.0pre8/.mtn2git_empty b/packages/mplayer/mplayer-1.0pre8/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/mplayer/mplayer-1.0pre8/.mtn2git_empty
+++ /dev/null
diff --git a/packages/mplayer/mplayer-atty-1.1.5/.mtn2git_empty b/packages/mplayer/mplayer-atty-1.1.5/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/mplayer/mplayer-atty-1.1.5/.mtn2git_empty
+++ /dev/null
diff --git a/packages/mplayer/mplayer-atty-1.1.5/Makefile-libs.patch b/packages/mplayer/mplayer-atty-1.1.5/Makefile-libs.patch
deleted file mode 100644
index 03456aca4a..0000000000
--- a/packages/mplayer/mplayer-atty-1.1.5/Makefile-libs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mplayer-1.1.4/Makefile.orig	2005-06-24 15:36:12.974059040 +0000
-+++ mplayer-1.1.4/Makefile	2005-06-24 15:36:31.628223176 +0000
-@@ -245,7 +245,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) $(LDFLAGS)
- 	cp $(PRG) $(PRG).debug
- 	$(STRIP) $(PRG)
- 
diff --git a/packages/mplayer/mplayer-atty-1.1.5/Makefile.patch b/packages/mplayer/mplayer-atty-1.1.5/Makefile.patch
deleted file mode 100644
index 78161e79ee..0000000000
--- a/packages/mplayer/mplayer-atty-1.1.5/Makefile.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- Makefile.orig	2005-04-07 10:19:08.392784784 +0100
-+++ Makefile	2005-04-07 10:21:26.262825352 +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
-@@ -283,7 +278,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) $(BUILD_CFLAGS) -I. -g codec-cfg.c mp_msg.c -o $(PRG_CFG) -DCODECS2HTML $(EXTRA_LIB) $(EXTRA_INC) $(I18NLIBS)
- 
- install: $(ALL_PRG)
- ifeq ($(VIDIX),yes)
-@@ -368,7 +363,6 @@
- 	@for a in $(PARTS); do $(MAKE) -C $$a distclean; done
- 
- strip:
--	strip -s $(ALL_PRG)
- 
- dep:	depend
- 
diff --git a/packages/mplayer/mplayer-atty-1.1.5/alsa-configure.patch b/packages/mplayer/mplayer-atty-1.1.5/alsa-configure.patch
deleted file mode 100644
index ad6d4504e1..0000000000
--- a/packages/mplayer/mplayer-atty-1.1.5/alsa-configure.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- mplayer-1.1.5/configure.orig	2005-11-08 15:07:52.000000000 +0000
-+++ mplayer-1.1.5/configure	2005-11-08 15:08:40.000000000 +0000
-@@ -4627,33 +4627,7 @@
- echocheck "ALSA audio"
- if test "$_alsa" != no ; then
-   _alsa=no
--  cat > $TMPC << EOF
--#include <sys/asoundlib.h>
--int main(void) { return (!(SND_LIB_MAJOR==0 && SND_LIB_MINOR==5)); }
--EOF
--  cc_check -lasound $_ld_dl $_ld_pthread && $TMPO && _alsaver='0.5.x'
--
--  cat > $TMPC << EOF
--#include <sys/asoundlib.h>
--int main(void) { return (!(SND_LIB_MAJOR==0 && SND_LIB_MINOR==9)); }
--EOF
--  cc_check -lasound $_ld_dl $_ld_pthread && $TMPO && _alsaver='0.9.x-sys'
--  cat > $TMPC << EOF
--#include <alsa/asoundlib.h>
--int main(void) { return (!(SND_LIB_MAJOR==0 && SND_LIB_MINOR==9)); }
--EOF
--  cc_check -lasound $_ld_dl $_ld_pthread && $TMPO && _alsaver='0.9.x-alsa'
--
--  cat > $TMPC << EOF
--#include <sys/asoundlib.h>
--int main(void) { return (!(SND_LIB_MAJOR==1 && SND_LIB_MINOR==0)); }
--EOF
--  cc_check -lasound $_ld_dl $_ld_pthread && $TMPO && _alsaver='1.0.x-sys'
--  cat > $TMPC << EOF
--#include <alsa/asoundlib.h>
--int main(void) { return (!(SND_LIB_MAJOR==1 && SND_LIB_MINOR==0)); }
--EOF
--  cc_check -lasound $_ld_dl $_ld_pthread && $TMPO && _alsaver='1.0.x-alsa'
-+  _alsaver='1.0.x-alsa'
- fi
- _def_alsa5='#undef HAVE_ALSA5'
- _def_alsa9='#undef HAVE_ALSA9'
diff --git a/packages/mplayer/mplayer-atty-1.1.5/dsputil.patch b/packages/mplayer/mplayer-atty-1.1.5/dsputil.patch
deleted file mode 100644
index 962f1bc1e3..0000000000
--- a/packages/mplayer/mplayer-atty-1.1.5/dsputil.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- mplayer-1.0.1/libavcodec/armv4l/dsputil_arm.c.orig	2005-04-08 09:16:18.310720680 +0000
-+++ mplayer-1.0.1/libavcodec/armv4l/dsputil_arm.c	2005-04-08 09:18:11.679486008 +0000
-@@ -248,22 +248,22 @@
- 	c->idct_permutation_type= FF_NO_IDCT_PERM;
-     }
- 
--    c->put_pixels_tab[0][0] = put_pixels16_arm;
--    c->put_pixels_tab[0][1] = put_pixels16_x2_arm;
--    c->put_pixels_tab[0][2] = put_pixels16_y2_arm;
--    c->put_pixels_tab[0][3] = put_pixels16_xy2_arm;
--    c->put_no_rnd_pixels_tab[0][0] = put_pixels16_arm;
--    c->put_no_rnd_pixels_tab[0][1] = put_no_rnd_pixels16_x2_arm;
--    c->put_no_rnd_pixels_tab[0][2] = put_no_rnd_pixels16_y2_arm;
--    c->put_no_rnd_pixels_tab[0][3] = put_no_rnd_pixels16_xy2_arm;
--    c->put_pixels_tab[1][0] = put_pixels8_arm;
--    c->put_pixels_tab[1][1] = put_pixels8_x2_arm;
--    c->put_pixels_tab[1][2] = put_pixels8_y2_arm;
--    c->put_pixels_tab[1][3] = put_pixels8_xy2_arm;
--    c->put_no_rnd_pixels_tab[1][0] = put_pixels8_arm;
--    c->put_no_rnd_pixels_tab[1][1] = put_no_rnd_pixels8_x2_arm;
--    c->put_no_rnd_pixels_tab[1][2] = put_no_rnd_pixels8_y2_arm;
--    c->put_no_rnd_pixels_tab[1][3] = put_no_rnd_pixels8_xy2_arm;
-+    /*     c->put_pixels_tab[0][0] = put_pixels16_arm; */ // NG!
-+    c->put_pixels_tab[0][1] = put_pixels16_x2_arm; //OK!
-+    c->put_pixels_tab[0][2] = put_pixels16_y2_arm; //OK!
-+    /*     c->put_pixels_tab[0][3] = put_pixels16_xy2_arm; /\* NG *\/ */
-+    /*     c->put_no_rnd_pixels_tab[0][0] = put_pixels16_arm; // ?(.....) */
-+    c->put_no_rnd_pixels_tab[0][1] = put_no_rnd_pixels16_x2_arm; // OK
-+    c->put_no_rnd_pixels_tab[0][2] = put_no_rnd_pixels16_y2_arm; //OK
-+    /*     c->put_no_rnd_pixels_tab[0][3] = put_no_rnd_pixels16_xy2_arm; //NG */
-+    c->put_pixels_tab[1][0] = put_pixels8_arm; //OK
-+    c->put_pixels_tab[1][1] = put_pixels8_x2_arm; //OK
-+    /*     c->put_pixels_tab[1][2] = put_pixels8_y2_arm; //NG */
-+    /*     c->put_pixels_tab[1][3] = put_pixels8_xy2_arm; //NG */
-+    c->put_no_rnd_pixels_tab[1][0] = put_pixels8_arm;//OK
-+    c->put_no_rnd_pixels_tab[1][1] = put_no_rnd_pixels8_x2_arm; //OK
-+    c->put_no_rnd_pixels_tab[1][2] = put_no_rnd_pixels8_y2_arm; //OK
-+    /*     c->put_no_rnd_pixels_tab[1][3] = put_no_rnd_pixels8_xy2_arm;//NG */
- 
- #ifdef HAVE_IWMMXT
-     dsputil_init_iwmmxt(c, avctx);
diff --git a/packages/mplayer/mplayer-atty-1.1.5/libmpcodecs-ogg-include.patch b/packages/mplayer/mplayer-atty-1.1.5/libmpcodecs-ogg-include.patch
deleted file mode 100644
index 9ca1266c4b..0000000000
--- a/packages/mplayer/mplayer-atty-1.1.5/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-atty-1.1.5/libmpdemux-ogg-include.patch b/packages/mplayer/mplayer-atty-1.1.5/libmpdemux-ogg-include.patch
deleted file mode 100644
index 059a397926..0000000000
--- a/packages/mplayer/mplayer-atty-1.1.5/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-atty-1.1.5/sdl.patch b/packages/mplayer/mplayer-atty-1.1.5/sdl.patch
deleted file mode 100644
index d74c8397b9..0000000000
--- a/packages/mplayer/mplayer-atty-1.1.5/sdl.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- ./configure.orig	2004-09-24 19:09:56.000000000 +0930
-+++ ./configure	2004-09-24 19:22:21.000000000 +0930
-@@ -3554,38 +3554,6 @@
- #################
- 
- 
--echocheck "SDL"
--if test -z "$_sdlconfig" ; then
--  if ( sdl-config --version ) >>"$TMPLOG" 2>&1 ; then
--    _sdlconfig="sdl-config"
--  elif ( sdl11-config --version ) >>"$TMPLOG" 2>&1 ; then
--    _sdlconfig="sdl11-config"
--  else
--    _sdlconfig=false
--  fi
--fi
--if test "$_sdl" = auto || test "$_sdl" = yes ; then
--  cat > $TMPC << EOF
--#include <SDL.h>
--int main(int argc, char *argv[]) { return 0; }
--EOF
--  _sdl=no
--  if "$_sdlconfig" --version >>"$TMPLOG" 2>&1 ; then
--    if cc_check `$_sdlconfig --cflags` `$_sdlconfig --libs` >>"$TMPLOG" 2>&1 ; then
--      _sdlversion=`$_sdlconfig --version | sed 's/[^0-9]//g'`
--        if test "$_sdlversion" -gt 116 ; then
--          if test "$_sdlversion" -lt 121 ; then
--            _def_sdlbuggy='#define BUGGY_SDL'
--          else
--            _def_sdlbuggy='#undef BUGGY_SDL'
--          fi
--          _sdl=yes
--        else
--          _sdl=outdated
--        fi
--     fi
--  fi
--fi
- if test "$_sdl" = yes ; then
-   _def_sdl='#define HAVE_SDL 1'
-   if cygwin ; then
diff --git a/packages/mplayer/mplayer-atty_1.1.5.bb b/packages/mplayer/mplayer-atty_1.1.5.bb
deleted file mode 100644
index cfc8c7a40a..0000000000
--- a/packages/mplayer/mplayer-atty_1.1.5.bb
+++ /dev/null
@@ -1,77 +0,0 @@
-DESCRIPTION = "Open Source multimedia player."
-SECTION = "opie/multimedia"
-PRIORITY = "optional"
-HOMEPAGE = "http://atty.skr.jp/?Zaurus%2Fmplayer"
-DEPENDS = "virtual/libsdl freetype libmad libogg libvorbis zlib libpng jpeg alsa-lib mplayer-common"
-RDEPENDS = "mplayer-common"
-LICENSE = "GPL"
-RCONFLICTS = "mplayer"
-MAINTAINER = "Graeme Gregory <dp@xora.org.uk>"
-PR = "r5"
-
-SRC_URI = "http://www.xora.org.uk/oe/mplayer-${PV}.tar.gz \
-	   file://Makefile.patch;patch=1;pnum=0 \
-	   file://sdl.patch;patch=1 \
-           file://Makefile-libs.patch;patch=1 \
-           file://libmpdemux-ogg-include.patch;patch=1 \
-           file://libmpcodecs-ogg-include.patch;patch=1 \
-	   file://alsa-configure.patch;patch=1 \
-	   file://mplayer-1.0_pre7-gcc4.patch;patch=1 "
-
-PARALLEL_MAKE = ""
-
-DEPENDS_append_c7x0 = " sharp-aticore-oss"
-PACKAGE_ARCH_c7x0 = "${MACHINE_ARCH}"
-PACKAGE_ARCH_akita = "${MACHINE_ARCH}"
-PACKAGE_ARCH_spitz = "${MACHINE_ARCH}"
-
-S = "${WORKDIR}/mplayer-${PV}"
-
-FILES_${PN} = "${bindir}/mplayer"
-
-inherit autotools 
-
-EXTRA_OECONF = " \
-        --prefix=/usr \
-        --mandir=${mandir} \
-        --target=${TARGET_SYS} \
-        --disable-shared-pp \
-        \
-        --disable-win32 \
-        --disable-macosx \
-        --disable-dvdread \
-        --disable-mpdvdkit \
-        --disable-tv \
-        --disable-tv-v4l \
-        --disable-tv-v4l2 \
-        --disable-tv-bsdbt848 \
-        --disable-mencoder \
-        --disable-live \
-	--disable-smb \
-        \
-        --enable-dynamic-plugins \
-        --enable-fbdev \
-        --enable-sdl \
-	--enable-alsa \
-        --with-sdl-config=${STAGING_BINDIR}/sdl-config \
-        \
-        --enable-mad \
-        --enable-vorbis \
-        \
-        --enable-ossaudio \
-        \
-        --enable-rtc \
-	--disable-ipp \
-	--disable-iwmmxt \
-        \
-	--enable-freetype \
-        --with-extralibdir=${STAGING_LIBDIR} "
-
-EXTRA_OECONF_append_c7x0 = " --enable-w100"
-EXTRA_OECONF_append_akita = " --enable-bvdd"
-EXTRA_OECONF_append_spitz = " --enable-bvdd"
-
-do_configure() {
-        ./configure ${EXTRA_OECONF}
-}
-
diff --git a/packages/mplayer/mplayer_1.0pre7.bb b/packages/mplayer/mplayer_1.0pre7.bb
deleted file mode 100644
index 25194beec9..0000000000
--- a/packages/mplayer/mplayer_1.0pre7.bb
+++ /dev/null
@@ -1,96 +0,0 @@
-DESCRIPTION = "Open Source multimedia player."
-SECTION = "opie/multimedia"
-PRIORITY = "optional"
-HOMEPAGE = "http://www.mplayerhq.hu/"
-DEPENDS = "virtual/libsdl libmad libogg libvorbis zlib libpng jpeg mplayer-common"
-RDEPENDS = "mplayer-common"
-LICENSE = "GPL"
-SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \
-           file://Makefile.patch;patch=1 \
-           file://sdl.patch;patch=0 \
-           file://zlib.patch;patch=0 \
-           file://libmpdemux-ogg-include.patch;patch=1 \
-           file://libmpcodecs-ogg-include.patch;patch=1 \
-           file://mplayer-1.0_pre7-gcc4.patch;patch=1 "
-
-MAINTAINER="Graeme Gregory <dp@xora.org.uk>"
-RCONFLICTS_${PN} = "mplayer-atty"
-PR = "r3"
-
-PARALLEL_MAKE = ""
-
-DEPENDS_append_c7x0 = " sharp-aticore-oss"
-PACKAGE_ARCH_c7x0 = "${MACHINE_ARCH}"
-SRC_URI_append_c7x0 = "file://mplayer-w100_1.0pre3.1.modified.diff;patch=1 \
-                       file://Makefile-vidix.patch;patch=0 \
-                       file://vidix-drivers-w100.patch;patch=1 "
-
-S = "${WORKDIR}/MPlayer-${PV}"
-
-PACKAGES =+ "postproc postproc-dev"
-
-FILES_${PN} = "${bindir}/mplayer ${libdir}/mplayer/vidix/w100_vid.so"
-
-FILES_postproc = " ${libdir}/libpostproc.so.0.0.0 ${libdir}/libpostproc.so.0"
-FILES_postproc-dev = " ${includedir}/postproc/postprocess.h ${libdir}/libpostproc.so ${libdir}/libpostproc.a"
-
-inherit autotools 
-
-EXTRA_OECONF = " \
-        --prefix=/usr \
-		--mandir=${mandir} \
-        --target=${TARGET_SYS} \
-        --enable-shared-pp \
-        \
-        --disable-win32 \
-        --disable-macosx \
-        --disable-dvdread \
-        --disable-mpdvdkit \
-        --disable-tv \
-        --disable-tv-v4l \
-        --disable-tv-v4l2 \
-        --disable-tv-bsdbt848 \
-        --disable-mencoder \
-	--disable-live \
-	--disable-smb \
-        \
-        --enable-dynamic-plugins \
-        --enable-fbdev \
-        --enable-sdl \
-        --with-sdl-config=${STAGING_BINDIR}/sdl-config \
-        \
-        --enable-mad \
-	--enable-tremor-low \
-        \
-        --enable-ossaudio \
-        \
-	--enable-rtc \
-	\
-        --with-extralibdir=${STAGING_LIBDIR} "
-
-EXTRA_OECONF_append_c7x0 = " --enable-vidix "
-
-do_configure() {
-        ./configure ${EXTRA_OECONF}
-}
-
-do_install_append () {
-        install -d ${D}${libdir} ${D}${includedir} ${D}${includedir}/postproc
-        install -m 0644 libavcodec/libpostproc/postprocess.h ${D}${includedir}/postproc/
-        oe_libinstall -so -C ${S}/libavcodec/libpostproc libpostproc ${D}${libdir}
-        cp ${S}/libavcodec/libpostproc/libpostproc.so ${D}${libdir}/libpostproc.so.0.0.0
-        cd ${D}${libdir}
-        ln -sf libpostproc.so.0.0.0 libpostproc.so.0
-        ln -sf libpostproc.so.0 libpostproc.so
-}
-
-do_stage () {
-        oe_libinstall -a -so -C libavcodec/libpostproc libpostproc ${STAGING_LIBDIR}
-        cd ${STAGING_LIBDIR}
-        ln -sf libpostproc.so libpostproc.so.0.0.0
-        ln -sf libpostproc.so libpostproc.so.0
-
-        install -d ${STAGING_INCDIR}/postproc
-        install -m 0644 ${S}/libavcodec/libpostproc/postprocess.h ${STAGING_INCDIR}/postproc/postprocess.h
-}                                       
-
diff --git a/packages/mplayer/mplayer_svn.bb b/packages/mplayer/mplayer_svn.bb
index 7af431430b..2a37efe3c6 100644
--- a/packages/mplayer/mplayer_svn.bb
+++ b/packages/mplayer/mplayer_svn.bb
@@ -2,18 +2,21 @@ DESCRIPTION = "Open Source multimedia player."
 SECTION = "opie/multimedia"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.mplayerhq.hu/"
-DEPENDS = "virtual/libsdl libmad zlib libpng jpeg mplayer-common"
+DEPENDS = "virtual/libsdl libmad zlib libpng jpeg liba52 freetype fontconfig alsa-lib lzo ncurses lame"
 RDEPENDS = "mplayer-common"
 LICENSE = "GPL"
 SRC_URI = "svn://svn.mplayerhq.hu/;module=mplayer \
 	   file://vo_w100.c \
 	   file://vo_w100_api.h \
 	   file://vo_w100_fb.h \
-	   file://Makefile.patch;patch=1 \
+	   file://Makefile-codec-cfg.patch;patch=1 \
 	   file://w100-configure.patch;patch=1 \
 	   file://w100-Makefile.patch;patch=1 \
 	   file://w100-video_out.patch;patch=1 \
-	   file://w100-mplayer.patch;patch=1"
+	   file://w100-mplayer.patch;patch= \
+           file://libmpdemux-ogg-include-svn.patch;patch=1 \
+           file://libmpcodecs-ogg-include.patch;patch=1 \
+           file://pld-onlyarm5.patch;patch=1"
 
 MAINTAINER="Graeme Gregory <dp@xora.org.uk>"
 RCONFLICTS_${PN} = "mplayer-atty"
@@ -34,30 +37,132 @@ PACKAGES =+ "mencoder"
 FILES_${PN} = "${bindir}/mplayer"
 FILES_mencoder = "${bindir}/mencoder"
 
-inherit autotools
+inherit autotools pkgconfig
 
 EXTRA_OECONF = " \
         --prefix=/usr \
-	--mandir=${mandir} \
+        --mandir=${mandir} \
         --target=${TARGET_SYS} \
-	\
-	--enable-mencoder \
-	--disable-gui \
-	--enable-largefiles \
-	--disable-linux-devfs \
-	--disable-lirc \
-	--disable-lircc \
-	--disable-tv \
-	--enable-rtc \
-	--disable-smb \
-	--disable-win32 \
-	\
-	--enable-tremor-low \
-	--disable-mp3lib \
-	\
-	--disable-x11 \
-	--enable-sdl \
-	--enable-fbdev "
+        \
+        --enable-mencoder \
+        --disable-gui \
+        --enable-largefiles \
+        --disable-linux-devfs \
+        --disable-lirc \
+        --disable-lircc \
+        --disable-joystick \
+        --disable-vm \
+        --disable-xf86keysym \
+        --disable-tv \
+        --disable-tv-v4l \
+        --disable-tv-v4l2 \
+        --disable-tv-bsdbt848 \
+        --enable-rtc \
+        --enable-network \
+        --disable-winsock2 \
+        --disable-smb \
+        --disable-live \
+        --disable-dvdread \
+        --disable-mpdvdkit \
+        --disable-cdparanoia \
+        --enable-freetype \
+        --disable-unrarlib \
+        --disable-menu \
+        --enable-sortsub \
+        --disable-fribidi \
+        --disable-enca \
+        --disable-macosx \
+        --disable-macosx-finder-support \
+        --disable-macosx-bundle \
+        --disable-ftp \
+        --disable-vstream \
+        \
+        --disable-gif \
+        --enable-png \
+        --enable-jpeg \
+        --disable-libcdio \
+        --enable-liblzo \
+        --disable-win32 \
+        --disable-qtx \
+        --disable-xanim \
+        --disable-real \
+        --disable-xvid \
+        --disable-x264 \
+        \
+        --disable-libavutil_so \
+        --disable-libavcodec_so \
+        --disable-libavformat_so \
+        --disable-libpostproc_so \
+        --disable-libfame \
+        \
+        --enable-tremor-low \
+        \
+        --disable-speex \
+        --disable-theora \
+        --disable-faac \
+        --disable-ladspa \
+        --disable-libdv \
+        --enable-mad \
+        --disable-toolame \
+        --disable-twolame \
+        --disable-xmms \
+        --disable-mp3lib \
+        --disable-libdts \
+        --enable-libmpeg2 \
+        --disable-musepack \
+        --disable-amr_nb \
+        --disable-amr_nb-fixed \
+        --disable-amr_wb \
+        \
+        --disable-gl \
+        --disable-dga \
+        --disable-vesa \
+        --disable-svga \
+        --enable-sdl \
+        --disable-aa \
+        --disable-caca \
+        --disable-ggi \
+        --disable-ggiwmh \
+        --disable-directx \
+        --disable-dxr2 \
+        --disable-dxr3 \
+        --disable-dvb \
+        --disable-dvbhead \
+        --disable-mga \
+        --disable-xmga \
+        --disable-xv \
+        --disable-xvmc \
+        --disable-vm \
+        --disable-xinerama \
+        --disable-x11 \
+        --enable-fbdev \
+        --disable-mlib \
+        --disable-3dfx \
+        --disable-tdfxfb \
+        --disable-s3fb \
+        --disable-directfb \
+        --disable-zr \
+        --disable-bl \
+        --disable-tdfxvid \
+        --disable-tga \
+        --disable-pnm \
+        --disable-md5sum \
+        \
+        --enable-alsa \
+        --enable-ossaudio \
+        --disable-arts \
+        --disable-esd \
+        --disable-polyp \
+        --disable-jack \
+        --disable-openal \
+        --disable-nas \
+        --disable-sgiaudio \
+        --disable-sunaudio \
+        --disable-win32waveout \
+        --enable-select \
+        \
+        --disable-runtime-cpudetection \
+        "
 
 EXTRA_OECONF_append_c7x0 = " --enable-w100 "