Hello community,
here is the log from the commit of package xine-lib
checked in at Tue Mar 25 20:14:36 CET 2008.
--------
--- xine-lib/xine-lib.changes 2008-03-10 13:29:40.000000000 +0100
+++ /mounts/work_src_done/STABLE/xine-lib/xine-lib.changes 2008-03-19 16:44:39.000000000 +0100
@@ -1,0 +2,26 @@
+Wed Mar 19 16:42:18 CET 2008 - mhopf@suse.de
+
+- Update to 1.1.11:
+ * Security fixes:
+ - Array Indexing Vulnerability in sdpplin_parse(). (CVE-2008-0073)
+ * Reworked the plugin directory naming so that external plugins don't have
+ to be rebuilt for every release. We now use a naming scheme based on the
+ API/ABI versioning, checking older directories - with this release, the
+ plugin directory name is 1.20, and if this gets bumped to 1.21 in a
+ future release, 1.20 will still be available for external plugins.
+ (Any directories not 1.* won't be looked in.)
+ * Made the version parsing much more reliable; it wasn't properly coping
+ with four-part version numbers. This affects any program whose build
+ scripts use xine-lib's automake macros.
+ * Fixed an off-by-one in the FLAC security fix patch. This breakage was
+ causing failure to play some files.
+ * Support 16-bit big-endian DTS audio.
+ * Improved frame snapshot API. (ABI extension.)
+ * Re-add support for # (stream parameter separator) in raw filenames,
+ without the bugs found in the original implementation.
+ (This is a convenience feature for users only. Front ends which rely on
+ it for functions like subtitle file detection must instead use file://
+ MRLs; if they don't, we consider them to be buggy.)
+ * Fixed long delay when closing stream on dual core systems [Bug #33]
+
+-------------------------------------------------------------------
Old:
----
xine-lib-1.1.10.1-crippled.tar.bz2
xine-lib-1.1.10.1.tar.bz2
New:
----
xine-lib-1.1.11-crippled.tar.bz2
xine-lib-1.1.11.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xine-lib.spec ++++++
--- /var/tmp/diff_new_pack.ve3300/_old 2008-03-25 20:12:53.000000000 +0100
+++ /var/tmp/diff_new_pack.ve3300/_new 2008-03-25 20:12:53.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package xine-lib (Version 1.1.10.1)
+# spec file for package xine-lib (Version 1.1.11)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -33,9 +33,9 @@
BuildRequires: mad-devel
%endif
Recommends: opensuse-codecs-installer
-Version: 1.1.10.1
-Release: 10
-%define abiversion 1.1.10
+Version: 1.1.11
+Release: 1
+%define abiversion 1.20
Summary: Video Player with Plug-Ins
Group: Productivity/Multimedia/Video/Players
License: GPL v2 or later; Public Domain, Freeware
@@ -448,6 +448,29 @@
%endif
%changelog
+* Wed Mar 19 2008 mhopf@suse.de
+- Update to 1.1.11:
+ * Security fixes:
+ - Array Indexing Vulnerability in sdpplin_parse(). (CVE-2008-0073)
+ * Reworked the plugin directory naming so that external plugins don't have
+ to be rebuilt for every release. We now use a naming scheme based on the
+ API/ABI versioning, checking older directories - with this release, the
+ plugin directory name is 1.20, and if this gets bumped to 1.21 in a
+ future release, 1.20 will still be available for external plugins.
+ (Any directories not 1.* won't be looked in.)
+ * Made the version parsing much more reliable; it wasn't properly coping
+ with four-part version numbers. This affects any program whose build
+ scripts use xine-lib's automake macros.
+ * Fixed an off-by-one in the FLAC security fix patch. This breakage was
+ causing failure to play some files.
+ * Support 16-bit big-endian DTS audio.
+ * Improved frame snapshot API. (ABI extension.)
+ * Re-add support for # (stream parameter separator) in raw filenames,
+ without the bugs found in the original implementation.
+ (This is a convenience feature for users only. Front ends which rely on
+ it for functions like subtitle file detection must instead use file://
+ MRLs; if they don't, we consider them to be buggy.)
+ * Fixed long delay when closing stream on dual core systems [Bug #33]
* Mon Mar 10 2008 lnussel@suse.de
- get rid of nosrc so a debuginfo package get created (bnc#284030)
* Fri Feb 15 2008 lnussel@suse.de
++++++ vdr-xine-lib-0.8.1.diff.bz2 ++++++
++++ 2527 lines (skipped)
++++ between xine-lib/vdr-xine-lib-0.8.1.diff.bz2
++++ and /mounts/work_src_done/STABLE/xine-lib/vdr-xine-lib-0.8.1.diff.bz2
++++++ xine-lib-1.1.10.1-crippled.tar.bz2 -> xine-lib-1.1.11-crippled.tar.bz2 ++++++
++++ 33598 lines of diff (skipped)
++++++ xine-lib-1.1.10.1-crippled.tar.bz2 -> xine-lib-1.1.11.tar.bz2 ++++++
xine-lib/xine-lib-1.1.10.1-crippled.tar.bz2 /mounts/work_src_done/STABLE/xine-lib/xine-lib-1.1.11.tar.bz2 differ: byte 11, line 1
++++++ xine-lib-1.1.7-install-plugins-helper.diff ++++++
--- /var/tmp/diff_new_pack.ve3300/_old 2008-03-25 20:13:01.000000000 +0100
+++ /var/tmp/diff_new_pack.ve3300/_new 2008-03-25 20:13:01.000000000 +0100
@@ -1,6 +1,8 @@
---- xine-lib-1.1.7.org/configure.ac 2007-08-16 11:12:26.000000000 +0000
-+++ xine-lib-1.1.7/configure.ac 2007-08-16 11:12:25.000000000 +0000
-@@ -2509,6 +2509,28 @@
+Index: xine-lib-1.1.11/configure.ac
+===================================================================
+--- xine-lib-1.1.11.orig/configure.ac
++++ xine-lib-1.1.11/configure.ac
+@@ -2545,6 +2545,28 @@ fi
AM_CONDITIONAL(HAVE_W32DLL, test "x$enable_w32dll" != "xno")
@@ -29,9 +31,11 @@
dnl ---------------------------------------------
dnl some include paths ( !!! DO NOT REMOVE !!! )
---- xine-lib-1.1.7.org/src/xine-engine/xine.c 2007-08-16 11:12:25.000000000 +0000
-+++ xine-lib-1.1.7/src/xine-engine/xine.c 2007-08-16 11:12:21.000000000 +0000
-@@ -1643,6 +1643,15 @@
+Index: xine-lib-1.1.11/src/xine-engine/xine.c
+===================================================================
+--- xine-lib-1.1.11.orig/src/xine-engine/xine.c
++++ xine-lib-1.1.11/src/xine-engine/xine.c
+@@ -1780,6 +1780,15 @@ void xine_init (xine_t *this) {
0, NULL, this);
/*
@@ -47,9 +51,11 @@
* keep track of all opened streams
*/
this->streams = xine_list_new();
---- xine-lib-1.1.7.org/src/xine-engine/video_decoder.c 2007-08-16 11:12:25.000000000 +0000
-+++ xine-lib-1.1.7/src/xine-engine/video_decoder.c 2007-08-16 11:40:56.000000000 +0000
-@@ -39,6 +39,7 @@
+Index: xine-lib-1.1.11/src/xine-engine/video_decoder.c
+===================================================================
+--- xine-lib-1.1.11.orig/src/xine-engine/video_decoder.c
++++ xine-lib-1.1.11/src/xine-engine/video_decoder.c
+@@ -37,6 +37,7 @@
#include "xine_internal.h"
#include "xineutils.h"
@@ -57,20 +63,22 @@
#include
#define SPU_SLEEP_INTERVAL (90000/2)
-@@ -369,6 +370,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 ));
++ _x_install_plugins_helper(stream,"decoder-video", buf->type, _x_buf_video_name( buf->type ));
++
+
-+
}
if (stream->video_decoder_plugin)
---- xine-lib-1.1.7.org/src/xine-engine/audio_decoder.c 2007-08-16 11:12:25.000000000 +0000
-+++ xine-lib-1.1.7/src/xine-engine/audio_decoder.c 2007-08-16 11:41:24.000000000 +0000
-@@ -43,6 +43,7 @@
+Index: xine-lib-1.1.11/src/xine-engine/audio_decoder.c
+===================================================================
+--- xine-lib-1.1.11.orig/src/xine-engine/audio_decoder.c
++++ xine-lib-1.1.11/src/xine-engine/audio_decoder.c
+@@ -41,6 +41,7 @@
#include "xine_internal.h"
#include "xineutils.h"
@@ -78,7 +86,7 @@
static void *audio_decoder_loop (void *stream_gen) {
-@@ -340,6 +341,10 @@
+@@ -339,6 +340,10 @@ static void *audio_decoder_loop (void *s
_x_stream_info_set(stream, XINE_STREAM_INFO_AUDIO_HANDLED,
(stream->audio_decoder_plugin != NULL));
@@ -89,9 +97,11 @@
}
if (audio_type != stream->audio_type) {
---- xine-lib-1.1.7.org/src/xine-engine/Makefile.am 2007-08-16 11:12:25.000000000 +0000
-+++ xine-lib-1.1.7/src/xine-engine/Makefile.am 2007-08-16 11:12:21.000000000 +0000
-@@ -19,7 +19,7 @@
+Index: xine-lib-1.1.11/src/xine-engine/Makefile.am
+===================================================================
+--- xine-lib-1.1.11.orig/src/xine-engine/Makefile.am
++++ xine-lib-1.1.11/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 \
@@ -100,7 +110,7 @@
# 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 \
@@ -110,11 +120,13 @@
noinst_HEADERS = bswap.h ffmpeg_bswap.h
---- /dev/null 2007-08-16 10:48:37.000000000 +0000
-+++ xine-lib-1.1.7/src/xine-engine/install_plugins_helper.h 2007-08-16 11:12:21.000000000 +0000
+Index: xine-lib-1.1.11/src/xine-engine/install_plugins_helper.h
+===================================================================
+--- /dev/null
++++ xine-lib-1.1.11/src/xine-engine/install_plugins_helper.h
@@ -0,0 +1,35 @@
+/*
-+ * Copyright (C) 2007 Sascha Sommer
++ * Copyright (C) 2007 Sascha Sommer
+ *
+ * This file is part of xine, a free video player.
+ *
@@ -142,14 +154,16 @@
+#include "xine_internal.h"
+
+/*
-+ * execute install plugins helper
++ * execute install plugins helper
+ */
+void _x_install_plugins_helper(xine_stream_t *stream, char* plugin_type, uint32_t type, char* plugin_desc) XINE_PROTECTED;
+
+
+#endif
---- /dev/null 2007-03-17 21:04:06.000000000 +0100
-+++ xine-lib-1.1.7/src/xine-engine/install_plugins_helper.c 2007-08-18 14:11:15.000000000 +0200
+Index: xine-lib-1.1.11/src/xine-engine/install_plugins_helper.c
+===================================================================
+--- /dev/null
++++ xine-lib-1.1.11/src/xine-engine/install_plugins_helper.c
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2007 Sascha Sommer
@@ -230,7 +244,7 @@
+ char* helper = get_helper(stream);
+ FILE* fp;
+
-+ if(helper && xine_config_lookup_entry(stream->xine, "media.plugins_helper", &cfgentry) && cfgentry.num_value
++ if(helper && xine_config_lookup_entry(stream->xine, "media.plugins_helper", &cfgentry) && cfgentry.num_value
+ && (fp = fopen(helper,"rb") )) {
+ char procname[PROCNAME_LEN];
+// char* procname = getenv("_"); /* might deliver /opt/kde3/bin/start_kdeinit_wrapper etc... */
@@ -254,6 +268,6 @@
+ }else{
+ waitpid(pid, NULL, 0);
+ }
-+ }
++ }
+}
+
++++++ xine-lib-assert.patch ++++++
--- /var/tmp/diff_new_pack.ve3300/_old 2008-03-25 20:13:01.000000000 +0100
+++ /var/tmp/diff_new_pack.ve3300/_new 2008-03-25 20:13:01.000000000 +0100
@@ -1,6 +1,8 @@
---- xine-lib-1.1.8/src/audio_out/audio_alsa_out.c
-+++ xine-lib-1.1.8/src/audio_out/audio_alsa_out.c
-@@ -44,6 +44,7 @@
+Index: xine-lib-1.1.11/src/audio_out/audio_alsa_out.c
+===================================================================
+--- xine-lib-1.1.11.orig/src/audio_out/audio_alsa_out.c
++++ xine-lib-1.1.11/src/audio_out/audio_alsa_out.c
+@@ -41,6 +41,7 @@
#ifdef HAVE_ALLOCA_H
#include
#endif
++++++ xine-lib-crippled-LOCAL.diff ++++++
--- /var/tmp/diff_new_pack.ve3300/_old 2008-03-25 20:13:01.000000000 +0100
+++ /var/tmp/diff_new_pack.ve3300/_new 2008-03-25 20:13:01.000000000 +0100
@@ -1,7 +1,8 @@
-diff -urp ../xine-lib-1.1.2.orig/src/input/input_dvd.c ./src/input/input_dvd.c
---- ../xine-lib-1.1.2.orig/src/input/input_dvd.c 2006-07-09 16:37:35.000000000 +0200
-+++ ./src/input/input_dvd.c 2006-10-11 14:19:43.000000000 +0200
-@@ -1391,7 +1391,12 @@ check_solaris_vold_device(dvd_input_clas
+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
static int dvd_parse_try_open(dvd_input_plugin_t *this, const char *locator)
{
@@ -15,7 +16,7 @@
/* FIXME: we temporarily special-case "dvd:/" for compatibility;
* actually "dvd:/" should play a DVD image stored in /, but for
-@@ -1407,7 +1412,6 @@ static int dvd_parse_try_open(dvd_input_
+@@ -1401,7 +1406,6 @@ static int dvd_parse_try_open(dvd_input_
xine_setenv("DVDCSS_RAW_DEVICE", "", 1);
} else {
/* use default DVD device */
@@ -23,7 +24,7 @@
xine_cfg_entry_t raw_device;
if (xine_config_lookup_entry(this->stream->xine,
"media.dvd.raw_device", &raw_device))
-@@ -1415,6 +1419,23 @@ static int dvd_parse_try_open(dvd_input_
+@@ -1409,6 +1413,23 @@ static int dvd_parse_try_open(dvd_input_
intended_dvd_device = class->dvd_device;
}
@@ -47,7 +48,7 @@
/* attempt to open DVD */
if (this->opened) {
if (intended_dvd_device == this->current_dvd_device) {
-@@ -1477,8 +1498,11 @@ static int dvd_parse_mrl(dvd_input_plugi
+@@ -1471,8 +1492,11 @@ static int dvd_parse_mrl(dvd_input_plugi
}
static int dvd_plugin_open (input_plugin_t *this_gen) {
@@ -58,9 +59,9 @@
+ plugin_node_t *node;
+ int i;
- char *locator;
+ char *locator, *locator_orig;
char *title_part;
-@@ -1487,6 +1511,23 @@ static int dvd_plugin_open (input_plugin
+@@ -1481,6 +1505,23 @@ static int dvd_plugin_open (input_plugin
trace_print("Called\n");
@@ -82,5 +83,5 @@
+ }
+
/* we already checked the "dvd:/" MRL before */
- locator = this->mrl + (sizeof("dvd:") - 1);
+ locator_orig = locator = strdup (this->mrl + (sizeof("dvd:") - 1));
++++++ xine-lib-demuxcheckfor_mad_ffmpeg-LOCAL.diff ++++++
--- /var/tmp/diff_new_pack.ve3300/_old 2008-03-25 20:13:01.000000000 +0100
+++ /var/tmp/diff_new_pack.ve3300/_new 2008-03-25 20:13:01.000000000 +0100
@@ -1,7 +1,8 @@
-diff -urp ../xine-lib-1.1.4.orig/src/xine-engine/load_plugins.c ./src/xine-engine/load_plugins.c
---- ../xine-lib-1.1.4.orig/src/xine-engine/load_plugins.c 2007-01-19 00:30:18.000000000 +0100
-+++ ./src/xine-engine/load_plugins.c 2007-01-30 19:04:56.000000000 +0100
-@@ -2366,9 +2366,19 @@ char *xine_get_file_extensions (xine_t *
+Index: src/xine-engine/load_plugins.c
+===================================================================
+--- src/xine-engine/load_plugins.c.orig
++++ src/xine-engine/load_plugins.c
+@@ -2401,9 +2401,19 @@ char *xine_get_file_extensions (xine_t *
plugin_node_t *node;
char *str;
int list_id, list_size;
@@ -21,7 +22,7 @@
/* calc length of output */
len = 0;
-@@ -2382,7 +2392,8 @@ char *xine_get_file_extensions (xine_t *
+@@ -2417,7 +2427,8 @@ char *xine_get_file_extensions (xine_t *
cls = (demux_class_t *)node->plugin_class;
@@ -31,7 +32,7 @@
len += strlen(exts) + 1;
}
}
-@@ -2402,7 +2413,8 @@ char *xine_get_file_extensions (xine_t *
+@@ -2437,7 +2448,8 @@ char *xine_get_file_extensions (xine_t *
cls = (demux_class_t *)node->plugin_class;
++++++ xine-lib-doc-fix-X11R6.diff ++++++
--- /var/tmp/diff_new_pack.ve3300/_old 2008-03-25 20:13:01.000000000 +0100
+++ /var/tmp/diff_new_pack.ve3300/_new 2008-03-25 20:13:01.000000000 +0100
@@ -1,6 +1,7 @@
-diff -urp ../xine-lib-1.1.2-orig/doc/README_xxmc.html ./doc/README_xxmc.html
---- ../xine-lib-1.1.2-orig/doc/README_xxmc.html 2006-08-11 16:22:08.000000000 +0200
-+++ ./doc/README_xxmc.html 2006-08-11 16:22:42.000000000 +0200
+Index: doc/README_xxmc.html
+===================================================================
+--- doc/README_xxmc.html.orig
++++ doc/README_xxmc.html
@@ -70,7 +70,7 @@ installing</h2>
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
@@ -10,10 +11,11 @@
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 -urp ../xine-lib-1.1.2-orig/doc/faq/faq.sgml ./doc/faq/faq.sgml
---- ../xine-lib-1.1.2-orig/doc/faq/faq.sgml 2006-08-11 16:22:08.000000000 +0200
-+++ ./doc/faq/faq.sgml 2006-08-11 16:24:58.000000000 +0200
-@@ -394,12 +394,12 @@
+Index: doc/faq/faq.sgml
+===================================================================
+--- doc/faq/faq.sgml.orig
++++ doc/faq/faq.sgml
+@@ -455,12 +455,12 @@
<para>
If you want to have Xv support compiled in, make sure you either have
a shared Xv library on your system, e.g.
++++++ xine-lib-mjpegplugin.diff ++++++
--- /var/tmp/diff_new_pack.ve3300/_old 2008-03-25 20:13:01.000000000 +0100
+++ /var/tmp/diff_new_pack.ve3300/_new 2008-03-25 20:13:01.000000000 +0100
@@ -1,6 +1,8 @@
---- configure.ac 2007-06-27 18:29:50.000000000 +0200
-+++ configure.ac 2007-06-27 18:13:42.000000000 +0200
-@@ -1059,6 +1059,28 @@
+Index: configure.ac
+===================================================================
+--- configure.ac.orig
++++ configure.ac
+@@ -1070,6 +1070,28 @@ AC_SUBST([SDL_CFLAGS])
AC_SUBST([SDL_LIBS])
dnl ---------------------------------------------
@@ -29,7 +31,7 @@
dnl check for Libstk
dnl ---------------------------------------------
-@@ -2676,6 +2698,7 @@
+@@ -2731,6 +2753,7 @@ src/libxineadec/Makefile
src/libxineadec/gsm610/Makefile
src/libxineadec/nosefart/Makefile
src/libreal/Makefile
@@ -37,7 +39,7 @@
src/post/Makefile
src/post/planar/Makefile
src/post/goom/Makefile
-@@ -2854,6 +2877,9 @@
+@@ -2918,6 +2941,9 @@ echo ""
dnl audio decoders
echo " * audio decoder plugins:"
echo " - GSM 06.10 - linear PCM"
@@ -47,9 +49,11 @@
if test "x$with_external_ffmpeg" = "xyes"; then
echo " - ffmpeg (external library):"
else
---- src/Makefile.am 2007-06-27 18:29:50.000000000 +0200
-+++ src/Makefile.am 2007-06-27 17:33:56.000000000 +0200
-@@ -25,6 +25,7 @@
+Index: src/Makefile.am
+===================================================================
+--- src/Makefile.am.orig
++++ src/Makefile.am
+@@ -25,6 +25,7 @@ SUBDIRS = \
libreal \
libfaad \
libmusepack \
@@ -57,8 +61,10 @@
post \
combined \
vdr
---- src/mjpeg/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ src/mjpeg/Makefile.am 2007-06-27 18:25:54.000000000 +0200
+Index: src/mjpeg/Makefile.am
+===================================================================
+--- /dev/null
++++ src/mjpeg/Makefile.am
@@ -0,0 +1,9 @@
+include $(top_srcdir)/misc/Makefile.common
+
@@ -69,24 +75,26 @@
+xineplug_decode_mjpeg_la_CFLAGS = $(VISIBILITY_FLAG)
+xineplug_decode_mjpeg_la_LDFLAGS = $(xineplug_ldflags)
+endif
---- src/mjpeg/xine_mjpeg_decoder.c 1970-01-01 01:00:00.000000000 +0100
-+++ src/mjpeg/xine_mjpeg_decoder.c 2007-06-27 18:12:23.000000000 +0200
+Index: src/mjpeg/xine_mjpeg_decoder.c
+===================================================================
+--- /dev/null
++++ src/mjpeg/xine_mjpeg_decoder.c
@@ -0,0 +1,388 @@
-+/*
++/*
+ * Copyright (C) 2007 Marcus Meissner
-+ *
++ *
+ * This file is part of xine, a free video player.
-+ *
++ *
+ * xine is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
-+ *
++ *
+ * xine is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
-+ *
++ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
@@ -212,7 +220,7 @@
+
+static void mjpeg_discontinuity (video_decoder_t *this_gen) {
+ mjpeg_decoder_t *this = (mjpeg_decoder_t *) this_gen;
-+
++
+ this->bytes_in_buffer = 0;
+ this->pts = 0;
+}
@@ -266,7 +274,7 @@
+ this->maxbytes_in_buffer *= 2;
+ this->buffer = newbuf;
+ }
-+ xine_fast_memcpy (&this->buffer[this->bytes_in_buffer],
++ xine_fast_memcpy (&this->buffer[this->bytes_in_buffer],
+ buf->content, buf->size);
+ this->bytes_in_buffer += buf->size;
+
@@ -341,7 +349,7 @@
+ uint8_t *y,*u,*v;
+ int i;
+ int x = jpeg_read_scanlines(&this->jd,&cursamprow,1);
-+
++
+ if (x != 1) {
+ fprintf(stderr, "failed to read current scanline?\n");
+ break;
@@ -365,10 +373,10 @@
+}
+
+static void mjpeg_dispose (video_decoder_t *this_gen) {
-+ mjpeg_decoder_t *this = (mjpeg_decoder_t *) this_gen;
++ mjpeg_decoder_t *this = (mjpeg_decoder_t *) this_gen;
+
+ jpeg_destroy_decompress(&this->jd);
-+ if (this->output_open) {
++ if (this->output_open) {
+ this->xstream->video_out->close (this->xstream->video_out, this->xstream);
+ this->output_open = 0;
+ }
@@ -433,7 +441,7 @@
+static void *init_plugin (xine_t *xine, void *data) {
+
+ mjpeg_class_t *this;
-+
++
+ this = (mjpeg_class_t *) xine_xmalloc (sizeof (mjpeg_class_t));
+
+ this->decoder_class.open_plugin = open_plugin;
@@ -444,7 +452,7 @@
+ return this;
+}
+
-+static uint32_t video_types[] = {
++static uint32_t video_types[] = {
+ BUF_VIDEO_JPEG,
+ BUF_VIDEO_MJPEG,
+ 0
@@ -456,12 +464,14 @@
+};
+
+const plugin_info_t xine_plugin_info[] EXPORTED = {
-+ /* type, API, "name", version, special_info, init_function */
++ /* type, API, "name", version, special_info, init_function */
+ { PLUGIN_VIDEO_DECODER, 18, "mjpeg", XINE_VERSION_CODE, &dec_info_video, init_plugin },
+ { PLUGIN_NONE, 0, "", 0, NULL, NULL }
+};
---- src/mjpeg/Makefile.in 2006-11-25 20:28:17.000000000 +0100
-+++ src/mjpeg/Makefile.in 2007-06-28 13:29:11.000000000 +0200
+Index: src/mjpeg/Makefile.in
+===================================================================
+--- /dev/null
++++ src/mjpeg/Makefile.in
@@ -0,0 +1,751 @@
+# Makefile.in generated by automake 1.10 from Makefile.am.
+# @configure_input@
@@ -921,7 +931,7 @@
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
-+xineplug_decode_mjpeg.la: $(xineplug_decode_mjpeg_la_OBJECTS) $(xineplug_decode_mjpeg_la_DEPENDENCIES)
++xineplug_decode_mjpeg.la: $(xineplug_decode_mjpeg_la_OBJECTS) $(xineplug_decode_mjpeg_la_DEPENDENCIES)
+ $(xineplug_decode_mjpeg_la_LINK) $(am_xineplug_decode_mjpeg_la_rpath) $(xineplug_decode_mjpeg_la_OBJECTS) $(xineplug_decode_mjpeg_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
@@ -1214,9 +1224,11 @@
+# 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:
---- configure
+Index: configure
+===================================================================
+--- configure.orig
+++ configure
-@@ -53416,6 +53416,7 @@
+@@ -53851,6 +53851,7 @@ echo ""
echo " * video decoder plugins:"
echo " - MPEG 1,2 - Amiga Bitplane"
echo " - Raw RGB - Raw YUV"
@@ -1224,13 +1236,15 @@
if test "x$with_external_ffmpeg" = "xyes"; then
echo " - ffmpeg (external library):"
else
---- src/Makefile.in
+Index: src/Makefile.in
+===================================================================
+--- src/Makefile.in.orig
+++ src/Makefile.in
-@@ -546,6 +546,7 @@
+@@ -399,6 +399,7 @@ SUBDIRS = \
libreal \
libfaad \
libmusepack \
+ mjpeg \
post \
- combined \
- vdr
+ combined
+
++++++ xine-lib-various-noncrippled.diff ++++++
--- /var/tmp/diff_new_pack.ve3300/_old 2008-03-25 20:13:01.000000000 +0100
+++ /var/tmp/diff_new_pack.ve3300/_new 2008-03-25 20:13:01.000000000 +0100
@@ -1,7 +1,8 @@
-diff -ur ../xine-lib-1.1.1-orig/src/libw32dll/wine/ldt_keeper.c ./src/libw32dll/wine/ldt_keeper.c
---- ../xine-lib-1.1.1-orig/src/libw32dll/wine/ldt_keeper.c 2006-01-02 12:43:47.000000000 +0100
-+++ ./src/libw32dll/wine/ldt_keeper.c 2006-01-02 12:43:51.000000000 +0100
-@@ -79,6 +79,10 @@
+Index: src/libw32dll/wine/ldt_keeper.c
+===================================================================
+--- src/libw32dll/wine/ldt_keeper.c.orig
++++ src/libw32dll/wine/ldt_keeper.c
+@@ -77,6 +77,10 @@ int modify_ldt(int func, void *ptr, unsi
#ifdef __cplusplus
}
#endif
@@ -10,5 +11,5 @@
+#define modify_ldt_ldt_s user_desc
+#endif
#else
- #if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
+ #if defined(__NetBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
#include
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org