rename packages/ to recipes/ per earlier agreement

See links below for more details:
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816

Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Mike Westerhof <mwester@dls.net>
Acked-by: Philip Balister <philip@balister.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Marcin Juszkiewicz <hrw@openembedded.org>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>

9 files changed, 0 insertions, 1515 deletions

diff --git a/packages/libxine/files/configure-1.0.patch b/packages/libxine/files/configure-1.0.patch
deleted file mode 100644
index c25d41988d..0000000000
--- a/packages/libxine/files/configure-1.0.patch
+++ /dev/null
@@ -1,177 +0,0 @@
---- xine-lib-1-rc6a/configure.ac.orig	2004-09-16 22:28:33.762843408 -0400
-+++ xine-lib-1-rc6a/configure.ac	2004-09-16 22:29:00.969707336 -0400
-@@ -622,7 +622,7 @@
- dnl ---------------------------------------------
- 
- AM_PATH_AALIB(1.4,, AC_MSG_RESULT([*** All of AALIB dependent parts will be disabled ***]))
--AM_CONDITIONAL(HAVE_AA, test x$no_aalib != "xyes")
-+AM_CONDITIONAL(HAVE_AA,  [test x"$enable_aalib" = "xyes" && test x$no_aalib != "xyes"])
- 
- 
- dnl ---------------------------------------------
-@@ -735,10 +735,7 @@
- dnl check for SDL
- dnl ---------------------------------------------
- 
--AM_PATH_SDL(1.1.5, 
--	AC_DEFINE(HAVE_SDL,1,[Define this if you have SDL library installed]),
--	[])
--AM_CONDITIONAL(HAVE_SDL, [test x"$no_sdl" != x"yes"])
-+AM_CONDITIONAL(HAVE_SDL, 0)
- 
- 
- dnl ---------------------------------------------
-@@ -868,61 +865,29 @@
- dnl Ogg/Theora libs.
- dnl ---------------------------------------------
- 
--AM_PATH_OGG(
--           [ AM_PATH_THEORA(AC_DEFINE(HAVE_THEORA,1,[Define this if you have theora]),
--                           AC_MSG_RESULT([*** All OGG/THEORA dependent parts will be disabled ***]))
--          ],
--           AC_MSG_RESULT([*** All of OGG/Theora dependent parts will be disabled ***]))
--AM_CONDITIONAL(HAVE_THEORA, [test x"$no_ogg" != "xyes" -a x"$no_theora" != "xyes"])
-+AM_CONDITIONAL(HAVE_THEORA, 0)
- 
- 
- dnl ---------------------------------------------
- dnl Ogg/Speex libs.
- dnl ---------------------------------------------
- 
--PKG_CHECK_MODULES(SPEEX, speex, no_speex="no", no_speex="yes")
--
--if test "x$no_speex" = "xyes" ; then
--  AM_PATH_OGG([ AM_PATH_SPEEX(no_speex="no")])
--fi
--
--if test "x$no_speex" = "xyes" ; then
--  AC_MSG_RESULT([*** All OGG/SPEEX dependent parts will be disabled ***])
--else
--  AC_DEFINE(HAVE_SPEEX,1,[Define this if you have speex])
--
--  dnl Test whether Speex headers are eg. <speex.h> or <speex/speex.h>
--  dnl Speex headers were moved in mid-2004; 1.0.x has backwards compatible headers, 1.1.x does not
--  AC_CHECK_HEADER([speex/speex.h],
--                  AC_DEFINE(HAVE_SPEEX_SUBDIR, [1], [Define to 1 if speex headers are eg. <speex/speex.h>])
--  )
--
--  AC_SUBST(SPEEX_CFLAGS)
--  AC_SUBST(SPEEX_LIBS)
--fi
--AM_CONDITIONAL(HAVE_SPEEX, [test x"$no_ogg" != "xyes" -a x"$no_speex" != "xyes"])
-+AM_CONDITIONAL(HAVE_SPEEX, 0)
- 
- 
- dnl ---------------------------------------------
- dnl check for libFLAC
- dnl ---------------------------------------------
- 
--AM_PATH_LIBFLAC([],
--	AC_MSG_RESULT([*** All FLAC dependent parts will be disabled ***]))
--AM_CONDITIONAL(HAVE_FLAC, [test x"$no_libFLAC" != "xyes"])
-+AM_CONDITIONAL(HAVE_FLAC, 0)
- 
- 
- dnl ---------------------------------------------
- dnl MNG libs.
- dnl ---------------------------------------------
- 
--AC_CHECK_LIB(mng, mng_initialize,
--	[ AC_CHECK_HEADER(libmng.h,
--		[ have_libmng=yes
--		  MNG_LIBS="-lmng" ], 
--		AC_MSG_RESULT([*** All libmng dependent parts will be disabled ***]))],
--	AC_MSG_RESULT([*** All libmng dependent parts will be disabled ***]))
--AM_CONDITIONAL(HAVE_LIBMNG, test x"$have_libmng" = "xyes")
-+MNG_LIBS=""
-+AM_CONDITIONAL(HAVE_LIBMNG, 0)
- AC_SUBST(MNG_LIBS)
- 
- 
-@@ -952,7 +917,7 @@
- dnl freetype2 lib.
- dnl ---------------------------------------------
- 
--AM_PATH_FREETYPE2()
-+AM_CONDITIONAL(HAVE_FT2, 0)
- 
- 
- dnl ---------------------------------------------
-@@ -995,37 +960,21 @@
- dnl ESD support
- dnl ---------------------------------------------
- 
--AM_PATH_ESD(0.2.8,
--        AC_DEFINE(HAVE_ESD,1,[Define this if you have ESD (libesd) installed]),
--        AC_MSG_RESULT(*** All of ESD dependent parts will be disabled ***))
--AM_CONDITIONAL(HAVE_ESD, test x"$no_esd" != "xyes")
-+AM_CONDITIONAL(HAVE_ESD, 0)
- 
- 
- dnl ---------------------------------------------
- dnl ARTS support
- dnl ---------------------------------------------
- 
--AM_PATH_ARTS(0.9.5,
--        AC_DEFINE(HAVE_ARTS,1,[Define this if you have ARTS (libartsc) installed]),
--        AC_MSG_RESULT(*** All of ARTS dependent parts will be disabled ***))
--AM_CONDITIONAL(HAVE_ARTS, test x"$no_arts" != "xyes")
-+AM_CONDITIONAL(HAVE_ARTS, 0)
- 
- 
- dnl ---------------------------------------------
- dnl gnome-vfs support
- dnl ---------------------------------------------
- 
--PKG_CHECK_MODULES(GNOME_VFS, gnome-vfs-2.0,
--                no_gnome_vfs=no,
--		no_gnome_vfs=yes)
--AC_SUBST(GNOME_VFS_CFLAGS)
--AC_SUBST(GNOME_VFS_LIBS)
--if test x"$no_gnome_vfs" != "xyes"; then
--AC_DEFINE(HAVE_GNOME_VFS,1,[Define this if you have gnome-vfs installed])
--else
--AC_MSG_RESULT(*** All of the gnome-vfs dependent parts will be disabled ***)
--fi
--AM_CONDITIONAL(HAVE_GNOME_VFS, test x"$no_gnome_vfs" != "xyes")
-+AM_CONDITIONAL(HAVE_GNOME_VFS, 0)
- 
- 
- dnl ---------------------------------------------
-@@ -1188,35 +1137,7 @@
-     ],ISOC99_PRAGMA=no)
-     AC_MSG_RESULT($ISOC99_PRAGMA)
- 
--    dnl bitfield order
--    AC_MSG_CHECKING(bitfield ordering in structs)
--    AC_TRY_RUN([
--int
-- main() {
--  struct { char bit_0:1, bit_12:2, bit_345:3, bit_67:2; }
--#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
--  __attribute__((packed))
--#endif
--  bf = { 1,1,1,1 };
--  if (sizeof (bf) != 1) return 1;
--  return *((unsigned char*) &bf) != 0x4b; }
--], bf_lsbf=1, AC_TRY_RUN([ 
--int
--main() {
--  struct { char bit_0:1, bit_12:2, bit_345:3, bit_67:2; }
--#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
--  __attribute__((packed))
--#endif
--  bf = { 1,1,1,1 };
--  if (sizeof (bf) != 1) return 1;
--  return *((unsigned char*) &bf) != 0xa5; }
--], bf_lsbf=0, AC_MSG_ERROR([unsupported bitfield ordering])))
--    if test "x$bf_lsbf" = "x1"; then
--     AC_MSG_RESULT(LSBF)
--     AC_DEFINE(BITFIELD_LSBF, [], [compiler does lsbf in struct bitfields])
--    else
--     AC_MSG_RESULT(MSBF)
--    fi
-+    AC_DEFINE(BITFIELD_LSBF, [], [compiler does lsbf in struct bitfields])
- 
-     AC_HAVE_HEADERS( errno.h fcntl.h \
- 		     stdbool.h  stdlib.h stdint.h stdio.h string.h \
diff --git a/packages/libxine/files/cpu-1.0.patch b/packages/libxine/files/cpu-1.0.patch
deleted file mode 100644
index a7ccdbbfa9..0000000000
--- a/packages/libxine/files/cpu-1.0.patch
+++ /dev/null
@@ -1,112 +0,0 @@
---- xine-lib-1-rc6a/src/post/goom/xmmx.c.orig	2004-09-16 21:53:34.040049792 -0400
-+++ xine-lib-1-rc6a/src/post/goom/xmmx.c	2004-09-16 21:59:24.407785800 -0400
-@@ -112,23 +112,23 @@
- 		 * post : mm3 & mm4 : coefs for this position
- 		 *              mm1 : X vector [0|X]
- 		 *
--		 * modif : eax,ebx
-+		 * modif : eax,ecx
- 		 */
- 		__asm__ __volatile__ (
--			"movd %%mm0,%%ebx\n"
-+			"movd %%mm0,%%ecx\n"
- 			"movq %%mm0,%%mm1\n"
- 
--			"andl $15,%%ebx\n"
-+			"andl $15,%%ecx\n"
- 			"psrlq $32,%%mm1\n"
- 
--			"shll $6,%%ebx\n"
-+			"shll $6,%%ecx\n"
- 			"movd %%mm1,%%eax\n"
- 
--			"addl %0,%%ebx\n"
-+			"addl %0,%%ecx\n"
- 			"andl $15,%%eax\n"
- 
--			"movd (%%ebx,%%eax,4),%%mm3\n"
--			::"g"(precalCoef):"eax","ebx");
-+			"movd (%%ecx,%%eax,4),%%mm3\n"
-+			::"g"(precalCoef):"eax","ecx");
- 
- 		/*
- 		 * extraction des coefficients...
-@@ -158,7 +158,7 @@
- 		 * post : mm0 : expix1[position]
- 		 *        mm2 : expix1[position+largeur]
- 		 *
--		 * modif : eax,ebx
-+		 * modif : eax,ecx
- 		 */
- 		psrld_i2r (PERTEDEC,mm0);
- 		psrld_i2r (PERTEDEC,mm1);
-@@ -167,23 +167,23 @@
- 			/*^*/ "movq %%mm3,%%mm5\n"       /*^*/
- 
- 			"mull %1\n"
--			"movd %%mm0,%%ebx\n"
-+			"movd %%mm0,%%ecx\n"
- 			/*^*/ "punpcklbw %%mm5, %%mm3\n" /*^*/
- 
--			"addl %%ebx,%%eax\n"
-+			"addl %%ecx,%%eax\n"
- 			/*^*/ "movq %%mm3,%%mm4\n"       /*^*/
- 			/*^*/ "movq %%mm3,%%mm5\n"       /*^*/
- 
--			"movl %0,%%ebx\n"
-+			"movl %0,%%ecx\n"
- 			/*^*/ "punpcklbw %%mm5,%%mm3\n"  /*^*/
- 
--			"movq (%%ebx,%%eax,4),%%mm0\n"
-+			"movq (%%ecx,%%eax,4),%%mm0\n"
- 			/*^*/ "punpckhbw %%mm5,%%mm4\n"  /*^*/
- 
- 			"addl %1,%%eax\n"
--			"movq (%%ebx,%%eax,4),%%mm2\n"
-+			"movq (%%ecx,%%eax,4),%%mm2\n"
- 
--			: : "X"(expix1), "X"(prevX):"eax","ebx"
-+			: : "X"(expix1), "X"(prevX):"eax","ecx"
- 		);
- 
- 		/*
---- xine-lib-1-rc7/src/post/goom/mmx.h	2004-09-12 05:17:26.000000000 -0700
-+++ xine-lib-1-rc7.new/src/post/goom/mmx.h	2004-11-09 16:08:17.777667856 -0700
-@@ -71,13 +71,15 @@
- 	*/
- 	register int rval = 0;
- 
-+	/* Maybe if I yell it will help:  DON'T CLOBBER EBX! */
-+
- 	__asm__ __volatile__ (
- 		/* See if CPUID instruction is supported ... */
- 		/* ... Get copies of EFLAGS into eax and ecx */
- 		"pushf\n\t"
- 		"popl %%eax\n\t"
- 		"movl %%eax, %%ecx\n\t"
--
-+	
- 		/* ... Toggle the ID bit in one copy and store */
- 		/*     to the EFLAGS reg */
- 		"xorl $0x200000, %%eax\n\t"
-@@ -97,6 +99,8 @@
- 		/* Get standard CPUID information, and
- 		       go to a specific vendor section */
- 		"movl $0, %%eax\n\t"
-+
-+		"pushl %%ebx\n\t"
- 		"cpuid\n\t"
- 
- 		/* Check for Intel */
-@@ -214,9 +218,10 @@
- 		"movl $0, %0\n\n\t"
- 
- 		"Return:\n\t"
-+		"popl %%ebx\n\t"
- 		: "=X" (rval)
- 		: /* no input */
--		: "eax", "ebx", "ecx", "edx"
-+		: "eax", "ecx", "edx"
- 	);
- 
- 	/* Return */
diff --git a/packages/libxine/files/libxine-cut-memusage.patch b/packages/libxine/files/libxine-cut-memusage.patch
deleted file mode 100644
index 696b479db2..0000000000
--- a/packages/libxine/files/libxine-cut-memusage.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
-Index: xine-lib-1.0/src/xine-engine/audio_out.c
-===================================================================
---- xine-lib-1.0.orig/src/xine-engine/audio_out.c	2004-12-19 21:24:30.000000000 +0100
-+++ xine-lib-1.0/src/xine-engine/audio_out.c	2005-02-16 22:19:25.836765770 +0100
-@@ -95,10 +95,10 @@
- #include "metronom.h"
- 
- 
--#define NUM_AUDIO_BUFFERS       32
--#define AUDIO_BUF_SIZE       32768
-+#define NUM_AUDIO_BUFFERS       16
-+#define AUDIO_BUF_SIZE        8192
- 
--#define ZERO_BUF_SIZE         5000
-+#define ZERO_BUF_SIZE         2048
- 
- /* By adding gap errors (difference between reported and expected
-  * sound card clock) into metronom's vpts_offset we can use its 
-Index: xine-lib-1.0/src/xine-engine/video_decoder.c
-===================================================================
---- xine-lib-1.0.orig/src/xine-engine/video_decoder.c	2004-12-16 14:59:06.000000000 +0100
-+++ xine-lib-1.0/src/xine-engine/video_decoder.c	2005-02-16 22:20:47.104487350 +0100
-@@ -479,7 +479,7 @@
-   
-     num_buffers = stream->xine->config->register_num (stream->xine->config,
-                                                       "engine.buffers.video_num_buffers",
--                                                      500,
-+                                                      250,
-                                                       _("number of video buffers"),
- 						      _("The number of video buffers (each is 8k in size) "
- 						        "xine uses in its internal queue. Higher values "
-@@ -487,7 +487,7 @@
- 							"also increased latency and memory consumption."),
-                                                       20, NULL, NULL);
-   
--    stream->video_fifo = _x_fifo_buffer_new (num_buffers, 8192);
-+    stream->video_fifo = _x_fifo_buffer_new (num_buffers, 4096);
-     stream->spu_track_map_entries = 0;
-   
-     pthread_attr_init(&pth_attrs);
-Index: xine-lib-1.0/src/xine-engine/video_overlay.h
-===================================================================
---- xine-lib-1.0.orig/src/xine-engine/video_overlay.h	2004-12-08 19:18:24.000000000 +0100
-+++ xine-lib-1.0/src/xine-engine/video_overlay.h	2005-02-16 22:19:25.837765631 +0100
-@@ -36,7 +36,7 @@
- #define CLUT_Y_CR_CB_INIT(_y,_cr,_cb)	{ (_cb), (_cr), (_y) }
- #endif
- 
--#define MAX_OBJECTS   50
-+#define MAX_OBJECTS    5
- #define MAX_EVENTS    50
- #define MAX_SHOWING   16
- 
-Index: xine-lib-1.0/src/xine-engine/audio_decoder.c
-===================================================================
---- xine-lib-1.0.orig/src/xine-engine/audio_decoder.c	2004-12-16 14:59:06.000000000 +0100
-+++ xine-lib-1.0/src/xine-engine/audio_decoder.c	2005-02-16 22:21:42.846730591 +0100
-@@ -462,7 +462,7 @@
-     
-     num_buffers = stream->xine->config->register_num (stream->xine->config,
-                                                       "engine.buffers.audio_num_buffers",
--                                                      230,
-+                                                      100,
-                                                       _("number of audio buffers"),
- 						      _("The number of audio buffers (each is 8k in size) "
- 						        "xine uses in its internal queue. Higher values "
diff --git a/packages/libxine/files/libxine-ffmpeg-enable-arm.patch b/packages/libxine/files/libxine-ffmpeg-enable-arm.patch
deleted file mode 100644
index f89d2baa4e..0000000000
--- a/packages/libxine/files/libxine-ffmpeg-enable-arm.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- xine-lib-1-rc7/src/libffmpeg/libavcodec/armv4l/Makefile.am~libxine-ffmpeg-enable-arm
-+++ xine-lib-1-rc7/src/libffmpeg/libavcodec/armv4l/Makefile.am
-@@ -9,9 +9,8 @@
- libavcodec_armv4l_dummy =  libavcodec_armv4l_dummy.c
- EXTRA_DIST =  $(libavcodec_armv4l_src) $(libavcodec_armv4l_dummy)
- 
--#if HAVE_ARMV4L
--#armv4l_modules = $(libavcodec_armv4l_src)
--#endif
--armv4l_modules = 
-+if HAVE_ARMV4L
-+armv4l_modules = $(libavcodec_armv4l_src)
-+endif
- 
- libavcodec_armv4l_la_SOURCES = $(armv4l_modules) $(libavcodec_armv4l_dummy)
diff --git a/packages/libxine/files/libxine-gcc4.patch b/packages/libxine/files/libxine-gcc4.patch
deleted file mode 100644
index 0a370b9579..0000000000
--- a/packages/libxine/files/libxine-gcc4.patch
+++ /dev/null
@@ -1,138 +0,0 @@
---- xine-lib-1.0.orig/src/xine-engine/post.c	2004-10-17 22:14:30.000000000 +0300
-+++ xine-lib-1.0/src/xine-engine/post.c	2006-02-09 22:15:08.000000000 +0200
-@@ -241,7 +241,7 @@
-     if (!*input) return port;
-     (*input)->xine_in.name = "video in";
-     (*input)->xine_in.type = XINE_POST_DATA_VIDEO;
--    (xine_video_port_t *)(*input)->xine_in.data = &port->new_port;
-+    (*input)->xine_in.data = &port->new_port;
-     (*input)->post = post;
-     xine_list_append_content(post->input, *input);
-   }
-@@ -251,7 +251,7 @@
-     if (!*output) return port;
-     (*output)->xine_out.name = "video out";
-     (*output)->xine_out.type = XINE_POST_DATA_VIDEO;
--    (xine_video_port_t **)(*output)->xine_out.data = &port->original_port;
-+    (*output)->xine_out.data = &port->original_port;
-     (*output)->xine_out.rewire = post_video_rewire;
-     (*output)->post = post;
-     (*output)->user_data = port;
-@@ -718,7 +718,7 @@
-     if (!*input) return port;
-     (*input)->xine_in.name = "audio in";
-     (*input)->xine_in.type = XINE_POST_DATA_AUDIO;
--    (xine_audio_port_t *)(*input)->xine_in.data = &port->new_port;
-+    (*input)->xine_in.data = &port->new_port;
-     (*input)->post = post;
-     xine_list_append_content(post->input, *input);
-   }
-@@ -728,7 +728,7 @@
-     if (!*output) return port;
-     (*output)->xine_out.name = "audio out";
-     (*output)->xine_out.type = XINE_POST_DATA_AUDIO;
--    (xine_audio_port_t **)(*output)->xine_out.data = &port->original_port;
-+    (*output)->xine_out.data = &port->original_port;
-     (*output)->xine_out.rewire = post_audio_rewire;
-     (*output)->post = post;
-     (*output)->user_data = port;
---- xine-lib-1.0.orig/src/xine-utils/color.c	2003-12-09 02:02:38.000000000 +0200
-+++ xine-lib-1.0/src/xine-utils/color.c	2006-02-09 22:13:36.000000000 +0200
-@@ -495,8 +495,10 @@
- 
-   /* process blocks of 4 pixels */
-   for (x=0; x < (width / 4); x++) {
--    n1  = *(((unsigned int *) src1)++);
--    n2  = *(((unsigned int *) src2)++);
-+    n1  = *((unsigned int *) src1);
-+    src1+=sizeof(unsigned int);
-+    n2  = *((unsigned int *) src2);
-+    src2+=sizeof(unsigned int);
-     n3  = (n1 & 0xFF00FF00) >> 8;
-     n4  = (n2 & 0xFF00FF00) >> 8;
-     n1 &= 0x00FF00FF;
---- xine-lib-1.0.orig/src/libffmpeg/libavcodec/avcodec.h	2004-05-30 22:24:19.000000000 +0300
-+++ xine-lib-1.0/src/libffmpeg/libavcodec/avcodec.h	2006-02-09 22:33:27.000000000 +0200
-@@ -1639,6 +1639,13 @@
- #define FF_OPT_MAX_DEPTH 10
- } AVOption;
-
-+#ifdef HAVE_MMX
-+extern const struct AVOption avoptions_common[3 + 5];
-+#else
-+extern const struct AVOption avoptions_common[3];
-+#endif
-+extern const struct AVOption avoptions_workaround_bug[11];
-+
- /**
-  * Parse option(s) and sets fields in passed structure
-  * @param strct  structure where the parsed results will be written
---- xine-lib-1.0.orig/src/libffmpeg/libavcodec/common.h	2004-05-30 22:24:19.000000000 +0300
-+++ xine-lib-1.0/src/libffmpeg/libavcodec/common.h	2006-02-09 22:32:56.000000000 +0200
-@@ -66,13 +66,13 @@
- #define AVOPTION_SUB(ptr) { .name = NULL, .help = (const char*)ptr }
- #define AVOPTION_END() AVOPTION_SUB(NULL)
- 
--struct AVOption;
-+/*struct AVOption;
- #ifdef HAVE_MMX
- extern const struct AVOption avoptions_common[3 + 5];
- #else
- extern const struct AVOption avoptions_common[3];
- #endif
--extern const struct AVOption avoptions_workaround_bug[11];
-+extern const struct AVOption avoptions_workaround_bug[11];*/
- 
- #endif /* HAVE_AV_CONFIG_H */
- 
---- xine-lib-1.0.orig/src/libffmpeg/libavcodec/mpegvideo.h	2004-05-30 22:24:22.000000000 +0300
-+++ xine-lib-1.0/src/libffmpeg/libavcodec/mpegvideo.h	2006-02-09 22:35:54.000000000 +0200
-@@ -904,7 +904,7 @@
- int ff_h263_resync(MpegEncContext *s);
- int ff_h263_get_gob_height(MpegEncContext *s);
- int ff_mpeg4_set_direct_mv(MpegEncContext *s, int mx, int my);
--int ff_h263_round_chroma(int x);
-+/*int ff_h263_round_chroma(int x);*/
- void ff_h263_encode_motion(MpegEncContext * s, int val, int f_code);
- int ff_mpeg4_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size);
- 
---- xine-lib-1.0.orig/src/libxineadec/nosefart/nes_apu.c	2004-12-12 08:55:59.000000000 +0200
-+++ xine-lib-1.0/src/libxineadec/nosefart/nes_apu.c	2006-02-11 22:42:29.000000000 +0200
-@@ -1012,9 +1012,15 @@
- 
-       /* signed 16-bit output, unsigned 8-bit */
-       if (16 == apu->sample_bits)
--         *((int16 *) buffer)++ = (int16) accum;
-+      {
-+         *((int16 *) buffer) = (int16) accum;
-+         buffer=((int16 *)buffer)+1;
-+      }
-       else
--         *((uint8 *) buffer)++ = (accum >> 8) ^ 0x80;
-+      {
-+         *((uint8 *) buffer) = (accum >> 8) ^ 0x80;
-+         buffer=((int8 *)buffer)+1;
-+      }
-    }
- 
-    /* resync cycle counter */
---- xine-lib-1.0.orig/src/post/audio/stretch.c	2004-10-30 02:11:38.000000000 +0300
-+++ xine-lib-1.0/src/post/audio/stretch.c	2006-02-11 22:45:14.000000000 +0200
-@@ -476,7 +476,7 @@
-     memcpy( outbuf->mem, data_out, 
-             outbuf->num_frames * this->bytes_per_frame );
-     num_frames_out -= outbuf->num_frames;
--    (uint8_t *)data_out += outbuf->num_frames * this->bytes_per_frame;
-+    data_out = (uint8_t *)data_out + outbuf->num_frames * this->bytes_per_frame;
-                 
-     outbuf->vpts        = this->pts;
-     this->pts           = 0;
-@@ -587,7 +587,7 @@
-     memcpy( (uint8_t *)this->audiofrag + this->num_frames * this->bytes_per_frame,
-             data_in, frames_to_copy * this->bytes_per_frame );
-     
--    (uint8_t *)data_in += frames_to_copy * this->bytes_per_frame;
-+    data_in = (uint8_t *)data_in + frames_to_copy * this->bytes_per_frame;
-     this->num_frames += frames_to_copy;
-     buf->num_frames -= frames_to_copy;
- 
diff --git a/packages/libxine/files/libxine-libavcodec.patch b/packages/libxine/files/libxine-libavcodec.patch
deleted file mode 100644
index 6dde9913c8..0000000000
--- a/packages/libxine/files/libxine-libavcodec.patch
+++ /dev/null
@@ -1,926 +0,0 @@
-TO be MERGED!!!
-
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- xine-lib-1-rc7/src/libffmpeg/libavcodec/Makefile.am~libxine-libavcodec
-+++ xine-lib-1-rc7/src/libffmpeg/libavcodec/Makefile.am
-@@ -9,9 +9,14 @@
- # we need to compile everything in debug mode, including the encoders,
- # otherwise we get unresolved symbols, because some unsatisfied function calls
- # are not optimized away with debug optimization
--AM_CFLAGS = $(LIBFFMPEG_CFLAGS) `test "$(CFLAGS)" = "$(DEBUG_CFLAGS)" && echo -DCONFIG_ENCODERS`
-+#AM_CFLAGS = $(LIBFFMPEG_CFLAGS) `test "$(CFLAGS)" = "$(DEBUG_CFLAGS)" && echo -DCONFIG_ENCODERS`
- ASFLAGS =
- 
-+if HAVE_ARMV4L
-+AM_CFLAGS = -DARCH_ARMV4L $(LIBFFMPEG_CFLAGS)
-+else
-+AM_CFLAGS = $(LIBFFMPEG_CFLAGS)
-+endif
- noinst_LTLIBRARIES = libavcodec.la
- 
- libavcodec_la_SOURCES = \
---- xine-lib-1-rc7/src/libffmpeg/libavcodec/dsputil.h~libxine-libavcodec
-+++ xine-lib-1-rc7/src/libffmpeg/libavcodec/dsputil.h
-@@ -45,6 +45,7 @@
- void ff_fdct248_islow (DCTELEM *data);
- 
- void j_rev_dct (DCTELEM *data);
-+void j_rev_dct_ARM ( DCTELEM *data );
- 
- void ff_fdct_mmx(DCTELEM *block);
- void ff_fdct_mmx2(DCTELEM *block);
---- xine-lib-1-rc7/src/libffmpeg/libavcodec/mpegvideo.c~libxine-libavcodec
-+++ xine-lib-1-rc7/src/libffmpeg/libavcodec/mpegvideo.c
-@@ -218,6 +218,25 @@
- }
- #endif //CONFIG_ENCODERS
- 
-+
-+#ifdef ARCH_ARMV4L
-+
-+static void ff_jref_idct_put_armv4l(UINT8 *dest, int line_size, DCTELEM *block)
-+{
-+//    fprintf(stderr, "src/libffmpeg/libavcodec/mpegvideo.c : ff_jref_idct_put_armv4l utilisant l'iDCT ARMv4l en ASM\n");
-+    j_rev_dct_ARM (block);
-+    ff_put_pixels_clamped(block, dest, line_size);
-+}
-+static void ff_jref_idct_add_armv4l(UINT8 *dest, int line_size, DCTELEM *block)
-+{
-+//    fprintf(stderr, "src/libffmpeg/libavcodec/mpegvideo.c : ff_jref_idct_add_armv4l utilisant l'iDCT ARMv4l en ASM\n");
-+    j_rev_dct_ARM (block);
-+    ff_add_pixels_clamped(block, dest, line_size);
-+}
-+
-+#endif
-+
-+
- /* init common dct for both encoder and decoder */
- int DCT_common_init(MpegEncContext *s)
- {
-@@ -246,7 +265,11 @@
-     MPV_common_init_mmi(s);
- #endif
- #ifdef ARCH_ARMV4L
--    MPV_common_init_armv4l(s);
-+/*    MPV_common_init_armv4l(s); */
-+/* Methode bourrine, mais bon, c'est pour pas trop se prendre la tete a tout changer ce soir, a ameliorer plus tard*/
-+    s->idct_put= ff_jref_idct_put_armv4l;
-+    s->idct_add= ff_jref_idct_add_armv4l;
-+    s->idct_permutation_type= FF_NO_IDCT_PERM;
- #endif
- #ifdef ARCH_POWERPC
-     MPV_common_init_ppc(s);
---- xine-lib-1-rc7/src/libffmpeg/libavcodec/armv4l/jrevdct_arm.S~libxine-libavcodec
-+++ xine-lib-1-rc7/src/libffmpeg/libavcodec/armv4l/jrevdct_arm.S
-@@ -1,386 +1,491 @@
- /* 
--   C-like prototype :
--	void j_rev_dct_ARM(DCTBLOCK data)
-+ * jrevdct_arm.S
-+ * Copyright (C) 2002 Frederic 'dilb' Boulay.
-+ * All Rights Reserved.
-+ *
-+ * Author: Frederic Boulay <dilb@handhelds.org>
-+ *
-+ * you can redistribute this file and/or modify
-+ * it under the terms of the GNU General Public License (version 2)
-+ * as published by the Free Software Foundation.
-+ *
-+ * This file is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ *
-+ * The function defined in this file, is derived from the simple_idct function from
-+ * the libavcodec library part of the ffmpeg project. 
-+ */
- 
--   With DCTBLOCK being a pointer to an array of 64 'signed shorts'
- 
--   Copyright (c) 2001 Lionel Ulmer (lionel.ulmer@free.fr / bbrox@bbrox.org)
- 
--   Permission is hereby granted, free of charge, to any person obtaining a copy
--   of this software and associated documentation files (the "Software"), to deal
--   in the Software without restriction, including without limitation the rights
--   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
--   copies of the Software, and to permit persons to whom the Software is
--   furnished to do so, subject to the following conditions:
- 
--   The above copyright notice and this permission notice shall be included in
--   all copies or substantial portions of the Software.
-+/* useful constants for the algorithm, they are save in __constant_ptr__ at the end of the source code.*/
-+#define W1  22725
-+#define W2  21407
-+#define W3  19266
-+#define W4  16383
-+#define W5  12873
-+#define W6  8867
-+#define W7  4520
-+#define MASK_MSHW 0xFFFF0000
-+
-+/* offsets of the constants in the vector*/
-+#define offW1  0
-+#define offW2  4
-+#define offW3  8
-+#define offW4  12
-+#define offW5  16
-+#define offW6  20
-+#define offW7  24
-+#define offMASK_MSHW 28
-+
-+#define ROW_SHIFT 11
-+#define ROW_SHIFT2MSHW (16-11)
-+#define COL_SHIFT 20
-+#define ROW_SHIFTED_1 1024 /* 1<< (ROW_SHIFT-1)*/
-+#define COL_SHIFTED_1 524288 /* 1<< (COL_SHIFT-1)*/
-+
- 
--   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
--   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
--   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
--   COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
--   IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
--   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--	
--*/
--#define FIX_0_298631336 2446
--#define FIX_0_541196100 4433
--#define FIX_0_765366865 6270
--#define FIX_1_175875602 9633
--#define FIX_1_501321110 12299
--#define FIX_2_053119869 16819
--#define FIX_3_072711026 25172
--#define FIX_M_0_390180644 -3196
--#define FIX_M_0_899976223 -7373
--#define FIX_M_1_847759065 -15137
--#define FIX_M_1_961570560 -16069
--#define FIX_M_2_562915447 -20995
--#define FIX_0xFFFF 0xFFFF	
--		
--#define FIX_0_298631336_ID      0
--#define FIX_0_541196100_ID      4
--#define FIX_0_765366865_ID      8
--#define FIX_1_175875602_ID     12
--#define FIX_1_501321110_ID     16
--#define FIX_2_053119869_ID     20
--#define FIX_3_072711026_ID     24
--#define FIX_M_0_390180644_ID   28
--#define FIX_M_0_899976223_ID   32
--#define FIX_M_1_847759065_ID   36
--#define FIX_M_1_961570560_ID   40
--#define FIX_M_2_562915447_ID   44
--#define FIX_0xFFFF_ID          48
- 	.text
- 	.align
--	
- 	.global j_rev_dct_ARM
-+
- j_rev_dct_ARM:
--	stmdb   sp!, { r4 - r12, lr }   @ all callee saved regs
-+simple_idct3:
-+simple_idct_ARM:
-+        @@ void simple_idct_ARM(int16_t *block)
-+        @@ save stack for reg needed (take all of them),
-+        @@ R0-R3 are scratch regs, so no need to save them, but R0 contains the pointer to block
-+        @@ so it must not be overwritten, if it is not saved!!
-+        @@ R12 is another scratch register, so it should not be saved too
-+        @@ save all registers
-+        stmfd sp!, {r4-r11, r14} @ R14 is also called LR
-+        @@ at this point, R0=block, other registers are free.
-+        add r14, r0, #112        @ R14=&block[8*7], better start from the last row, and decrease the value until row=0, i.e. R12=block.
-+        add r12, pc, #(__constant_ptr__-.-8) @ R12=__constant_ptr__, the vector containing the constants, probably not necessary to reserve a register for it
-+        @@ add 2 temporary variables in the stack: R0 and R14
-+        sub sp, sp, #8          @ allow 2 local variables
-+        str r0, [sp, #0]        @ save block in sp[0]
-+        @@ stack status
-+        @@ sp+4   free
-+        @@ sp+0   R0  (block)
- 
--	sub sp, sp, #4                  @ reserve some space on the stack
--	str r0, [ sp ]                  @ save the DCT pointer to the stack
- 
--	mov lr, r0                      @ lr = pointer to the current row
--	mov r12, #8                     @ r12 = row-counter
--	add r11, pc, #(const_array-.-8) @ r11 = base pointer to the constants array	
--row_loop:
--	ldrsh r0, [lr, # 0]             @ r0 = 'd0'
--	ldrsh r1, [lr, # 8]             @ r1 = 'd1'
-+        @@ at this point, R0=block, R14=&block[56], R12=__const_ptr_, R1-R11 free
- 
--	@ Optimization for row that have all items except the first set to 0
--	@ (this works as the DCTELEMS are always 4-byte aligned)
--	ldr r5, [lr, # 0]
--	ldr r2, [lr, # 4]
--	ldr r3, [lr, # 8]
--	ldr r4, [lr, #12]
--	orr r3, r3, r4
--	orr r3, r3, r2
--	orrs r5, r3, r5
--	beq end_of_row_loop             @ nothing to be done as ALL of them are '0'
--	orrs r2, r3, r1
--	beq empty_row
--	
--	ldrsh r2, [lr, # 2]             @ r2 = 'd2'
--	ldrsh r4, [lr, # 4]             @ r4 = 'd4'
--	ldrsh r6, [lr, # 6]             @ r6 = 'd6'
--	
--	ldr r3, [r11, #FIX_0_541196100_ID]
--	add r7, r2, r6
--	ldr r5, [r11, #FIX_M_1_847759065_ID]
--	mul r7, r3, r7                      @ r7 = z1
--	ldr r3, [r11, #FIX_0_765366865_ID]
--	mla r6, r5, r6, r7                  @ r6 = tmp2
--	add r5, r0, r4                      @ r5 = tmp0
--	mla r2, r3, r2, r7                  @ r2 = tmp3
--	sub r3, r0, r4                      @ r3 = tmp1
- 
--	add r0, r2, r5, lsl #13             @ r0 = tmp10
--	rsb r2, r2, r5, lsl #13             @ r2 = tmp13
--	add r4, r6, r3, lsl #13             @ r4 = tmp11
--	rsb r3, r6, r3, lsl #13             @ r3 = tmp12
-+__row_loop:
-+        @@ read the row and check if it is null, almost null, or not, according to strongarm specs, it is not necessary to optimise ldr accesses (i.e. split 32bits in 2 16bits words), at least it gives more usable registers :)
-+        ldr r1, [r14, #0]        @ R1=(int32)(R12)[0]=ROWr32[0] (relative row cast to a 32b pointer)
-+        ldr r2, [r14, #4]        @ R2=(int32)(R12)[1]=ROWr32[1]
-+        ldr r3, [r14, #8]        @ R3=ROWr32[2]
-+        ldr r4, [r14, #12]       @ R4=ROWr32[3]
-+        @@ check if the words are null, if all of them are null, then proceed with next row (branch __end_row_loop),
-+        @@ if ROWr16[0] is the only one not null, then proceed with this special case (branch __almost_empty_row)
-+        @@ else follow the complete algorithm.
-+        @@ at this point, R0=block, R14=&block[n], R12=__const_ptr_, R1=ROWr32[0], R2=ROWr32[1],
-+        @@                R3=ROWr32[2], R4=ROWr32[3], R5-R11 free
-+        orr r5, r4, r3           @ R5=R4 | R3
-+        orr r5, r5, r2           @ R5=R4 | R3 | R2
-+        orrs r6, r5, r1          @ Test R5 | R1 (the aim is to check if everything is null)
-+        beq __end_row_loop
-+        mov r7, r1, asr #16      @ R7=R1>>16=ROWr16[1] (evaluate it now, as it could be useful later)
-+        ldrsh r6, [r14, #0]      @ R6=ROWr16[0]
-+        orrs r5, r5, r7          @ R5=R4 | R3 | R2 | R7
-+        beq __almost_empty_row
- 
--	stmdb   sp!, { r0, r2, r3, r4 } @ save on the stack tmp10, tmp13, tmp12, tmp11
--	
--	ldrsh r3, [lr, #10]             @ r3 = 'd3'
--	ldrsh r5, [lr, #12]             @ r5 = 'd5'
--	ldrsh r7, [lr, #14]             @ r7 = 'd7'
-+__b_evaluation:
-+        @@ at this point, R0=block (temp),  R1(free), R2=ROWr32[1], R3=ROWr32[2], R4=ROWr32[3],
-+        @@     R5=(temp), R6=ROWr16[0], R7=ROWr16[1], R8-R11 free,
-+        @@     R12=__const_ptr_, R14=&block[n]
-+        @@ to save some registers/calls, proceed with b0-b3 first, followed by a0-a3
- 
--	add r0, r3, r5	                @ r0 = 'z2'
--	add r2, r1, r7                  @ r2 = 'z1'
--	add r4, r3, r7                  @ r4 = 'z3'
--	add r6, r1, r5                  @ r6 = 'z4'
--	ldr r9, [r11, #FIX_1_175875602_ID]
--	add r8, r4, r6                  @ r8 = z3 + z4
--	ldr r10, [r11, #FIX_M_0_899976223_ID]
--	mul r8, r9, r8                  @ r8 = 'z5'
--	ldr r9, [r11, #FIX_M_2_562915447_ID]
--	mul r2, r10, r2                 @ r2 = 'z1'
--	ldr r10, [r11, #FIX_M_1_961570560_ID]
--	mul r0, r9, r0                  @ r0 = 'z2'
--	ldr r9, [r11, #FIX_M_0_390180644_ID]
--	mla r4, r10, r4, r8             @ r4 = 'z3'
--	ldr r10, [r11, #FIX_0_298631336_ID]
--	mla r6, r9, r6, r8              @ r6 = 'z4'
--	ldr r9, [r11, #FIX_2_053119869_ID]
--	mla r7, r10, r7, r2             @ r7 = tmp0 + z1
--	ldr r10, [r11, #FIX_3_072711026_ID]
--	mla r5, r9, r5, r0              @ r5 = tmp1 + z2
--	ldr r9, [r11, #FIX_1_501321110_ID]
--	mla r3, r10, r3, r0             @ r3 = tmp2 + z2
--	add r7, r7, r4                  @ r7 = tmp0
--	mla r1, r9, r1, r2              @ r1 = tmp3 + z1
--	add r5,	r5, r6                  @ r5 = tmp1
--	add r3, r3, r4                  @ r3 = tmp2
--	add r1, r1, r6                  @ r1 = tmp3
-+        @@ MUL16(b0, W1, row[1]);
-+        @@ MUL16(b1, W3, row[1]);
-+        @@ MUL16(b2, W5, row[1]);
-+        @@ MUL16(b3, W7, row[1]);
-+        @@ MAC16(b0, W3, row[3]);
-+        @@ MAC16(b1, -W7, row[3]);
-+        @@ MAC16(b2, -W1, row[3]);
-+        @@ MAC16(b3, -W5, row[3]);
-+        ldr r8, [r12, #offW1]    @ R8=W1
-+        mov r2, r2, asr #16      @ R2=ROWr16[3]
-+        mul r0, r8, r7           @ R0=W1*ROWr16[1]=b0 (ROWr16[1] must be the second arg, to have the possibility to save 1 cycle)
-+        ldr r9, [r12, #offW3]    @ R9=W3
-+        ldr r10, [r12, #offW5]   @ R10=W5
-+        mul r1, r9, r7           @ R1=W3*ROWr16[1]=b1 (ROWr16[1] must be the second arg, to have the possibility to save 1 cycle)
-+        ldr r11, [r12, #offW7]   @ R11=W7
-+        mul r5, r10, r7          @ R5=W5*ROWr16[1]=b2 (ROWr16[1] must be the second arg, to have the possibility to save 1 cycle)
-+        mul r7, r11, r7          @ R7=W7*ROWr16[1]=b3 (ROWr16[1] must be the second arg, to have the possibility to save 1 cycle)
-+		teq r2, #0               @ if null avoid muls
-+		mlane r0, r9, r2, r0     @ R0+=W3*ROWr16[3]=b0 (ROWr16[3] must be the second arg, to have the possibility to save 1 cycle)
-+        rsbne r2, r2, #0         @ R2=-ROWr16[3]
-+        mlane r1, r11, r2, r1    @ R1-=W7*RO