r476 - general/xine-lib-vdr/trunk/debian/patches
Darren Salt
pkg-vdr-dvb-changes@lists.alioth.debian.org
Sun, 17 Apr 2005 21:53:11 +0000
Author: dsalt-guest
Date: 2005-04-17 21:53:02 +0000 (Sun, 17 Apr 2005)
New Revision: 476
Modified:
general/xine-lib-vdr/trunk/debian/patches/03_vdr-xine_patch.dpatch
general/xine-lib-vdr/trunk/debian/patches/99_autoconf.dpatch
Log:
Update for vdr-plugin-xine 0.7.3
Modified: general/xine-lib-vdr/trunk/debian/patches/03_vdr-xine_patch.dpatch
===================================================================
--- general/xine-lib-vdr/trunk/debian/patches/03_vdr-xine_patch.dpatch 2005-04-17 20:25:11 UTC (rev 475)
+++ general/xine-lib-vdr/trunk/debian/patches/03_vdr-xine_patch.dpatch 2005-04-17 21:53:02 UTC (rev 476)
@@ -5,9 +5,9 @@
## DP: VDR plugin.
@DPATCH@
-diff -urNad xine-lib-vdr-1.0/configure.ac /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/configure.ac
---- xine-lib-vdr-1.0/configure.ac 2005-02-12 22:01:42.000000000 +0000
-+++ /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/configure.ac 2005-02-12 22:01:43.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/configure.ac /tmp/dpep.gJYg3C/xine-lib-vdr-1.0/configure.ac
+--- xine-lib-vdr-1.0/configure.ac 2005-04-11 23:44:35.743457774 +0100
++++ /tmp/dpep.gJYg3C/xine-lib-vdr-1.0/configure.ac 2005-04-11 23:45:16.936119681 +0100
@@ -2254,6 +2254,7 @@
src/xine-utils/Makefile
src/xine-engine/Makefile
@@ -33,20 +33,103 @@
echo " * SFX:"
echo " - goom - oscope"
echo " - fftscope - mosaico"
-diff -urNad xine-lib-vdr-1.0/src/Makefile.am /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/src/Makefile.am
---- xine-lib-vdr-1.0/src/Makefile.am 2005-02-12 22:01:42.000000000 +0000
-+++ /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/src/Makefile.am 2005-02-12 22:02:17.000000000 +0000
-@@ -30,4 +30,6 @@
+diff -urNad xine-lib-vdr-1.0/include/xine.h.in /tmp/dpep.gJYg3C/xine-lib-vdr-1.0/include/xine.h.in
+--- xine-lib-vdr-1.0/include/xine.h.in 2005-04-11 23:44:35.745457612 +0100
++++ /tmp/dpep.gJYg3C/xine-lib-vdr-1.0/include/xine.h.in 2005-04-11 23:44:43.794805324 +0100
+@@ -895,6 +895,26 @@
+ #define XINE_STREAM_INFO_AUDIO_MODE 26
+ #define XINE_STREAM_INFO_SKIPPED_FRAMES 27 /* for 1000 frames delivered */
+ #define XINE_STREAM_INFO_DISCARDED_FRAMES 28 /* for 1000 frames delivered */
++#define XINE_STREAM_INFO_VIDEO_AFD 29
++
++/* possible values for XINE_STREAM_INFO_VIDEO_AFD */
++#define XINE_VIDEO_AFD_NOT_PRESENT -1
++#define XINE_VIDEO_AFD_RESERVED_0 0
++#define XINE_VIDEO_AFD_RESERVED_1 1
++#define XINE_VIDEO_AFD_BOX_16_9_TOP 2
++#define XINE_VIDEO_AFD_BOX_14_9_TOP 3
++#define XINE_VIDEO_AFD_BOX_GT_16_9_CENTRE 4
++#define XINE_VIDEO_AFD_RESERVED_5 5
++#define XINE_VIDEO_AFD_RESERVED_6 6
++#define XINE_VIDEO_AFD_RESERVED_7 7
++#define XINE_VIDEO_AFD_SAME_AS_FRAME 8
++#define XINE_VIDEO_AFD_4_3_CENTRE 9
++#define XINE_VIDEO_AFD_16_9_CENTRE 10
++#define XINE_VIDEO_AFD_14_9_CENTRE 11
++#define XINE_VIDEO_AFD_RESERVED_12 12
++#define XINE_VIDEO_AFD_4_3_PROTECT_14_9 13
++#define XINE_VIDEO_AFD_16_9_PROTECT_14_9 14
++#define XINE_VIDEO_AFD_16_9_PROTECT_4_3 15
+
+ /* xine_get_meta_info */
+ #define XINE_META_INFO_TITLE 0
+@@ -1488,6 +1508,7 @@
+ #define XINE_EVENT_VDR_VOLPLUS 329
+ #define XINE_EVENT_VDR_VOLMINUS 330
+ #define XINE_EVENT_VDR_MUTE 331
++#define XINE_EVENT_VDR_AUDIO 332
+ /* some space for further keys */
+ #define XINE_EVENT_VDR_SETVIDEOWINDOW 350
+ #define XINE_EVENT_VDR_FRAMESIZECHANGED 351
+diff -urNad xine-lib-vdr-1.0/src/Makefile.am /tmp/dpep.gJYg3C/xine-lib-vdr-1.0/src/Makefile.am
+--- xine-lib-vdr-1.0/src/Makefile.am 2005-04-11 23:44:35.885446268 +0100
++++ /tmp/dpep.gJYg3C/xine-lib-vdr-1.0/src/Makefile.am 2005-04-11 23:44:43.795805243 +0100
+@@ -30,4 +30,5 @@
libfaad \
libflac \
libmusepack \
- post
+ post \
+ vdr
+diff -urNad xine-lib-vdr-1.0/src/demuxers/demux_mpeg_pes.c /tmp/dpep.gJYg3C/xine-lib-vdr-1.0/src/demuxers/demux_mpeg_pes.c
+--- xine-lib-vdr-1.0/src/demuxers/demux_mpeg_pes.c 2005-04-11 23:44:35.900445052 +0100
++++ /tmp/dpep.gJYg3C/xine-lib-vdr-1.0/src/demuxers/demux_mpeg_pes.c 2005-04-11 23:44:43.796805162 +0100
+@@ -157,7 +157,42 @@
+ }
+
+ if( pts )
++ {
++ /* don't detect a discontinuity only for video respectively audio. It's also a discontinuity
++ indication when audio and video pts differ to much e. g. when a pts wrap happens.
++ The original code worked well when the wrap happend like this:
+
-diff -urNad xine-lib-vdr-1.0/src/libmpeg2/decode.c /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/src/libmpeg2/decode.c
---- xine-lib-vdr-1.0/src/libmpeg2/decode.c 2005-02-12 22:01:42.000000000 +0000
-+++ /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/src/libmpeg2/decode.c 2005-02-12 22:01:43.000000000 +0000
++ V7 A7 V8 V9 A9 Dv V0 V1 da A1 V2 V3 A3 V4
++
++ Legend:
++ Vn = video packet with timestamp n
++ An = audio packet with timestamp n
++ Dv = discontinuity detected on following video packet
++ Da = discontinuity detected on following audio packet
++ dv = discontinuity detected on following video packet but ignored
++ da = discontinuity detected on following audio packet but ignored
++
++ But with a certain delay between audio and video packets (e. g. the way DVB-S broadcasts
++ the packets) the code didn't work:
++
++ V7 V8 A7 V9 Dv V0 _A9_ V1 V2 Da _A1_ V3 V4 A3
++
++ Packet A9 caused audio to jump forward and A1 caused it to jump backward with inserting
++ a delay of almoust 26.5 hours!
++
++ The new code gives the following sequences for the above examples:
++
++ V7 A7 V8 V9 A9 Dv V0 V1 A1 V2 V3 A3 V4
++
++ V7 V8 A7 V9 Dv V0 Da A9 Dv V1 V2 A1 V3 V4 A3
++
++ After proving this code it should be cleaned up to use just a single variable "last_pts". */
++
++/*
+ this->last_pts[video] = pts;
++*/
++ this->last_pts[video] = this->last_pts[1-video] = pts;
++ }
+ }
+
+ static void demux_mpeg_pes_parse_pack (demux_mpeg_pes_t *this, int preview_mode) {
+diff -urNad xine-lib-vdr-1.0/src/libmpeg2/decode.c /tmp/dpep.gJYg3C/xine-lib-vdr-1.0/src/libmpeg2/decode.c
+--- xine-lib-vdr-1.0/src/libmpeg2/decode.c 2005-04-11 23:44:36.003436706 +0100
++++ /tmp/dpep.gJYg3C/xine-lib-vdr-1.0/src/libmpeg2/decode.c 2005-04-11 23:46:06.072137889 +0100
@@ -175,7 +175,7 @@
1.0, 0.6735, 0.7031, 0.7615, 0.8055, 0.8437, 0.8935, 0.9157,
0.9815, 1.0255, 1.0695, 1.0950, 1.1575, 1.2015, 1.0 /*reserved*/ };
@@ -91,9 +174,20 @@
}
break;
-diff -urNad xine-lib-vdr-1.0/src/libmpeg2/mpeg2_internal.h /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/src/libmpeg2/mpeg2_internal.h
---- xine-lib-vdr-1.0/src/libmpeg2/mpeg2_internal.h 2004-11-13 19:32:52.000000000 +0000
-+++ /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/src/libmpeg2/mpeg2_internal.h 2005-02-12 22:01:43.000000000 +0000
+@@ -1023,4 +1028,10 @@
+ mpeg2dec->cc_dec->decode_data(mpeg2dec->cc_dec, &buf);
+ }
+ }
++ /* check Active Format Description ETSI TS 101 154 V1.5.1 */
++ else if (buffer[0] == 0x44 && buffer[1] == 0x54 && buffer[2] == 0x47 && buffer[3] == 0x31)
++ {
++ int afd = (buffer[4] & 0x40) ? (buffer[5] & 0x0f) : -1;
++ _x_stream_info_set(mpeg2dec->stream, XINE_STREAM_INFO_VIDEO_AFD, afd);
++ }
+ }
+diff -urNad xine-lib-vdr-1.0/src/libmpeg2/mpeg2_internal.h /tmp/dpep.gJYg3C/xine-lib-vdr-1.0/src/libmpeg2/mpeg2_internal.h
+--- xine-lib-vdr-1.0/src/libmpeg2/mpeg2_internal.h 2005-04-03 00:03:00.000000000 +0100
++++ /tmp/dpep.gJYg3C/xine-lib-vdr-1.0/src/libmpeg2/mpeg2_internal.h 2005-04-11 23:44:43.798805000 +0100
@@ -158,7 +158,7 @@
int second_field;
@@ -103,9 +197,24 @@
int skip_non_intra_dct;
-diff -urNad xine-lib-vdr-1.0/src/post/planar/expand.c /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/src/post/planar/expand.c
---- xine-lib-vdr-1.0/src/post/planar/expand.c 2004-04-17 20:54:32.000000000 +0100
-+++ /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/src/post/planar/expand.c 2005-02-12 22:01:43.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/post/deinterlace/xine_plugin.c /tmp/dpep.gJYg3C/xine-lib-vdr-1.0/src/post/deinterlace/xine_plugin.c
+--- xine-lib-vdr-1.0/src/post/deinterlace/xine_plugin.c 2004-09-29 19:30:37.000000000 +0100
++++ /tmp/dpep.gJYg3C/xine-lib-vdr-1.0/src/post/deinterlace/xine_plugin.c 2005-04-11 23:44:43.799804919 +0100
+@@ -563,6 +563,11 @@
+ frame->flags | VO_BOTH_FIELDS);
+ pthread_mutex_lock (&this->lock);
+
++ deinterlaced_frame->crop_left = frame->crop_left;
++ deinterlaced_frame->crop_right = frame->crop_right;
++ deinterlaced_frame->crop_top = frame->crop_top;
++ deinterlaced_frame->crop_bottom = frame->crop_bottom;
++
+ _x_extra_info_merge(deinterlaced_frame->extra_info, frame->extra_info);
+
+ if( skip > 0 && !this->pulldown ) {
+diff -urNad xine-lib-vdr-1.0/src/post/planar/expand.c /tmp/dpep.gJYg3C/xine-lib-vdr-1.0/src/post/planar/expand.c
+--- xine-lib-vdr-1.0/src/post/planar/expand.c 2005-04-03 00:03:00.000000000 +0100
++++ /tmp/dpep.gJYg3C/xine-lib-vdr-1.0/src/post/planar/expand.c 2005-04-11 23:44:43.800804838 +0100
@@ -21,7 +21,8 @@
*
* expand video filter by James Stembridge 24/05/2003
@@ -307,9 +416,9 @@
+
+ return skip;
+}
-diff -urNad xine-lib-vdr-1.0/src/vdr/Makefile.am /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/src/vdr/Makefile.am
+diff -urNad xine-lib-vdr-1.0/src/vdr/Makefile.am /tmp/dpep.gJYg3C/xine-lib-vdr-1.0/src/vdr/Makefile.am
--- xine-lib-vdr-1.0/src/vdr/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/src/vdr/Makefile.am 2005-02-12 22:01:43.000000000 +0000
++++ /tmp/dpep.gJYg3C/xine-lib-vdr-1.0/src/vdr/Makefile.am 2005-04-11 23:44:43.805804433 +0100
@@ -0,0 +1,30 @@
+include $(top_srcdir)/misc/Makefile.common
+
@@ -341,10 +450,10 @@
+
+noinst_HEADERS = post_vdr.h
+
-diff -urNad xine-lib-vdr-1.0/src/vdr/input_vdr.c /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/src/vdr/input_vdr.c
+diff -urNad xine-lib-vdr-1.0/src/vdr/input_vdr.c /tmp/dpep.gJYg3C/xine-lib-vdr-1.0/src/vdr/input_vdr.c
--- xine-lib-vdr-1.0/src/vdr/input_vdr.c 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/src/vdr/input_vdr.c 2005-02-12 22:01:43.000000000 +0000
-@@ -0,0 +1,1586 @@
++++ /tmp/dpep.gJYg3C/xine-lib-vdr-1.0/src/vdr/input_vdr.c 2005-04-11 23:44:43.808804190 +0100
+@@ -0,0 +1,1745 @@
+/*
+ * Copyright (C) 2003-2004 the xine project
+ *
@@ -442,7 +551,10 @@
+ int last_volume;
+ vdr_frame_size_changed_data_t frame_size;
+
-+ pthread_t thread_control;
++ pthread_t rpc_thread;
++ int rpc_thread_shutdown;
++ pthread_mutex_t rpc_thread_shutdown_lock;
++ pthread_cond_t rpc_thread_shutdown_cond;
+
+ xine_event_queue_t *event_queue;
+ xine_event_queue_t *event_queue_external;
@@ -462,21 +574,32 @@
+
+
+
-+static int xwrite(int f, void *b, int n)
++static int vdr_write(int f, void *b, int n)
+{
+ int t = 0;
+
+ while (t < n)
+ {
++ /*
++ * System calls are not a thread cancellation point in Linux
++ * pthreads. However, the RT signal sent to cancel the thread
++ * will cause recv() to return with EINTR, and we can manually
++ * check cancellation.
++ */
++ pthread_testcancel();
+ int r = write(f, ((char *)b) + t, n - t);
-+ if (r < 0)
++ pthread_testcancel();
++
++ if (r < 0
++ && (errno == EINTR
++ || errno == EAGAIN))
+ {
-+ if (EAGAIN == errno)
-+ break;
-+
-+ return r;
++ continue;
+ }
+
++ if (r < 0)
++ return r;
++
+ t += r;
+ }
+
@@ -505,7 +628,7 @@
+
+ if (0 != internal_write_event_play_external(this, key))
+ xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
-+ _("input event write: %s.\n"), strerror(errno));
++ _(LOG_MODULE ": input event write: %s.\n"), strerror(errno));
+}
+
+static void external_stream_stop(vdr_input_plugin_t *this)
@@ -545,50 +668,71 @@
+
+ if ( 0 != internal_write_event_play_external(this, key))
+ xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
-+ _("input event write: %s.\n"), strerror(errno));
++ _(LOG_MODULE ": input event write: %s.\n"), strerror(errno));
+ }
+}
+
++static off_t vdr_read_abort(xine_stream_t *stream, int fd, char *buf, off_t todo)
++{
++ off_t ret;
++
++ while (1)
++ {
++ /*
++ * System calls are not a thread cancellation point in Linux
++ * pthreads. However, the RT signal sent to cancel the thread
++ * will cause recv() to return with EINTR, and we can manually
++ * check cancellation.
++ */
++ pthread_testcancel();
++ ret = _x_read_abort(stream, fd, buf, todo);
++ pthread_testcancel();
++
++ if (ret < 0
++ && (errno == EINTR
++ || errno == EAGAIN))
++ {
++ continue;
++ }
++
++ break;
++ }
+
++ return ret;
++}
++
+#define READ_DATA_OR_FAIL(kind, log) \
+ data_##kind##_t *data = &data_union.kind; \
+ { \
+ log; \
-+ n = _x_read_abort (this->stream, this->fh_control, (char *)data + sizeof (data->header), sizeof (*data) - sizeof (data->header)); \
++ n = vdr_read_abort(this->stream, this->fh_control, (char *)data + sizeof (data->header), sizeof (*data) - sizeof (data->header)); \
+ if (n != sizeof (*data) - sizeof (data->header)) \
+ return -1; \
+ \
+ this->cur_size -= n; \
+ }
+
-+static off_t internal_ead(vdr_input_plugin_t *this, char *buf, off_t len);
++static double _now()
++{
++ struct timeval tv;
++
++ gettimeofday(&tv, 0);
+
-+static off_t internal_read(vdr_input_plugin_t *this, char *buf, off_t len)
-+{
-+ off_t r = internal_ead(this, buf, len);
-+ fprintf(stderr, "internal_ead(): %lld, func: %d\n", r, this->cur_func);
-+ return r;
++ return (tv.tv_sec * 1000000.0 + tv.tv_usec) / 1000.0;
+}
+
-+static off_t internal_ead(vdr_input_plugin_t *this, char *buf, off_t len)
++static off_t vdr_execute_rpc_command(vdr_input_plugin_t *this)
+{
+ data_union_t data_union;
+ off_t n;
+
-+retry:
-+ if (this->cur_done == this->cur_size)
-+ this->cur_func = func_unknown;
-+
-+ if (func_unknown == this->cur_func)
-+ {
-+ n = _x_read_abort(this->stream, this->fh_control, (char *)&data_union, sizeof (data_union.header));
-+ if (n != sizeof (data_union.header))
-+ return -1;
-+
-+ this->cur_func = data_union.header.func;
-+ this->cur_size = data_union.header.len - sizeof (data_union.header);
-+ this->cur_done = 0;
-+ }
++ n = vdr_read_abort(this->stream, this->fh_control, (char *)&data_union, sizeof (data_union.header));
++ if (n != sizeof (data_union.header))
++ return -1;
++
++ this->cur_func = data_union.header.func;
++ this->cur_size = data_union.header.len - sizeof (data_union.header);
++ this->cur_done = 0;
+
+ switch (this->cur_func)
+ {
@@ -679,17 +823,27 @@
+
+ case func_osd_flush:
+ {
++ double _t1, _t2;
++ int _n = 0;
++
+ READ_DATA_OR_FAIL(osd_flush, LOG_OSD(lprintf("got OSDFLUSH\n")));
+/*
+ fprintf(stderr, "vdr: osdflush +\n");
+*/
++ _t1 = _now();
++
+ while (_x_query_unprocessed_osd_events(this->stream))
+ {
+/*
+ fprintf(stderr, "redraw_needed: 1\n");
+*/
-+ sched_yield();
++// sched_yield();
++ xine_usec_sleep(5000);
++ _n++;
+ }
++
++ _t2 = _now();
++ fprintf(stderr, "vdr: osdflush: n: %d, %.1lf\n", _n, _t2 - _t1);
+/*
+ fprintf(stderr, "redraw_needed: 0\n");
+
@@ -732,7 +886,7 @@
+ this->osd_buffer_size = this->cur_size;
+ }
+
-+ n = _x_read_abort (this->stream, this->fh_control, (char *)this->osd_buffer, this->cur_size);
++ n = vdr_read_abort (this->stream, this->fh_control, (char *)this->osd_buffer, this->cur_size);
+ if (n != this->cur_size)
+ return -1;
+
@@ -755,7 +909,7 @@
+ if (((data->num + 1) * sizeof (uint32_t)) != this->cur_size)
+ return -1;
+
-+ n = _x_read_abort (this->stream, this->fh_control, (char *)&vdr_color[ data->index ], this->cur_size);
++ n = vdr_read_abort (this->stream, this->fh_control, (char *)&vdr_color[ data->index ], this->cur_size);
+ if (n != this->cur_size)
+ return -1;
+
@@ -812,7 +966,7 @@
+ return -1;
+ }
+
-+ n = _x_read_abort (this->stream, this->fh_control, file_name, file_name_len);
++ n = vdr_read_abort (this->stream, this->fh_control, file_name, file_name_len);
+ if (n != file_name_len)
+ return -1;
+
@@ -836,16 +990,19 @@
+ READ_DATA_OR_FAIL(clear, lprintf("got CLEAR\n"));
+
+ {
++fprintf(stderr, "+++ CLEAR(%d)\n", data->n);
+/*
+ if (!this->dont_change_xine_volume)
+ xine_set_param(this->stream, XINE_PARAM_AUDIO_VOLUME, 0);
+*/
+ _x_demux_flush_engine(this->stream);
++ _x_demux_seek(this->stream, 0, 0, 0);
+ _x_trigger_relaxed_frame_drop_mode(this->stream);
+/*
+ if (!this->dont_change_xine_volume)
+ xine_set_param(this->stream, XINE_PARAM_AUDIO_VOLUME, this->last_volume);
+*/
++fprintf(stderr, "--- CLEAR(%d)\n", data->n);
+ }
+ }
+ break;
@@ -858,6 +1015,14 @@
+ }
+ break;
+
++ case func_still_frame:
++ {
++ READ_DATA_OR_FAIL(still_frame, lprintf("got STILL FRAME\n"));
++
++ _x_reset_relaxed_frame_drop_mode(this->stream);
++ }
++ break;
++
+ case func_set_video_window:
+ {
+ READ_DATA_OR_FAIL(set_video_window, lprintf("got SET VIDEO WINDOW\n"));
@@ -895,7 +1060,7 @@
+ buf_element_t *buf = this->stream->video_fifo->buffer_pool_alloc(this->stream->video_fifo);
+ if (!buf)
+ {
-+ xprintf(this->stream->xine, XINE_VERBOSITY_LOG, _("VDR: buffer_pool_alloc() failed!\n"));
++ xprintf(this->stream->xine, XINE_VERBOSITY_LOG, _(LOG_MODULE ": buffer_pool_alloc() failed!\n"));
+ return -1;
+ }
+
@@ -906,6 +1071,9 @@
+ }
+
+ {
++ double _t1, _t2;
++ int _n = 0;
++
+ int vb = -1, ab = -1, vf = -1, af = -1;
+
+ uint8_t timed_out = 0;
@@ -926,6 +1094,8 @@
+ then.tv_sec += 1;
+ }
+ }
++
++ _t1 = _now();
+
+ while (1)
+ {
@@ -941,15 +1111,20 @@
+ break;
+ }
+
-+ sched_yield();
++// sched_yield();
++ xine_usec_sleep(5000);
++ _n++;
+
+ if (data->ms_timeout >= 0)
+ gettimeofday(&now, 0);
+ }
++
++ _t2 = _now();
++ fprintf(stderr, "vdr: flush: n: %d, %.1lf\n", _n, _t2 - _t1);
+
+ xprintf(this->stream->xine
+ , XINE_VERBOSITY_LOG
-+ , _("VDR: flush buffers (vb: %d, ab: %d, vf: %d, af: %d) %s.\n")
++ , _(LOG_MODULE ": flush buffers (vb: %d, ab: %d, vf: %d, af: %d) %s.\n")
+ , vb, ab, vf, af
+ , (timed_out ? "timed out" : "done"));
+
@@ -960,7 +1135,7 @@
+
+ result_flush.timed_out = timed_out;
+
-+ if (sizeof (result_flush) != xwrite(this->fh_result, &result_flush, sizeof (result_flush)))
++ if (sizeof (result_flush) != vdr_write(this->fh_result, &result_flush, sizeof (result_flush)))
+ return -1;
+ }
+ }
@@ -1068,6 +1243,7 @@
+ READ_DATA_OR_FAIL(start, lprintf("got START\n"));
+
+ _x_demux_control_start(this->stream);
++ _x_demux_seek(this->stream, 0, 0, 0);
+ }
+ break;
+
@@ -1157,9 +1333,9 @@
+ result_grab_image.ratio = ratio_code;
+ result_grab_image.format = format;
+
-+ if (sizeof (result_grab_image) == xwrite(this->fh_result, &result_grab_image, sizeof (result_grab_image)))
++ if (sizeof (result_grab_image) == vdr_write(this->fh_result, &result_grab_image, sizeof (result_grab_image)))
+ {
-+ if (frame_size == xwrite(this->fh_result, img, frame_size))
++ if (frame_size == vdr_write(this->fh_result, img, frame_size))
+ ret_val = 0;
+ }
+ }
@@ -1184,7 +1360,7 @@
+
+ result_get_pts.pts = xine_get_current_vpts(this->stream) - this->stream->metronom->get_option(this->stream->metronom, METRONOM_VPTS_OFFSET);
+
-+ if (sizeof (result_get_pts) != xwrite(this->fh_result, &result_get_pts, sizeof (result_get_pts)))
++ if (sizeof (result_get_pts) != vdr_write(this->fh_result, &result_get_pts, sizeof (result_get_pts)))
+ return -1;
+ }
+ }
@@ -1229,7 +1405,7 @@
+ result_video_size.height = this->frame_size.h;
+ }
+
-+ if (sizeof (result_video_size) != xwrite(this->fh_result, &result_video_size, sizeof (result_video_size)))
++ if (sizeof (result_video_size) != vdr_write(this->fh_result, &result_video_size, sizeof (result_video_size)))
+ return -1;
+ }
+ }
@@ -1237,22 +1413,50 @@
+
+ case func_reset_audio:
+ {
-+ READ_DATA_OR_FAIL(reset_audio, printf("got RESET AUDIO\n"));
++ double _t1, _t2;
++ int _n = 0;
++
++ READ_DATA_OR_FAIL(reset_audio, lprintf("got RESET AUDIO\n"));
+
-+ xine_set_param(this->stream, XINE_PARAM_IGNORE_AUDIO, 1);
-+ xine_set_param(this->stream, XINE_PARAM_AUDIO_CHANNEL_LOGICAL, -2);
++ if (this->stream->audio_fifo)
++ {
++ xine_set_param(this->stream, XINE_PARAM_IGNORE_AUDIO, 1);
++ xine_set_param(this->stream, XINE_PARAM_AUDIO_CHANNEL_LOGICAL, -2);
+
-+ while (1)
-+ {
-+ int n = xine_get_stream_info(this->stream, XINE_STREAM_INFO_MAX_AUDIO_CHANNEL);
-+ if (n <= 0)
-+ break;
++ _t1 = _now();
+
-+ sched_yield();
++ while (1)
++ {
++ int n = xine_get_stream_info(this->stream, XINE_STREAM_INFO_MAX_AUDIO_CHANNEL);
++ if (n <= 0)
++ break;
++
++ // keep the decoder running
++ if (this->stream->audio_fifo)
++ {
++ buf_element_t *buf = this->stream->audio_fifo->buffer_pool_alloc(this->stream->audio_fifo);
++ if (!buf)
++ {
++ xprintf(this->stream->xine, XINE_VERBOSITY_LOG, _(LOG_MODULE ": buffer_pool_alloc() failed!\n"));
++ return -1;
++ }
++
++ buf->type = BUF_CONTROL_NOP;
++
++ this->stream->audio_fifo->put(this->stream->audio_fifo, buf);
++ }
++
++// sched_yield();
++ xine_usec_sleep(5000);
++ _n++;
++ }
++
++ _t2 = _now();
++ fprintf(stderr, "vdr: reset_audio: n: %d, %.1lf\n", _n, _t2 - _t1);
++
++ xine_set_param(this->stream, XINE_PARAM_AUDIO_CHANNEL_LOGICAL, -1);
++ xine_set_param(this->stream, XINE_PARAM_IGNORE_AUDIO, 0);
+ }
-+
-+ xine_set_param(this->stream, XINE_PARAM_AUDIO_CHANNEL_LOGICAL, -1);
-+ xine_set_param(this->stream, XINE_PARAM_IGNORE_AUDIO, 0);
+ }
+ break;
+
@@ -1268,60 +1472,86 @@
+
+ while (skip > BUF_SIZE)
+ {
-+ n = _x_read_abort(this->stream, this->fh_control, this->seek_buf, BUF_SIZE);
++ n = vdr_read_abort(this->stream, this->fh_control, this->seek_buf, BUF_SIZE);
+ if (n != BUF_SIZE)
+ return -1;
+
+ skip -= BUF_SIZE;
+ }
+
-+ n = _x_read_abort(this->stream, this->fh_control, this->seek_buf, skip);
++ n = vdr_read_abort(this->stream, this->fh_control, this->seek_buf, skip);
+ if (n != skip)
+ return -1;
+
+ this->cur_done = this->cur_size;
++
++ return -1;
+ }
+
-+ goto retry;
-+
-+ return -1;
++ return 0;
+}
+
-+
-+
-+static void *vdr_plugin_control_loop(void *arg)
++static void *vdr_rpc_thread_loop(void *arg)
+{
+ vdr_input_plugin_t *this = (vdr_input_plugin_t *)arg;
-+
-+ off_t length;
-+ char buffer[ 1000 ];
++ int frontend_lock_failures = 0;
++ int failed = 0;
+
-+ while (1)
++ while (!failed
++ && !this->rpc_thread_shutdown)
+ {
-+ /*
-+ * System calls are not a thread cancellation point in Linux
-+ * pthreads. However, the RT signal sent to cancel the thread
-+ * will cause recv() to return with EINTR, and we can manually
-+ * check cancellation.
-+ */
-+ pthread_testcancel();
-+ length = internal_read(this, buffer, sizeof (buffer));
-+ pthread_testcancel();
-+
-+ if (length < 0)
++ struct timeval timeout;
++ fd_set rset;
++
++ FD_ZERO(&rset);
++ FD_SET(this->fh_control, &rset);
++
++ timeout.tv_sec = 0;
++ timeout.tv_usec = 50000;
++
++ if (select(this->fh_control + 1, &rset, NULL, NULL, &timeout) > 0)
+ {
-+ if (errno != EINTR)
++ if (!_x_lock_frontend(this->stream, 100))
+ {
-+ xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
-+ _("read(): %s.\n"), strerror(errno));
-+ return NULL;
++ if (++frontend_lock_failures > 50)
++ {
++ failed = 1;
++ xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
++ LOG_MODULE ": locking frontend for rpc command execution failed, exiting ...\n");
++ }
+ }
++ else
++ {
++ frontend_lock_failures = 0;
++
++ if (vdr_execute_rpc_command(this) < 0)
++ {
++ failed = 1;
++ xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
++ LOG_MODULE ": execution of rpc command %d (%s) failed, exiting ...\n", this->cur_func, "");
++ }
++
++ _x_unlock_frontend(this->stream);
++ }
+ }
-+ else
-+ {
-+ lprintf("read %lld bytes\n", length);
-+ }
+ }
++
++ // close control and result channel here to have vdr-xine initiate a disconnect for the above error case ...
++ close(this->fh_control);
++ this->fh_control = -1;
++
++ close(this->fh_result);
++ this->fh_result = -1;
++
++ xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
++ LOG_MODULE ": rpc thread done.\n");
++
++ pthread_mutex_lock(&this->rpc_thread_shutdown_lock);
++ this->rpc_thread_shutdown = -1;
++ pthread_cond_broadcast(&this->rpc_thread_shutdown_cond);
++ pthread_mutex_unlock(&this->rpc_thread_shutdown_lock);
++
++ return 0;
+}
+
+static int internal_write_event_key(vdr_input_plugin_t *this, uint32_t key)
@@ -1332,7 +1562,7 @@
+
+ event.key = key;
+
-+ if (sizeof (event) != xwrite(this->fh_event, &event, sizeof (event)))
++ if (sizeof (event) != vdr_write(this->fh_event, &event, sizeof (event)))
+ return -1;
+
+ return 0;
@@ -1349,7 +1579,7 @@
+ event.width = this->frame_size.w,
+ event.height = this->frame_size.h;
+
-+ if (sizeof (event) != xwrite(this->fh_event, &event, sizeof (event)))
++ if (sizeof (event) != vdr_write(this->fh_event, &event, sizeof (event)))
+ return -1;
+
+ return 0;
@@ -1363,7 +1593,7 @@
+
+ event.key = key;
+
-+ if (sizeof (event) != xwrite(this->fh_event, &event, sizeof (event)))
++ if (sizeof (event) != vdr_write(this->fh_event, &event, sizeof (event)))
+ return -1;
+
+ return 0;
@@ -1375,7 +1605,7 @@
+ vdr_input_plugin_t *this = (vdr_input_plugin_t *) this_gen;
+ off_t n, total;
+#ifdef LOG_READ
-+ lprintf ("vdr: reading %lld bytes...\n", len);
++ lprintf ("reading %lld bytes...\n", len);
+#endif
+ total=0;
+ if (this->curpos < this->preview_size)
@@ -1384,7 +1614,7 @@
+ if (n > (len - total))
+ n = len - total;
+#ifdef LOG_READ
-+ lprintf ("vdr: %lld bytes from preview (which has %lld bytes)\n",
++ lprintf ("%lld bytes from preview (which has %lld bytes)\n",
+ n, this->preview_size);
+#endif
+ memcpy (&buf[total], &this->preview[this->curpos], n);
@@ -1397,17 +1627,16 @@
+ int retries = 0;
+ do
+ {
-+ n = _x_read_abort (this->stream, this->fh, &buf[total], len-total);
-+
++ n = vdr_read_abort (this->stream, this->fh, &buf[total], len-total);
+ if (0 == n)
-+ lprintf("vdr: read 0, retries: %d\n", retries);
++ lprintf("read 0, retries: %d\n", retries);
+ }
+ while (0 == n
+ && !this->stream_external
+ && _x_continue_stream_processing(this->stream)
+ && 200 > retries++); /* 200 * 50ms */
+#ifdef LOG_READ
-+ lprintf ("vdr: got %lld bytes (%lld/%lld bytes read)\n",
++ lprintf ("got %lld bytes (%lld/%lld bytes read)\n",
+ n,total,len);
+#endif
+ if (n < 0)
@@ -1451,7 +1680,7 @@
+{
+ vdr_input_plugin_t *this = (vdr_input_plugin_t *)this_gen;
+
-+ lprintf("vdr: seek %lld offset, %d origin...\n",
++ lprintf("seek %lld offset, %d origin...\n",
+ offset, origin);
+
+ if ((origin == SEEK_CUR) && (offset >= 0))
@@ -1472,7 +1701,7 @@
+ if (this->curpos <= this->preview_size)
+ this->curpos = offset;
+ else
-+ lprintf("vdr: cannot seek back! (%lld > %lld)\n", this->curpos, offset);
++ lprintf("cannot seek back! (%lld > %lld)\n", this->curpos, offset);
+ }
+ else
+ {
@@ -1531,14 +1760,50 @@
+ if (this->event_queue)
+ xine_event_dispose_queue(this->event_queue);
+
-+ if (this->thread_control)
++ if (this->rpc_thread)
+ {
-+ xprintf(this->stream->xine, XINE_VERBOSITY_LOG, _("VDR: stopping control thread...\n"));
-+ pthread_cancel(this->thread_control);
-+ pthread_join(this->thread_control, NULL);
-+ xprintf(this->stream->xine, XINE_VERBOSITY_LOG, _("VDR: control thread terminated\n"));
++ struct timespec abstime;
++ int ms_to_time_out = 10000;
++
++ xprintf(this->stream->xine, XINE_VERBOSITY_LOG, _(LOG_MODULE ": shutting down rpc thread (timeout: %d ms) ...\n"), ms_to_time_out);
++
++ pthread_mutex_lock(&this->rpc_thread_shutdown_lock);
++
++ if (this->rpc_thread_shutdown > -1)
++ {
++ this->rpc_thread_shutdown = 1;
++
++ {
++ struct timeval now;
++ gettimeofday(&now, 0);
++
++ abstime.tv_sec = now.tv_sec + ms_to_time_out / 1000;
++ abstime.tv_nsec = now.tv_usec * 1000 + (ms_to_time_out % 1000) * 1e6;
++
++ if (abstime.tv_nsec > 1e9)
++ {
++ abstime.tv_nsec -= 1e9;
++ abstime.tv_sec++;
++ }
++ }
++
++ if (0 != pthread_cond_timedwait(&this->rpc_thread_shutdown_cond, &this->rpc_thread_shutdown_lock, &abstime))
++ {
++ xprintf(this->stream->xine, XINE_VERBOSITY_LOG, _(LOG_MODULE ": cancelling rpc thread ...\n"));
++ pthread_cancel(this->rpc_thread);
++ }
++ }
++
++ pthread_mutex_unlock(&this->rpc_thread_shutdown_lock);
++
++ xprintf(this->stream->xine, XINE_VERBOSITY_LOG, _(LOG_MODULE ": joining rpc thread ...\n"));
++ pthread_join(this->rpc_thread, 0);
++ xprintf(this->stream->xine, XINE_VERBOSITY_LOG, _(LOG_MODULE ": rpc thread joined.\n"));
+ }
+
++ pthread_cond_destroy(&this->rpc_thread_shutdown_cond);
++ pthread_mutex_destroy(&this->rpc_thread_shutdown_lock);
++
+ if (this->fh_result != -1)
+ close(this->fh_result);
+
@@ -1587,7 +1852,7 @@
+{
+ vdr_input_plugin_t *this = (vdr_input_plugin_t *)this_gen;
+
-+ lprintf("input_vdr: trying to open '%s'...\n", this->mrl);
++ lprintf("trying to open '%s'...\n", this->mrl);
+
+ if (this->fh == -1)
+ {
@@ -1597,12 +1862,12 @@
+ filename = (char *)&this->mrl[ 4 ];
+ this->fh = open(filename, O_RDONLY | O_NONBLOCK);
+
-+ lprintf("input_vdr: filename '%s'\n", filename);
++ lprintf("filename '%s'\n", filename);
+
+ if (this->fh == -1)
+ {
+ xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
-+ _("vdr: failed to open '%s' (%s)\n"),
++ _(LOG_MODULE ": failed to open '%s' (%s)\n"),
+ filename,
+ strerror(errno));
+
@@ -1616,7 +1881,7 @@
+ if (1 != r)
+ {
+ xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
-+ _("vdr: failed to open '%s' (%s)\n"),
++ _(LOG_MODULE ": failed to open '%s' (%s)\n"),
+ filename,
+ _("timeout expired during setup phase"));
+
@@ -1634,7 +1899,7 @@
+
+ if (this->fh_control == -1) {
+ xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
-+ _("vdr: failed to open '%s' (%s)\n"),
++ _(LOG_MODULE ": failed to open '%s' (%s)\n"),
+ filename_control,
+ strerror(errno));
+
@@ -1655,7 +1920,7 @@
+ perror("failed");
+
+ xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
-+ _("vdr: failed to open '%s' (%s)\n"),
++ _(LOG_MODULE ": failed to open '%s' (%s)\n"),
+ filename_result,
+ strerror(errno));
+
@@ -1676,7 +1941,7 @@
+ perror("failed");
+
+ xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
-+ _("vdr: failed to open '%s' (%s)\n"),
++ _(LOG_MODULE ": failed to open '%s' (%s)\n"),
+ filename_event,
+ strerror(errno));
+
@@ -1687,11 +1952,12 @@
+ free(filename_event);
+ }
+
-+ if ((err = pthread_create(&this->thread_control, NULL,
-+ vdr_plugin_control_loop, (void *)this)) != 0)
++ this->rpc_thread_shutdown = 0;
++ if ((err = pthread_create(&this->rpc_thread, NULL,
++ vdr_rpc_thread_loop, (void *)this)) != 0)
+ {
+ xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
-+ _("vdr: can't create new thread (%s)\n"),
++ _(LOG_MODULE ": can't create new thread (%s)\n"),
+ strerror(err));
+
+ return 0;
@@ -1729,7 +1995,7 @@
+
+ if (0 != internal_write_event_frame_size(this))
+ xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
-+ _("input event write: %s.\n"), strerror(errno));
++ _(LOG_MODULE ": input event write: %s.\n"), strerror(errno));
+
+ return;
+ }
@@ -1784,13 +2050,14 @@
+ case XINE_EVENT_VDR_VOLPLUS: key = key_volume_plus; break;
+ case XINE_EVENT_VDR_VOLMINUS: key = key_volume_minus; break;
+ case XINE_EVENT_VDR_MUTE: key = key_mute; break;
++ case XINE_EVENT_VDR_AUDIO: key = key_audio; break;
+ default:
+ return;
+ }
+
+ if (0 != internal_write_event_key(this, key))
+ xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
-+ _("input event write: %s.\n"), strerror(errno));
++ _(LOG_MODULE ": input event write: %s.\n"), strerror(errno));
+}
+
+static input_plugin_t *vdr_class_get_instance(input_class_t *cls_gen, xine_stream_t *stream,
@@ -1825,7 +2092,6 @@
+ this->fh_result = -1;
+ this->fh_event = -1;
+
-+
+ this->input_plugin.open = vdr_plugin_open;
+ this->input_plugin.get_capabilities = vdr_plugin_get_capabilities;
+ this->input_plugin.read = vdr_plugin_read;
@@ -1856,11 +2122,13 @@
+ this->frame_size.w = 0;
+ this->frame_size.h = 0;
+
-+ this->event_queue = xine_event_new_queue(this->stream);
-+
+ this->stream_external = 0;
+ this->event_queue_external = 0;
+
++ pthread_mutex_init(&this->rpc_thread_shutdown_lock, 0);
++ pthread_cond_init(&this->rpc_thread_shutdown_cond, 0);
++
++ this->event_queue = xine_event_new_queue(this->stream);
+ if (this->event_queue)
+ xine_event_create_listener_thread(this->event_queue, event_handler, this);
+
@@ -1931,10 +2199,10 @@
+ { PLUGIN_INPUT, 15, "VDR", XINE_VERSION_CODE, NULL, init_class },
+ { PLUGIN_NONE, 0, "", 0, NULL, NULL }
+};
-diff -urNad xine-lib-vdr-1.0/src/vdr/input_vdr.h /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/src/vdr/input_vdr.h
+diff -urNad xine-lib-vdr-1.0/src/vdr/input_vdr.h /tmp/dpep.gJYg3C/xine-lib-vdr-1.0/src/vdr/input_vdr.h
--- xine-lib-vdr-1.0/src/vdr/input_vdr.h 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/src/vdr/input_vdr.h 2005-02-12 22:01:43.000000000 +0000
-@@ -0,0 +1,512 @@
++++ /tmp/dpep.gJYg3C/xine-lib-vdr-1.0/src/vdr/input_vdr.h 2005-04-11 23:44:43.808804190 +0100
+@@ -0,0 +1,525 @@
+
+#ifndef __INPUT_VDR_H
+#define __INPUT_VDR_H
@@ -1965,6 +2233,7 @@
+ , func_get_pts
+ , func_flush
+ , func_first_frame
++ , func_still_frame
+ , func_video_size
+ , func_set_video_window
+ , func_osd_flush
@@ -2025,6 +2294,7 @@
+ key_user7,
+ key_user8,
+ key_user9,
++ key_audio,
+};
+
+
@@ -2173,6 +2443,8 @@
+typedef struct __attribute__((packed)) data_clear_s
+{
+ data_header_t header;
++
++ int32_t n;
+}
+data_clear_t;
+
@@ -2271,6 +2543,14 @@
+
+
+
++typedef struct __attribute__((packed)) data_still_frame_s
++{
++ data_header_t header;
++}
++data_still_frame_t;
++
++
++
+typedef struct __attribute__((packed)) data_set_video_window_s
+{
+ data_header_t header;
@@ -2412,6 +2692,7 @@
+ data_grab_image_t grab_image;
+ data_get_pts_t get_pts;
+ data_first_frame_t first_frame;
++ data_still_frame_t still_frame;
+ data_video_size_t video_size;
+ data_set_video_window_t set_video_window;
+ data_osd_flush_t osd_flush;
@@ -2447,10 +2728,10 @@
+
+#endif /* __INPUT_VDR_H */
+
-diff -urNad xine-lib-vdr-1.0/src/vdr/post_vdr.c /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/src/vdr/post_vdr.c
+diff -urNad xine-lib-vdr-1.0/src/vdr/post_vdr.c /tmp/dpep.gJYg3C/xine-lib-vdr-1.0/src/vdr/post_vdr.c
--- xine-lib-vdr-1.0/src/vdr/post_vdr.c 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/src/vdr/post_vdr.c 2005-02-12 22:01:43.000000000 +0000
-@@ -0,0 +1,492 @@
++++ /tmp/dpep.gJYg3C/xine-lib-vdr-1.0/src/vdr/post_vdr.c 2005-04-11 23:44:43.809804109 +0100
+@@ -0,0 +1,499 @@
+/*
+ * Copyright (C) 2000-2004 the xine project
+ *
@@ -2488,7 +2769,6 @@
+ post_plugin_t post_plugin;
+
+ xine_event_queue_t *event_queue;
-+ xine_stream_t *current_stream;
+ xine_stream_t *vdr_stream;
+
+ int8_t enabled;
@@ -2595,7 +2875,6 @@
+ vdr_singleton = this;
+
+ this->enabled = 0;
-+ this->current_stream = 0;
+ this->vdr_stream = 0;
+ this->event_queue = 0;
+ this->old_frame_left = 0;
@@ -2630,9 +2909,6 @@
+
+ vdr_singleton = 0;
+
-+ if (this->event_queue)
-+ xine_event_dispose_queue(this->event_queue);
-+
+ if (this->vdr_stream)
+ {
+ xine_event_t event;
@@ -2648,6 +2924,8 @@
+ event.data_length = sizeof (event_data);
+
+ xine_event_send(this->vdr_stream, &event);
++
++ xine_event_dispose_queue(this->event_queue);
+ }
+
+ free(this_gen);
@@ -2657,7 +2935,8 @@
+
+static int vdr_intercept_frame(post_video_port_t *port, vo_frame_t *frame)
+{
-+ return (frame->format == XINE_IMGFMT_YV12 || frame->format == XINE_IMGFMT_YUY2);
++ return (frame->format == XINE_IMGFMT_YUY2
++ || frame->format == XINE_IMGFMT_YV12);
+}
+
+
@@ -2807,7 +3086,6 @@
+ if (input_class->get_identifier)
+ {
+ const char *identifier = input_class->get_identifier(input_class);
-+
+ if (identifier
+ && 0 == strcmp(identifier, "VDR"))
+ {
@@ -2828,22 +3106,28 @@
+ xine_event_t *event;
+ int skip;
+
-+ if (this->current_stream != stream)
++ if (this->vdr_stream
++ && !_x_continue_stream_processing(this->vdr_stream))
+ {
-+ this->current_stream = stream;
++ this->vdr_stream = 0;
+
-+ if (this->vdr_stream != this->current_stream
-+ && vdr_is_vdr_stream(this->current_stream))
-+ {
-+ this->vdr_stream = this->current_stream;
-+
-+ if (this->event_queue)
-+ xine_event_dispose_queue(this->event_queue);
-+
-+ this->event_queue = xine_event_new_queue(this->vdr_stream);
-+ }
++ xine_event_dispose_queue(this->event_queue);
++ this->event_queue = 0;
++
++ this->old_frame_left = 0;
++ this->old_frame_top = 0;
++ this->old_frame_width = 0;
++ this->old_frame_height = 0;
+ }
-+
++
++ if (!this->vdr_stream
++ && vdr_is_vdr_stream(stream))
++ {
++ this->event_queue = xine_event_new_queue(stream);
++ if (this->event_queue)
++ this->vdr_stream = stream;
++ }
++
+ if (this->event_queue)
+ {
+ while ((event = xine_event_get(this->event_queue)))
@@ -2868,11 +3152,11 @@
+ if (frame_left < 0)
+ frame_left = 0;
+ if (frame_width > frame->width)
-+ frame_width = frame_width;
++ frame_width = frame->width;
+ if (frame_top < 0)
+ frame_top = 0;
+ if (frame_height > frame->height)
-+ frame_height = frame_height;
++ frame_height = frame->height;
+
+ if (this->vdr_stream
+ && (this->old_frame_left != frame_left
@@ -2888,6 +3172,7 @@
+ event_data.w = frame_width;
+ event_data.h = frame_height;
+
++fprintf(stderr, "osd: (%d, %d)-(%d, %d)\n", frame_left, frame_top, frame_width, frame_height);
+ event.type = XINE_EVENT_VDR_FRAMESIZECHANGED;
+ event.data = &event_data;
+ event.data_length = sizeof (event_data);
@@ -2901,7 +3186,10 @@
+ }
+ }
+
-+ if (!this->enabled || frame->bad_frame)
++ if (!this->enabled
++ || frame->bad_frame
++ || (frame->format != XINE_IMGFMT_YUY2
++ && frame->format != XINE_IMGFMT_YV12))
+ {
+ _x_post_frame_copy_down(frame, frame->next);
+ skip = frame->next->draw(frame->next, stream);
@@ -2943,9 +3231,9 @@
+ { PLUGIN_NONE, 0, "", 0, NULL, NULL }
+};
+
-diff -urNad xine-lib-vdr-1.0/src/vdr/post_vdr.h /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/src/vdr/post_vdr.h
+diff -urNad xine-lib-vdr-1.0/src/vdr/post_vdr.h /tmp/dpep.gJYg3C/xine-lib-vdr-1.0/src/vdr/post_vdr.h
--- xine-lib-vdr-1.0/src/vdr/post_vdr.h 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/src/vdr/post_vdr.h 2005-02-12 22:01:43.000000000 +0000
++++ /tmp/dpep.gJYg3C/xine-lib-vdr-1.0/src/vdr/post_vdr.h 2005-04-11 23:44:43.810804028 +0100
@@ -0,0 +1,30 @@
+
+#ifndef __POST_VDR_H
@@ -2977,9 +3265,9 @@
+
+#endif /* __POST_VDR_H */
+
-diff -urNad xine-lib-vdr-1.0/src/xine-engine/post.c /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/src/xine-engine/post.c
---- xine-lib-vdr-1.0/src/xine-engine/post.c 2004-10-17 20:14:30.000000000 +0100
-+++ /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/src/xine-engine/post.c 2005-02-12 22:01:43.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/xine-engine/post.c /tmp/dpep.gJYg3C/xine-lib-vdr-1.0/src/xine-engine/post.c
+--- xine-lib-vdr-1.0/src/xine-engine/post.c 2005-04-03 00:03:00.000000000 +0100
++++ /tmp/dpep.gJYg3C/xine-lib-vdr-1.0/src/xine-engine/post.c 2005-04-11 23:44:43.800804838 +0100
@@ -241,7 +241,7 @@
if (!*input) return port;
(*input)->xine_in.name = "video in";
@@ -3027,9 +3315,20 @@
(*output)->xine_out.rewire = post_audio_rewire;
(*output)->post = post;
(*output)->user_data = port;
-diff -urNad xine-lib-vdr-1.0/src/xine-engine/video_overlay.h /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/src/xine-engine/video_overlay.h
---- xine-lib-vdr-1.0/src/xine-engine/video_overlay.h 2004-12-08 18:18:24.000000000 +0000
-+++ /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/src/xine-engine/video_overlay.h 2005-02-12 22:01:43.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/xine-engine/video_out.c /tmp/dpep.gJYg3C/xine-lib-vdr-1.0/src/xine-engine/video_out.c
+--- xine-lib-vdr-1.0/src/xine-engine/video_out.c 2004-12-12 22:01:32.000000000 +0000
++++ /tmp/dpep.gJYg3C/xine-lib-vdr-1.0/src/xine-engine/video_out.c 2005-04-11 23:44:43.801804757 +0100
+@@ -500,6 +500,7 @@
+ vo_append_to_img_buf_queue (this->display_img_buf_queue, img);
+
+ } else {
++ fprintf (stderr, "bad_frame\n");
+ lprintf ("bad_frame\n");
+
+ if (stream) {
+diff -urNad xine-lib-vdr-1.0/src/xine-engine/video_overlay.h /tmp/dpep.gJYg3C/xine-lib-vdr-1.0/src/xine-engine/video_overlay.h
+--- xine-lib-vdr-1.0/src/xine-engine/video_overlay.h 2005-04-03 00:03:00.000000000 +0100
++++ /tmp/dpep.gJYg3C/xine-lib-vdr-1.0/src/xine-engine/video_overlay.h 2005-04-11 23:44:43.802804676 +0100
@@ -38,7 +38,7 @@
#define MAX_OBJECTS 50
@@ -3039,10 +3338,171 @@
#define OVERLAY_EVENT_NULL 0
#define OVERLAY_EVENT_SHOW 1
-diff -urNad xine-lib-vdr-1.0/src/xine-engine/xine.c /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/src/xine-engine/xine.c
---- xine-lib-vdr-1.0/src/xine-engine/xine.c 2005-02-12 22:01:42.000000000 +0000
-+++ /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/src/xine-engine/xine.c 2005-02-12 22:01:43.000000000 +0000
-@@ -1923,3 +1923,48 @@
+diff -urNad xine-lib-vdr-1.0/src/xine-engine/xine.c /tmp/dpep.gJYg3C/xine-lib-vdr-1.0/src/xine-engine/xine.c
+--- xine-lib-vdr-1.0/src/xine-engine/xine.c 2005-04-11 23:44:36.075430872 +0100
++++ /tmp/dpep.gJYg3C/xine-lib-vdr-1.0/src/xine-engine/xine.c 2005-04-11 23:44:43.804804514 +0100
+@@ -35,6 +35,7 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <pthread.h>
++#include <errno.h>
+ #include <stdarg.h>
+ #if defined (__linux__)
+ #include <endian.h>
+@@ -301,7 +302,7 @@
+
+ void xine_stop (xine_stream_t *stream) {
+
+- pthread_mutex_lock (&stream->frontend_lock);
++ _x_rmutex_lock (&stream->frontend_lock);
+
+ stream->ignore_speed_change = 1;
+ stream->xine->port_ticket->acquire(stream->xine->port_ticket, 1);
+@@ -324,7 +325,7 @@
+ stream->xine->port_ticket->release(stream->xine->port_ticket, 1);
+ stream->ignore_speed_change = 0;
+
+- pthread_mutex_unlock (&stream->frontend_lock);
++ _x_rmutex_unlock (&stream->frontend_lock);
+ }
+
+
+@@ -388,7 +389,7 @@
+
+ void xine_close (xine_stream_t *stream) {
+
+- pthread_mutex_lock (&stream->frontend_lock);
++ _x_rmutex_lock (&stream->frontend_lock);
+
+ close_internal (stream);
+
+@@ -402,7 +403,7 @@
+ if (stream->status != XINE_STATUS_QUIT)
+ stream->status = XINE_STATUS_IDLE;
+
+- pthread_mutex_unlock (&stream->frontend_lock);
++ _x_rmutex_unlock (&stream->frontend_lock);
+ }
+
+ static int stream_rewire_audio(xine_post_out_t *output, void *data)
+@@ -524,7 +525,7 @@
+ pthread_mutex_init (&stream->info_mutex, NULL);
+ pthread_mutex_init (&stream->meta_mutex, NULL);
+ pthread_mutex_init (&stream->demux_lock, NULL);
+- pthread_mutex_init (&stream->frontend_lock, NULL);
++ _x_rmutex_init (&stream->frontend_lock);
+ pthread_mutex_init (&stream->event_queues_lock, NULL);
+ pthread_mutex_init (&stream->counter_lock, NULL);
+ pthread_cond_init (&stream->counter_changed, NULL);
+@@ -1069,13 +1070,13 @@
+
+ int ret;
+
+- pthread_mutex_lock (&stream->frontend_lock);
++ _x_rmutex_lock (&stream->frontend_lock);
+
+ lprintf ("open MRL:%s\n", mrl);
+
+ ret = open_internal (stream, mrl);
+
+- pthread_mutex_unlock (&stream->frontend_lock);
++ _x_rmutex_unlock (&stream->frontend_lock);
+
+ return ret;
+ }
+@@ -1201,13 +1202,13 @@
+
+ int ret;
+
+- pthread_mutex_lock (&stream->frontend_lock);
++ _x_rmutex_lock (&stream->frontend_lock);
+
+ ret = play_internal (stream, start_pos, start_time);
+ if( stream->slave && (stream->slave_affection & XINE_MASTER_SLAVE_PLAY) )
+ xine_play (stream->slave, start_pos, start_time);
+
+- pthread_mutex_unlock (&stream->frontend_lock);
++ _x_rmutex_unlock (&stream->frontend_lock);
+
+ return ret;
+ }
+@@ -1219,7 +1220,7 @@
+ if (!stream->eject_class)
+ return 0;
+
+- pthread_mutex_lock (&stream->frontend_lock);
++ _x_rmutex_lock (&stream->frontend_lock);
+
+ status = 0;
+ /* only eject, if we are stopped OR a different input plugin is playing */
+@@ -1230,7 +1231,7 @@
+ status = stream->eject_class->eject_media (stream->eject_class);
+ }
+
+- pthread_mutex_unlock (&stream->frontend_lock);
++ _x_rmutex_unlock (&stream->frontend_lock);
+ return status;
+ }
+
+@@ -1241,7 +1242,7 @@
+ lprintf("stream: %p\n", stream);
+ pthread_mutex_destroy (&stream->info_mutex);
+ pthread_mutex_destroy (&stream->meta_mutex);
+- pthread_mutex_destroy (&stream->frontend_lock);
++ _x_rmutex_destroy (&stream->frontend_lock);
+ pthread_mutex_destroy (&stream->counter_lock);
+ pthread_mutex_destroy (&stream->event_queues_lock);
+ pthread_mutex_destroy (&stream->current_extra_info_lock);
+@@ -1548,7 +1549,7 @@
+
+ void _x_select_spu_channel (xine_stream_t *stream, int channel) {
+
+- pthread_mutex_lock (&stream->frontend_lock);
++ _x_rmutex_lock (&stream->frontend_lock);
+ stream->spu_channel_user = (channel >= -2 ? channel : -2);
+
+ stream->xine->port_ticket->acquire(stream->xine->port_ticket, 0);
+@@ -1573,18 +1574,18 @@
+
+ stream->xine->port_ticket->release(stream->xine->port_ticket, 0);
+
+- pthread_mutex_unlock (&stream->frontend_lock);
++ _x_rmutex_unlock (&stream->frontend_lock);
+ }
+
+ static int get_current_position (xine_stream_t *stream) {
+
+ int pos;
+
+- pthread_mutex_lock (&stream->frontend_lock);
++ _x_rmutex_lock (&stream->frontend_lock);
+
+ if (!stream->input_plugin) {
+ lprintf ("no input source\n");
+- pthread_mutex_unlock (&stream->frontend_lock);
++ _x_rmutex_unlock (&stream->frontend_lock);
+ return -1;
+ }
+
+@@ -1596,7 +1597,7 @@
+ }
+
+ if ( stream->current_extra_info->seek_count != stream->video_seek_count ) {
+- pthread_mutex_unlock (&stream->frontend_lock);
++ _x_rmutex_unlock (&stream->frontend_lock);
+ return -1; /* position not yet known */
+ }
+
+@@ -1604,7 +1605,7 @@
+ pos = stream->current_extra_info->input_normpos;
+ pthread_mutex_unlock( &stream->current_extra_info_lock );
+
+- pthread_mutex_unlock (&stream->frontend_lock);
++ _x_rmutex_unlock (&stream->frontend_lock);
+
+ return pos;
+ }
+@@ -1923,3 +1924,155 @@
slave->master = master->master;
return 1;
}
@@ -3058,6 +3518,11 @@
+ stream->first_frame_flag = 2;
+}
+
++void _x_reset_relaxed_frame_drop_mode(xine_stream_t *stream)
++{
++ stream->first_frame_flag = 1;
++}
++
+void _x_query_buffer_usage(xine_stream_t *stream, int *num_video_buffers, int *num_audio_buffers, int *num_video_frames, int *num_audio_frames)
+{
+ stream->xine->port_ticket->acquire(stream->xine->port_ticket, 0);
@@ -3091,17 +3556,217 @@
+
+ return redraw_needed;
+}
-diff -urNad xine-lib-vdr-1.0/src/xine-engine/xine_internal.h /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/src/xine-engine/xine_internal.h
---- xine-lib-vdr-1.0/src/xine-engine/xine_internal.h 2004-12-19 20:24:31.000000000 +0000
-+++ /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/src/xine-engine/xine_internal.h 2005-02-12 22:01:43.000000000 +0000
-@@ -342,6 +342,11 @@
++
++int _x_demux_seek(xine_stream_t *stream, off_t start_pos, int start_time, int playing)
++{
++ return stream->demux_plugin->seek(stream->demux_plugin, start_pos, start_time, playing);
++}
++
++int _x_lock_frontend(xine_stream_t *stream, int ms_to_time_out)
++{
++ return (0 == _x_rmutex_timedlock(&stream->frontend_lock, ms_to_time_out));
++}
++
++void _x_unlock_frontend(xine_stream_t *stream)
++{
++ _x_rmutex_unlock(&stream->frontend_lock);
++}
++
++int _x_rmutex_init(xine_rmutex_t *rmutex)
++{
++ pthread_mutex_init(&rmutex->access_rmutex, 0);
++ pthread_cond_init(&rmutex->unlock_cond, 0);
++ rmutex->lock_count = 0;
++
++ return 0;
++}
++
++int _x_rmutex_lock(xine_rmutex_t *rmutex)
++{
++ return _x_rmutex_timedlock(rmutex, -1);
++}
++
++#include "assert.h"
++
++int _x_rmutex_timedlock(xine_rmutex_t *rmutex, int ms_to_time_out)
++{
++ int r = 0;
++
++ struct timespec abstime;
++ {
++ struct timeval now;
++ gettimeofday(&now, 0);
++
++ abstime.tv_sec = now.tv_sec + ms_to_time_out / 1000;
++ abstime.tv_nsec = now.tv_usec * 1000 + (ms_to_time_out % 1000) * 1e6;
++
++ if (abstime.tv_nsec > 1e9)
++ {
++ abstime.tv_nsec -= 1e9;
++ abstime.tv_sec++;
++ }
++ }
++
++ pthread_mutex_lock(&rmutex->access_rmutex);
++
++ assert(rmutex->lock_count >= 0);
++
++ while (0 == r
++ && rmutex->lock_count > 0
++ && !pthread_equal(rmutex->lock_owner, pthread_self()))
++ {
++ if (ms_to_time_out < 0)
++ pthread_cond_wait(&rmutex->unlock_cond, &rmutex->access_rmutex);
++ else
++ r = pthread_cond_timedwait(&rmutex->unlock_cond, &rmutex->access_rmutex, &abstime);
++ }
++
++ if (0 == r)
++ {
++ rmutex->lock_owner = pthread_self();
++ rmutex->lock_count++;
++ }
++
++ pthread_mutex_unlock(&rmutex->access_rmutex);
++
++ return r;
++}
++
++int _x_rmutex_unlock(xine_rmutex_t *rmutex)
++{
++ int r = 0;
++
++ pthread_mutex_lock(&rmutex->access_rmutex);
++
++ assert(rmutex->lock_count > 0);
++ assert(pthread_equal(rmutex->lock_owner, pthread_self()));
++
++ rmutex->lock_count--;
++
++ if (rmutex->lock_count == 0)
++ pthread_cond_broadcast(&rmutex->unlock_cond);
++
++ pthread_mutex_unlock(&rmutex->access_rmutex);
++
++ return r;
++}
++
++int _x_rmutex_destroy(xine_rmutex_t *rmutex)
++{
++ pthread_cond_destroy(&rmutex->unlock_cond);
++ pthread_mutex_destroy(&rmutex->access_rmutex);
++
++ return 0;
++}
+diff -urNad xine-lib-vdr-1.0/src/xine-engine/xine_interface.c /tmp/dpep.gJYg3C/xine-lib-vdr-1.0/src/xine-engine/xine_interface.c
+--- xine-lib-vdr-1.0/src/xine-engine/xine_interface.c 2004-12-20 21:22:22.000000000 +0000
++++ /tmp/dpep.gJYg3C/xine-lib-vdr-1.0/src/xine-engine/xine_interface.c 2005-04-11 23:44:43.805804433 +0100
+@@ -329,15 +329,15 @@
+
+ switch (param) {
+ case XINE_PARAM_SPEED:
+- pthread_mutex_lock (&stream->frontend_lock);
++ _x_rmutex_lock (&stream->frontend_lock);
+ _x_set_speed (stream, value);
+- pthread_mutex_unlock (&stream->frontend_lock);
++ _x_rmutex_unlock (&stream->frontend_lock);
+ break;
+
+ case XINE_PARAM_FINE_SPEED:
+- pthread_mutex_lock (&stream->frontend_lock);
++ _x_rmutex_lock (&stream->frontend_lock);
+ _x_set_fine_speed (stream, value);
+- pthread_mutex_unlock (&stream->frontend_lock);
++ _x_rmutex_unlock (&stream->frontend_lock);
+ break;
+
+ case XINE_PARAM_AV_OFFSET:
+@@ -349,11 +349,11 @@
+ break;
+
+ case XINE_PARAM_AUDIO_CHANNEL_LOGICAL:
+- pthread_mutex_lock (&stream->frontend_lock);
++ _x_rmutex_lock (&stream->frontend_lock);
+ if (value < -2)
+ value = -2;
+ stream->audio_channel_user = value;
+- pthread_mutex_unlock (&stream->frontend_lock);
++ _x_rmutex_unlock (&stream->frontend_lock);
+ break;
+
+ case XINE_PARAM_SPU_CHANNEL:
+@@ -361,11 +361,11 @@
+ break;
+
+ case XINE_PARAM_VIDEO_CHANNEL:
+- pthread_mutex_lock (&stream->frontend_lock);
++ _x_rmutex_lock (&stream->frontend_lock);
+ if (value<0)
+ value = 0;
+ stream->video_channel = value;
+- pthread_mutex_unlock (&stream->frontend_lock);
++ _x_rmutex_unlock (&stream->frontend_lock);
+ break;
+
+ case XINE_PARAM_AUDIO_VOLUME:
+@@ -671,6 +671,7 @@
+ case XINE_STREAM_INFO_IGNORE_AUDIO:
+ case XINE_STREAM_INFO_IGNORE_SPU:
+ case XINE_STREAM_INFO_VIDEO_HAS_STILL:
++ case XINE_STREAM_INFO_VIDEO_AFD:
+ return _x_stream_info_get_public(stream, info);
+
+ case XINE_STREAM_INFO_MAX_AUDIO_CHANNEL:
+diff -urNad xine-lib-vdr-1.0/src/xine-engine/xine_internal.h /tmp/dpep.gJYg3C/xine-lib-vdr-1.0/src/xine-engine/xine_internal.h
+--- xine-lib-vdr-1.0/src/xine-engine/xine_internal.h 2005-04-03 00:03:00.000000000 +0100
++++ /tmp/dpep.gJYg3C/xine-lib-vdr-1.0/src/xine-engine/xine_internal.h 2005-04-11 23:44:43.805804433 +0100
+@@ -186,6 +186,25 @@
+ };
+
+ /*
++ * xine_rmutex - xine's recursive mutex emulation
++ */
++
++struct xine_rmutex_s {
++ pthread_mutex_t access_rmutex;
++ pthread_cond_t unlock_cond;
++ int lock_count;
++ pthread_t lock_owner;
++};
++
++typedef struct xine_rmutex_s xine_rmutex_t;
++
++int _x_rmutex_init(xine_rmutex_t *rmutex);
++int _x_rmutex_lock(xine_rmutex_t *rmutex);
++int _x_rmutex_timedlock(xine_rmutex_t *rmutex, int ms_to_time_out);
++int _x_rmutex_unlock(xine_rmutex_t *rmutex);
++int _x_rmutex_destroy(xine_rmutex_t *rmutex);
++
++/*
+ * xine_stream - per-stream parts of the xine engine
+ */
+
+@@ -277,7 +296,7 @@
+ /* int spu_channel; */
+
+ /* lock for public xine player functions */
+- pthread_mutex_t frontend_lock;
++ xine_rmutex_t frontend_lock;
+
+ /* stream meta information */
+ /* NEVER access directly, use helpers (see info_helper.c) */
+@@ -342,6 +361,15 @@
* private function prototypes:
*/
+int _x_continue_stream_processing(xine_stream_t *stream);
+void _x_trigger_relaxed_frame_drop_mode(xine_stream_t *stream);
++void _x_reset_relaxed_frame_drop_mode(xine_stream_t *stream);
+void _x_query_buffer_usage(xine_stream_t *stream, int *num_video_buffers, int *num_audio_buffers, int *num_video_frames, int *num_audio_frames);
+int _x_query_unprocessed_osd_events(xine_stream_t *stream);
++int _x_demux_seek(xine_stream_t *stream, off_t start_pos, int start_time, int playing);
++int _x_lock_frontend(xine_stream_t *stream, int ms_to_time_out);
++void _x_unlock_frontend(xine_stream_t *stream);
+
void _x_handle_stream_end (xine_stream_t *stream, int non_user);
Modified: general/xine-lib-vdr/trunk/debian/patches/99_autoconf.dpatch
===================================================================
--- general/xine-lib-vdr/trunk/debian/patches/99_autoconf.dpatch 2005-04-17 20:25:11 UTC (rev 475)
+++ general/xine-lib-vdr/trunk/debian/patches/99_autoconf.dpatch 2005-04-17 21:53:02 UTC (rev 476)
@@ -5,9 +5,9 @@
## DP: No description.
@DPATCH@
-diff -urNad xine-lib-vdr-1.0/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/Makefile.in
---- xine-lib-vdr-1.0/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/Makefile.in 2005-02-13 01:07:52.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/Makefile.in
+--- xine-lib-vdr-1.0/Makefile.in 2005-04-12 00:05:00.041245447 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/Makefile.in 2005-04-12 00:05:37.525207893 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -950,9 +950,9 @@
install-debug: debug
@list='$(SUBDIRS)'; for subdir in $$list; do \
(cd $$subdir && $(MAKE) $@) || exit; \
-diff -urNad xine-lib-vdr-1.0/aclocal.m4 /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/aclocal.m4
---- xine-lib-vdr-1.0/aclocal.m4 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/aclocal.m4 2005-02-13 01:07:42.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/aclocal.m4 /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/aclocal.m4
+--- xine-lib-vdr-1.0/aclocal.m4 2005-04-12 00:05:00.075242692 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/aclocal.m4 2005-04-12 00:05:27.203044361 +0100
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.9.3 -*- Autoconf -*-
+# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*-
@@ -6375,18 +6375,30 @@
-m4_include([m4/theora.m4])
-m4_include([m4/vorbis.m4])
-m4_include([m4/xv.m4])
-diff -urNad xine-lib-vdr-1.0/config.guess /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/config.guess
---- xine-lib-vdr-1.0/config.guess 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/config.guess 2005-02-13 01:07:42.000000000 +0000
-@@ -3,7 +3,7 @@
+diff -urNad xine-lib-vdr-1.0/config.guess /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/config.guess
+--- xine-lib-vdr-1.0/config.guess 2005-04-12 00:05:00.078242449 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/config.guess 2005-04-12 00:05:27.586013326 +0100
+@@ -1,9 +1,9 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- # 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+-# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
++# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-timestamp='2004-08-13'
-+timestamp='2004-11-12'
++timestamp='2005-03-24'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
+@@ -53,7 +53,7 @@
+ GNU config.guess ($timestamp)
+
+ Originally written by Per Bothner.
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+ Free Software Foundation, Inc.
+
+ This is free software; see the source for copying conditions. There is NO
@@ -319,6 +319,9 @@
*:OS/390:*:*)
echo i370-ibm-openedition
@@ -6406,7 +6418,17 @@
case `/usr/bin/uname -p` in
sparc) echo sparc-icl-nx7 && exit 0 ;;
esac ;;
-@@ -824,6 +827,12 @@
+@@ -801,6 +804,9 @@
+ i*:UWIN*:*)
+ echo ${UNAME_MACHINE}-pc-uwin
+ exit 0 ;;
++ amd64:CYGWIN*:*:*)
++ echo x86_64-unknown-cygwin
++ exit 0 ;;
+ p*:CYGWIN*:*)
+ echo powerpcle-unknown-cygwin
+ exit 0 ;;
+@@ -824,6 +830,12 @@
cris:Linux:*:*)
echo cris-axis-linux-gnu
exit 0 ;;
@@ -6419,7 +6441,17 @@
ia64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit 0 ;;
-@@ -1241,7 +1250,10 @@
+@@ -1188,6 +1200,9 @@
+ *:QNX:*:4*)
+ echo i386-pc-qnx
+ exit 0 ;;
++ NSE-?:NONSTOP_KERNEL:*:*)
++ echo nse-tandem-nsk${UNAME_RELEASE}
++ exit 0 ;;
+ NSR-?:NONSTOP_KERNEL:*:*)
+ echo nsr-tandem-nsk${UNAME_RELEASE}
+ exit 0 ;;
+@@ -1241,7 +1256,10 @@
A*) echo alpha-dec-vms && exit 0 ;;
I*) echo ia64-dec-vms && exit 0 ;;
V*) echo vax-dec-vms && exit 0 ;;
@@ -6431,9 +6463,20 @@
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
-diff -urNad xine-lib-vdr-1.0/config.h.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/config.h.in
---- xine-lib-vdr-1.0/config.h.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/config.h.in 2005-02-13 01:07:33.000000000 +0000
+@@ -1401,7 +1419,9 @@
+ the operating system you are using. It is advised that you
+ download the most up to date version of the config scripts from
+
+- ftp://ftp.gnu.org/pub/gnu/config/
++ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
++and
++ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
+
+ If the version you run ($0) is already up to date, please
+ send the following data and any information you think might be
+diff -urNad xine-lib-vdr-1.0/config.h.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/config.h.in
+--- xine-lib-vdr-1.0/config.h.in 2005-04-12 00:05:00.079242368 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/config.h.in 2005-04-12 00:05:08.564554751 +0100
@@ -201,7 +201,7 @@
/* Define this if you have gnome-vfs installed */
#undef HAVE_GNOME_VFS
@@ -6443,18 +6486,39 @@
#undef HAVE_HSTRERROR
/* Define if you have the iconv() function. */
-diff -urNad xine-lib-vdr-1.0/config.sub /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/config.sub
---- xine-lib-vdr-1.0/config.sub 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/config.sub 2005-02-13 01:07:42.000000000 +0000
-@@ -3,7 +3,7 @@
+diff -urNad xine-lib-vdr-1.0/config.sub /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/config.sub
+--- xine-lib-vdr-1.0/config.sub 2005-04-12 00:05:00.091241396 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/config.sub 2005-04-12 00:05:27.605011787 +0100
+@@ -1,9 +1,9 @@
+ #! /bin/sh
+ # Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- # 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+-# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
++# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-timestamp='2004-06-24'
-+timestamp='2004-11-30'
++timestamp='2005-02-10'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
+@@ -70,7 +70,7 @@
+ version="\
+ GNU config.sub ($timestamp)
+
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+ Free Software Foundation, Inc.
+
+ This is free software; see the source for copying conditions. There is NO
+@@ -237,7 +237,7 @@
+ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ | i370 | i860 | i960 | ia64 \
+ | ip2k | iq2000 \
+- | m32r | m32rle | m68000 | m68k | m88k | mcore \
++ | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
+ | mips | mipsbe | mipseb | mipsel | mipsle \
+ | mips16 \
+ | mips64 | mips64el \
@@ -267,7 +267,7 @@
| tahoe | thumb | tic4x | tic80 | tron \
| v850 | v850e \
@@ -6464,6 +6528,15 @@
| z8k)
basic_machine=$basic_machine-unknown
;;
+@@ -310,7 +310,7 @@
+ | ip2k-* | iq2000-* \
+ | m32r-* | m32rle-* \
+ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+- | m88110-* | m88k-* | mcore-* \
++ | m88110-* | m88k-* | maxq-* | mcore-* \
+ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+ | mips16-* \
+ | mips64-* | mips64el-* \
@@ -343,8 +343,8 @@
| tron-* \
| v850-* | v850e-* | vax-* \
@@ -6517,9 +6590,9 @@
-none)
;;
*)
-diff -urNad xine-lib-vdr-1.0/configure /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/configure
---- xine-lib-vdr-1.0/configure 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/configure 2005-02-13 01:08:06.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/configure /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/configure
+--- xine-lib-vdr-1.0/configure 2005-04-12 00:05:00.193233131 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/configure 2005-04-12 00:05:51.564070238 +0100
@@ -464,7 +464,7 @@
# include <unistd.h>
#endif"
@@ -7943,9 +8016,9 @@
echo " * SFX:"
echo " - goom - oscope"
echo " - fftscope - mosaico"
-diff -urNad xine-lib-vdr-1.0/doc/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/doc/Makefile.in
---- xine-lib-vdr-1.0/doc/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/doc/Makefile.in 2005-02-13 01:07:52.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/doc/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/doc/Makefile.in
+--- xine-lib-vdr-1.0/doc/Makefile.in 2005-04-12 00:05:00.196232888 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/doc/Makefile.in 2005-04-12 00:05:37.625199790 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -8739,9 +8812,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/doc/faq/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/doc/faq/Makefile.in
---- xine-lib-vdr-1.0/doc/faq/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/doc/faq/Makefile.in 2005-02-13 01:07:52.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/doc/faq/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/doc/faq/Makefile.in
+--- xine-lib-vdr-1.0/doc/faq/Makefile.in 2005-04-12 00:05:00.199232644 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/doc/faq/Makefile.in 2005-04-12 00:05:37.728191444 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -9415,9 +9488,9 @@
uninstall-info-am
-diff -urNad xine-lib-vdr-1.0/doc/hackersguide/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/doc/hackersguide/Makefile.in
---- xine-lib-vdr-1.0/doc/hackersguide/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/doc/hackersguide/Makefile.in 2005-02-13 01:07:52.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/doc/hackersguide/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/doc/hackersguide/Makefile.in
+--- xine-lib-vdr-1.0/doc/hackersguide/Makefile.in 2005-04-12 00:05:00.201232482 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/doc/hackersguide/Makefile.in 2005-04-12 00:05:37.843182125 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -10103,9 +10176,9 @@
uninstall-info-am
-diff -urNad xine-lib-vdr-1.0/doc/man/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/doc/man/Makefile.in
---- xine-lib-vdr-1.0/doc/man/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/doc/man/Makefile.in 2005-02-13 01:07:53.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/doc/man/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/doc/man/Makefile.in
+--- xine-lib-vdr-1.0/doc/man/Makefile.in 2005-04-12 00:05:00.203232320 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/doc/man/Makefile.in 2005-04-12 00:05:37.963172402 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -10842,9 +10915,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/doc/man/en/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/doc/man/en/Makefile.in
---- xine-lib-vdr-1.0/doc/man/en/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/doc/man/en/Makefile.in 2005-02-13 01:07:53.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/doc/man/en/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/doc/man/en/Makefile.in
+--- xine-lib-vdr-1.0/doc/man/en/Makefile.in 2005-04-12 00:05:00.206232077 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/doc/man/en/Makefile.in 2005-04-12 00:05:38.070163732 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -11517,9 +11590,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/include/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/include/Makefile.in
---- xine-lib-vdr-1.0/include/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/include/Makefile.in 2005-02-13 01:07:53.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/include/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/include/Makefile.in
+--- xine-lib-vdr-1.0/include/Makefile.in 2005-04-12 00:05:00.208231915 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/include/Makefile.in 2005-04-12 00:05:38.166155953 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -12232,9 +12305,9 @@
debug:
-diff -urNad xine-lib-vdr-1.0/lib/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/lib/Makefile.in
---- xine-lib-vdr-1.0/lib/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/lib/Makefile.in 2005-02-13 01:07:53.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/lib/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/lib/Makefile.in
+--- xine-lib-vdr-1.0/lib/Makefile.in 2005-04-12 00:05:00.210231753 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/lib/Makefile.in 2005-04-12 00:05:38.320143474 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -13053,9 +13126,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/m4/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/m4/Makefile.in
---- xine-lib-vdr-1.0/m4/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/m4/Makefile.in 2005-02-13 01:07:53.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/m4/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/m4/Makefile.in
+--- xine-lib-vdr-1.0/m4/Makefile.in 2005-04-12 00:05:00.212231591 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/m4/Makefile.in 2005-04-12 00:05:38.410136182 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -13729,9 +13802,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/misc/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/misc/Makefile.in
---- xine-lib-vdr-1.0/misc/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/misc/Makefile.in 2005-02-13 01:07:53.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/misc/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/misc/Makefile.in
+--- xine-lib-vdr-1.0/misc/Makefile.in 2005-04-12 00:05:00.216231267 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/misc/Makefile.in 2005-04-12 00:05:38.518127430 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -14584,9 +14657,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/misc/fonts/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/misc/fonts/Makefile.in
---- xine-lib-vdr-1.0/misc/fonts/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/misc/fonts/Makefile.in 2005-02-13 01:07:53.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/misc/fonts/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/misc/fonts/Makefile.in
+--- xine-lib-vdr-1.0/misc/fonts/Makefile.in 2005-04-12 00:05:00.219231024 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/misc/fonts/Makefile.in 2005-04-12 00:05:38.611119895 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -15252,9 +15325,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/mkinstalldirs /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/mkinstalldirs
+diff -urNad xine-lib-vdr-1.0/mkinstalldirs /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/mkinstalldirs
--- xine-lib-vdr-1.0/mkinstalldirs 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/mkinstalldirs 2005-02-13 01:07:33.000000000 +0000
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/mkinstalldirs 2005-04-12 00:05:08.778537411 +0100
@@ -0,0 +1,99 @@
+#! /bin/sh
+# mkinstalldirs --- make directory hierarchy
@@ -15355,9 +15428,9 @@
+# sh-indentation: 3
+# End:
+# mkinstalldirs ends here
-diff -urNad xine-lib-vdr-1.0/src/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/Makefile.in
---- xine-lib-vdr-1.0/src/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/Makefile.in 2005-02-13 01:07:53.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/Makefile.in
+--- xine-lib-vdr-1.0/src/Makefile.in 2005-04-12 00:05:00.221230862 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/Makefile.in 2005-04-12 00:05:38.707112116 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -16102,9 +16175,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/audio_out/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/audio_out/Makefile.in
---- xine-lib-vdr-1.0/src/audio_out/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/audio_out/Makefile.in 2005-02-13 01:07:53.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/audio_out/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/audio_out/Makefile.in
+--- xine-lib-vdr-1.0/src/audio_out/Makefile.in 2005-04-12 00:05:00.225230538 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/audio_out/Makefile.in 2005-04-12 00:05:38.902096315 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -17224,9 +17297,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/demuxers/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/demuxers/Makefile.in
---- xine-lib-vdr-1.0/src/demuxers/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/demuxers/Makefile.in 2005-02-13 01:07:54.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/demuxers/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/demuxers/Makefile.in
+--- xine-lib-vdr-1.0/src/demuxers/Makefile.in 2005-04-12 00:05:00.235229727 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/demuxers/Makefile.in 2005-04-12 00:05:39.192072816 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -18522,9 +18595,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/dxr3/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/dxr3/Makefile.in
---- xine-lib-vdr-1.0/src/dxr3/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/dxr3/Makefile.in 2005-02-13 01:07:54.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/dxr3/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/dxr3/Makefile.in
+--- xine-lib-vdr-1.0/src/dxr3/Makefile.in 2005-04-12 00:05:00.238229484 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/dxr3/Makefile.in 2005-04-12 00:05:39.352059852 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -19476,9 +19549,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/input/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/input/Makefile.in
---- xine-lib-vdr-1.0/src/input/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/input/Makefile.in 2005-02-13 01:07:54.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/input/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/input/Makefile.in
+--- xine-lib-vdr-1.0/src/input/Makefile.in 2005-04-12 00:05:00.242229160 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/input/Makefile.in 2005-04-12 00:05:39.619038217 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -20710,9 +20783,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/input/dvb/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/input/dvb/Makefile.in
---- xine-lib-vdr-1.0/src/input/dvb/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/input/dvb/Makefile.in 2005-02-13 01:07:54.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/input/dvb/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/input/dvb/Makefile.in
+--- xine-lib-vdr-1.0/src/input/dvb/Makefile.in 2005-04-12 00:05:00.244228998 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/input/dvb/Makefile.in 2005-04-12 00:05:39.719030114 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -21390,9 +21463,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/input/libdvdnav/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/input/libdvdnav/Makefile.in
---- xine-lib-vdr-1.0/src/input/libdvdnav/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/input/libdvdnav/Makefile.in 2005-02-13 01:07:54.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/input/libdvdnav/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/input/libdvdnav/Makefile.in
+--- xine-lib-vdr-1.0/src/input/libdvdnav/Makefile.in 2005-04-12 00:05:00.247228755 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/input/libdvdnav/Makefile.in 2005-04-12 00:05:39.860018689 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -22212,9 +22285,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/input/libreal/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/input/libreal/Makefile.in
---- xine-lib-vdr-1.0/src/input/libreal/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/input/libreal/Makefile.in 2005-02-13 01:07:54.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/input/libreal/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/input/libreal/Makefile.in
+--- xine-lib-vdr-1.0/src/input/libreal/Makefile.in 2005-04-12 00:05:00.256228026 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/input/libreal/Makefile.in 2005-04-12 00:05:39.997007588 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -23019,9 +23092,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/input/librtsp/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/input/librtsp/Makefile.in
---- xine-lib-vdr-1.0/src/input/librtsp/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/input/librtsp/Makefile.in 2005-02-13 01:07:55.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/input/librtsp/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/input/librtsp/Makefile.in
+--- xine-lib-vdr-1.0/src/input/librtsp/Makefile.in 2005-04-12 00:05:00.259227783 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/input/librtsp/Makefile.in 2005-04-12 00:05:40.132996568 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -23822,9 +23895,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/input/vcd/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/input/vcd/Makefile.in
---- xine-lib-vdr-1.0/src/input/vcd/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/input/vcd/Makefile.in 2005-02-13 01:07:55.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/input/vcd/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/input/vcd/Makefile.in
+--- xine-lib-vdr-1.0/src/input/vcd/Makefile.in 2005-04-12 00:05:00.261227621 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/input/vcd/Makefile.in 2005-04-12 00:05:40.277984818 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -24755,9 +24828,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/input/vcd/libcdio/MSWindows/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/input/vcd/libcdio/MSWindows/Makefile.in
---- xine-lib-vdr-1.0/src/input/vcd/libcdio/MSWindows/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/input/vcd/libcdio/MSWindows/Makefile.in 2005-02-13 01:07:55.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/input/vcd/libcdio/MSWindows/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/input/vcd/libcdio/MSWindows/Makefile.in
+--- xine-lib-vdr-1.0/src/input/vcd/libcdio/MSWindows/Makefile.in 2005-04-12 00:05:00.264227378 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/input/vcd/libcdio/MSWindows/Makefile.in 2005-04-12 00:05:40.365977688 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -25375,9 +25448,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/input/vcd/libcdio/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/input/vcd/libcdio/Makefile.in
---- xine-lib-vdr-1.0/src/input/vcd/libcdio/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/input/vcd/libcdio/Makefile.in 2005-02-13 01:07:55.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/input/vcd/libcdio/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/input/vcd/libcdio/Makefile.in
+--- xine-lib-vdr-1.0/src/input/vcd/libcdio/Makefile.in 2005-04-12 00:05:00.268227053 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/input/vcd/libcdio/Makefile.in 2005-04-12 00:05:40.584959942 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -26579,9 +26652,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/input/vcd/libcdio/cdio/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/input/vcd/libcdio/cdio/Makefile.in
---- xine-lib-vdr-1.0/src/input/vcd/libcdio/cdio/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/input/vcd/libcdio/cdio/Makefile.in 2005-02-13 01:07:55.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/input/vcd/libcdio/cdio/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/input/vcd/libcdio/cdio/Makefile.in
+--- xine-lib-vdr-1.0/src/input/vcd/libcdio/cdio/Makefile.in 2005-04-12 00:05:00.270226891 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/input/vcd/libcdio/cdio/Makefile.in 2005-04-12 00:05:40.687951596 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -27274,9 +27347,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/input/vcd/libcdio/image/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/input/vcd/libcdio/image/Makefile.in
---- xine-lib-vdr-1.0/src/input/vcd/libcdio/image/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/input/vcd/libcdio/image/Makefile.in 2005-02-13 01:07:55.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/input/vcd/libcdio/image/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/input/vcd/libcdio/image/Makefile.in
+--- xine-lib-vdr-1.0/src/input/vcd/libcdio/image/Makefile.in 2005-04-12 00:05:00.272226729 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/input/vcd/libcdio/image/Makefile.in 2005-04-12 00:05:40.774944547 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -27894,9 +27967,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/input/vcd/libvcd/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/input/vcd/libvcd/Makefile.in
---- xine-lib-vdr-1.0/src/input/vcd/libvcd/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/input/vcd/libvcd/Makefile.in 2005-02-13 01:07:55.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/input/vcd/libvcd/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/input/vcd/libvcd/Makefile.in
+--- xine-lib-vdr-1.0/src/input/vcd/libvcd/Makefile.in 2005-04-12 00:05:00.275226486 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/input/vcd/libvcd/Makefile.in 2005-04-12 00:05:40.930931906 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -28830,9 +28903,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/input/vcd/libvcd/libvcd/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/input/vcd/libvcd/libvcd/Makefile.in
---- xine-lib-vdr-1.0/src/input/vcd/libvcd/libvcd/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/input/vcd/libvcd/libvcd/Makefile.in 2005-02-13 01:07:55.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/input/vcd/libvcd/libvcd/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/input/vcd/libvcd/libvcd/Makefile.in
+--- xine-lib-vdr-1.0/src/input/vcd/libvcd/libvcd/Makefile.in 2005-04-12 00:05:00.281226000 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/input/vcd/libvcd/libvcd/Makefile.in 2005-04-12 00:05:41.030923803 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -29507,9 +29580,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/liba52/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/liba52/Makefile.in
---- xine-lib-vdr-1.0/src/liba52/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/liba52/Makefile.in 2005-02-13 01:07:56.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/liba52/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/liba52/Makefile.in
+--- xine-lib-vdr-1.0/src/liba52/Makefile.in 2005-04-12 00:05:00.284225757 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/liba52/Makefile.in 2005-04-12 00:05:41.168912621 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -30361,9 +30434,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/libdts/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libdts/Makefile.in
---- xine-lib-vdr-1.0/src/libdts/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libdts/Makefile.in 2005-02-13 01:07:56.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/libdts/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libdts/Makefile.in
+--- xine-lib-vdr-1.0/src/libdts/Makefile.in 2005-04-12 00:05:00.287225514 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libdts/Makefile.in 2005-04-12 00:05:41.305901520 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -31204,9 +31277,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/libfaad/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libfaad/Makefile.in
---- xine-lib-vdr-1.0/src/libfaad/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libfaad/Makefile.in 2005-02-13 01:07:56.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/libfaad/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libfaad/Makefile.in
+--- xine-lib-vdr-1.0/src/libfaad/Makefile.in 2005-04-12 00:05:00.290225271 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libfaad/Makefile.in 2005-04-12 00:05:41.460888960 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -32157,9 +32230,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/libfaad/codebook/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libfaad/codebook/Makefile.in
---- xine-lib-vdr-1.0/src/libfaad/codebook/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libfaad/codebook/Makefile.in 2005-02-13 01:07:56.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/libfaad/codebook/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libfaad/codebook/Makefile.in
+--- xine-lib-vdr-1.0/src/libfaad/codebook/Makefile.in 2005-04-12 00:05:00.292225109 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libfaad/codebook/Makefile.in 2005-04-12 00:05:41.548881830 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -32783,9 +32856,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/libffmpeg/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libffmpeg/Makefile.in
---- xine-lib-vdr-1.0/src/libffmpeg/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libffmpeg/Makefile.in 2005-02-13 01:07:56.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/libffmpeg/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libffmpeg/Makefile.in
+--- xine-lib-vdr-1.0/src/libffmpeg/Makefile.in 2005-04-12 00:05:00.295224866 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libffmpeg/Makefile.in 2005-04-12 00:05:41.701869432 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -33759,9 +33832,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/libffmpeg/libavcodec/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libffmpeg/libavcodec/Makefile.in
---- xine-lib-vdr-1.0/src/libffmpeg/libavcodec/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libffmpeg/libavcodec/Makefile.in 2005-02-13 01:07:56.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/libffmpeg/libavcodec/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libffmpeg/libavcodec/Makefile.in
+--- xine-lib-vdr-1.0/src/libffmpeg/libavcodec/Makefile.in 2005-04-12 00:05:00.304224136 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libffmpeg/libavcodec/Makefile.in 2005-04-12 00:05:41.866856062 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -34700,9 +34773,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/libffmpeg/libavcodec/alpha/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libffmpeg/libavcodec/alpha/Makefile.in
---- xine-lib-vdr-1.0/src/libffmpeg/libavcodec/alpha/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libffmpeg/libavcodec/alpha/Makefile.in 2005-02-13 01:07:56.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/libffmpeg/libavcodec/alpha/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libffmpeg/libavcodec/alpha/Makefile.in
+--- xine-lib-vdr-1.0/src/libffmpeg/libavcodec/alpha/Makefile.in 2005-04-12 00:05:00.306223974 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libffmpeg/libavcodec/alpha/Makefile.in 2005-04-12 00:05:41.956848770 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -35328,9 +35401,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/libffmpeg/libavcodec/armv4l/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libffmpeg/libavcodec/armv4l/Makefile.in
---- xine-lib-vdr-1.0/src/libffmpeg/libavcodec/armv4l/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libffmpeg/libavcodec/armv4l/Makefile.in 2005-02-13 01:07:56.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/libffmpeg/libavcodec/armv4l/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libffmpeg/libavcodec/armv4l/Makefile.in
+--- xine-lib-vdr-1.0/src/libffmpeg/libavcodec/armv4l/Makefile.in 2005-04-12 00:05:00.309223731 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libffmpeg/libavcodec/armv4l/Makefile.in 2005-04-12 00:05:42.084838398 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -36128,9 +36201,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/libffmpeg/libavcodec/i386/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libffmpeg/libavcodec/i386/Makefile.in
---- xine-lib-vdr-1.0/src/libffmpeg/libavcodec/i386/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libffmpeg/libavcodec/i386/Makefile.in 2005-02-13 01:07:57.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/libffmpeg/libavcodec/i386/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libffmpeg/libavcodec/i386/Makefile.in
+--- xine-lib-vdr-1.0/src/libffmpeg/libavcodec/i386/Makefile.in 2005-04-12 00:05:00.312223488 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libffmpeg/libavcodec/i386/Makefile.in 2005-04-12 00:05:42.226826892 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -36969,9 +37042,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/libffmpeg/libavcodec/libpostproc/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libffmpeg/libavcodec/libpostproc/Makefile.in
---- xine-lib-vdr-1.0/src/libffmpeg/libavcodec/libpostproc/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libffmpeg/libavcodec/libpostproc/Makefile.in 2005-02-13 01:07:57.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/libffmpeg/libavcodec/libpostproc/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libffmpeg/libavcodec/libpostproc/Makefile.in
+--- xine-lib-vdr-1.0/src/libffmpeg/libavcodec/libpostproc/Makefile.in 2005-04-12 00:05:00.315223245 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libffmpeg/libavcodec/libpostproc/Makefile.in 2005-04-12 00:05:42.364815710 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -37765,9 +37838,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/libffmpeg/libavcodec/mlib/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libffmpeg/libavcodec/mlib/Makefile.in
---- xine-lib-vdr-1.0/src/libffmpeg/libavcodec/mlib/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libffmpeg/libavcodec/mlib/Makefile.in 2005-02-13 01:07:57.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/libffmpeg/libavcodec/mlib/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libffmpeg/libavcodec/mlib/Makefile.in
+--- xine-lib-vdr-1.0/src/libffmpeg/libavcodec/mlib/Makefile.in 2005-04-12 00:05:00.318223002 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libffmpeg/libavcodec/mlib/Makefile.in 2005-04-12 00:05:42.494805176 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -38570,9 +38643,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/libffmpeg/libavcodec/ppc/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libffmpeg/libavcodec/ppc/Makefile.in
---- xine-lib-vdr-1.0/src/libffmpeg/libavcodec/ppc/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libffmpeg/libavcodec/ppc/Makefile.in 2005-02-13 01:07:57.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/libffmpeg/libavcodec/ppc/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libffmpeg/libavcodec/ppc/Makefile.in
+--- xine-lib-vdr-1.0/src/libffmpeg/libavcodec/ppc/Makefile.in 2005-04-12 00:05:00.321222759 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libffmpeg/libavcodec/ppc/Makefile.in 2005-04-12 00:05:42.634793832 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -39385,9 +39458,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/libffmpeg/libavcodec/sparc/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libffmpeg/libavcodec/sparc/Makefile.in
---- xine-lib-vdr-1.0/src/libffmpeg/libavcodec/sparc/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libffmpeg/libavcodec/sparc/Makefile.in 2005-02-13 01:07:57.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/libffmpeg/libavcodec/sparc/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libffmpeg/libavcodec/sparc/Makefile.in
+--- xine-lib-vdr-1.0/src/libffmpeg/libavcodec/sparc/Makefile.in 2005-04-12 00:05:00.323222597 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libffmpeg/libavcodec/sparc/Makefile.in 2005-04-12 00:05:42.765783217 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -40188,9 +40261,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/libflac/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libflac/Makefile.in
---- xine-lib-vdr-1.0/src/libflac/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libflac/Makefile.in 2005-02-13 01:07:57.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/libflac/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libflac/Makefile.in
+--- xine-lib-vdr-1.0/src/libflac/Makefile.in 2005-04-12 00:05:00.326222354 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libflac/Makefile.in 2005-04-12 00:05:42.904771954 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -41031,9 +41104,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/liblpcm/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/liblpcm/Makefile.in
---- xine-lib-vdr-1.0/src/liblpcm/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/liblpcm/Makefile.in 2005-02-13 01:07:57.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/liblpcm/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/liblpcm/Makefile.in
+--- xine-lib-vdr-1.0/src/liblpcm/Makefile.in 2005-04-12 00:05:00.329222111 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/liblpcm/Makefile.in 2005-04-12 00:05:43.032761582 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -41862,9 +41935,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/libmad/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libmad/Makefile.in
---- xine-lib-vdr-1.0/src/libmad/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libmad/Makefile.in 2005-02-13 01:07:58.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/libmad/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libmad/Makefile.in
+--- xine-lib-vdr-1.0/src/libmad/Makefile.in 2005-04-12 00:05:00.334221705 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libmad/Makefile.in 2005-04-12 00:05:43.176749914 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -42725,9 +42798,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/libmpeg2/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libmpeg2/Makefile.in
---- xine-lib-vdr-1.0/src/libmpeg2/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libmpeg2/Makefile.in 2005-02-13 01:07:58.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/libmpeg2/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libmpeg2/Makefile.in
+--- xine-lib-vdr-1.0/src/libmpeg2/Makefile.in 2005-04-12 00:05:00.337221462 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libmpeg2/Makefile.in 2005-04-12 00:05:43.317738489 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -43594,9 +43667,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/libmusepack/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libmusepack/Makefile.in
+diff -urNad xine-lib-vdr-1.0/src/libmusepack/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libmusepack/Makefile.in
--- xine-lib-vdr-1.0/src/libmusepack/Makefile.in 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libmusepack/Makefile.in 2005-02-13 01:07:58.000000000 +0000
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libmusepack/Makefile.in 2005-04-12 00:05:43.454727388 +0100
@@ -0,0 +1,708 @@
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# @configure_input@
@@ -44306,9 +44379,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:
-diff -urNad xine-lib-vdr-1.0/src/libmusepack/musepack/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libmusepack/musepack/Makefile.in
+diff -urNad xine-lib-vdr-1.0/src/libmusepack/musepack/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libmusepack/musepack/Makefile.in
--- xine-lib-vdr-1.0/src/libmusepack/musepack/Makefile.in 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libmusepack/musepack/Makefile.in 2005-02-13 01:07:58.000000000 +0000
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libmusepack/musepack/Makefile.in 2005-04-12 00:05:43.556719123 +0100
@@ -0,0 +1,508 @@
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# @configure_input@
@@ -44818,9 +44891,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:
-diff -urNad xine-lib-vdr-1.0/src/libreal/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libreal/Makefile.in
---- xine-lib-vdr-1.0/src/libreal/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libreal/Makefile.in 2005-02-13 01:07:58.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/libreal/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libreal/Makefile.in
+--- xine-lib-vdr-1.0/src/libreal/Makefile.in 2005-04-12 00:05:00.376218302 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libreal/Makefile.in 2005-04-12 00:05:43.693708021 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -45670,9 +45743,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/libspeex/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libspeex/Makefile.in
---- xine-lib-vdr-1.0/src/libspeex/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libspeex/Makefile.in 2005-02-13 01:07:58.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/libspeex/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libspeex/Makefile.in
+--- xine-lib-vdr-1.0/src/libspeex/Makefile.in 2005-04-12 00:05:00.379218059 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libspeex/Makefile.in 2005-04-12 00:05:43.824697407 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -46510,9 +46583,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/libspucc/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libspucc/Makefile.in
---- xine-lib-vdr-1.0/src/libspucc/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libspucc/Makefile.in 2005-02-13 01:07:58.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/libspucc/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libspucc/Makefile.in
+--- xine-lib-vdr-1.0/src/libspucc/Makefile.in 2005-04-12 00:05:00.409215628 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libspucc/Makefile.in 2005-04-12 00:05:43.966685900 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -47350,9 +47423,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/libspucmml/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libspucmml/Makefile.in
---- xine-lib-vdr-1.0/src/libspucmml/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libspucmml/Makefile.in 2005-02-13 01:07:58.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/libspucmml/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libspucmml/Makefile.in
+--- xine-lib-vdr-1.0/src/libspucmml/Makefile.in 2005-04-12 00:05:00.411215466 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libspucmml/Makefile.in 2005-04-12 00:05:44.102674880 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -48182,9 +48255,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/libspudec/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libspudec/Makefile.in
---- xine-lib-vdr-1.0/src/libspudec/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libspudec/Makefile.in 2005-02-13 01:07:59.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/libspudec/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libspudec/Makefile.in
+--- xine-lib-vdr-1.0/src/libspudec/Makefile.in 2005-04-12 00:05:00.428214089 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libspudec/Makefile.in 2005-04-12 00:05:44.245663293 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -49052,9 +49125,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/libspudvb/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libspudvb/Makefile.in
---- xine-lib-vdr-1.0/src/libspudvb/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libspudvb/Makefile.in 2005-02-13 01:07:59.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/libspudvb/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libspudvb/Makefile.in
+--- xine-lib-vdr-1.0/src/libspudvb/Makefile.in 2005-04-12 00:05:00.439213197 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libspudvb/Makefile.in 2005-04-12 00:05:44.376652678 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -49884,9 +49957,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/libsputext/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libsputext/Makefile.in
---- xine-lib-vdr-1.0/src/libsputext/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libsputext/Makefile.in 2005-02-13 01:07:59.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/libsputext/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libsputext/Makefile.in
+--- xine-lib-vdr-1.0/src/libsputext/Makefile.in 2005-04-12 00:05:00.442212954 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libsputext/Makefile.in 2005-04-12 00:05:44.513641577 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -50735,9 +50808,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/libtheora/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libtheora/Makefile.in
---- xine-lib-vdr-1.0/src/libtheora/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libtheora/Makefile.in 2005-02-13 01:07:59.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/libtheora/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libtheora/Makefile.in
+--- xine-lib-vdr-1.0/src/libtheora/Makefile.in 2005-04-12 00:05:00.445212711 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libtheora/Makefile.in 2005-04-12 00:05:44.645630881 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -51574,9 +51647,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/libvorbis/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libvorbis/Makefile.in
---- xine-lib-vdr-1.0/src/libvorbis/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libvorbis/Makefile.in 2005-02-13 01:07:59.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/libvorbis/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libvorbis/Makefile.in
+--- xine-lib-vdr-1.0/src/libvorbis/Makefile.in 2005-04-12 00:05:00.447212549 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libvorbis/Makefile.in 2005-04-12 00:05:44.778620104 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -52413,9 +52486,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/libw32dll/DirectShow/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libw32dll/DirectShow/Makefile.in
---- xine-lib-vdr-1.0/src/libw32dll/DirectShow/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libw32dll/DirectShow/Makefile.in 2005-02-13 01:07:59.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/libw32dll/DirectShow/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libw32dll/DirectShow/Makefile.in
+--- xine-lib-vdr-1.0/src/libw32dll/DirectShow/Makefile.in 2005-04-12 00:05:00.467210929 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libw32dll/DirectShow/Makefile.in 2005-04-12 00:05:44.921608517 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -53237,9 +53310,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/libw32dll/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libw32dll/Makefile.in
---- xine-lib-vdr-1.0/src/libw32dll/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libw32dll/Makefile.in 2005-02-13 01:07:59.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/libw32dll/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libw32dll/Makefile.in
+--- xine-lib-vdr-1.0/src/libw32dll/Makefile.in 2005-04-12 00:05:00.470210685 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libw32dll/Makefile.in 2005-04-12 00:05:45.074596120 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -54189,9 +54262,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/libw32dll/dmo/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libw32dll/dmo/Makefile.in
---- xine-lib-vdr-1.0/src/libw32dll/dmo/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libw32dll/dmo/Makefile.in 2005-02-13 01:08:00.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/libw32dll/dmo/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libw32dll/dmo/Makefile.in
+--- xine-lib-vdr-1.0/src/libw32dll/dmo/Makefile.in 2005-04-12 00:05:00.472210523 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libw32dll/dmo/Makefile.in 2005-04-12 00:05:45.216584614 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -55009,9 +55082,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/libw32dll/qtx/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libw32dll/qtx/Makefile.in
---- xine-lib-vdr-1.0/src/libw32dll/qtx/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libw32dll/qtx/Makefile.in 2005-02-13 01:08:00.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/libw32dll/qtx/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libw32dll/qtx/Makefile.in
+--- xine-lib-vdr-1.0/src/libw32dll/qtx/Makefile.in 2005-04-12 00:05:00.475210280 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libw32dll/qtx/Makefile.in 2005-04-12 00:05:45.315576592 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -55748,9 +55821,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/libw32dll/qtx/qtxsdk/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libw32dll/qtx/qtxsdk/Makefile.in
---- xine-lib-vdr-1.0/src/libw32dll/qtx/qtxsdk/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libw32dll/qtx/qtxsdk/Makefile.in 2005-02-13 01:08:00.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/libw32dll/qtx/qtxsdk/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libw32dll/qtx/qtxsdk/Makefile.in
+--- xine-lib-vdr-1.0/src/libw32dll/qtx/qtxsdk/Makefile.in 2005-04-12 00:05:00.494208741 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libw32dll/qtx/qtxsdk/Makefile.in 2005-04-12 00:05:45.417568327 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -56425,9 +56498,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/libw32dll/wine/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libw32dll/wine/Makefile.in
---- xine-lib-vdr-1.0/src/libw32dll/wine/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libw32dll/wine/Makefile.in 2005-02-13 01:08:00.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/libw32dll/wine/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libw32dll/wine/Makefile.in
+--- xine-lib-vdr-1.0/src/libw32dll/wine/Makefile.in 2005-04-12 00:05:00.497208498 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libw32dll/wine/Makefile.in 2005-04-12 00:05:45.581555038 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -57292,9 +57365,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/libxineadec/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libxineadec/Makefile.in
---- xine-lib-vdr-1.0/src/libxineadec/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libxineadec/Makefile.in 2005-02-13 01:08:00.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/libxineadec/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libxineadec/Makefile.in
+--- xine-lib-vdr-1.0/src/libxineadec/Makefile.in 2005-04-12 00:05:00.500208255 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libxineadec/Makefile.in 2005-04-12 00:05:45.734542640 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -58225,9 +58298,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/libxineadec/gsm610/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libxineadec/gsm610/Makefile.in
---- xine-lib-vdr-1.0/src/libxineadec/gsm610/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libxineadec/gsm610/Makefile.in 2005-02-13 01:08:00.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/libxineadec/gsm610/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libxineadec/gsm610/Makefile.in
+--- xine-lib-vdr-1.0/src/libxineadec/gsm610/Makefile.in 2005-04-12 00:05:00.502208093 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libxineadec/gsm610/Makefile.in 2005-04-12 00:05:45.875531215 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -59041,9 +59114,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/libxineadec/nosefart/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libxineadec/nosefart/Makefile.in
---- xine-lib-vdr-1.0/src/libxineadec/nosefart/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libxineadec/nosefart/Makefile.in 2005-02-13 01:08:00.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/libxineadec/nosefart/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libxineadec/nosefart/Makefile.in
+--- xine-lib-vdr-1.0/src/libxineadec/nosefart/Makefile.in 2005-04-12 00:05:00.505207849 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libxineadec/nosefart/Makefile.in 2005-04-12 00:05:46.021519385 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -59858,9 +59931,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/libxinevdec/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libxinevdec/Makefile.in
---- xine-lib-vdr-1.0/src/libxinevdec/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libxinevdec/Makefile.in 2005-02-13 01:08:00.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/libxinevdec/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libxinevdec/Makefile.in
+--- xine-lib-vdr-1.0/src/libxinevdec/Makefile.in 2005-04-12 00:05:00.524206310 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/libxinevdec/Makefile.in 2005-04-12 00:05:46.179506582 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -60781,9 +60854,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/post/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/post/Makefile.in
---- xine-lib-vdr-1.0/src/post/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/post/Makefile.in 2005-02-13 01:08:01.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/post/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/post/Makefile.in
+--- xine-lib-vdr-1.0/src/post/Makefile.in 2005-04-12 00:05:00.527206067 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/post/Makefile.in 2005-04-12 00:05:46.278498560 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -61522,9 +61595,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/post/audio/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/post/audio/Makefile.in
---- xine-lib-vdr-1.0/src/post/audio/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/post/audio/Makefile.in 2005-02-13 01:08:01.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/post/audio/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/post/audio/Makefile.in
+--- xine-lib-vdr-1.0/src/post/audio/Makefile.in 2005-04-12 00:05:00.529205905 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/post/audio/Makefile.in 2005-04-12 00:05:46.421486973 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -62367,9 +62440,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/post/deinterlace/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/post/deinterlace/Makefile.in
---- xine-lib-vdr-1.0/src/post/deinterlace/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/post/deinterlace/Makefile.in 2005-02-13 01:08:01.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/post/deinterlace/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/post/deinterlace/Makefile.in
+--- xine-lib-vdr-1.0/src/post/deinterlace/Makefile.in 2005-04-12 00:05:00.532205662 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/post/deinterlace/Makefile.in 2005-04-12 00:05:46.570474900 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -63286,9 +63359,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/post/deinterlace/plugins/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/post/deinterlace/plugins/Makefile.in
---- xine-lib-vdr-1.0/src/post/deinterlace/plugins/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/post/deinterlace/plugins/Makefile.in 2005-02-13 01:08:01.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/post/deinterlace/plugins/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/post/deinterlace/plugins/Makefile.in
+--- xine-lib-vdr-1.0/src/post/deinterlace/plugins/Makefile.in 2005-04-12 00:05:00.535205419 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/post/deinterlace/plugins/Makefile.in 2005-04-12 00:05:46.712463393 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -64099,9 +64172,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/post/goom/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/post/goom/Makefile.in
---- xine-lib-vdr-1.0/src/post/goom/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/post/goom/Makefile.in 2005-02-13 01:08:01.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/post/goom/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/post/goom/Makefile.in
+--- xine-lib-vdr-1.0/src/post/goom/Makefile.in 2005-04-12 00:05:00.552204041 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/post/goom/Makefile.in 2005-04-12 00:05:46.860451401 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -64994,9 +65067,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/post/mosaico/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/post/mosaico/Makefile.in
---- xine-lib-vdr-1.0/src/post/mosaico/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/post/mosaico/Makefile.in 2005-02-13 01:08:01.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/post/mosaico/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/post/mosaico/Makefile.in
+--- xine-lib-vdr-1.0/src/post/mosaico/Makefile.in 2005-04-12 00:05:00.555203798 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/post/mosaico/Makefile.in 2005-04-12 00:05:47.000440057 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -65842,9 +65915,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/post/planar/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/post/planar/Makefile.in
---- xine-lib-vdr-1.0/src/post/planar/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/post/planar/Makefile.in 2005-02-13 01:08:01.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/post/planar/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/post/planar/Makefile.in
+--- xine-lib-vdr-1.0/src/post/planar/Makefile.in 2005-04-12 00:05:00.557203636 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/post/planar/Makefile.in 2005-04-12 00:05:47.135429118 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -66684,9 +66757,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/post/visualizations/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/post/visualizations/Makefile.in
---- xine-lib-vdr-1.0/src/post/visualizations/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/post/visualizations/Makefile.in 2005-02-13 01:08:02.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/post/visualizations/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/post/visualizations/Makefile.in
+--- xine-lib-vdr-1.0/src/post/visualizations/Makefile.in 2005-04-12 00:05:00.560203393 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/post/visualizations/Makefile.in 2005-04-12 00:05:47.278417531 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -67531,9 +67604,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/vdr/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/vdr/Makefile.in
+diff -urNad xine-lib-vdr-1.0/src/vdr/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/vdr/Makefile.in
--- xine-lib-vdr-1.0/src/vdr/Makefile.in 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/vdr/Makefile.in 2005-02-13 01:08:02.000000000 +0000
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/vdr/Makefile.in 2005-04-12 00:05:47.442404242 +0100
@@ -0,0 +1,662 @@
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# @configure_input@
@@ -68197,9 +68270,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:
-diff -urNad xine-lib-vdr-1.0/src/video_out/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/video_out/Makefile.in
---- xine-lib-vdr-1.0/src/video_out/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/video_out/Makefile.in 2005-02-13 01:08:02.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/video_out/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/video_out/Makefile.in
+--- xine-lib-vdr-1.0/src/video_out/Makefile.in 2005-04-12 00:05:00.632197559 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/video_out/Makefile.in 2005-04-12 00:05:47.730380905 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -69702,9 +69775,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/video_out/libdha/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/video_out/libdha/Makefile.in
---- xine-lib-vdr-1.0/src/video_out/libdha/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/video_out/libdha/Makefile.in 2005-02-13 01:08:02.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/video_out/libdha/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/video_out/libdha/Makefile.in
+--- xine-lib-vdr-1.0/src/video_out/libdha/Makefile.in 2005-04-12 00:05:00.635197316 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/video_out/libdha/Makefile.in 2005-04-12 00:05:47.891367859 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -70602,9 +70675,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/video_out/libdha/bin/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/video_out/libdha/bin/Makefile.in
---- xine-lib-vdr-1.0/src/video_out/libdha/bin/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/video_out/libdha/bin/Makefile.in 2005-02-13 01:08:02.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/video_out/libdha/bin/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/video_out/libdha/bin/Makefile.in
+--- xine-lib-vdr-1.0/src/video_out/libdha/bin/Makefile.in 2005-04-12 00:05:00.642196748 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/video_out/libdha/bin/Makefile.in 2005-04-12 00:05:47.980360648 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -71222,9 +71295,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/video_out/libdha/kernelhelper/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/video_out/libdha/kernelhelper/Makefile.in
---- xine-lib-vdr-1.0/src/video_out/libdha/kernelhelper/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/video_out/libdha/kernelhelper/Makefile.in 2005-02-13 01:08:02.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/video_out/libdha/kernelhelper/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/video_out/libdha/kernelhelper/Makefile.in
+--- xine-lib-vdr-1.0/src/video_out/libdha/kernelhelper/Makefile.in 2005-04-12 00:05:00.648196262 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/video_out/libdha/kernelhelper/Makefile.in 2005-04-12 00:05:48.124348980 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -72011,9 +72084,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/video_out/libdha/oth/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/video_out/libdha/oth/Makefile.in
---- xine-lib-vdr-1.0/src/video_out/libdha/oth/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/video_out/libdha/oth/Makefile.in 2005-02-13 01:08:02.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/video_out/libdha/oth/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/video_out/libdha/oth/Makefile.in
+--- xine-lib-vdr-1.0/src/video_out/libdha/oth/Makefile.in 2005-04-12 00:05:00.650196100 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/video_out/libdha/oth/Makefile.in 2005-04-12 00:05:48.211341930 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -72631,9 +72704,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/video_out/libdha/sysdep/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/video_out/libdha/sysdep/Makefile.in
---- xine-lib-vdr-1.0/src/video_out/libdha/sysdep/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/video_out/libdha/sysdep/Makefile.in 2005-02-13 01:08:03.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/video_out/libdha/sysdep/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/video_out/libdha/sysdep/Makefile.in
+--- xine-lib-vdr-1.0/src/video_out/libdha/sysdep/Makefile.in 2005-04-12 00:05:00.653195857 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/video_out/libdha/sysdep/Makefile.in 2005-04-12 00:05:48.313333665 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -73322,9 +73395,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/video_out/macosx/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/video_out/macosx/Makefile.in
---- xine-lib-vdr-1.0/src/video_out/macosx/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/video_out/macosx/Makefile.in 2005-02-13 01:08:03.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/video_out/macosx/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/video_out/macosx/Makefile.in
+--- xine-lib-vdr-1.0/src/video_out/macosx/Makefile.in 2005-04-12 00:05:00.656195614 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/video_out/macosx/Makefile.in 2005-04-12 00:05:48.452322402 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -74187,9 +74260,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/video_out/vidix/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/video_out/vidix/Makefile.in
---- xine-lib-vdr-1.0/src/video_out/vidix/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/video_out/vidix/Makefile.in 2005-02-13 01:08:03.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/video_out/vidix/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/video_out/vidix/Makefile.in
+--- xine-lib-vdr-1.0/src/video_out/vidix/Makefile.in 2005-04-12 00:05:00.661195209 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/video_out/vidix/Makefile.in 2005-04-12 00:05:48.603310166 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -75060,9 +75133,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/video_out/vidix/drivers/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/video_out/vidix/drivers/Makefile.in
---- xine-lib-vdr-1.0/src/video_out/vidix/drivers/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/video_out/vidix/drivers/Makefile.in 2005-02-13 01:08:03.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/video_out/vidix/drivers/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/video_out/vidix/drivers/Makefile.in
+--- xine-lib-vdr-1.0/src/video_out/vidix/drivers/Makefile.in 2005-04-12 00:05:00.678193831 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/video_out/vidix/drivers/Makefile.in 2005-04-12 00:05:48.818292745 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -76154,9 +76227,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:
-diff -urNad xine-lib-vdr-1.0/src/xine-engine/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/xine-engine/Makefile.in
---- xine-lib-vdr-1.0/src/xine-engine/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/xine-engine/Makefile.in 2005-02-13 01:08:03.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/xine-engine/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/xine-engine/Makefile.in
+--- xine-lib-vdr-1.0/src/xine-engine/Makefile.in 2005-04-12 00:05:00.681193588 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/xine-engine/Makefile.in 2005-04-12 00:05:48.983279375 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -77070,9 +77143,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/src/xine-utils/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/xine-utils/Makefile.in
---- xine-lib-vdr-1.0/src/xine-utils/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/xine-utils/Makefile.in 2005-02-13 01:08:03.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/src/xine-utils/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/xine-utils/Makefile.in
+--- xine-lib-vdr-1.0/src/xine-utils/Makefile.in 2005-04-12 00:05:00.684193345 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/src/xine-utils/Makefile.in 2005-04-12 00:05:49.152265681 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -77934,9 +78007,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/win32/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/win32/Makefile.in
---- xine-lib-vdr-1.0/win32/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/win32/Makefile.in 2005-02-13 01:08:03.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/win32/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/win32/Makefile.in
+--- xine-lib-vdr-1.0/win32/Makefile.in 2005-04-12 00:05:00.687193102 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/win32/Makefile.in 2005-04-12 00:05:49.251257659 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -78687,9 +78760,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/win32/contrib/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/win32/contrib/Makefile.in
---- xine-lib-vdr-1.0/win32/contrib/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/win32/contrib/Makefile.in 2005-02-13 01:08:04.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/win32/contrib/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/win32/contrib/Makefile.in
+--- xine-lib-vdr-1.0/win32/contrib/Makefile.in 2005-04-12 00:05:00.690192859 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/win32/contrib/Makefile.in 2005-04-12 00:05:49.414244451 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -79575,9 +79648,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/win32/contrib/pthreads/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/win32/contrib/pthreads/Makefile.in
---- xine-lib-vdr-1.0/win32/contrib/pthreads/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/win32/contrib/pthreads/Makefile.in 2005-02-13 01:08:04.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/win32/contrib/pthreads/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/win32/contrib/pthreads/Makefile.in
+--- xine-lib-vdr-1.0/win32/contrib/pthreads/Makefile.in 2005-04-12 00:05:00.692192697 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/win32/contrib/pthreads/Makefile.in 2005-04-12 00:05:49.570231811 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -80430,9 +80503,9 @@
uninstall-am uninstall-includeHEADERS uninstall-info-am
-diff -urNad xine-lib-vdr-1.0/win32/contrib/zlib/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/win32/contrib/zlib/Makefile.in
---- xine-lib-vdr-1.0/win32/contrib/zlib/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/win32/contrib/zlib/Makefile.in 2005-02-13 01:08:04.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/win32/contrib/zlib/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/win32/contrib/zlib/Makefile.in
+--- xine-lib-vdr-1.0/win32/contrib/zlib/Makefile.in 2005-04-12 00:05:00.695192454 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/win32/contrib/zlib/Makefile.in 2005-04-12 00:05:49.718219819 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
@@ -81250,9 +81323,9 @@
$(XINE_LIB):
-diff -urNad xine-lib-vdr-1.0/win32/include/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/win32/include/Makefile.in
---- xine-lib-vdr-1.0/win32/include/Makefile.in 2005-02-13 01:06:48.000000000 +0000
-+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/win32/include/Makefile.in 2005-02-13 01:08:04.000000000 +0000
+diff -urNad xine-lib-vdr-1.0/win32/include/Makefile.in /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/win32/include/Makefile.in
+--- xine-lib-vdr-1.0/win32/include/Makefile.in 2005-04-12 00:05:00.697192292 +0100
++++ /tmp/dpep.FgwaJp/xine-lib-vdr-1.0/win32/include/Makefile.in 2005-04-12 00:05:49.806212688 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.