Hello community,
here is the log from the commit of package xine-lib for openSUSE:Factory
checked in at Thu Apr 1 03:28:34 CEST 2010.
--------
--- xine-lib/xine-lib.changes 2010-02-01 13:37:50.000000000 +0100
+++ /mounts/work_src_done/STABLE/xine-lib/xine-lib.changes 2010-03-07 01:12:26.000000000 +0100
@@ -1,0 +2,31 @@
+Sun Mar 7 01:00:00 CET 2010 - Manfred.Tremmel(a)iiv.de
+- update to 1.1.18.1
+ * Oops. compat.c (for DXR3 support) was omitted.
+ * Fix up V4L/V4L2 compilation. Some non-Linux have V4L2 but not V4L.
+ * Fix a size check (wrong variable, causing int/ptr comparison) in rmff.c.
+ * Fix build with the old, outdated and deprecated internal ffmpeg.
+
+-------------------------------------------------------------------
+Wed Feb 24 23:14:00 CET 2010 - Manfred.Tremmel(a)iiv.de
+- update to 1.1.18
+ * Bump the FLAC decoder's priority above ffmpegaudio. This should fix
+ various problems with FLAC playback.
+ * Build fix (undefined symbol) for when using older ffmpeg.
+ * TTA demuxer fixes; allow seeking.
+ * More meta-information tags.
+ Only the Ogg demuxer knows about these at present.
+ * Added basic support for .qtl (Quicktime media link).
+ * "Fixed" playback of 24-bit FLAC.
+ * Fixed playback of 24-bit LPCM.
+ * Work around an ffmpeg bug concerning Sorenson Video 3.
+ * Flash audio bug fixes, mostly concerning AAC.
+ * Fix DXR3 support for newer versions of the em8300 driver.
+ * Added support for WMA Pro.
+
+-------------------------------------------------------------------
+Wed Feb 03 21:03:00 CET 2010 - Manfred.Tremmel(a)iiv.de
+
+- patches can't be build to work with crippled and non crippled tarball
+ with fuzz=0, added "-F2" for patch 50 and 61 to fix this
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
xine-lib-1.1.17-assert.patch
xine-lib-1.1.17-crippled.tar.bz2
xine-lib-1.1.17-demuxcheckfor_mad_ffmpeg.patch
xine-lib-1.1.17-glitch-free-pulseaudio.patch
xine-lib-1.1.17-ia64-is-not-alpha.diff
xine-lib-1.1.17-install-plugins-helper.diff
xine-lib-1.1.17-mjpegplugin.diff
xine-lib-1.1.17.tar.bz2
New:
----
xine-lib-1.1.18.1-assert.patch
xine-lib-1.1.18.1-crippled.tar.bz2
xine-lib-1.1.18.1-demuxcheckfor_mad_ffmpeg.patch
xine-lib-1.1.18.1-glitch-free-pulseaudio.patch
xine-lib-1.1.18.1-ia64-is-not-alpha.diff
xine-lib-1.1.18.1-install-plugins-helper.diff
xine-lib-1.1.18.1-mjpegplugin.diff
xine-lib-1.1.18.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xine-lib.spec ++++++
++++ 614 lines (skipped)
++++ between xine-lib/xine-lib.spec
++++ and /mounts/work_src_done/STABLE/xine-lib/xine-lib.spec
++++++ vdr-xine-0.9.3.diff.bz2 ++++++
--- /var/tmp/diff_new_pack.ewFZb3/_old 2010-04-01 03:27:29.000000000 +0200
+++ /var/tmp/diff_new_pack.ewFZb3/_new 2010-04-01 03:27:29.000000000 +0200
@@ -1,8 +1,7 @@
-Index: xine-lib-1.1.17/configure.ac
-================================================================================
---- xine-lib-1.1.17/configure.ac
-+++ xine-lib-1.1.17/configure.ac
-@@ -2818,6 +2818,7 @@
+diff -uNr xine-lib-1.1.18.orig/configure.ac xine-lib-1.1.18/configure.ac
+--- xine-lib-1.1.18.orig/configure.ac 2010-02-24 20:51:35.535132250 +0100
++++ xine-lib-1.1.18/configure.ac 2010-02-24 20:55:52.445884006 +0100
+@@ -2836,6 +2836,7 @@
src/video_out/vidix/drivers/Makefile
src/xine-utils/Makefile
src/xine-engine/Makefile
@@ -10,7 +9,7 @@
win32/Makefile
win32/include/Makefile])
AC_CONFIG_COMMANDS([default],[[chmod +x ./misc/SlackBuild ./misc/build_rpms.sh ./misc/relchk.sh]],[[]])
-@@ -2860,6 +2861,7 @@
+@@ -2878,6 +2879,7 @@
echo " - stdin_fifo - rtp"
echo " - http - mms"
echo " - pnm - rtsp"
@@ -18,7 +17,7 @@
if test "$have_supported_dvb" = yes; then
echo " - dvb"
fi
-@@ -3067,6 +3069,7 @@
+@@ -3085,6 +3087,7 @@
echo " - eq - eq2"
echo " - boxblur - denoise3d"
echo " - unsharp - tvtime"
@@ -26,33 +25,19 @@
echo " * SFX:"
echo " - goom - oscope"
echo " - fftscope - mosaico"
---- xine-lib-1.1.17/src/Makefile.am
-+++ xine-lib-1.1.17/src/Makefile.am
+diff -uNr xine-lib-1.1.18.orig/src/Makefile.am xine-lib-1.1.18/src/Makefile.am
+--- xine-lib-1.1.18.orig/src/Makefile.am 2010-01-14 23:17:54.000000000 +0100
++++ xine-lib-1.1.18/src/Makefile.am 2010-02-24 20:55:52.446883463 +0100
@@ -28,4 +28,5 @@
- \
+ libfaad \
libmusepack \
post \
- combined
+ combined \
+ vdr
---- xine-lib-1.1.17/src/vdr/Makefile.am
-+++ xine-lib-1.1.17/src/vdr/Makefile.am
-@@ -0,0 +1,13 @@
-+include $(top_srcdir)/misc/Makefile.common
-+
-+AM_CFLAGS = -D_LARGEFILE64_SOURCE
-+
-+xineplug_LTLIBRARIES = \
-+ xineplug_vdr.la
-+
-+xineplug_vdr_la_SOURCES = combined_vdr.c input_vdr.c post_vdr_video.c post_vdr_audio.c
-+xineplug_vdr_la_LIBADD = $(XINE_LIB)
-+xineplug_vdr_la_LDFLAGS = -avoid-version -module @IMPURE_TEXT_LDFLAGS@
-+
-+xineinclude_HEADERS = vdr.h
-+noinst_HEADERS = combined_vdr.h
---- xine-lib-1.1.17/src/vdr/combined_vdr.c
-+++ xine-lib-1.1.17/src/vdr/combined_vdr.c
+diff -uNr xine-lib-1.1.18.orig/src/vdr/combined_vdr.c xine-lib-1.1.18/src/vdr/combined_vdr.c
+--- xine-lib-1.1.18.orig/src/vdr/combined_vdr.c 1970-01-01 01:00:00.000000000 +0100
++++ xine-lib-1.1.18/src/vdr/combined_vdr.c 2010-02-24 20:55:52.447884248 +0100
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2000-2004 the xine project
@@ -98,8 +83,9 @@
+ { PLUGIN_NONE , 0, "" , 0 , NULL , NULL }
+};
+
---- xine-lib-1.1.17/src/vdr/combined_vdr.h
-+++ xine-lib-1.1.17/src/vdr/combined_vdr.h
+diff -uNr xine-lib-1.1.18.orig/src/vdr/combined_vdr.h xine-lib-1.1.18/src/vdr/combined_vdr.h
+--- xine-lib-1.1.18.orig/src/vdr/combined_vdr.h 1970-01-01 01:00:00.000000000 +0100
++++ xine-lib-1.1.18/src/vdr/combined_vdr.h 2010-02-24 20:55:52.447884248 +0100
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2000-2004 the xine project
@@ -193,8 +179,9 @@
+
+#endif /* __COMBINED_VDR_H */
+
---- xine-lib-1.1.17/src/vdr/input_vdr.c
-+++ xine-lib-1.1.17/src/vdr/input_vdr.c
+diff -uNr xine-lib-1.1.18.orig/src/vdr/input_vdr.c xine-lib-1.1.18/src/vdr/input_vdr.c
+--- xine-lib-1.1.18.orig/src/vdr/input_vdr.c 1970-01-01 01:00:00.000000000 +0100
++++ xine-lib-1.1.18/src/vdr/input_vdr.c 2010-02-24 20:55:52.456882929 +0100
@@ -0,0 +1,2665 @@
+/*
+ * Copyright (C) 2003-2004 the xine project
@@ -2861,8 +2848,26 @@
+
+ return this;
+}
---- xine-lib-1.1.17/src/vdr/post_vdr_audio.c
-+++ xine-lib-1.1.17/src/vdr/post_vdr_audio.c
+diff -uNr xine-lib-1.1.18.orig/src/vdr/Makefile.am xine-lib-1.1.18/src/vdr/Makefile.am
+--- xine-lib-1.1.18.orig/src/vdr/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ xine-lib-1.1.18/src/vdr/Makefile.am 2010-02-24 20:55:52.446883463 +0100
+@@ -0,0 +1,13 @@
++include $(top_srcdir)/misc/Makefile.common
++
++AM_CFLAGS = -D_LARGEFILE64_SOURCE
++
++xineplug_LTLIBRARIES = \
++ xineplug_vdr.la
++
++xineplug_vdr_la_SOURCES = combined_vdr.c input_vdr.c post_vdr_video.c post_vdr_audio.c
++xineplug_vdr_la_LIBADD = $(XINE_LIB)
++xineplug_vdr_la_LDFLAGS = -avoid-version -module @IMPURE_TEXT_LDFLAGS@
++
++xineinclude_HEADERS = vdr.h
++noinst_HEADERS = combined_vdr.h
+diff -uNr xine-lib-1.1.18.orig/src/vdr/post_vdr_audio.c xine-lib-1.1.18/src/vdr/post_vdr_audio.c
+--- xine-lib-1.1.18.orig/src/vdr/post_vdr_audio.c 1970-01-01 01:00:00.000000000 +0100
++++ xine-lib-1.1.18/src/vdr/post_vdr_audio.c 2010-02-24 20:55:52.456882929 +0100
@@ -0,0 +1,285 @@
+/*
+ * Copyright (C) 2000-2004 the xine project
@@ -3149,8 +3154,9 @@
+
+ return;
+}
---- xine-lib-1.1.17/src/vdr/post_vdr_video.c
-+++ xine-lib-1.1.17/src/vdr/post_vdr_video.c
+diff -uNr xine-lib-1.1.18.orig/src/vdr/post_vdr_video.c xine-lib-1.1.18/src/vdr/post_vdr_video.c
+--- xine-lib-1.1.18.orig/src/vdr/post_vdr_video.c 1970-01-01 01:00:00.000000000 +0100
++++ xine-lib-1.1.18/src/vdr/post_vdr_video.c 2010-02-24 20:55:52.458884429 +0100
@@ -0,0 +1,502 @@
+/*
+ * Copyright (C) 2000-2004 the xine project
@@ -3654,8 +3660,9 @@
+
+ return skip;
+}
---- xine-lib-1.1.17/src/vdr/vdr.h
-+++ xine-lib-1.1.17/src/vdr/vdr.h
+diff -uNr xine-lib-1.1.18.orig/src/vdr/vdr.h xine-lib-1.1.18/src/vdr/vdr.h
+--- xine-lib-1.1.18.orig/src/vdr/vdr.h 1970-01-01 01:00:00.000000000 +0100
++++ xine-lib-1.1.18/src/vdr/vdr.h 2010-02-24 20:55:52.458884429 +0100
@@ -0,0 +1,665 @@
+/*
+ * Copyright (C) 2000-2004 the xine project
@@ -4322,8 +4329,9 @@
+
+#endif /* __VDR_H */
+
---- xine-lib-1.1.17/src/video_out/video_out_xvmc.c
-+++ xine-lib-1.1.17/src/video_out/video_out_xvmc.c
+diff -uNr xine-lib-1.1.18.orig/src/video_out/video_out_xvmc.c xine-lib-1.1.18/src/video_out/video_out_xvmc.c
+--- xine-lib-1.1.18.orig/src/video_out/video_out_xvmc.c 2010-01-14 23:17:55.000000000 +0100
++++ xine-lib-1.1.18/src/video_out/video_out_xvmc.c 2010-02-24 20:55:52.459882281 +0100
@@ -486,9 +486,9 @@
int second_field,
xvmc_macroblocks_t *macroblocks) {
@@ -4345,8 +4353,9 @@
/* keep track of frames and how many frames alocated. */
this->frames[this->num_frame_buffers++] = frame;
---- xine-lib-1.1.17/src/video_out/video_out_xxmc.c
-+++ xine-lib-1.1.17/src/video_out/video_out_xxmc.c
+diff -uNr xine-lib-1.1.18.orig/src/video_out/video_out_xxmc.c xine-lib-1.1.18/src/video_out/video_out_xxmc.c
+--- xine-lib-1.1.18.orig/src/video_out/video_out_xxmc.c 2010-01-14 23:17:55.000000000 +0100
++++ xine-lib-1.1.18/src/video_out/video_out_xxmc.c 2010-02-24 20:55:52.460882227 +0100
@@ -365,15 +365,15 @@
switch(pc_type) {
@@ -4462,8 +4471,9 @@
format, flags);
}
}
---- xine-lib-1.1.17/src/video_out/xvmc_mocomp.c
-+++ xine-lib-1.1.17/src/video_out/xvmc_mocomp.c
+diff -uNr xine-lib-1.1.18.orig/src/video_out/xvmc_mocomp.c xine-lib-1.1.18/src/video_out/xvmc_mocomp.c
+--- xine-lib-1.1.18.orig/src/video_out/xvmc_mocomp.c 2010-01-14 23:17:55.000000000 +0100
++++ xine-lib-1.1.18/src/video_out/xvmc_mocomp.c 2010-02-24 20:55:52.461882453 +0100
@@ -70,9 +70,9 @@
int second_field,
xvmc_macroblocks_t *macroblocks) {
@@ -4477,8 +4487,9 @@
int flags;
lprintf ("xvmc_render_macro_blocks\n");
---- xine-lib-1.1.17/src/video_out/xvmc_vld.c
-+++ xine-lib-1.1.17/src/video_out/xvmc_vld.c
+diff -uNr xine-lib-1.1.18.orig/src/video_out/xvmc_vld.c xine-lib-1.1.18/src/video_out/xvmc_vld.c
+--- xine-lib-1.1.18.orig/src/video_out/xvmc_vld.c 2010-01-14 23:17:55.000000000 +0100
++++ xine-lib-1.1.18/src/video_out/xvmc_vld.c 2010-02-24 20:55:52.461882453 +0100
@@ -32,12 +32,12 @@
{
vo_frame_t *this = (vo_frame_t *) this_gen;
@@ -4504,8 +4515,9 @@
xxmc_driver_t
*driver = (xxmc_driver_t *) cf->vo_frame.driver;
---- xine-lib-1.1.17/src/xine-engine/accel_xvmc.h
-+++ xine-lib-1.1.17/src/xine-engine/accel_xvmc.h
+diff -uNr xine-lib-1.1.18.orig/src/xine-engine/accel_xvmc.h xine-lib-1.1.18/src/xine-engine/accel_xvmc.h
+--- xine-lib-1.1.18.orig/src/xine-engine/accel_xvmc.h 2010-01-14 23:17:55.000000000 +0100
++++ xine-lib-1.1.18/src/xine-engine/accel_xvmc.h 2010-02-24 20:55:52.461882453 +0100
@@ -65,6 +65,7 @@
@@ -4534,8 +4546,9 @@
/*
* Register XvMC stream types here.
*/
---- xine-lib-1.1.17/src/xine-engine/post.c
-+++ xine-lib-1.1.17/src/xine-engine/post.c
+diff -uNr xine-lib-1.1.18.orig/src/xine-engine/post.c xine-lib-1.1.18/src/xine-engine/post.c
+--- xine-lib-1.1.18.orig/src/xine-engine/post.c 2010-01-14 23:17:56.000000000 +0100
++++ xine-lib-1.1.18/src/xine-engine/post.c 2010-02-24 20:55:52.462882679 +0100
@@ -144,6 +144,14 @@
if (port->port_lock) pthread_mutex_unlock(port->port_lock);
}
@@ -4604,8 +4617,9 @@
return 1;
}
---- xine-lib-1.1.17/src/xine-engine/post.h
-+++ xine-lib-1.1.17/src/xine-engine/post.h
+diff -uNr xine-lib-1.1.18.orig/src/xine-engine/post.h xine-lib-1.1.18/src/xine-engine/post.h
+--- xine-lib-1.1.18.orig/src/xine-engine/post.h 2010-01-14 23:17:56.000000000 +0100
++++ xine-lib-1.1.18/src/xine-engine/post.h 2010-02-24 20:55:52.462882679 +0100
@@ -177,6 +177,13 @@
/* the new frame function pointers */
vo_frame_t *new_frame;
@@ -4620,8 +4634,9 @@
/* if you want to decide yourself, whether the overlay manager should
* be intercepted, fill in this function; get_overlay_manager() acts as
* a template method and asks your function; return a boolean;
---- xine-lib-1.1.17/src/xine-engine/video_out.c
-+++ xine-lib-1.1.17/src/xine-engine/video_out.c
+diff -uNr xine-lib-1.1.18.orig/src/xine-engine/video_out.c xine-lib-1.1.18/src/xine-engine/video_out.c
+--- xine-lib-1.1.18.orig/src/xine-engine/video_out.c 2010-02-23 22:57:24.000000000 +0100
++++ xine-lib-1.1.18/src/xine-engine/video_out.c 2010-02-24 20:55:52.463882626 +0100
@@ -132,6 +132,9 @@
int frame_drop_cpt;
int frame_drop_suggested;
@@ -4686,7 +4701,7 @@
if (this->discard_frames)
break;
-@@ -1626,6 +1658,9 @@
+@@ -1629,6 +1661,9 @@
free (this->free_img_buf_queue);
free (this->display_img_buf_queue);
@@ -4696,7 +4711,7 @@
free (this);
}
-@@ -1695,6 +1730,15 @@
+@@ -1698,6 +1733,15 @@
}
}
@@ -4712,7 +4727,7 @@
/* crop_frame() will allocate a new frame to copy in the given image
* while cropping. maybe someday this will be an automatic post plugin.
*/
-@@ -1790,6 +1834,7 @@
+@@ -1793,6 +1837,7 @@
this->vo.enable_ovl = vo_enable_overlay;
this->vo.get_overlay_manager = vo_get_overlay_manager;
this->vo.flush = vo_flush;
@@ -4720,7 +4735,7 @@
this->vo.get_property = vo_get_property;
this->vo.set_property = vo_set_property;
this->vo.status = vo_status;
-@@ -1883,6 +1928,9 @@
+@@ -1886,6 +1931,9 @@
"were not scheduled for display in time, xine sends a notification."),
20, NULL, NULL);
@@ -4730,8 +4745,9 @@
if (grabonly) {
---- xine-lib-1.1.17/src/xine-engine/video_out.h
-+++ xine-lib-1.1.17/src/xine-engine/video_out.h
+diff -uNr xine-lib-1.1.18.orig/src/xine-engine/video_out.h xine-lib-1.1.18/src/xine-engine/video_out.h
+--- xine-lib-1.1.18.orig/src/xine-engine/video_out.h 2010-01-14 23:17:56.000000000 +0100
++++ xine-lib-1.1.18/src/xine-engine/video_out.h 2010-02-24 20:55:52.463882626 +0100
@@ -198,6 +198,9 @@
/* flush video_out fifo */
void (*flush) (xine_video_port_t *self);
@@ -4742,8 +4758,9 @@
/* Get/Set video property
*
* See VO_PROP_* bellow
---- xine-lib-1.1.17/src/xine-engine/video_overlay.h
-+++ xine-lib-1.1.17/src/xine-engine/video_overlay.h
+diff -uNr xine-lib-1.1.18.orig/src/xine-engine/video_overlay.h xine-lib-1.1.18/src/xine-engine/video_overlay.h
+--- xine-lib-1.1.18.orig/src/xine-engine/video_overlay.h 2010-01-14 23:17:56.000000000 +0100
++++ xine-lib-1.1.18/src/xine-engine/video_overlay.h 2010-02-24 20:55:52.464882991 +0100
@@ -35,7 +35,7 @@
#define MAX_OBJECTS 50
@@ -4753,8 +4770,9 @@
#define OVERLAY_EVENT_NULL 0
#define OVERLAY_EVENT_SHOW 1
---- xine-lib-1.1.17/src/xine-engine/xine.c
-+++ xine-lib-1.1.17/src/xine-engine/xine.c
+diff -uNr xine-lib-1.1.18.orig/src/xine-engine/xine.c xine-lib-1.1.18/src/xine-engine/xine.c
+--- xine-lib-1.1.18.orig/src/xine-engine/xine.c 2010-02-23 23:27:15.000000000 +0100
++++ xine-lib-1.1.18/src/xine-engine/xine.c 2010-02-24 20:55:52.465882658 +0100
@@ -294,8 +294,37 @@
pthread_mutex_unlock(&this->revoke_lock);
}
@@ -4793,7 +4811,7 @@
pthread_mutex_destroy(&this->lock);
pthread_mutex_destroy(&this->revoke_lock);
pthread_cond_destroy(&this->issued);
-@@ -316,12 +345,15 @@
+@@ -317,12 +346,15 @@
port_ticket->renew = ticket_renew;
port_ticket->issue = ticket_issue;
port_ticket->revoke = ticket_revoke;
@@ -4809,7 +4827,7 @@
pthread_cond_init(&port_ticket->issued, NULL);
pthread_cond_init(&port_ticket->revoked, NULL);
-@@ -523,6 +555,7 @@
+@@ -524,6 +556,7 @@
if (!data)
return 0;
@@ -4817,7 +4835,7 @@
stream->xine->port_ticket->revoke(stream->xine->port_ticket, 1);
if (stream->audio_out->status(stream->audio_out, stream, &bits, &rate, &mode)) {
-@@ -533,6 +566,7 @@
+@@ -534,6 +567,7 @@
stream->audio_out = new_port;
stream->xine->port_ticket->issue(stream->xine->port_ticket, 1);
@@ -4825,7 +4843,7 @@
return 1;
}
-@@ -547,6 +581,7 @@
+@@ -548,6 +582,7 @@
if (!data)
return 0;
@@ -4833,7 +4851,7 @@
stream->xine->port_ticket->revoke(stream->xine->port_ticket, 1);
if (stream->video_out->status(stream->video_out, stream, &width, &height, &img_duration)) {
-@@ -557,6 +592,7 @@
+@@ -558,6 +593,7 @@
stream->video_out = new_port;
stream->xine->port_ticket->issue(stream->xine->port_ticket, 1);
@@ -4841,7 +4859,7 @@
return 1;
}
-@@ -2339,3 +2375,83 @@
+@@ -2340,3 +2376,83 @@
return ticket_acquired != 0;
}
@@ -4925,8 +4943,9 @@
+{
+ stream->first_frame_flag = 1;
+}
---- xine-lib-1.1.17/src/xine-engine/xine_internal.h
-+++ xine-lib-1.1.17/src/xine-engine/xine_internal.h
+diff -uNr xine-lib-1.1.18.orig/src/xine-engine/xine_internal.h xine-lib-1.1.18/src/xine-engine/xine_internal.h
+--- xine-lib-1.1.18.orig/src/xine-engine/xine_internal.h 2010-02-23 23:27:15.000000000 +0100
++++ xine-lib-1.1.18/src/xine-engine/xine_internal.h 2010-02-24 20:55:52.465882658 +0100
@@ -169,6 +169,9 @@
* be used in combination with acquire_nonblocking() */
void (*release_nonblocking)(xine_ticket_t *self, int irrevocable);
++++++ vdr-xine-SUSE.diff ++++++
--- /var/tmp/diff_new_pack.ewFZb3/_old 2010-04-01 03:27:29.000000000 +0200
+++ /var/tmp/diff_new_pack.ewFZb3/_new 2010-04-01 03:27:29.000000000 +0200
@@ -1,11 +1,6 @@
-The vdr plugin is patched to use /var/lib/vdr-xine for fifos and so
-needs the part here. Don't remove this patch.
-
-Signed-off-by: Ludwig Nussel <ludwig.nussel(a)suse.de>
-Index: xine-lib-1.1.9/src/vdr/input_vdr.c
-===================================================================
---- xine-lib-1.1.9.orig/src/vdr/input_vdr.c
-+++ xine-lib-1.1.9/src/vdr/input_vdr.c
+diff -ur xine-lib-1.1.18.orig/src/vdr/input_vdr.c xine-lib-1.1.18/src/vdr/input_vdr.c
+--- xine-lib-1.1.18.orig/src/vdr/input_vdr.c 2010-02-24 21:01:43.658883179 +0100
++++ xine-lib-1.1.18/src/vdr/input_vdr.c 2010-02-24 21:02:59.800133025 +0100
@@ -51,7 +51,7 @@
++++++ xine-configure.diff ++++++
--- /var/tmp/diff_new_pack.ewFZb3/_old 2010-04-01 03:27:29.000000000 +0200
+++ /var/tmp/diff_new_pack.ewFZb3/_new 2010-04-01 03:27:29.000000000 +0200
@@ -1,6 +1,7 @@
---- xine-lib-1.1.12/configure.ac
-+++ xine-lib-1.1.12/configure.ac
-@@ -118,6 +118,7 @@ dnl Check for programs.
+diff -ur xine-lib-1.1.18.orig/configure.ac xine-lib-1.1.18/configure.ac
+--- xine-lib-1.1.18.orig/configure.ac 2010-02-24 21:37:21.487134132 +0100
++++ xine-lib-1.1.18/configure.ac 2010-02-24 21:40:15.697916133 +0100
+@@ -119,6 +119,7 @@
dnl ---------------------------------------------
AC_PROG_CC
@@ -8,3 +9,5 @@
AM_PROG_AS
case "$host_os" in
+Nur in xine-lib-1.1.18/src/xine-engine: install_plugins_helper.c.
+Nur in xine-lib-1.1.18/src/xine-engine: install_plugins_helper.h.
++++++ xine-lib-1.1.17-assert.patch -> xine-lib-1.1.18.1-assert.patch ++++++
--- xine-lib/xine-lib-1.1.17-assert.patch 2009-12-01 22:53:08.000000000 +0100
+++ /mounts/work_src_done/STABLE/xine-lib/xine-lib-1.1.18.1-assert.patch 2010-03-07 01:10:38.000000000 +0100
@@ -1,5 +1,6 @@
---- xine-lib-1.1.16.3.orig/src/audio_out/audio_alsa_out.c 2008-06-25 15:04:09.000000000 +0200
-+++ xine-lib-1.1.16.3/src/audio_out/audio_alsa_out.c 2009-11-14 10:52:16.423781020 +0100
+diff -ur xine-lib-1.1.18.orig/src/audio_out/audio_alsa_out.c xine-lib-1.1.18/src/audio_out/audio_alsa_out.c
+--- xine-lib-1.1.18.orig/src/audio_out/audio_alsa_out.c 2010-01-14 23:17:54.000000000 +0100
++++ xine-lib-1.1.18/src/audio_out/audio_alsa_out.c 2010-02-24 21:38:21.022134045 +0100
@@ -41,6 +41,7 @@
#ifdef HAVE_ALLOCA_H
#include <alloca.h>
@@ -8,3 +9,5 @@
#define ALSA_PCM_NEW_HW_PARAMS_API
#define ALSA_PCM_NEW_SW_PARAMS_API
+Nur in xine-lib-1.1.18/src/xine-engine: install_plugins_helper.c.
+Nur in xine-lib-1.1.18/src/xine-engine: install_plugins_helper.h.
++++++ xine-lib-1.1.17-crippled.tar.bz2 -> xine-lib-1.1.18.1-crippled.tar.bz2 ++++++
++++ 26126 lines of diff (skipped)
++++++ xine-lib-1.1.17-demuxcheckfor_mad_ffmpeg.patch -> xine-lib-1.1.18.1-demuxcheckfor_mad_ffmpeg.patch ++++++
--- xine-lib/xine-lib-1.1.17-demuxcheckfor_mad_ffmpeg.patch 2009-12-01 22:53:09.000000000 +0100
+++ /mounts/work_src_done/STABLE/xine-lib/xine-lib-1.1.18.1-demuxcheckfor_mad_ffmpeg.patch 2010-03-07 01:11:20.000000000 +0100
@@ -1,16 +1,7 @@
-From 8861e0d755127fde4b57d32561491853e49a0edc Mon Sep 17 00:00:00 2001
-From: Ludwig Nussel <lnussel(a)suse.de>
-Date: Fri, 25 Jul 2008 15:07:23 +0200
-Subject: [PATCH] xine-lib-demuxcheckfor_mad_ffmpeg-LOCAL.diff
-
-===================================================================
----
- src/xine-engine/load_plugins.c | 17 ++++++++++++++++-
- 1 files changed, 16 insertions(+), 1 deletions(-)
-
---- xine-lib-1.1.16.3.orig/src/xine-engine/load_plugins.c 2009-02-10 18:21:07.000000000 +0100
-+++ xine-lib-1.1.16.3/src/xine-engine/load_plugins.c 2009-11-14 11:00:26.719796977 +0100
-@@ -2487,9 +2487,18 @@
+diff -ur xine-lib-1.1.18.orig/src/xine-engine/load_plugins.c xine-lib-1.1.18/src/xine-engine/load_plugins.c
+--- xine-lib-1.1.18.orig/src/xine-engine/load_plugins.c 2010-01-14 23:17:56.000000000 +0100
++++ xine-lib-1.1.18/src/xine-engine/load_plugins.c 2010-02-24 21:54:02.396132130 +0100
+@@ -2508,9 +2508,18 @@
plugin_catalog_t *catalog = self->plugin_catalog;
int list_id;
@@ -29,7 +20,7 @@
/* calc length of output string and create an array of strings to
concatenate */
size_t len = 0;
-@@ -2501,7 +2510,13 @@
+@@ -2522,7 +2531,13 @@
if (node->plugin_class || _load_plugin_class(self, node, NULL)) {
demux_class_t *const cls = (demux_class_t *)node->plugin_class;
if( (extensions[list_id] = cls->get_extensions(cls)) != NULL )
++++++ xine-lib-1.1.17-glitch-free-pulseaudio.patch -> xine-lib-1.1.18.1-glitch-free-pulseaudio.patch ++++++
--- xine-lib/xine-lib-1.1.17-glitch-free-pulseaudio.patch 2009-12-16 11:17:02.000000000 +0100
+++ /mounts/work_src_done/STABLE/xine-lib/xine-lib-1.1.18.1-glitch-free-pulseaudio.patch 2010-03-07 01:11:21.000000000 +0100
@@ -1,8 +1,7 @@
-Index: xine-lib-1.1.17/src/xine-engine/audio_out.c
-===================================================================
---- xine-lib-1.1.17.orig/src/xine-engine/audio_out.c
-+++ xine-lib-1.1.17/src/xine-engine/audio_out.c
-@@ -1156,8 +1156,17 @@ static void *ao_loop (void *this_gen) {
+diff -ur xine-lib-1.1.18.orig/src/xine-engine/audio_out.c xine-lib-1.1.18/src/xine-engine/audio_out.c
+--- xine-lib-1.1.18.orig/src/xine-engine/audio_out.c 2010-02-23 22:59:05.000000000 +0100
++++ xine-lib-1.1.18/src/xine-engine/audio_out.c 2010-02-24 20:52:10.870884193 +0100
+@@ -1156,8 +1156,17 @@
/*
* calculate gap:
++++++ xine-lib-1.1.17-ia64-is-not-alpha.diff -> xine-lib-1.1.18.1-ia64-is-not-alpha.diff ++++++
--- xine-lib/xine-lib-1.1.17-ia64-is-not-alpha.diff 2009-12-01 22:53:09.000000000 +0100
+++ /mounts/work_src_done/STABLE/xine-lib/xine-lib-1.1.18.1-ia64-is-not-alpha.diff 2010-03-07 01:11:21.000000000 +0100
@@ -1,17 +1,7 @@
-From c781f4b2e726fa3fabf8cc0cdd592f617ae799e2 Mon Sep 17 00:00:00 2001
-From: Ludwig Nussel <ludwig.nussel(a)suse.de>
-Date: Fri, 25 Jul 2008 16:58:56 +0200
-Subject: [PATCH] ia64 is not alpha
-
----
- configure.ac | 5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
-
-Index: xine-lib-1.1.16.3/configure.ac
-===================================================================
---- xine-lib-1.1.16.3.orig/configure.ac 2009-04-02 20:44:45.000000000 +0200
-+++ xine-lib-1.1.16.3/configure.ac 2009-11-14 10:45:11.618782275 +0100
-@@ -2328,10 +2328,13 @@
+diff -ur xine-lib-1.1.18.orig/configure.ac xine-lib-1.1.18/configure.ac
+--- xine-lib-1.1.18.orig/configure.ac 2010-02-22 21:03:51.000000000 +0100
++++ xine-lib-1.1.18/configure.ac 2010-02-24 20:47:41.959133782 +0100
+@@ -2381,10 +2381,13 @@
mips-*)
AC_DEFINE_UNQUOTED(FPM_MIPS,,[Define to select libmad fixed point arithmetic implementation])
;;
++++++ xine-lib-1.1.17-install-plugins-helper.diff -> xine-lib-1.1.18.1-install-plugins-helper.diff ++++++
--- xine-lib/xine-lib-1.1.17-install-plugins-helper.diff 2009-12-16 11:17:03.000000000 +0100
+++ /mounts/work_src_done/STABLE/xine-lib/xine-lib-1.1.18.1-install-plugins-helper.diff 2010-03-07 01:11:22.000000000 +0100
@@ -1,8 +1,7 @@
-Index: xine-lib-1.1.17/configure.ac
-===================================================================
---- xine-lib-1.1.17.orig/configure.ac
-+++ xine-lib-1.1.17/configure.ac
-@@ -2613,6 +2613,28 @@ fi
+diff -uNr xine-lib-1.1.18.orig/configure.ac xine-lib-1.1.18/configure.ac
+--- xine-lib-1.1.18.orig/configure.ac 2010-02-24 22:24:29.445882777 +0100
++++ xine-lib-1.1.18/configure.ac 2010-02-24 22:26:25.554146234 +0100
+@@ -2631,6 +2631,28 @@
AM_CONDITIONAL(HAVE_W32DLL, test "x$enable_w32dll" != "xno")
@@ -31,10 +30,9 @@
dnl ---------------------------------------------
dnl some include paths ( !!! DO NOT REMOVE !!! )
-Index: xine-lib-1.1.17/src/xine-engine/audio_decoder.c
-===================================================================
---- xine-lib-1.1.17.orig/src/xine-engine/audio_decoder.c
-+++ xine-lib-1.1.17/src/xine-engine/audio_decoder.c
+diff -uNr xine-lib-1.1.18.orig/src/xine-engine/audio_decoder.c xine-lib-1.1.18/src/xine-engine/audio_decoder.c
+--- xine-lib-1.1.18.orig/src/xine-engine/audio_decoder.c 2010-01-14 23:17:55.000000000 +0100
++++ xine-lib-1.1.18/src/xine-engine/audio_decoder.c 2010-02-24 22:26:25.555133914 +0100
@@ -41,6 +41,7 @@
#include "xine_internal.h"
@@ -43,7 +41,7 @@
static void *audio_decoder_loop (void *stream_gen) {
-@@ -341,6 +342,10 @@ static void *audio_decoder_loop (void *s
+@@ -341,6 +342,10 @@
_x_stream_info_set(stream, XINE_STREAM_INFO_AUDIO_HANDLED,
(stream->audio_decoder_plugin != NULL));
@@ -54,10 +52,9 @@
}
if (audio_type != stream->audio_type) {
-Index: xine-lib-1.1.17/src/xine-engine/install_plugins_helper.c
-===================================================================
---- /dev/null
-+++ xine-lib-1.1.17/src/xine-engine/install_plugins_helper.c
+diff -uNr xine-lib-1.1.18.orig/src/xine-engine/install_plugins_helper.c xine-lib-1.1.18/src/xine-engine/install_plugins_helper.c
+--- xine-lib-1.1.18.orig/src/xine-engine/install_plugins_helper.c 1970-01-01 01:00:00.000000000 +0100
++++ xine-lib-1.1.18/src/xine-engine/install_plugins_helper.c 2010-02-24 22:26:25.556133119 +0100
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2007 Sascha Sommer
@@ -165,10 +162,9 @@
+ }
+}
+
-Index: xine-lib-1.1.17/src/xine-engine/install_plugins_helper.h
-===================================================================
---- /dev/null
-+++ xine-lib-1.1.17/src/xine-engine/install_plugins_helper.h
+diff -uNr xine-lib-1.1.18.orig/src/xine-engine/install_plugins_helper.h xine-lib-1.1.18/src/xine-engine/install_plugins_helper.h
+--- xine-lib-1.1.18.orig/src/xine-engine/install_plugins_helper.h 1970-01-01 01:00:00.000000000 +0100
++++ xine-lib-1.1.18/src/xine-engine/install_plugins_helper.h 2010-02-24 22:26:25.556133119 +0100
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2007 Sascha Sommer
@@ -205,11 +201,10 @@
+
+
+#endif
-Index: xine-lib-1.1.17/src/xine-engine/Makefile.am
-===================================================================
---- xine-lib-1.1.17.orig/src/xine-engine/Makefile.am
-+++ xine-lib-1.1.17/src/xine-engine/Makefile.am
-@@ -19,7 +19,7 @@ libxine_la_SOURCES = xine.c metronom.c c
+diff -uNr xine-lib-1.1.18.orig/src/xine-engine/Makefile.am xine-lib-1.1.18/src/xine-engine/Makefile.am
+--- xine-lib-1.1.18.orig/src/xine-engine/Makefile.am 2010-01-21 00:45:27.000000000 +0100
++++ xine-lib-1.1.18/src/xine-engine/Makefile.am 2010-02-24 22:26:25.556133119 +0100
+@@ -19,7 +19,7 @@
video_overlay.c osd.c scratch.c demux.c vo_scale.c \
xine_interface.c post.c tvmode.c broadcaster.c io_helper.c \
input_rip.c input_cache.c info_helper.c refcounter.c \
@@ -218,7 +213,7 @@
# FIXME: these are currently unused:
EXTRA_DIST = lrb.c lrb.h accel_xvmc.h
-@@ -39,7 +39,8 @@ xineinclude_HEADERS = buffer.h metronom
+@@ -39,7 +39,8 @@
audio_out.h resample.h video_out.h xine_internal.h spu_decoder.h \
video_overlay.h osd.h scratch.h xine_plugin.h xineintl.h \
plugin_catalog.h audio_decoder.h video_decoder.h post.h \
@@ -228,10 +223,9 @@
noinst_HEADERS = bswap.h ffmpeg_bswap.h
-Index: xine-lib-1.1.17/src/xine-engine/video_decoder.c
-===================================================================
---- xine-lib-1.1.17.orig/src/xine-engine/video_decoder.c
-+++ xine-lib-1.1.17/src/xine-engine/video_decoder.c
+diff -uNr xine-lib-1.1.18.orig/src/xine-engine/video_decoder.c xine-lib-1.1.18/src/xine-engine/video_decoder.c
+--- xine-lib-1.1.18.orig/src/xine-engine/video_decoder.c 2010-02-23 23:27:15.000000000 +0100
++++ xine-lib-1.1.18/src/xine-engine/video_decoder.c 2010-02-24 22:26:25.557133929 +0100
@@ -37,6 +37,7 @@
#include "xine_internal.h"
@@ -240,7 +234,7 @@
#include <sched.h>
#define SPU_SLEEP_INTERVAL (90000/2)
-@@ -376,6 +377,10 @@ static void *video_decoder_loop (void *s
+@@ -376,6 +377,10 @@
stream->video_decoder_plugin = _x_get_video_decoder (stream, streamtype);
_x_stream_info_set(stream, XINE_STREAM_INFO_VIDEO_HANDLED, (stream->video_decoder_plugin != NULL));
@@ -251,11 +245,10 @@
}
if (stream->video_decoder_plugin)
-Index: xine-lib-1.1.17/src/xine-engine/xine.c
-===================================================================
---- xine-lib-1.1.17.orig/src/xine-engine/xine.c
-+++ xine-lib-1.1.17/src/xine-engine/xine.c
-@@ -1809,6 +1809,15 @@ void xine_init (xine_t *this) {
+diff -uNr xine-lib-1.1.18.orig/src/xine-engine/xine.c xine-lib-1.1.18/src/xine-engine/xine.c
+--- xine-lib-1.1.18.orig/src/xine-engine/xine.c 2010-02-24 22:24:02.482882309 +0100
++++ xine-lib-1.1.18/src/xine-engine/xine.c 2010-02-24 22:26:25.559133664 +0100
+@@ -1810,6 +1810,15 @@
0, NULL, this);
/*
++++++ xine-lib-1.1.17-mjpegplugin.diff -> xine-lib-1.1.18.1-mjpegplugin.diff ++++++
--- xine-lib/xine-lib-1.1.17-mjpegplugin.diff 2009-12-16 11:17:04.000000000 +0100
+++ /mounts/work_src_done/STABLE/xine-lib/xine-lib-1.1.18.1-mjpegplugin.diff 2010-03-07 01:11:22.000000000 +0100
@@ -1,8 +1,7 @@
-Index: xine-lib-1.1.17/configure
-===================================================================
---- xine-lib-1.1.17.orig/configure
-+++ xine-lib-1.1.17/configure
-@@ -48965,6 +48965,7 @@ echo ""
+diff -uNr xine-lib-1.1.18.orig/configure xine-lib-1.1.18/configure
+--- xine-lib-1.1.18.orig/configure 2010-02-23 23:50:53.000000000 +0100
++++ xine-lib-1.1.18/configure 2010-02-24 21:28:13.318884098 +0100
+@@ -33611,6 +33611,7 @@
echo " * video decoder plugins:"
echo " - MPEG 1,2 - Amiga Bitplane"
echo " - Raw RGB - Raw YUV"
@@ -10,11 +9,10 @@
if test "x$with_external_ffmpeg" = "xyes"; then
echo " - ffmpeg (external library):"
else
-Index: xine-lib-1.1.17/configure.ac
-===================================================================
---- xine-lib-1.1.17.orig/configure.ac
-+++ xine-lib-1.1.17/configure.ac
-@@ -1086,6 +1086,28 @@ AC_SUBST([SDL_CFLAGS])
+diff -uNr xine-lib-1.1.18.orig/configure.ac xine-lib-1.1.18/configure.ac
+--- xine-lib-1.1.18.orig/configure.ac 2010-02-24 21:24:46.643882529 +0100
++++ xine-lib-1.1.18/configure.ac 2010-02-24 21:28:13.320882133 +0100
+@@ -1104,6 +1104,28 @@
AC_SUBST([SDL_LIBS])
dnl ---------------------------------------------
@@ -43,15 +41,15 @@
dnl check for Libstk
dnl ---------------------------------------------
-@@ -2799,6 +2821,7 @@ src/libxineadec/Makefile
-
-
+@@ -2817,6 +2839,7 @@
+ src/libxineadec/gsm610/Makefile
+ src/libxineadec/nosefart/Makefile
src/libreal/Makefile
+src/mjpeg/Makefile
src/post/Makefile
src/post/planar/Makefile
src/post/goom/Makefile
-@@ -2989,6 +3012,9 @@ echo ""
+@@ -3007,6 +3030,9 @@
dnl audio decoders
echo " * audio decoder plugins:"
echo " - GSM 06.10 - linear PCM"
@@ -61,34 +59,31 @@
if test "x$with_external_ffmpeg" = "xyes"; then
echo " - ffmpeg (external library):"
else
-Index: xine-lib-1.1.17/src/Makefile.am
-===================================================================
---- xine-lib-1.1.17.orig/src/Makefile.am
-+++ xine-lib-1.1.17/src/Makefile.am
-@@ -27,6 +27,7 @@ SUBDIRS = \
+diff -uNr xine-lib-1.1.18.orig/src/Makefile.am xine-lib-1.1.18/src/Makefile.am
+--- xine-lib-1.1.18.orig/src/Makefile.am 2010-02-24 21:24:46.643882529 +0100
++++ xine-lib-1.1.18/src/Makefile.am 2010-02-24 21:28:13.321884189 +0100
+@@ -27,6 +27,7 @@
libreal \
- \
+ libfaad \
libmusepack \
+ mjpeg \
post \
combined \
vdr
-Index: xine-lib-1.1.17/src/Makefile.in
-===================================================================
---- xine-lib-1.1.17.orig/src/Makefile.in
-+++ xine-lib-1.1.17/src/Makefile.in
-@@ -450,6 +450,7 @@ SUBDIRS = \
+diff -uNr xine-lib-1.1.18.orig/src/Makefile.in xine-lib-1.1.18/src/Makefile.in
+--- xine-lib-1.1.18.orig/src/Makefile.in 2010-02-23 23:50:35.000000000 +0100
++++ xine-lib-1.1.18/src/Makefile.in 2010-02-24 21:28:13.321884189 +0100
+@@ -453,6 +453,7 @@
libreal \
- \
+ libfaad \
libmusepack \
+ mjpeg \
post \
combined
-Index: xine-lib-1.1.17/src/mjpeg/Makefile.am
-===================================================================
---- /dev/null
-+++ xine-lib-1.1.17/src/mjpeg/Makefile.am
+diff -uNr xine-lib-1.1.18.orig/src/mjpeg/Makefile.am xine-lib-1.1.18/src/mjpeg/Makefile.am
+--- xine-lib-1.1.18.orig/src/mjpeg/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ xine-lib-1.1.18/src/mjpeg/Makefile.am 2010-02-24 21:28:13.323883132 +0100
@@ -0,0 +1,9 @@
+include $(top_srcdir)/misc/Makefile.common
+
@@ -99,10 +94,9 @@
+xineplug_decode_mjpeg_la_CFLAGS = $(VISIBILITY_FLAG)
+xineplug_decode_mjpeg_la_LDFLAGS = $(xineplug_ldflags)
+endif
-Index: xine-lib-1.1.17/src/mjpeg/Makefile.in
-===================================================================
---- /dev/null
-+++ xine-lib-1.1.17/src/mjpeg/Makefile.in
+diff -uNr xine-lib-1.1.18.orig/src/mjpeg/Makefile.in xine-lib-1.1.18/src/mjpeg/Makefile.in
+--- xine-lib-1.1.18.orig/src/mjpeg/Makefile.in 1970-01-01 01:00:00.000000000 +0100
++++ xine-lib-1.1.18/src/mjpeg/Makefile.in 2010-02-24 21:28:13.324882254 +0100
@@ -0,0 +1,751 @@
+# Makefile.in generated by automake 1.10 from Makefile.am.
+# @configure_input@
@@ -855,10 +849,9 @@
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
-Index: xine-lib-1.1.17/src/mjpeg/xine_mjpeg_decoder.c
-===================================================================
---- /dev/null
-+++ xine-lib-1.1.17/src/mjpeg/xine_mjpeg_decoder.c
+diff -uNr xine-lib-1.1.18.orig/src/mjpeg/xine_mjpeg_decoder.c xine-lib-1.1.18/src/mjpeg/xine_mjpeg_decoder.c
+--- xine-lib-1.1.18.orig/src/mjpeg/xine_mjpeg_decoder.c 1970-01-01 01:00:00.000000000 +0100
++++ xine-lib-1.1.18/src/mjpeg/xine_mjpeg_decoder.c 2010-02-24 21:28:13.325884030 +0100
@@ -0,0 +1,397 @@
+/*
+ * Copyright (C) 2007 Marcus Meissner
++++++ xine-lib-1.1.17-crippled.tar.bz2 -> xine-lib-1.1.18.1.tar.bz2 ++++++
xine-lib/xine-lib-1.1.17-crippled.tar.bz2 /mounts/work_src_done/STABLE/xine-lib/xine-lib-1.1.18.1.tar.bz2 differ: char 11, line 1
++++++ xine-lib-libdvdread_udf.diff ++++++
--- /var/tmp/diff_new_pack.ewFZb3/_old 2010-04-01 03:27:31.000000000 +0200
+++ /var/tmp/diff_new_pack.ewFZb3/_new 2010-04-01 03:27:31.000000000 +0200
@@ -1,14 +1,7 @@
-# HG changeset patch
-# User Tobias Rautenkranz <mail(a)tobias.rautenkranz.ch>
-# Date 1202208482 -3600
-# Node ID 100241ff36f0730a15018a58456fb86eb590bf18
-# Parent 07c29261ed98fdb710a241c6711dac0215b6074a
-Fix playback of DVDs with a broken UDF file system (aka DVD-Movie-Protect).
-
-diff -r 07c29261ed98 -r 100241ff36f0 src/input/libdvdnav/dvd_udf.c
---- a/src/input/libdvdnav/dvd_udf.c Thu Jan 31 22:02:04 2008 +0000
-+++ b/src/input/libdvdnav/dvd_udf.c Tue Feb 05 11:48:02 2008 +0100
-@@ -38,9 +38,15 @@
+diff -ur xine-lib-1.1.18.orig/src/input/libdvdnav/dvd_udf.c xine-lib-1.1.18/src/input/libdvdnav/dvd_udf.c
+--- xine-lib-1.1.18.orig/src/input/libdvdnav/dvd_udf.c 2009-11-30 21:57:20.000000000 +0100
++++ xine-lib-1.1.18/src/input/libdvdnav/dvd_udf.c 2010-02-24 21:12:36.032882913 +0100
+@@ -38,10 +38,16 @@
#include <sys/stat.h>
#include <unistd.h>
#include <inttypes.h>
@@ -18,13 +11,14 @@
#include "dvd_reader.h"
#include "dvd_udf.h"
-+
+
+#include "ifo_types.h"
+#include "ifo_read.h"
-
++
/* Private but located in/shared with dvd_reader.c */
extern int UDFReadBlocksRaw( dvd_reader_t *device, uint32_t lb_number,
-@@ -774,7 +780,9 @@ static int UDFFindPartition( dvd_reader_
+ size_t block_count, unsigned char *data,
+@@ -774,7 +780,9 @@
return part->valid;
}
@@ -35,7 +29,7 @@
uint32_t *filesize )
{
uint8_t LogBlock_base[ DVD_VIDEO_LB_LEN + 2048 ];
-@@ -856,6 +864,84 @@ uint32_t UDFFindFile( dvd_reader_t *devi
+@@ -856,6 +864,84 @@
return partition.Start + File.Location;
}
++++++ xine-lib-various-noncrippled.diff ++++++
--- /var/tmp/diff_new_pack.ewFZb3/_old 2010-04-01 03:27:31.000000000 +0200
+++ /var/tmp/diff_new_pack.ewFZb3/_new 2010-04-01 03:27:31.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- src/libw32dll/wine/ldt_keeper.c.orig
+++ src/libw32dll/wine/ldt_keeper.c
-@@ -77,6 +77,10 @@ int modify_ldt(int func, void *ptr, unsi
+@@ -77,6 +77,10 @@
#ifdef __cplusplus
}
#endif
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
