import clean BK tree at cset 1.3670

7 files changed, 148 insertions, 0 deletions

diff --git a/packages/mplayer/mplayer-atty-1.1.5/.mtn2git_empty b/packages/mplayer/mplayer-atty-1.1.5/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/mplayer/mplayer-atty-1.1.5/.mtn2git_empty
diff --git a/packages/mplayer/mplayer-atty-1.1.5/Makefile-libs.patch b/packages/mplayer/mplayer-atty-1.1.5/Makefile-libs.patch
index e69de29bb2..03456aca4a 100644
--- a/packages/mplayer/mplayer-atty-1.1.5/Makefile-libs.patch
+++ b/packages/mplayer/mplayer-atty-1.1.5/Makefile-libs.patch
@@ -0,0 +1,11 @@
+--- 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
index e69de29bb2..78161e79ee 100644
--- a/packages/mplayer/mplayer-atty-1.1.5/Makefile.patch
+++ b/packages/mplayer/mplayer-atty-1.1.5/Makefile.patch
@@ -0,0 +1,31 @@
+--- 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/dsputil.patch b/packages/mplayer/mplayer-atty-1.1.5/dsputil.patch
index e69de29bb2..962f1bc1e3 100644
--- a/packages/mplayer/mplayer-atty-1.1.5/dsputil.patch
+++ b/packages/mplayer/mplayer-atty-1.1.5/dsputil.patch
@@ -0,0 +1,41 @@
+--- 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
index e69de29bb2..9ca1266c4b 100644
--- a/packages/mplayer/mplayer-atty-1.1.5/libmpcodecs-ogg-include.patch
+++ b/packages/mplayer/mplayer-atty-1.1.5/libmpcodecs-ogg-include.patch
@@ -0,0 +1,11 @@
+--- 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
index e69de29bb2..059a397926 100644
--- a/packages/mplayer/mplayer-atty-1.1.5/libmpdemux-ogg-include.patch
+++ b/packages/mplayer/mplayer-atty-1.1.5/libmpdemux-ogg-include.patch
@@ -0,0 +1,13 @@
+--- 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
index e69de29bb2..d74c8397b9 100644
--- a/packages/mplayer/mplayer-atty-1.1.5/sdl.patch
+++ b/packages/mplayer/mplayer-atty-1.1.5/sdl.patch
@@ -0,0 +1,41 @@
+--- ./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