Origin: upstream, other, *
Description: Applied patches. See Vcs-* headers in debian/control.

--- xine-lib-1.2-1.1.90hg+20110516+847d4f89a4fb.orig/m4/decoders.m4
+++ xine-lib-1.2-1.1.90hg+20110516+847d4f89a4fb/m4/decoders.m4
@@ -299,9 +299,9 @@ AC_DEFUN([XINE_DECODER_PLUGINS], [
         if test x"$enable_modplug" = x"yes" && test x"$have_modplug" != x"yes"; then
             AC_MSG_ERROR([MODPlug support requested, but MODPlug not found])
         fi
-	if test "`"$PKG_CONFIG" --modversion libmodplug`" = 0.8.8; then
-	    AC_MSG_ERROR([you have a broken version of libmodplug (0.8.8); cowardly refusing to use it])
-	fi
+#	if test "`"$PKG_CONFIG" --modversion libmodplug`" = 0.8.8; then
+#	    AC_MSG_ERROR([you have a broken version of libmodplug (0.8.8); cowardly refusing to use it])
+#	fi
     fi
     AM_CONDITIONAL([ENABLE_MODPLUG], [test x"$have_modplug" = x"yes"])
 
--- xine-lib-1.2-1.1.90hg+20110516+847d4f89a4fb.orig/src/input/input_cdda.c
+++ xine-lib-1.2-1.1.90hg+20110516+847d4f89a4fb/src/input/input_cdda.c
@@ -110,6 +110,7 @@
 #  define av_sha_init(c,b) 	av_sha1_init(c)
 #  define av_sha_update		av_sha1_update
 #  define av_sha_final		av_sha1_final
+#  define av_sha_size		av_sha1_size
 #endif
 
 typedef struct _cdrom_toc_entry {
--- xine-lib-1.2-1.1.90hg+20110516+847d4f89a4fb.orig/src/video_out/video_out_directfb.c
+++ xine-lib-1.2-1.1.90hg+20110516+847d4f89a4fb/src/video_out/video_out_directfb.c
@@ -707,7 +707,7 @@ static void directfb_display_frame (vo_d
        || (frame->vo_frame.crop_left != this->sc.crop_left)
        || (frame->vo_frame.crop_right != this->sc.crop_right)
        || (frame->vo_frame.crop_top != this->sc.crop_top)
-       || (frame->vo_frame.crop_bottom != this->sc.crop_bottom) ) {
+       || (frame->vo_frame.crop_bottom != this->sc.crop_bottom) )
   {
     lprintf ("forcing redraw.\n");
     this->sc.force_redraw = 1;
