diff --git a/vdr-xine-0.9.3.diff.bz2 b/vdr-xine-0.9.3.diff.bz2 index 73ceeb9..9878426 100644 --- a/vdr-xine-0.9.3.diff.bz2 +++ b/vdr-xine-0.9.3.diff.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9bda7583f46a039c70abb77360f84342125519a6497a50ccc0d19bc81934a6dd -size 25043 +oid sha256:ffd45aca1ab74ad3743d704b048203832464247e26276445eaa9b26f3235e287 +size 24533 diff --git a/xine-lib-1.1.16.3-cdda.diff b/xine-lib-1.1.16.3-cdda.diff deleted file mode 100644 index 3529fda..0000000 --- a/xine-lib-1.1.16.3-cdda.diff +++ /dev/null @@ -1,310 +0,0 @@ -diff -ur xine-lib-1.1.16.3.orig/src/demuxers/demux_cdda.c xine-lib-1.1.16.3/src/demuxers/demux_cdda.c ---- xine-lib-1.1.16.3.orig/src/demuxers/demux_cdda.c 2008-06-15 01:15:00.000000000 +0200 -+++ xine-lib-1.1.16.3/src/demuxers/demux_cdda.c 2009-05-07 19:43:04.000000000 +0200 -@@ -60,6 +60,7 @@ - input_plugin_t *input; - int status; - -+ int send_newpts; - int seek_flag; /* this is set when a seek just occurred */ - } demux_cdda_t; - -@@ -91,9 +92,9 @@ - buf->extra_info->input_time = buf->pts / 90; - buf->decoder_flags |= BUF_FLAG_FRAME_END; - -- if (this->seek_flag) { -- _x_demux_control_newpts(this->stream, buf->pts, BUF_FLAG_SEEK); -- this->seek_flag = 0; -+ if (this->send_newpts) { -+ _x_demux_control_newpts(this->stream, buf->pts, this->seek_flag); -+ this->send_newpts = this->seek_flag = 0; - } - - this->audio_fifo->put (this->audio_fifo, buf); -@@ -146,9 +147,14 @@ - this->input->seek(this->input, start_pos & ~3, SEEK_SET); - else - this->input->seek(this->input, start_time * CD_BYTES_PER_SECOND, SEEK_SET); -- this->seek_flag = 1; -+ - this->status = DEMUX_OK; -- _x_demux_flush_engine (this->stream); -+ -+ this->send_newpts = 1; -+ if (playing) { -+ this->seek_flag = BUF_FLAG_SEEK; -+ _x_demux_flush_engine (this->stream); -+ } - - return this->status; - } -diff -ur xine-lib-1.1.16.3.orig/src/input/input_cdda.c xine-lib-1.1.16.3/src/input/input_cdda.c ---- xine-lib-1.1.16.3.orig/src/input/input_cdda.c 2009-02-17 03:55:21.000000000 +0100 -+++ xine-lib-1.1.16.3/src/input/input_cdda.c 2009-05-12 00:16:12.000000000 +0200 -@@ -113,7 +113,7 @@ - *************************************************************************/ - - #define MAX_TRACKS 99 --#define CACHED_FRAMES 500 -+#define CACHED_FRAMES 100 - - typedef struct { - int start; -@@ -1433,6 +1433,73 @@ - return err; - } - -+static inline char *_cdda_append (/*const*/ char *first, const char *second) -+{ -+ if (!first) -+ return strdup (second); -+ -+ char *result = (char *) realloc (first, strlen (first) + strlen (second) + 1); -+ strcat (result, second); -+ return result; -+} -+ -+static void _cdda_parse_cddb_info (cdda_input_plugin_t *this, char *buffer, char **dtitle) -+{ -+ /* buffer should be no more than 2048 bytes... */ -+ char buf[2048]; -+ int track_no; -+ -+ if (sscanf (buffer, "DTITLE=%s", &buf[0]) == 1) { -+ char *pt = strchr (buffer, '='); -+ if (pt) { -+ ++pt; -+ -+ *dtitle = _cdda_append (*dtitle, pt); -+ pt = strdup (*dtitle); -+ -+ char *title = strstr (pt, " / "); -+ if (title) -+ { -+ *title = 0; -+ title += 3; -+ free (this->cddb.disc_artist); -+ this->cddb.disc_artist = strdup (pt); -+ } -+ else -+ title = pt; -+ -+ free (this->cddb.disc_title); -+ this->cddb.disc_title = strdup (title); -+ -+ free (pt); -+ } -+ } -+ else if (sscanf (buffer, "DYEAR=%s", &buf[0]) == 1) { -+ char *pt = strchr (buffer, '='); -+ if (pt && strlen (pt) == 5) -+ this->cddb.disc_year = strdup (pt + 1); -+ } -+ else if(sscanf(buffer, "DGENRE=%s", &buf[0]) == 1) { -+ char *pt = strchr(buffer, '='); -+ if (pt) -+ this->cddb.disc_category = strdup (pt + 1); -+ } -+ else if (sscanf (buffer, "TTITLE%d=%s", &track_no, &buf[0]) == 2) { -+ char *pt = strchr(buffer, '='); -+ this->cddb.track[track_no].title = _cdda_append (this->cddb.track[track_no].title, pt + 1); -+ } -+ else if (!strncmp (buffer, "EXTD=", 5)) -+ { -+ if (!this->cddb.disc_year) -+ { -+ int nyear; -+ char *y = strstr (buffer, "YEAR:"); -+ if (y && sscanf (y + 5, "%4d", &nyear) == 1) -+ asprintf (&this->cddb.disc_year, "%d", nyear); -+ } -+ } -+} -+ - /* - * Try to load cached cddb infos - */ -@@ -1465,82 +1532,16 @@ - return 0; - } - else { -- char buffer[256], *ln; -- char buf[256]; -- int tnum; -+ char buffer[2048], *ln; - char *dtitle = NULL; - -- while ((ln = fgets(buffer, 255, fd)) != NULL) { -- -- buffer[strlen(buffer) - 1] = '\0'; -- -- if (sscanf(buffer, "DTITLE=%s", &buf[0]) == 1) { -- char *pt, *artist, *title; -- -- pt = strchr(buffer, '='); -- if (pt) { -- pt++; -- -- if (dtitle != NULL) -- { -- dtitle = (char *) realloc(dtitle, strlen(dtitle) + strlen(pt) + 1); -- strcat(dtitle, pt); -- pt = dtitle; -- } -- dtitle = strdup(pt); -- -- artist = pt; -- title = strstr(pt, " / "); -- if (title) { -- *title++ = '\0'; -- title += 2; -- } -- else { -- title = artist; -- artist = NULL; -- } -+ while ((ln = fgets(buffer, sizeof (buffer) - 1, fd)) != NULL) { - -- if (artist) -- this->cddb.disc_artist = strdup(artist); -+ int length = strlen (buffer); -+ if (length && buffer[length - 1] == '\n') -+ buffer[length - 1] = '\0'; - -- this->cddb.disc_title = strdup(title); -- } -- } -- else if (sscanf(buffer, "DYEAR=%s", &buf[0]) == 1) { -- char *pt; -- -- pt = strrchr(buffer, '='); -- pt++; -- if (pt != NULL && strlen(pt) == 4) -- this->cddb.disc_year = strdup(pt); -- } -- else if (sscanf(buffer, "TTITLE%d=%s", &tnum, &buf[0]) == 2) { -- char *pt; -- -- pt = strchr(buffer, '='); -- if (pt) -- pt++; -- if (this->cddb.track[tnum].title == NULL) -- this->cddb.track[tnum].title = strdup(pt); -- else -- { -- this->cddb.track[tnum].title -- = (char *) realloc(this->cddb.track[tnum].title, strlen(this->cddb.track[tnum].title) + strlen(pt) + 1); -- strcat(this->cddb.track[tnum].title, pt); -- } -- } -- else { -- if (!strncmp(buffer, "EXTD=", 5)) { -- char *y; -- int nyear; -- -- y = strstr(buffer, "YEAR:"); -- if (y && this->cddb.disc_year == NULL) { -- if (sscanf(y+5, "%4d", &nyear) == 1) -- asprintf(&this->cddb.disc_year, "%d", nyear); -- } -- } -- } -+ _cdda_parse_cddb_info (this, buffer, &dtitle); - } - fclose(fd); - free(dtitle); -@@ -1803,82 +1804,13 @@ - memset(&buffercache, 0, sizeof(buffercache)); - - while (strcmp(buffer, ".")) { -- char buf[2048]; -- int tnum; - size_t bufsize = strlen(buffercache); - - memset(&buffer, 0, sizeof(buffer)); - _cdda_cddb_socket_read(this, buffer, sizeof(buffer) - 1); - snprintf(buffercache + bufsize, sizeof(buffercache) - bufsize, "%s\n", buffer); - -- if (sscanf(buffer, "DTITLE=%s", &buf[0]) == 1) { -- char *pt, *artist, *title; -- -- pt = strrchr(buffer, '='); -- if (pt) { -- pt++; -- -- if (dtitle != NULL) -- { -- dtitle = (char *) realloc(dtitle, strlen(dtitle) + strlen(pt) + 1); -- strcat(dtitle, pt); -- pt = dtitle; -- } -- dtitle = strdup(pt); -- -- artist = pt; -- title = strstr(pt, " / "); -- if (title) { -- *title++ = '\0'; -- title += 2; -- } -- else { -- title = artist; -- artist = NULL; -- } -- -- if (artist) { -- this->cddb.disc_artist = strdup(artist); -- } -- this->cddb.disc_title = strdup(title); -- } -- } -- else if(sscanf(buffer, "DYEAR=%s", &buf[0]) == 1) { -- char *pt; -- -- pt = strrchr(buffer, '='); -- pt++; -- if (pt != NULL && strlen(pt) == 4) -- this->cddb.disc_year = strdup(pt); -- } -- else if (sscanf(buffer, "TTITLE%d=%s", &tnum, &buf[0]) == 2) { -- char *pt; -- -- pt = strrchr(buffer, '='); -- if (pt) { -- pt++; -- if (this->cddb.track[tnum].title == NULL) -- this->cddb.track[tnum].title = strdup(pt); -- else -- { -- this->cddb.track[tnum].title -- = (char *) realloc(this->cddb.track[tnum].title, strlen(this->cddb.track[tnum].title) + strlen(pt) + 1); -- strcat(this->cddb.track[tnum].title, pt); -- } -- } -- } -- else { -- if (!strncmp(buffer, "EXTD=", 5)) { -- char *y; -- int nyear; -- -- y = strstr(buffer, "YEAR:"); -- if (y && this->cddb.disc_year == NULL) { -- if (sscanf(y+5, "%4d", &nyear) == 1) -- asprintf(&this->cddb.disc_year, "%d", nyear); -- } -- } -- } -+ _cdda_parse_cddb_info (this, buffer, &dtitle); - } - free(dtitle); - -@@ -2491,6 +2423,9 @@ - } - lprintf("Track %d Title: %s\n", this->track+1, pt); - -+ char tracknum[4]; -+ snprintf(tracknum, 4, "%d", this->track+1); -+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_TRACK_NUMBER, tracknum); - _x_meta_info_set_utf8(this->stream, XINE_META_INFO_TITLE, pt); - } - diff --git a/xine-lib-1.1.16.3-crippled.tar.bz2 b/xine-lib-1.1.16.3-crippled.tar.bz2 deleted file mode 100644 index 274ee42..0000000 --- a/xine-lib-1.1.16.3-crippled.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7ed20d7e52e8e8db1a535d628d7afc41ed3665a9d23190ced8cbd9dca667be91 -size 5073254 diff --git a/xine-lib-1.1.16.3.tar.bz2 b/xine-lib-1.1.16.3.tar.bz2 deleted file mode 100644 index 8ede996..0000000 --- a/xine-lib-1.1.16.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d25a241efa55dc7d8f482336efa8bb7b9bb9d69b6df8a8a37f2660948fd67b52 -size 7468182 diff --git a/xine-lib-1.1.16.3-assert.patch b/xine-lib-1.1.17-assert.patch similarity index 100% rename from xine-lib-1.1.16.3-assert.patch rename to xine-lib-1.1.17-assert.patch diff --git a/xine-lib-1.1.17-crippled.tar.bz2 b/xine-lib-1.1.17-crippled.tar.bz2 new file mode 100644 index 0000000..cf3cee3 --- /dev/null +++ b/xine-lib-1.1.17-crippled.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d593dd04e953e5417f72575ed735af603f9dbf8d3a368b8eb40cd0ff2105b50 +size 5110047 diff --git a/xine-lib-1.1.16.3-demuxcheckfor_mad_ffmpeg.patch b/xine-lib-1.1.17-demuxcheckfor_mad_ffmpeg.patch similarity index 100% rename from xine-lib-1.1.16.3-demuxcheckfor_mad_ffmpeg.patch rename to xine-lib-1.1.17-demuxcheckfor_mad_ffmpeg.patch diff --git a/xine-lib-1.1.16.3-glitch-free-pulseaudio.patch b/xine-lib-1.1.17-glitch-free-pulseaudio.patch similarity index 67% rename from xine-lib-1.1.16.3-glitch-free-pulseaudio.patch rename to xine-lib-1.1.17-glitch-free-pulseaudio.patch index 4c7f175..7c8752f 100644 --- a/xine-lib-1.1.16.3-glitch-free-pulseaudio.patch +++ b/xine-lib-1.1.17-glitch-free-pulseaudio.patch @@ -1,8 +1,9 @@ -diff -uNr xine-lib-1.1.15.orig/src/xine-engine/audio_out.c xine-lib-1.1.15/src/xine-engine/audio_out.c ---- xine-lib-1.1.15.orig/src/xine-engine/audio_out.c 2008-07-10 18:19:10.000000000 +0200 -+++ xine-lib-1.1.15/src/xine-engine/audio_out.c 2009-01-10 21:57:20.000000000 +0100 -@@ -1151,8 +1151,17 @@ - +Index: xine-lib-1.1.17/src/xine-engine/audio_out.c +=================================================================== +--- xine-lib-1.1.17.orig/src/xine-engine/audio_out.c ++++ xine-lib-1.1.17/src/xine-engine/audio_out.c +@@ -1156,8 +1156,17 @@ static void *ao_loop (void *this_gen) { + /* * calculate gap: + * diff --git a/xine-lib-1.1.16.3-ia64-is-not-alpha.diff b/xine-lib-1.1.17-ia64-is-not-alpha.diff similarity index 100% rename from xine-lib-1.1.16.3-ia64-is-not-alpha.diff rename to xine-lib-1.1.17-ia64-is-not-alpha.diff diff --git a/xine-lib-1.1.16.3-install-plugins-helper.diff b/xine-lib-1.1.17-install-plugins-helper.diff similarity index 78% rename from xine-lib-1.1.16.3-install-plugins-helper.diff rename to xine-lib-1.1.17-install-plugins-helper.diff index d36ba37..90dd87a 100644 --- a/xine-lib-1.1.16.3-install-plugins-helper.diff +++ b/xine-lib-1.1.17-install-plugins-helper.diff @@ -1,7 +1,8 @@ -diff -uNr xine-lib-1.1.16.3.orig/configure.ac xine-lib-1.1.16.3/configure.ac ---- xine-lib-1.1.16.3.orig/configure.ac 2009-04-02 20:44:45.000000000 +0200 -+++ xine-lib-1.1.16.3/configure.ac 2009-11-14 10:39:51.933031529 +0100 -@@ -2553,6 +2553,28 @@ +Index: xine-lib-1.1.17/configure.ac +=================================================================== +--- xine-lib-1.1.17.orig/configure.ac ++++ xine-lib-1.1.17/configure.ac +@@ -2613,6 +2613,28 @@ fi AM_CONDITIONAL(HAVE_W32DLL, test "x$enable_w32dll" != "xno") @@ -30,9 +31,10 @@ diff -uNr xine-lib-1.1.16.3.orig/configure.ac xine-lib-1.1.16.3/configure.ac dnl --------------------------------------------- dnl some include paths ( !!! DO NOT REMOVE !!! ) -diff -uNr xine-lib-1.1.16.3.orig/src/xine-engine/audio_decoder.c xine-lib-1.1.16.3/src/xine-engine/audio_decoder.c ---- xine-lib-1.1.16.3.orig/src/xine-engine/audio_decoder.c 2009-02-10 18:32:23.000000000 +0100 -+++ xine-lib-1.1.16.3/src/xine-engine/audio_decoder.c 2009-11-14 10:39:51.934031409 +0100 +Index: xine-lib-1.1.17/src/xine-engine/audio_decoder.c +=================================================================== +--- xine-lib-1.1.17.orig/src/xine-engine/audio_decoder.c ++++ xine-lib-1.1.17/src/xine-engine/audio_decoder.c @@ -41,6 +41,7 @@ #include "xine_internal.h" @@ -41,8 +43,8 @@ diff -uNr xine-lib-1.1.16.3.orig/src/xine-engine/audio_decoder.c xine-lib-1.1.16 static void *audio_decoder_loop (void *stream_gen) { -@@ -341,6 +342,10 @@ - +@@ -341,6 +342,10 @@ static void *audio_decoder_loop (void *s + _x_stream_info_set(stream, XINE_STREAM_INFO_AUDIO_HANDLED, (stream->audio_decoder_plugin != NULL)); + @@ -50,11 +52,12 @@ diff -uNr xine-lib-1.1.16.3.orig/src/xine-engine/audio_decoder.c xine-lib-1.1.16 + _x_install_plugins_helper(stream,"decoder-audio", buf->type, _x_buf_audio_name( buf->type )); + } - + if (audio_type != stream->audio_type) { -diff -uNr xine-lib-1.1.16.3.orig/src/xine-engine/install_plugins_helper.c xine-lib-1.1.16.3/src/xine-engine/install_plugins_helper.c ---- xine-lib-1.1.16.3.orig/src/xine-engine/install_plugins_helper.c 1970-01-01 01:00:00.000000000 +0100 -+++ xine-lib-1.1.16.3/src/xine-engine/install_plugins_helper.c 2009-11-14 10:39:51.935031218 +0100 +Index: xine-lib-1.1.17/src/xine-engine/install_plugins_helper.c +=================================================================== +--- /dev/null ++++ xine-lib-1.1.17/src/xine-engine/install_plugins_helper.c @@ -0,0 +1,106 @@ +/* + * Copyright (C) 2007 Sascha Sommer @@ -162,9 +165,10 @@ diff -uNr xine-lib-1.1.16.3.orig/src/xine-engine/install_plugins_helper.c xine-l + } +} + -diff -uNr xine-lib-1.1.16.3.orig/src/xine-engine/install_plugins_helper.h xine-lib-1.1.16.3/src/xine-engine/install_plugins_helper.h ---- xine-lib-1.1.16.3.orig/src/xine-engine/install_plugins_helper.h 1970-01-01 01:00:00.000000000 +0100 -+++ xine-lib-1.1.16.3/src/xine-engine/install_plugins_helper.h 2009-11-14 10:39:51.935031218 +0100 +Index: xine-lib-1.1.17/src/xine-engine/install_plugins_helper.h +=================================================================== +--- /dev/null ++++ xine-lib-1.1.17/src/xine-engine/install_plugins_helper.h @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2007 Sascha Sommer @@ -201,10 +205,11 @@ diff -uNr xine-lib-1.1.16.3.orig/src/xine-engine/install_plugins_helper.h xine-l + + +#endif -diff -uNr xine-lib-1.1.16.3.orig/src/xine-engine/Makefile.am xine-lib-1.1.16.3/src/xine-engine/Makefile.am ---- xine-lib-1.1.16.3.orig/src/xine-engine/Makefile.am 2008-07-13 00:23:52.000000000 +0200 -+++ xine-lib-1.1.16.3/src/xine-engine/Makefile.am 2009-11-14 10:39:51.935031218 +0100 -@@ -19,7 +19,7 @@ +Index: xine-lib-1.1.17/src/xine-engine/Makefile.am +=================================================================== +--- xine-lib-1.1.17.orig/src/xine-engine/Makefile.am ++++ xine-lib-1.1.17/src/xine-engine/Makefile.am +@@ -19,7 +19,7 @@ libxine_la_SOURCES = xine.c metronom.c c video_overlay.c osd.c scratch.c demux.c vo_scale.c \ xine_interface.c post.c tvmode.c broadcaster.c io_helper.c \ input_rip.c input_cache.c info_helper.c refcounter.c \ @@ -213,7 +218,7 @@ diff -uNr xine-lib-1.1.16.3.orig/src/xine-engine/Makefile.am xine-lib-1.1.16.3/s # FIXME: these are currently unused: EXTRA_DIST = lrb.c lrb.h accel_xvmc.h -@@ -39,7 +39,8 @@ +@@ -39,7 +39,8 @@ xineinclude_HEADERS = buffer.h metronom audio_out.h resample.h video_out.h xine_internal.h spu_decoder.h \ video_overlay.h osd.h scratch.h xine_plugin.h xineintl.h \ plugin_catalog.h audio_decoder.h video_decoder.h post.h \ @@ -223,9 +228,10 @@ diff -uNr xine-lib-1.1.16.3.orig/src/xine-engine/Makefile.am xine-lib-1.1.16.3/s noinst_HEADERS = bswap.h ffmpeg_bswap.h -diff -uNr xine-lib-1.1.16.3.orig/src/xine-engine/video_decoder.c xine-lib-1.1.16.3/src/xine-engine/video_decoder.c ---- xine-lib-1.1.16.3.orig/src/xine-engine/video_decoder.c 2009-02-10 18:32:24.000000000 +0100 -+++ xine-lib-1.1.16.3/src/xine-engine/video_decoder.c 2009-11-14 10:39:51.934031409 +0100 +Index: xine-lib-1.1.17/src/xine-engine/video_decoder.c +=================================================================== +--- xine-lib-1.1.17.orig/src/xine-engine/video_decoder.c ++++ xine-lib-1.1.17/src/xine-engine/video_decoder.c @@ -37,6 +37,7 @@ #include "xine_internal.h" @@ -234,9 +240,9 @@ diff -uNr xine-lib-1.1.16.3.orig/src/xine-engine/video_decoder.c xine-lib-1.1.16 #include #define SPU_SLEEP_INTERVAL (90000/2) -@@ -376,6 +377,10 @@ +@@ -376,6 +377,10 @@ static void *video_decoder_loop (void *s stream->video_decoder_plugin = _x_get_video_decoder (stream, streamtype); - + _x_stream_info_set(stream, XINE_STREAM_INFO_VIDEO_HANDLED, (stream->video_decoder_plugin != NULL)); + if(buf->type != buftype_unknown && !stream->video_decoder_plugin) + _x_install_plugins_helper(stream,"decoder-video", buf->type, _x_buf_video_name( buf->type )); @@ -245,10 +251,11 @@ diff -uNr xine-lib-1.1.16.3.orig/src/xine-engine/video_decoder.c xine-lib-1.1.16 } if (stream->video_decoder_plugin) -diff -uNr xine-lib-1.1.16.3.orig/src/xine-engine/xine.c xine-lib-1.1.16.3/src/xine-engine/xine.c ---- xine-lib-1.1.16.3.orig/src/xine-engine/xine.c 2009-02-18 12:37:43.000000000 +0100 -+++ xine-lib-1.1.16.3/src/xine-engine/xine.c 2009-11-14 10:39:51.934031409 +0100 -@@ -1773,6 +1773,15 @@ +Index: xine-lib-1.1.17/src/xine-engine/xine.c +=================================================================== +--- xine-lib-1.1.17.orig/src/xine-engine/xine.c ++++ xine-lib-1.1.17/src/xine-engine/xine.c +@@ -1809,6 +1809,15 @@ void xine_init (xine_t *this) { 0, NULL, this); /* diff --git a/xine-lib-1.1.16.3-mjpegplugin.diff b/xine-lib-1.1.17-mjpegplugin.diff similarity index 95% rename from xine-lib-1.1.16.3-mjpegplugin.diff rename to xine-lib-1.1.17-mjpegplugin.diff index 6907438..1562b20 100644 --- a/xine-lib-1.1.16.3-mjpegplugin.diff +++ b/xine-lib-1.1.17-mjpegplugin.diff @@ -1,7 +1,8 @@ -diff -uNr xine-lib-1.1.16.3.orig/configure xine-lib-1.1.16.3/configure ---- xine-lib-1.1.16.3.orig/configure 2009-04-02 20:46:08.000000000 +0200 -+++ xine-lib-1.1.16.3/configure 2009-11-14 11:11:36.154780901 +0100 -@@ -48161,6 +48161,7 @@ +Index: xine-lib-1.1.17/configure +=================================================================== +--- xine-lib-1.1.17.orig/configure ++++ xine-lib-1.1.17/configure +@@ -48965,6 +48965,7 @@ echo "" echo " * video decoder plugins:" echo " - MPEG 1,2 - Amiga Bitplane" echo " - Raw RGB - Raw YUV" @@ -9,10 +10,11 @@ diff -uNr xine-lib-1.1.16.3.orig/configure xine-lib-1.1.16.3/configure if test "x$with_external_ffmpeg" = "xyes"; then echo " - ffmpeg (external library):" else -diff -uNr xine-lib-1.1.16.3.orig/configure.ac xine-lib-1.1.16.3/configure.ac ---- xine-lib-1.1.16.3.orig/configure.ac 2009-04-02 20:44:45.000000000 +0200 -+++ xine-lib-1.1.16.3/configure.ac 2009-11-14 11:11:36.156781247 +0100 -@@ -1075,6 +1075,28 @@ +Index: xine-lib-1.1.17/configure.ac +=================================================================== +--- xine-lib-1.1.17.orig/configure.ac ++++ xine-lib-1.1.17/configure.ac +@@ -1086,6 +1086,28 @@ AC_SUBST([SDL_CFLAGS]) AC_SUBST([SDL_LIBS]) dnl --------------------------------------------- @@ -41,15 +43,15 @@ diff -uNr xine-lib-1.1.16.3.orig/configure.ac xine-lib-1.1.16.3/configure.ac dnl check for Libstk dnl --------------------------------------------- -@@ -2760,6 +2782,7 @@ - src/libxineadec/gsm610/Makefile - src/libxineadec/nosefart/Makefile +@@ -2799,6 +2821,7 @@ src/libxineadec/Makefile + + src/libreal/Makefile +src/mjpeg/Makefile src/post/Makefile src/post/planar/Makefile src/post/goom/Makefile -@@ -2946,6 +2969,9 @@ +@@ -2989,6 +3012,9 @@ echo "" dnl audio decoders echo " * audio decoder plugins:" echo " - GSM 06.10 - linear PCM" @@ -59,30 +61,34 @@ diff -uNr xine-lib-1.1.16.3.orig/configure.ac xine-lib-1.1.16.3/configure.ac if test "x$with_external_ffmpeg" = "xyes"; then echo " - ffmpeg (external library):" else -diff -uNr xine-lib-1.1.16.3.orig/src/Makefile.am xine-lib-1.1.16.3/src/Makefile.am ---- xine-lib-1.1.16.3.orig/src/Makefile.am 2009-02-13 18:52:47.000000000 +0100 -+++ xine-lib-1.1.16.3/src/Makefile.am 2009-11-14 11:11:36.156781247 +0100 -@@ -26,5 +26,6 @@ +Index: xine-lib-1.1.17/src/Makefile.am +=================================================================== +--- xine-lib-1.1.17.orig/src/Makefile.am ++++ xine-lib-1.1.17/src/Makefile.am +@@ -27,6 +27,7 @@ SUBDIRS = \ libreal \ - libfaad \ + \ libmusepack \ + mjpeg \ post \ - combined -diff -uNr xine-lib-1.1.16.3.orig/src/Makefile.in xine-lib-1.1.16.3/src/Makefile.in ---- xine-lib-1.1.16.3.orig/src/Makefile.in 2009-04-02 20:45:50.000000000 +0200 -+++ xine-lib-1.1.16.3/src/Makefile.in 2009-11-14 11:11:36.157781105 +0100 -@@ -414,6 +414,7 @@ + combined \ + vdr +Index: xine-lib-1.1.17/src/Makefile.in +=================================================================== +--- xine-lib-1.1.17.orig/src/Makefile.in ++++ xine-lib-1.1.17/src/Makefile.in +@@ -450,6 +450,7 @@ SUBDIRS = \ libreal \ - libfaad \ + \ libmusepack \ + mjpeg \ post \ combined -diff -uNr xine-lib-1.1.16.3.orig/src/mjpeg/Makefile.am xine-lib-1.1.16.3/src/mjpeg/Makefile.am ---- xine-lib-1.1.16.3.orig/src/mjpeg/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ xine-lib-1.1.16.3/src/mjpeg/Makefile.am 2009-11-14 11:11:36.157781105 +0100 +Index: xine-lib-1.1.17/src/mjpeg/Makefile.am +=================================================================== +--- /dev/null ++++ xine-lib-1.1.17/src/mjpeg/Makefile.am @@ -0,0 +1,9 @@ +include $(top_srcdir)/misc/Makefile.common + @@ -93,9 +99,10 @@ diff -uNr xine-lib-1.1.16.3.orig/src/mjpeg/Makefile.am xine-lib-1.1.16.3/src/mjp +xineplug_decode_mjpeg_la_CFLAGS = $(VISIBILITY_FLAG) +xineplug_decode_mjpeg_la_LDFLAGS = $(xineplug_ldflags) +endif -diff -uNr xine-lib-1.1.16.3.orig/src/mjpeg/Makefile.in xine-lib-1.1.16.3/src/mjpeg/Makefile.in ---- xine-lib-1.1.16.3.orig/src/mjpeg/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ xine-lib-1.1.16.3/src/mjpeg/Makefile.in 2009-11-14 11:11:36.158781034 +0100 +Index: xine-lib-1.1.17/src/mjpeg/Makefile.in +=================================================================== +--- /dev/null ++++ xine-lib-1.1.17/src/mjpeg/Makefile.in @@ -0,0 +1,751 @@ +# Makefile.in generated by automake 1.10 from Makefile.am. +# @configure_input@ @@ -848,9 +855,10 @@ diff -uNr xine-lib-1.1.16.3.orig/src/mjpeg/Makefile.in xine-lib-1.1.16.3/src/mjp +# 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 -uNr xine-lib-1.1.16.3.orig/src/mjpeg/xine_mjpeg_decoder.c xine-lib-1.1.16.3/src/mjpeg/xine_mjpeg_decoder.c ---- xine-lib-1.1.16.3.orig/src/mjpeg/xine_mjpeg_decoder.c 1970-01-01 01:00:00.000000000 +0100 -+++ xine-lib-1.1.16.3/src/mjpeg/xine_mjpeg_decoder.c 2009-11-14 11:11:36.158781034 +0100 +Index: xine-lib-1.1.17/src/mjpeg/xine_mjpeg_decoder.c +=================================================================== +--- /dev/null ++++ xine-lib-1.1.17/src/mjpeg/xine_mjpeg_decoder.c @@ -0,0 +1,397 @@ +/* + * Copyright (C) 2007 Marcus Meissner diff --git a/xine-lib-1.1.17.tar.bz2 b/xine-lib-1.1.17.tar.bz2 new file mode 100644 index 0000000..10a256c --- /dev/null +++ b/xine-lib-1.1.17.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:14e17e1665c0aa90f958204570060a3aebded2b93078c5fae14ca8a92c0e79cf +size 7528937 diff --git a/xine-lib-crippled-LOCAL.diff b/xine-lib-crippled-LOCAL.diff index 81ae529..4a501a3 100644 --- a/xine-lib-crippled-LOCAL.diff +++ b/xine-lib-crippled-LOCAL.diff @@ -2,7 +2,7 @@ Index: src/input/input_dvd.c =================================================================== --- src/input/input_dvd.c.orig +++ src/input/input_dvd.c -@@ -1385,7 +1385,12 @@ check_solaris_vold_device(dvd_input_clas +@@ -1387,7 +1387,12 @@ static int dvd_parse_try_open(dvd_input_plugin_t *this, const char *locator) { @@ -13,10 +13,10 @@ Index: src/input/input_dvd.c + xine_sarray_t **plgs = class->xine->plugin_catalog->plugin_lists; + plugin_node_t *node; + int i; - + /* FIXME: we temporarily special-case "dvd:/" for compatibility; * actually "dvd:/" should play a DVD image stored in /, but for -@@ -1401,7 +1406,6 @@ static int dvd_parse_try_open(dvd_input_ +@@ -1403,7 +1408,6 @@ xine_setenv("DVDCSS_RAW_DEVICE", "", 1); } else { /* use default DVD device */ @@ -24,10 +24,10 @@ Index: src/input/input_dvd.c xine_cfg_entry_t raw_device; if (xine_config_lookup_entry(this->stream->xine, "media.dvd.raw_device", &raw_device)) -@@ -1409,6 +1413,23 @@ static int dvd_parse_try_open(dvd_input_ +@@ -1411,6 +1415,23 @@ intended_dvd_device = class->dvd_device; } - + + for (i = 0; (node = xine_sarray_get (plgs[PLUGIN_VIDEO_DECODER-1], i)); i++) + if (strcmp (node->info->id, "mpeg2") == 0) + break; @@ -48,7 +48,7 @@ Index: src/input/input_dvd.c /* attempt to open DVD */ if (this->opened) { if (intended_dvd_device == this->current_dvd_device) { -@@ -1471,8 +1492,11 @@ static int dvd_parse_mrl(dvd_input_plugi +@@ -1473,8 +1494,11 @@ } static int dvd_plugin_open (input_plugin_t *this_gen) { @@ -58,11 +58,11 @@ Index: src/input/input_dvd.c + xine_sarray_t **plgs = class->xine->plugin_catalog->plugin_lists; + plugin_node_t *node; + int i; - + char *locator, *locator_orig; char *title_part; -@@ -1481,6 +1505,23 @@ static int dvd_plugin_open (input_plugin - +@@ -1483,6 +1507,23 @@ + trace_print("Called\n"); + for (i = 0; (node = xine_sarray_get (plgs[PLUGIN_VIDEO_DECODER-1], i)); i++) diff --git a/xine-lib-doc-fix-X11R6.diff b/xine-lib-doc-fix-X11R6.diff index 37834e3..8af1726 100644 --- a/xine-lib-doc-fix-X11R6.diff +++ b/xine-lib-doc-fix-X11R6.diff @@ -1,16 +1,3 @@ -Index: doc/README_xxmc.html -=================================================================== ---- doc/README_xxmc.html.orig -+++ doc/README_xxmc.html -@@ -70,7 +70,7 @@ installing - Make sure you have the XvMC wrapper installed. The wrapper will try to - figure out at run-time what xvmc-hardware specific driver to load. If - it fails it will open the file /etc/X11/XvMCConfig --or /usr/X11R6/lib/X11/XvMCConfig -+or /usr/lib/X11/XvMCConfig - and try to load the hardware-specific library mentioned in that file. - If you downloaded the XvMC wrapper from the unichrome site, the default - XvMCConfig will make the XvMC wrapper try to load the Nvidia XvMC Index: doc/faq/faq.sgml =================================================================== --- doc/faq/faq.sgml.orig @@ -18,7 +5,7 @@ Index: doc/faq/faq.sgml @@ -455,12 +455,12 @@ If you want to have Xv support compiled in, make sure you either have - a shared Xv library on your system, e.g. + a shared Xv library on your system, e.g. - ls /usr/X11R6/lib/libXv* + ls /usr/lib/libXv* should give you some .so libs, like this: @@ -31,4 +18,18 @@ Index: doc/faq/faq.sgml +   /usr/lib/libXv.so.1 - Alternatively you need to have libtool 1.4 or newer installed, then + Alternatively you need to have libtool 1.4 or newer installed, then +Index: doc/README_xxmc.html +=================================================================== +--- doc/README_xxmc.html.orig ++++ doc/README_xxmc.html +@@ -69,8 +69,7 @@ + installing + Make sure you have the XvMC wrapper installed. The wrapper will try to + figure out at run-time what xvmc-hardware specific driver to load. If +-it fails it will open the file /etc/X11/XvMCConfig +-or /usr/X11R6/lib/X11/XvMCConfig ++it fails it will open the file /usr/lib/X11/XvMCConfig + and try to load the hardware-specific library mentioned in that file. + If you downloaded the XvMC wrapper from the unichrome site, the default + XvMCConfig will make the XvMC wrapper try to load the Nvidia XvMC diff --git a/xine-lib.changes b/xine-lib.changes index 0496855..7e24a99 100644 --- a/xine-lib.changes +++ b/xine-lib.changes @@ -1,3 +1,45 @@ +------------------------------------------------------------------- +Fri Jan 8 12:28:04 CET 2010 - ro@suse.de + +- rediffed again + +------------------------------------------------------------------- +Wed Dec 16 11:16:46 CET 2009 - meissner@suse.de + +- rediffed for fuzz=0 + +------------------------------------------------------------------- +Mon Dec 01 21:14:00 CEST 2009 - Manfred.Tremmel@iiv.de +- update to 1.1.17 + * Add support for Matroska SIMPLEBLOCK. + * Add support for sndio (OpenBSD sound API). + * Correct invalid MIME info in the MOD demuxer. + * Fix a resource leak in libdvdnav. + * Properly NUL-terminate when reading ID3v2.2 tag content. + * Fix handling of the length of UTF-16 content sourced from, e.g., ID3 tags. + * Make ~/.xine/catalog.cache writing safer: write a new file & atomically + replace the old one. + * Initial parsing of Xing header LAME extension. + * Fixes for gapless playback. + * Added padding delay to the first and last frames (MPEG audio). + * Fixed buggy discontinuity handling when playing short streams and using the gapless switch. The current time should not be used here. + * Added audio padding handling. (New buffer flag for this.) + * Fix seeking in large raw DV files. + * Ported to new libmpcdec API (retaining build compat. with the old API). + * Cope with CDDB return code 211 (multiple entries). + * Allow reading of non-block-sized chunks from audio CDs. + * Add a user agent & protocol hack ("qthttp://...") to allow direct + viewing of Apple film trailers. + * Fixed int-to-float conversion in the JACK output plugin. + * Work around MOD files with reported length == 0. + * Reworked Matroska demuxer. Now reads files created by mkvmerge 2.7.0. + * Support BluRay/HDMV streams & subtitles. + * The XML parser & lexer code now has re-entrancy. + * Fixed a bug which prevented "dvb://" (no channel specified) working with + the default configuration. + * Handle VC1 extradata requirement (should fix playback). + + ------------------------------------------------------------------- Wed Nov 18 15:11:00 UTC 2009 - lnussel@suse.de diff --git a/xine-lib.spec b/xine-lib.spec index c9fb834..fc2c275 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -1,7 +1,7 @@ # -# spec file for package xine-lib (Version 1.1.16.3) +# spec file for package xine-lib (Version 1.1.17) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -97,13 +97,13 @@ BuildRequires: DirectFB %if %{with modplug} BuildRequires: libmodplug-devel %endif -Version: 1.1.16.3 +Version: 1.1.17 Release: 1 # bug437293 %ifarch ppc64 Obsoletes: xine-lib-64bit %endif -%define abiversion 1.26 +%define abiversion 1.27 Summary: Video Player with Plug-Ins Group: Productivity/Multimedia/Video/Players License: GPLv2+ ; Public Domain, Freeware @@ -119,7 +119,6 @@ Source99: precheckin_cripple_tarball.sh # *** xine-lib: Bugfixes Patch26: xine-lib-doc-fix-X11R6.diff Patch28: xine-lib-%{version}-ia64-is-not-alpha.diff -Patch30: xine-lib-%{version}-cdda.diff Patch31: xine-lib-%{version}-glitch-free-pulseaudio.patch # *** Addons Patch50: vdr-xine-0.9.3.diff.bz2 @@ -183,18 +182,6 @@ Plugins. Einige Plugins sind enthalten, andere können nach der Installation von xine nachinstalliert werden. xine untersützt Stereosound via OSS und AC5.1 per Alsa. -xine is a video player with a graphical front-end that supports a large -number of file formats (VCD and MPEG2, for example) using plug-ins. -Several plug-ins are included. Others can be installed after xine -installation. xine supports stereo sound using OSS and AC5.1 using -Alsa. - -xine ist ein Videoplayer mit grafischem Frontend und unterstützt -eine vielzahl an Dateiformaten (z.B. VCD und MPEG2) mit hilfe von -Plugins. Einige Plugins sind enthalten, andere können nach der -Installation von xine nachinstalliert werden. xine untersützt -Stereosound via OSS und AC5.1 per Alsa. - %if %{with distributable} This version of xine may lack certain features because of legal requirements (potential patent violation). See also @@ -219,18 +206,6 @@ Plugins. Einige Plugins sind enthalten, andere können nach der Installation von xine nachinstalliert werden. xine untersützt Stereosound via OSS und AC5.1 per Alsa. -xine is a video player with a graphical front-end that supports a large -number of file formats (VCD and MPEG2, for example) using plug-ins. -Several plug-ins are included. Others can be installed after xine -installation. xine supports stereo sound using OSS and AC5.1 using -Alsa. - -xine ist ein Videoplayer mit grafischem Frontend und unterstützt -eine vielzahl an Dateiformaten (z.B. VCD und MPEG2) mit hilfe von -Plugins. Einige Plugins sind enthalten, andere können nach der -Installation von xine nachinstalliert werden. xine untersützt -Stereosound via OSS und AC5.1 per Alsa. - %if %{with distributable} Diese xine-Version lässt eventuell einige Funktione aus rechtlichen Gründen vermissen (mögliche Patentverletzungen). Siehe dazu @@ -279,25 +254,6 @@ Plugins. Einige Plugins sind enthalten, andere können nach der Installation von xine nachinstalliert werden. xine untersützt Stereosound via OSS und AC5.1 per Alsa. -This package contains all necessary include files, libraries and -configuration files needed to compile applications that use the xine -media player. - -xine is a video player which supports a large number of file formats -(i.e., VCD, MPEG2) using plug-ins. Several plug-ins are included. -Others can be post-installed. Supports stereo sound using OSS and AC5.1 -using Alsa. - -Dieses Paket enthält alle nötigen Include Dateien, Biblioteken und -Konfigurationsdateien, die benötigt werden, um Anwendungen zu -kompilieren, die den xine Media Player verwenden. - -xine ist ein Videoplayer mit grafischem Frontend und unterstützt -eine vielzahl an Dateiformaten (z.B. VCD und MPEG2) mit hilfe von -Plugins. Einige Plugins sind enthalten, andere können nach der -Installation von xine nachinstalliert werden. xine untersützt -Stereosound via OSS und AC5.1 per Alsa. - %if %{with distributable} This version of xine may lack certain features because of legal requirements (potential patent violation). See also @@ -329,25 +285,6 @@ Plugins. Einige Plugins sind enthalten, andere können nach der Installation von xine nachinstalliert werden. xine untersützt Stereosound via OSS und AC5.1 per Alsa. -This package contains all necessary include files, libraries and -configuration files needed to compile applications that use the xine -media player. - -xine is a video player which supports a large number of file formats -(i.e., VCD, MPEG2) using plug-ins. Several plug-ins are included. -Others can be post-installed. Supports stereo sound using OSS and AC5.1 -using Alsa. - -Dieses Paket enthält alle nötigen Include Dateien, Biblioteken und -Konfigurationsdateien, die benötigt werden, um Anwendungen zu -kompilieren, die den xine Media Player verwenden. - -xine ist ein Videoplayer mit grafischem Frontend und unterstützt -eine vielzahl an Dateiformaten (z.B. VCD und MPEG2) mit hilfe von -Plugins. Einige Plugins sind enthalten, andere können nach der -Installation von xine nachinstalliert werden. xine untersützt -Stereosound via OSS und AC5.1 per Alsa. - %if %{with distributable} Diese xine-Version lässt eventuell einige Funktione aus rechtlichen Gründen vermissen (mögliche Patentverletzungen). Siehe dazu @@ -380,22 +317,6 @@ xine Soundausgabeplugin für den Pulseaudio Soundserver -Autoren: --------- - Guenter Bartsch - -xine sound output plugin for the pulseaudio soundserver - - - -Authors: --------- - Guenter Bartsch - -xine Soundausgabeplugin für den Pulseaudio Soundserver - - - Autoren: -------- Guenter Bartsch @@ -413,22 +334,6 @@ xine Soundausgabeplugin für den Pulseaudio Soundserver -Autoren: --------- - Guenter Bartsch - -xine sound output plugin for the pulseaudio soundserver - - - -Authors: --------- - Guenter Bartsch - -xine Soundausgabeplugin für den Pulseaudio Soundserver - - - Autoren: -------- Guenter Bartsch @@ -455,22 +360,6 @@ SDL xine Video-Ausgabeplugin -Autoren: --------- - Guenter Bartsch - -SDL xine video output plugin - - - -Authors: --------- - Guenter Bartsch - -SDL xine Video-Ausgabeplugin - - - Autoren: -------- Guenter Bartsch @@ -488,22 +377,6 @@ SDL xine Video-Ausgabeplugin -Autoren: --------- - Guenter Bartsch - -SDL xine video output plugin - - - -Authors: --------- - Guenter Bartsch - -SDL xine Video-Ausgabeplugin - - - Autoren: -------- Guenter Bartsch @@ -542,14 +415,6 @@ Authors: -------- Guenter Bartsch -xine Soundausgabeplugin für den arts Soundserver - - - -Autoren: --------- - Guenter Bartsch - %description -n libxine1-arts -l de xine sound output plugin for the arts soundserver @@ -575,14 +440,6 @@ Authors: -------- Guenter Bartsch -xine Soundausgabeplugin für den arts Soundserver - - - -Autoren: --------- - Guenter Bartsch - %endif %if %{with aalib} @@ -601,13 +458,6 @@ Authors: -------- Guenter Bartsch -aalib und libcaca xine Video-Ausgabeplugin - - - -Autoren: --------- - Guenter Bartsch aalib and libcaca xine video-output plugin @@ -617,14 +467,6 @@ Authors: -------- Guenter Bartsch -aalib und libcaca xine Video-Ausgabeplugin - - - -Autoren: --------- - Guenter Bartsch - %description -n libxine1-aa -l de aalib and libcaca xine video-output plugin @@ -634,13 +476,6 @@ Authors: -------- Guenter Bartsch -aalib und libcaca xine Video-Ausgabeplugin - - - -Autoren: --------- - Guenter Bartsch aalib and libcaca xine video-output plugin @@ -650,14 +485,6 @@ Authors: -------- Guenter Bartsch -aalib und libcaca xine Video-Ausgabeplugin - - - -Autoren: --------- - Guenter Bartsch - %endif %if %{with esd} @@ -678,12 +505,6 @@ Authors: libxine Soundausgabeplugin für den esound Soundserver - - -Autoren: --------- - Guenter Bartsch - libxine sound output plugin for the esound soundserver @@ -692,14 +513,6 @@ Authors: -------- Guenter Bartsch -libxine Soundausgabeplugin für den esound Soundserver - - - -Autoren: --------- - Guenter Bartsch - %description -n libxine1-esd -l de libxine sound output plugin for the esound soundserver @@ -711,12 +524,6 @@ Authors: libxine Soundausgabeplugin für den esound Soundserver - - -Autoren: --------- - Guenter Bartsch - libxine sound output plugin for the esound soundserver @@ -725,14 +532,6 @@ Authors: -------- Guenter Bartsch -libxine Soundausgabeplugin für den esound Soundserver - - - -Autoren: --------- - Guenter Bartsch - %endif %if %{with jack} @@ -755,22 +554,6 @@ xine Soundausgabeplugin für den jack Soundserver -Autoren: --------- - Guenter Bartsch - -xine sound output plugin for the jack soundserver - - - -Authors: --------- - Guenter Bartsch - -xine Soundausgabeplugin für den jack Soundserver - - - Autoren: -------- Guenter Bartsch @@ -788,22 +571,6 @@ xine Soundausgabeplugin für den jack Soundserver -Autoren: --------- - Guenter Bartsch - -xine sound output plugin for the jack soundserver - - - -Authors: --------- - Guenter Bartsch - -xine Soundausgabeplugin für den jack Soundserver - - - Autoren: -------- Guenter Bartsch @@ -830,22 +597,6 @@ Directfb xine Video-Ausgabeplugin -Autoren: --------- - Guenter Bartsch - -Directfb xine video-output plugin - - - -Authors: --------- - Guenter Bartsch - -Directfb xine Video-Ausgabeplugin - - - Autoren: -------- Guenter Bartsch @@ -863,22 +614,6 @@ Directfb xine Video-Ausgabeplugin -Autoren: --------- - Guenter Bartsch - -Directfb xine video-output plugin - - - -Authors: --------- - Guenter Bartsch - -Directfb xine Video-Ausgabeplugin - - - Autoren: -------- Guenter Bartsch @@ -906,22 +641,6 @@ Eingabeplugin welches xine ermöglicht Gnome-vfs zu benutzen -Autoren: --------- - Guenter Bartsch - -Input plugin which enables xine to use Gnome-vfs - - - -Authors: --------- - Guenter Bartsch - -Eingabeplugin welches xine ermöglicht Gnome-vfs zu benutzen - - - Autoren: -------- Guenter Bartsch @@ -939,22 +658,6 @@ Eingabeplugin welches xine ermöglicht Gnome-vfs zu benutzen -Autoren: --------- - Guenter Bartsch - -Input plugin which enables xine to use Gnome-vfs - - - -Authors: --------- - Guenter Bartsch - -Eingabeplugin welches xine ermöglicht Gnome-vfs zu benutzen - - - Autoren: -------- Guenter Bartsch @@ -1004,26 +707,6 @@ http://www.xine-project.org/home -Autoren: --------- - Guenter Bartsch -With these xine plug-ins, you can watch DVDs and all other kind of -media using xine. More information about xine plug-ins can be found at -http://www.xine-project.org/home - - - -Authors: --------- - Guenter Bartsch - -Mit diesem xine Plugins können Sie DVDs und alle von xine unterstützten -Medienverainten abspielen. Weitere Informationtne über xine Plugins -finden Sie unter -http://www.xine-project.org/home - - - Autoren: -------- Guenter Bartsch @@ -1045,26 +728,6 @@ http://www.xine-project.org/home -Autoren: --------- - Guenter Bartsch -With these xine plug-ins, you can watch DVDs and all other kind of -media using xine. More information about xine plug-ins can be found at -http://www.xine-project.org/home - - - -Authors: --------- - Guenter Bartsch - -Mit diesem xine Plugins können Sie DVDs und alle von xine unterstützten -Medienverainten abspielen. Weitere Informationtne über xine Plugins -finden Sie unter -http://www.xine-project.org/home - - - Autoren: -------- Guenter Bartsch @@ -1095,7 +758,6 @@ EOF %setup -q %patch26 %patch28 -p1 -%patch30 -p1 %patch31 -p1 %patch50 -p1 %patch51 -p1 @@ -1225,6 +887,7 @@ xineplug_decode_mpc xineplug_decode_gdk_pixbuf xineplug_decode_spucmml xineplug_decode_sputext +xineplug_decode_spuhdmv # requires ImageMagick xineplug_decode_image xineplug_dmx_yuv_frames