Hello community,
here is the log from the commit of package xine-lib
checked in at Fri Mar 31 15:52:42 CEST 2006.
--------
--- xine-lib/xine-lib.changes 2006-03-16 16:03:57.000000000 +0100
+++ xine-lib/xine-lib.changes 2006-03-30 13:14:19.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Mar 30 13:13:02 CEST 2006 - mhopf@suse.de
+
+- Fix for #157854: Check for mad and ffmpeg before advertizing mp3.
+- Improved fix for shared images, but not shared pixmaps.
+
+-------------------------------------------------------------------
New:
----
xine-lib-demuxcheckfor_mad_ffmpeg.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xine-lib.spec ++++++
--- /var/tmp/diff_new_pack.PZ2rla/_old 2006-03-31 15:52:13.000000000 +0200
+++ /var/tmp/diff_new_pack.PZ2rla/_new 2006-03-31 15:52:13.000000000 +0200
@@ -15,7 +15,7 @@
%define DISTRIBUTABLE 1
Summary: Video Player with Plug-Ins
Version: 1.1.1
-Release: 12
+Release: 14
%define libversion 1.1.1
%define uiversion 0.99.4
Obsoletes: xine
@@ -42,6 +42,7 @@
Patch14: xine-lib-accel-ppc-cache32.diff
Patch15: xine-lib-alsa-resume-fix.diff
Patch16: xine-lib-faad-x86_64.diff
+Patch17: xine-lib-demuxcheckfor_mad_ffmpeg.diff
Patch100: xine-ui.diff
Patch102: vdr-xine-ui-0.7.6.diff
Patch103: xine-ui-fix-gcc-warnings.diff
@@ -109,7 +110,7 @@
Group: Productivity/Multimedia/Video/Players
Provides: xine:/usr/bin/xine
Version: 0.99.4
-Release: 20
+Release: 22
Autoreqprov: on
%description -n xine-ui
@@ -129,15 +130,15 @@
Guenter Bartsch
%package -n xine-extra
-Summary: Xine Plug-In for Unencrypted DVDs
+Summary: optional Xine plugins
Group: Productivity/Multimedia/Video/Players
Requires: xine-lib = %libversion
Autoreqprov: on
%description -n xine-extra
-With this Xine plug-in, you can watch unencrypted DVDs using Xine. More
-information about Xine plug-ins can be found at
-http://xine.sourceforge.net/
+The package contains less often needed xine plugins with extra
+dependencies. For example to use aRts or esd autio output or visual
+output via SDL or aalib.
@@ -179,12 +180,13 @@
%patch14
%patch15
%patch16
+%patch17
(cd ../xine-ui-%{uiversion}
%patch100
%patch102 -p1
%patch103 -p1
%patch104
-%patch105
+%patch105 -p1
)
libtoolize --force
%if %suse_version > 820
@@ -519,6 +521,9 @@
/usr/include/xine.h
%changelog -n xine-lib
+* Thu Mar 30 2006 - mhopf@suse.de
+- Fix for #157854: Check for mad and ffmpeg before advertizing mp3.
+- Improved fix for shared images, but not shared pixmaps.
* Thu Mar 16 2006 - mhopf@suse.de
- Really fixed #132749: crippled xine URL was no longer valid.
Missed text in one of the patches.
++++++ xine-lib-demuxcheckfor_mad_ffmpeg.diff ++++++
diff -ur ../xine-lib-1.1.1-orig/src/xine-engine/load_plugins.c ./src/xine-engine/load_plugins.c
--- ../xine-lib-1.1.1-orig/src/xine-engine/load_plugins.c 2005-09-19 18:14:02.000000000 +0200
+++ ./src/xine-engine/load_plugins.c 2006-03-28 12:52:37.000000000 +0200
@@ -2258,11 +2258,21 @@
int len, pos;
plugin_node_t *node;
char *str;
+ int havempgdecoder = 0;
+ const char * const * p;
+
pthread_mutex_lock (&catalog->lock);
- /* calc length of output */
+ _build_list_typed_plugins(&catalog, catalog->plugin_lists[PLUGIN_AUDIO_DECODER - 1]);
+ for (p = catalog->ids; p && *p; p++) {
+ if (strcmp (*p, "mad") == 0 || strcmp (*p, "ffmpegaudio") == 0) {
+ havempgdecoder = 1;
+ break;
+ }
+ }
+ /* calc length of output */
len = 0;
node = xine_list_first_content (catalog->plugin_lists[PLUGIN_DEMUX - 1]);
while (node) {
@@ -2273,7 +2283,8 @@
cls = (demux_class_t *)node->plugin_class;
- if((exts = cls->get_extensions(cls)) && strlen(exts))
+ if((exts = cls->get_extensions(cls)) && strlen(exts) &&
+ (havempgdecoder || !strstr (exts, "mp3")))
len += strlen(exts) + 1;
}
node = xine_list_next_content (catalog->plugin_lists[PLUGIN_DEMUX - 1]);
@@ -2293,7 +2304,8 @@
cls = (demux_class_t *)node->plugin_class;
- if((e = cls->get_extensions (cls)) && strlen(e)) {
+ if((e = cls->get_extensions (cls)) && strlen(e) &&
+ (havempgdecoder || !strstr (e, "mp3"))) {
l = strlen(e);
memcpy (&str[pos], e, l);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...