Hello community,
here is the log from the commit of package xine-lib for openSUSE:Factory
checked in at Tue Aug 3 18:20:42 CEST 2010.
--------
--- xine-lib/xine-lib.changes 2010-03-07 01:12:26.000000000 +0100
+++ xine-lib/xine-lib.changes 2010-08-03 18:16:25.479676000 +0200
@@ -1,0 +2,32 @@
+Tue Aug 3 13:14:49 UTC 2010 - lnussel@suse.de
+
+- remove unneeded libcdio-mini-devel buildignore again
+
+-------------------------------------------------------------------
+Mon Jul 26 01:00:00 CET 2010 - Manfred.Tremmel@iiv.de
+
+- update to 1.1.19
+ * Handle odd widths properly (for ffmpeg-decoded video).
+ * Make buildable with current (external) libdvdnav & libdvdread.
+ * Fix V4L2 check.
+ * Add support for Ogg tag 'DISCNUMBER' and ID3 tag 'TPOS'.
+ * Add support for EAC3.
+ * Recognise video/mp2t and video/mp2p.
+ * TTA fixes.
+ * Add support for Xv gamma adjustment.
+ * Better recovery from ALSA-reported errors.
+ * Report stream buffer stats to the application.
+ * Recognise and handle the WebM container format.
+ (VP8 video is not yet supported.)
+ * Recognise ScreamTracker 2 & 3 files.
+ * Fix playback of the first file handled by the modplug demuxer.
+ * Refuse to build with known-broken libmodplug (0.8.8).
+ http://bugs.debian.org/588465
+ * Fix a potential freeing of unallocated memory.
+
+-------------------------------------------------------------------
+Mon Apr 26 11:39:27 CEST 2010 - ro@suse.de
+
+- buildignore libcdio-mini-devel
+
+-------------------------------------------------------------------
@@ -2,0 +35 @@
+
@@ -10,0 +44 @@
+
@@ -48,0 +83 @@
+
@@ -77 +111,0 @@
-
calling whatdependson for head-i586
Old:
----
xine-lib-1.1.18.1-assert.patch
xine-lib-1.1.18.1-crippled.tar.bz2
xine-lib-1.1.18.1-demuxcheckfor_mad_ffmpeg.patch
xine-lib-1.1.18.1-glitch-free-pulseaudio.patch
xine-lib-1.1.18.1-ia64-is-not-alpha.diff
xine-lib-1.1.18.1-install-plugins-helper.diff
xine-lib-1.1.18.1-mjpegplugin.diff
xine-lib-1.1.18.1.tar.bz2
New:
----
xine-lib-1.1.19-assert.patch
xine-lib-1.1.19-crippled.tar.bz2
xine-lib-1.1.19-demuxcheckfor_mad_ffmpeg.patch
xine-lib-1.1.19-glitch-free-pulseaudio.patch
xine-lib-1.1.19-ia64-is-not-alpha.diff
xine-lib-1.1.19-install-plugins-helper.diff
xine-lib-1.1.19-mjpegplugin.diff
xine-lib-1.1.19.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xine-lib.spec ++++++
--- /var/tmp/diff_new_pack.E98zLp/_old 2010-08-03 18:20:20.000000000 +0200
+++ /var/tmp/diff_new_pack.E98zLp/_new 2010-08-03 18:20:20.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package xine-lib (Version 1.1.18.1)
+# spec file for package xine-lib (Version 1.1.19)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -100,22 +100,22 @@
%if %{with modplug}
BuildRequires: libmodplug-devel
%endif
-Version: 1.1.18.1
+Version: 1.1.19
Release: 1
# bug437293
%ifarch ppc64
Obsoletes: xine-lib-64bit
%endif
-%define abiversion 1.28
+%define abiversion 1.29
Summary: Video Player with Plug-Ins
Group: Productivity/Multimedia/Video/Players
-License: GPLv2+ ; Public Domain, Freeware
-Url: http://xine.sourceforge.net
+License: GPLv2+
+Url: http://www.xine-project.org/home
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %{with distributable}
Source: xine-lib-%{version}-crippled.tar.bz2
%else
-Source: xine-lib-%{version}.tar.bz2
+Source: http://downloads.sourceforge.net/project/xine/xine-lib/%{version}/xine-lib-%{version}.tar.bz2
%endif
Source2: baselibs.conf
Source10: README.SuSE
@@ -206,6 +206,7 @@
%endif
More information about xine plug-ins can be found at
http://www.xine-project.org/home
+
Authors:
--------
Guenter Bartsch
@@ -242,6 +243,7 @@
%endif
Weitere Informationen über xine Plugins finden Sie unter
http://www.xine-project.org/home
+
Autoren:
--------
Guenter Bartsch
@@ -309,6 +311,7 @@
%endif
More information about xine plug-ins can be found at
http://www.xine-project.org/home
+
Authors:
--------
Guenter Bartsch
@@ -359,9 +362,11 @@
%endif
Weitere Informationen über xine Plugins finden Sie unter
http://www.xine-project.org/home
+
Autoren:
--------
Guenter Bartsch
+
%if %{with pulseaudio}
%package -n libxine1-pulse
@@ -374,33 +379,13 @@
%description -n libxine1-pulse
xine sound output plugin for the pulseaudio soundserver
-
-
Authors:
--------
Guenter Bartsch
-xine Soundausgabeplugin für den Pulseaudio Soundserver
-
-
-
-Autoren:
---------
- Guenter Bartsch
-
%description -n libxine1-pulse -l de
-xine sound output plugin for the pulseaudio soundserver
-
-
-
-Authors:
---------
- Guenter Bartsch
-
xine Soundausgabeplugin für den Pulseaudio Soundserver
-
-
Autoren:
--------
Guenter Bartsch
@@ -417,38 +402,19 @@
%description -n libxine1-sdl
SDL xine video output plugin
-
-
Authors:
--------
Guenter Bartsch
-SDL xine Video-Ausgabeplugin
-
-
-
-Autoren:
---------
- Guenter Bartsch
-
%description -n libxine1-sdl -l de
-SDL xine video output plugin
-
-
-
-Authors:
---------
- Guenter Bartsch
-
SDL xine Video-Ausgabeplugin
-
-
Autoren:
--------
Guenter Bartsch
%endif
+
%if %{with arts}
%package -n libxine1-arts
@@ -460,38 +426,19 @@
%description -n libxine1-arts
xine sound output plugin for the arts soundserver
-
-
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
-
-
-
-Authors:
---------
- Guenter Bartsch
-
xine Soundausgabeplugin für den arts Soundserver
-
-
Autoren:
--------
Guenter Bartsch
%endif
+
%if %{with aalib}
%package -n libxine1-aa
@@ -503,35 +450,14 @@
%description -n libxine1-aa
aalib and libcaca xine video-output plugin
-
-
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
-
-
-
-Authors:
---------
- Guenter Bartsch
-
-
aalib und libcaca xine Video Ausgabeplugin
-
-
Autoren:
--------
Guenter Bartsch
@@ -548,35 +474,13 @@
%description -n libxine1-esd
libxine sound output plugin for the esound soundserver
-
-
-Authors:
---------
- Guenter Bartsch
-
-
-libxine Soundausgabeplugin für den esound Soundserver
-
-
-
Authors:
--------
Guenter Bartsch
%description -n libxine1-esd -l de
-libxine sound output plugin for the esound soundserver
-
-
-
-Authors:
---------
- Guenter Bartsch
-
-
libxine Soundausgabeplugin für den esound Soundserver
-
-
Authors:
--------
Guenter Bartsch
@@ -593,38 +497,19 @@
%description -n libxine1-jack
xine sound output plugin for the jack soundserver
-
-
Authors:
--------
Guenter Bartsch
-xine Soundausgabeplugin für den jack Soundserver
-
-
-
-Autoren:
---------
- Guenter Bartsch
-
%description -n libxine1-jack -l de
-xine sound output plugin for the jack soundserver
-
-
-
-Authors:
---------
- Guenter Bartsch
-
xine Soundausgabeplugin für den jack Soundserver
-
-
Autoren:
--------
Guenter Bartsch
%endif
+
%if %{with directfb}
%package -n libxine1-directfb
@@ -636,38 +521,19 @@
%description -n libxine1-directfb
Directfb xine video-output plugin
-
-
Authors:
--------
Guenter Bartsch
-Directfb xine Video-Ausgabeplugin
-
-
-
-Autoren:
---------
- Guenter Bartsch
-
%description -n libxine1-directfb -l de
-Directfb xine video-output plugin
-
-
-
-Authors:
---------
- Guenter Bartsch
-
Directfb xine Video-Ausgabeplugin
-
-
Autoren:
--------
Guenter Bartsch
%endif
+
%if %{with gnome_vfs}
%package -n libxine1-gnome-vfs
@@ -680,38 +546,19 @@
%description -n libxine1-gnome-vfs
Input plugin which enables xine to use Gnome-vfs
-
-
Authors:
--------
Guenter Bartsch
-Eingabeplugin welches xine ermöglicht Gnome-vfs zu benutzen
-
-
-
-Autoren:
---------
- Guenter Bartsch
-
%description -n libxine1-gnome-vfs -l de
-Input plugin which enables xine to use Gnome-vfs
-
-
-
-Authors:
---------
- Guenter Bartsch
-
Eingabeplugin welches xine ermöglicht Gnome-vfs zu benutzen
-
-
Autoren:
--------
Guenter Bartsch
%endif
+
%if !%{with distributable}
%package -n libxine1-codecs
@@ -743,40 +590,16 @@
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
%description -n libxine1-codecs -l de
-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
++++++ vdr-xine-0.9.3.diff.bz2 ++++++
--- /var/tmp/diff_new_pack.E98zLp/_old 2010-08-03 18:20:20.000000000 +0200
+++ /var/tmp/diff_new_pack.E98zLp/_new 2010-08-03 18:20:20.000000000 +0200
@@ -1,7 +1,7 @@
-diff -uNr xine-lib-1.1.18.orig/configure.ac xine-lib-1.1.18/configure.ac
---- xine-lib-1.1.18.orig/configure.ac 2010-02-24 20:51:35.535132250 +0100
-+++ xine-lib-1.1.18/configure.ac 2010-02-24 20:55:52.445884006 +0100
-@@ -2836,6 +2836,7 @@
+diff -urN xine-lib-1.1.19.orig/configure.ac xine-lib-1.1.19/configure.ac
+--- xine-lib-1.1.19.orig/configure.ac 2010-07-26 00:33:19.235784655 +0200
++++ xine-lib-1.1.19/configure.ac 2010-07-26 00:39:10.215786402 +0200
+@@ -2850,6 +2850,7 @@
src/video_out/vidix/drivers/Makefile
src/xine-utils/Makefile
src/xine-engine/Makefile
@@ -9,7 +9,7 @@
win32/Makefile
win32/include/Makefile])
AC_CONFIG_COMMANDS([default],[[chmod +x ./misc/SlackBuild ./misc/build_rpms.sh ./misc/relchk.sh]],[[]])
-@@ -2878,6 +2879,7 @@
+@@ -2892,6 +2893,7 @@
echo " - stdin_fifo - rtp"
echo " - http - mms"
echo " - pnm - rtsp"
@@ -17,7 +17,7 @@
if test "$have_supported_dvb" = yes; then
echo " - dvb"
fi
-@@ -3085,6 +3087,7 @@
+@@ -3105,6 +3107,7 @@
echo " - eq - eq2"
echo " - boxblur - denoise3d"
echo " - unsharp - tvtime"
@@ -25,9 +25,9 @@
echo " * SFX:"
echo " - goom - oscope"
echo " - fftscope - mosaico"
-diff -uNr xine-lib-1.1.18.orig/src/Makefile.am xine-lib-1.1.18/src/Makefile.am
---- xine-lib-1.1.18.orig/src/Makefile.am 2010-01-14 23:17:54.000000000 +0100
-+++ xine-lib-1.1.18/src/Makefile.am 2010-02-24 20:55:52.446883463 +0100
+diff -urN xine-lib-1.1.19.orig/src/Makefile.am xine-lib-1.1.19/src/Makefile.am
+--- xine-lib-1.1.19.orig/src/Makefile.am 2010-03-09 23:17:05.000000000 +0100
++++ xine-lib-1.1.19/src/Makefile.am 2010-07-26 00:39:10.215786402 +0200
@@ -28,4 +28,5 @@
libfaad \
libmusepack \
@@ -35,9 +35,9 @@
- combined
+ combined \
+ vdr
-diff -uNr xine-lib-1.1.18.orig/src/vdr/combined_vdr.c xine-lib-1.1.18/src/vdr/combined_vdr.c
---- xine-lib-1.1.18.orig/src/vdr/combined_vdr.c 1970-01-01 01:00:00.000000000 +0100
-+++ xine-lib-1.1.18/src/vdr/combined_vdr.c 2010-02-24 20:55:52.447884248 +0100
+diff -urN xine-lib-1.1.19.orig/src/vdr/combined_vdr.c xine-lib-1.1.19/src/vdr/combined_vdr.c
+--- xine-lib-1.1.19.orig/src/vdr/combined_vdr.c 1970-01-01 01:00:00.000000000 +0100
++++ xine-lib-1.1.19/src/vdr/combined_vdr.c 2010-07-26 00:39:10.216786094 +0200
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2000-2004 the xine project
@@ -83,9 +83,9 @@
+ { PLUGIN_NONE , 0, "" , 0 , NULL , NULL }
+};
+
-diff -uNr xine-lib-1.1.18.orig/src/vdr/combined_vdr.h xine-lib-1.1.18/src/vdr/combined_vdr.h
---- xine-lib-1.1.18.orig/src/vdr/combined_vdr.h 1970-01-01 01:00:00.000000000 +0100
-+++ xine-lib-1.1.18/src/vdr/combined_vdr.h 2010-02-24 20:55:52.447884248 +0100
+diff -urN xine-lib-1.1.19.orig/src/vdr/combined_vdr.h xine-lib-1.1.19/src/vdr/combined_vdr.h
+--- xine-lib-1.1.19.orig/src/vdr/combined_vdr.h 1970-01-01 01:00:00.000000000 +0100
++++ xine-lib-1.1.19/src/vdr/combined_vdr.h 2010-07-26 00:39:10.216786094 +0200
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2000-2004 the xine project
@@ -179,9 +179,9 @@
+
+#endif /* __COMBINED_VDR_H */
+
-diff -uNr xine-lib-1.1.18.orig/src/vdr/input_vdr.c xine-lib-1.1.18/src/vdr/input_vdr.c
---- xine-lib-1.1.18.orig/src/vdr/input_vdr.c 1970-01-01 01:00:00.000000000 +0100
-+++ xine-lib-1.1.18/src/vdr/input_vdr.c 2010-02-24 20:55:52.456882929 +0100
+diff -urN xine-lib-1.1.19.orig/src/vdr/input_vdr.c xine-lib-1.1.19/src/vdr/input_vdr.c
+--- xine-lib-1.1.19.orig/src/vdr/input_vdr.c 1970-01-01 01:00:00.000000000 +0100
++++ xine-lib-1.1.19/src/vdr/input_vdr.c 2010-07-26 00:39:10.220795412 +0200
@@ -0,0 +1,2665 @@
+/*
+ * Copyright (C) 2003-2004 the xine project
@@ -2848,9 +2848,9 @@
+
+ return this;
+}
-diff -uNr xine-lib-1.1.18.orig/src/vdr/Makefile.am xine-lib-1.1.18/src/vdr/Makefile.am
---- xine-lib-1.1.18.orig/src/vdr/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ xine-lib-1.1.18/src/vdr/Makefile.am 2010-02-24 20:55:52.446883463 +0100
+diff -urN xine-lib-1.1.19.orig/src/vdr/Makefile.am xine-lib-1.1.19/src/vdr/Makefile.am
+--- xine-lib-1.1.19.orig/src/vdr/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ xine-lib-1.1.19/src/vdr/Makefile.am 2010-07-26 00:39:10.220795412 +0200
@@ -0,0 +1,13 @@
+include $(top_srcdir)/misc/Makefile.common
+
@@ -2865,9 +2865,9 @@
+
+xineinclude_HEADERS = vdr.h
+noinst_HEADERS = combined_vdr.h
-diff -uNr xine-lib-1.1.18.orig/src/vdr/post_vdr_audio.c xine-lib-1.1.18/src/vdr/post_vdr_audio.c
---- xine-lib-1.1.18.orig/src/vdr/post_vdr_audio.c 1970-01-01 01:00:00.000000000 +0100
-+++ xine-lib-1.1.18/src/vdr/post_vdr_audio.c 2010-02-24 20:55:52.456882929 +0100
+diff -urN xine-lib-1.1.19.orig/src/vdr/post_vdr_audio.c xine-lib-1.1.19/src/vdr/post_vdr_audio.c
+--- xine-lib-1.1.19.orig/src/vdr/post_vdr_audio.c 1970-01-01 01:00:00.000000000 +0100
++++ xine-lib-1.1.19/src/vdr/post_vdr_audio.c 2010-07-26 00:39:10.221785676 +0200
@@ -0,0 +1,285 @@
+/*
+ * Copyright (C) 2000-2004 the xine project
@@ -3154,9 +3154,9 @@
+
+ return;
+}
-diff -uNr xine-lib-1.1.18.orig/src/vdr/post_vdr_video.c xine-lib-1.1.18/src/vdr/post_vdr_video.c
---- xine-lib-1.1.18.orig/src/vdr/post_vdr_video.c 1970-01-01 01:00:00.000000000 +0100
-+++ xine-lib-1.1.18/src/vdr/post_vdr_video.c 2010-02-24 20:55:52.458884429 +0100
+diff -urN xine-lib-1.1.19.orig/src/vdr/post_vdr_video.c xine-lib-1.1.19/src/vdr/post_vdr_video.c
+--- xine-lib-1.1.19.orig/src/vdr/post_vdr_video.c 1970-01-01 01:00:00.000000000 +0100
++++ xine-lib-1.1.19/src/vdr/post_vdr_video.c 2010-07-26 00:39:10.221785676 +0200
@@ -0,0 +1,502 @@
+/*
+ * Copyright (C) 2000-2004 the xine project
@@ -3660,9 +3660,9 @@
+
+ return skip;
+}
-diff -uNr xine-lib-1.1.18.orig/src/vdr/vdr.h xine-lib-1.1.18/src/vdr/vdr.h
---- xine-lib-1.1.18.orig/src/vdr/vdr.h 1970-01-01 01:00:00.000000000 +0100
-+++ xine-lib-1.1.18/src/vdr/vdr.h 2010-02-24 20:55:52.458884429 +0100
+diff -urN xine-lib-1.1.19.orig/src/vdr/vdr.h xine-lib-1.1.19/src/vdr/vdr.h
+--- xine-lib-1.1.19.orig/src/vdr/vdr.h 1970-01-01 01:00:00.000000000 +0100
++++ xine-lib-1.1.19/src/vdr/vdr.h 2010-07-26 00:39:10.222784950 +0200
@@ -0,0 +1,665 @@
+/*
+ * Copyright (C) 2000-2004 the xine project
@@ -4329,9 +4329,9 @@
+
+#endif /* __VDR_H */
+
-diff -uNr xine-lib-1.1.18.orig/src/video_out/video_out_xvmc.c xine-lib-1.1.18/src/video_out/video_out_xvmc.c
---- xine-lib-1.1.18.orig/src/video_out/video_out_xvmc.c 2010-01-14 23:17:55.000000000 +0100
-+++ xine-lib-1.1.18/src/video_out/video_out_xvmc.c 2010-02-24 20:55:52.459882281 +0100
+diff -urN xine-lib-1.1.19.orig/src/video_out/video_out_xvmc.c xine-lib-1.1.19/src/video_out/video_out_xvmc.c
+--- xine-lib-1.1.19.orig/src/video_out/video_out_xvmc.c 2010-04-08 16:52:29.000000000 +0200
++++ xine-lib-1.1.19/src/video_out/video_out_xvmc.c 2010-07-26 00:39:10.223784433 +0200
@@ -486,9 +486,9 @@
int second_field,
xvmc_macroblocks_t *macroblocks) {
@@ -4353,9 +4353,9 @@
/* keep track of frames and how many frames alocated. */
this->frames[this->num_frame_buffers++] = frame;
-diff -uNr xine-lib-1.1.18.orig/src/video_out/video_out_xxmc.c xine-lib-1.1.18/src/video_out/video_out_xxmc.c
---- xine-lib-1.1.18.orig/src/video_out/video_out_xxmc.c 2010-01-14 23:17:55.000000000 +0100
-+++ xine-lib-1.1.18/src/video_out/video_out_xxmc.c 2010-02-24 20:55:52.460882227 +0100
+diff -urN xine-lib-1.1.19.orig/src/video_out/video_out_xxmc.c xine-lib-1.1.19/src/video_out/video_out_xxmc.c
+--- xine-lib-1.1.19.orig/src/video_out/video_out_xxmc.c 2010-04-08 16:52:43.000000000 +0200
++++ xine-lib-1.1.19/src/video_out/video_out_xxmc.c 2010-07-26 00:39:10.224784615 +0200
@@ -365,15 +365,15 @@
switch(pc_type) {
@@ -4471,9 +4471,9 @@
format, flags);
}
}
-diff -uNr xine-lib-1.1.18.orig/src/video_out/xvmc_mocomp.c xine-lib-1.1.18/src/video_out/xvmc_mocomp.c
---- xine-lib-1.1.18.orig/src/video_out/xvmc_mocomp.c 2010-01-14 23:17:55.000000000 +0100
-+++ xine-lib-1.1.18/src/video_out/xvmc_mocomp.c 2010-02-24 20:55:52.461882453 +0100
+diff -urN xine-lib-1.1.19.orig/src/video_out/xvmc_mocomp.c xine-lib-1.1.19/src/video_out/xvmc_mocomp.c
+--- xine-lib-1.1.19.orig/src/video_out/xvmc_mocomp.c 2010-03-09 23:17:05.000000000 +0100
++++ xine-lib-1.1.19/src/video_out/xvmc_mocomp.c 2010-07-26 00:39:10.224784615 +0200
@@ -70,9 +70,9 @@
int second_field,
xvmc_macroblocks_t *macroblocks) {
@@ -4487,9 +4487,9 @@
int flags;
lprintf ("xvmc_render_macro_blocks\n");
-diff -uNr xine-lib-1.1.18.orig/src/video_out/xvmc_vld.c xine-lib-1.1.18/src/video_out/xvmc_vld.c
---- xine-lib-1.1.18.orig/src/video_out/xvmc_vld.c 2010-01-14 23:17:55.000000000 +0100
-+++ xine-lib-1.1.18/src/video_out/xvmc_vld.c 2010-02-24 20:55:52.461882453 +0100
+diff -urN xine-lib-1.1.19.orig/src/video_out/xvmc_vld.c xine-lib-1.1.19/src/video_out/xvmc_vld.c
+--- xine-lib-1.1.19.orig/src/video_out/xvmc_vld.c 2010-03-09 23:17:05.000000000 +0100
++++ xine-lib-1.1.19/src/video_out/xvmc_vld.c 2010-07-26 00:39:10.224784615 +0200
@@ -32,12 +32,12 @@
{
vo_frame_t *this = (vo_frame_t *) this_gen;
@@ -4515,9 +4515,9 @@
xxmc_driver_t
*driver = (xxmc_driver_t *) cf->vo_frame.driver;
-diff -uNr xine-lib-1.1.18.orig/src/xine-engine/accel_xvmc.h xine-lib-1.1.18/src/xine-engine/accel_xvmc.h
---- xine-lib-1.1.18.orig/src/xine-engine/accel_xvmc.h 2010-01-14 23:17:55.000000000 +0100
-+++ xine-lib-1.1.18/src/xine-engine/accel_xvmc.h 2010-02-24 20:55:52.461882453 +0100
+diff -urN xine-lib-1.1.19.orig/src/xine-engine/accel_xvmc.h xine-lib-1.1.19/src/xine-engine/accel_xvmc.h
+--- xine-lib-1.1.19.orig/src/xine-engine/accel_xvmc.h 2010-03-09 23:17:05.000000000 +0100
++++ xine-lib-1.1.19/src/xine-engine/accel_xvmc.h 2010-07-26 00:39:10.225784587 +0200
@@ -65,6 +65,7 @@
@@ -4546,9 +4546,9 @@
/*
* Register XvMC stream types here.
*/
-diff -uNr xine-lib-1.1.18.orig/src/xine-engine/post.c xine-lib-1.1.18/src/xine-engine/post.c
---- xine-lib-1.1.18.orig/src/xine-engine/post.c 2010-01-14 23:17:56.000000000 +0100
-+++ xine-lib-1.1.18/src/xine-engine/post.c 2010-02-24 20:55:52.462882679 +0100
+diff -urN xine-lib-1.1.19.orig/src/xine-engine/post.c xine-lib-1.1.19/src/xine-engine/post.c
+--- xine-lib-1.1.19.orig/src/xine-engine/post.c 2010-03-09 23:17:05.000000000 +0100
++++ xine-lib-1.1.19/src/xine-engine/post.c 2010-07-26 00:39:10.225784587 +0200
@@ -144,6 +144,14 @@
if (port->port_lock) pthread_mutex_unlock(port->port_lock);
}
@@ -4617,9 +4617,9 @@
return 1;
}
-diff -uNr xine-lib-1.1.18.orig/src/xine-engine/post.h xine-lib-1.1.18/src/xine-engine/post.h
---- xine-lib-1.1.18.orig/src/xine-engine/post.h 2010-01-14 23:17:56.000000000 +0100
-+++ xine-lib-1.1.18/src/xine-engine/post.h 2010-02-24 20:55:52.462882679 +0100
+diff -urN xine-lib-1.1.19.orig/src/xine-engine/post.h xine-lib-1.1.19/src/xine-engine/post.h
+--- xine-lib-1.1.19.orig/src/xine-engine/post.h 2010-03-09 23:17:05.000000000 +0100
++++ xine-lib-1.1.19/src/xine-engine/post.h 2010-07-26 00:39:10.225784587 +0200
@@ -177,6 +177,13 @@
/* the new frame function pointers */
vo_frame_t *new_frame;
@@ -4634,9 +4634,9 @@
/* if you want to decide yourself, whether the overlay manager should
* be intercepted, fill in this function; get_overlay_manager() acts as
* a template method and asks your function; return a boolean;
-diff -uNr xine-lib-1.1.18.orig/src/xine-engine/video_out.c xine-lib-1.1.18/src/xine-engine/video_out.c
---- xine-lib-1.1.18.orig/src/xine-engine/video_out.c 2010-02-23 22:57:24.000000000 +0100
-+++ xine-lib-1.1.18/src/xine-engine/video_out.c 2010-02-24 20:55:52.463882626 +0100
+diff -urN xine-lib-1.1.19.orig/src/xine-engine/video_out.c xine-lib-1.1.19/src/xine-engine/video_out.c
+--- xine-lib-1.1.19.orig/src/xine-engine/video_out.c 2010-07-21 19:43:52.000000000 +0200
++++ xine-lib-1.1.19/src/xine-engine/video_out.c 2010-07-26 00:39:10.226784210 +0200
@@ -132,6 +132,9 @@
int frame_drop_cpt;
int frame_drop_suggested;
@@ -4701,7 +4701,7 @@
if (this->discard_frames)
break;
-@@ -1629,6 +1661,9 @@
+@@ -1632,6 +1664,9 @@
free (this->free_img_buf_queue);
free (this->display_img_buf_queue);
@@ -4711,7 +4711,7 @@
free (this);
}
-@@ -1698,6 +1733,15 @@
+@@ -1701,6 +1736,15 @@
}
}
@@ -4727,7 +4727,7 @@
/* crop_frame() will allocate a new frame to copy in the given image
* while cropping. maybe someday this will be an automatic post plugin.
*/
-@@ -1793,6 +1837,7 @@
+@@ -1796,6 +1840,7 @@
this->vo.enable_ovl = vo_enable_overlay;
this->vo.get_overlay_manager = vo_get_overlay_manager;
this->vo.flush = vo_flush;
@@ -4735,7 +4735,7 @@
this->vo.get_property = vo_get_property;
this->vo.set_property = vo_set_property;
this->vo.status = vo_status;
-@@ -1886,6 +1931,9 @@
+@@ -1889,6 +1934,9 @@
"were not scheduled for display in time, xine sends a notification."),
20, NULL, NULL);
@@ -4745,9 +4745,9 @@
if (grabonly) {
-diff -uNr xine-lib-1.1.18.orig/src/xine-engine/video_out.h xine-lib-1.1.18/src/xine-engine/video_out.h
---- xine-lib-1.1.18.orig/src/xine-engine/video_out.h 2010-01-14 23:17:56.000000000 +0100
-+++ xine-lib-1.1.18/src/xine-engine/video_out.h 2010-02-24 20:55:52.463882626 +0100
+diff -urN xine-lib-1.1.19.orig/src/xine-engine/video_out.h xine-lib-1.1.19/src/xine-engine/video_out.h
+--- xine-lib-1.1.19.orig/src/xine-engine/video_out.h 2010-04-08 17:04:17.000000000 +0200
++++ xine-lib-1.1.19/src/xine-engine/video_out.h 2010-07-26 00:39:10.226784210 +0200
@@ -198,6 +198,9 @@
/* flush video_out fifo */
void (*flush) (xine_video_port_t *self);
@@ -4758,9 +4758,9 @@
/* Get/Set video property
*
* See VO_PROP_* bellow
-diff -uNr xine-lib-1.1.18.orig/src/xine-engine/video_overlay.h xine-lib-1.1.18/src/xine-engine/video_overlay.h
---- xine-lib-1.1.18.orig/src/xine-engine/video_overlay.h 2010-01-14 23:17:56.000000000 +0100
-+++ xine-lib-1.1.18/src/xine-engine/video_overlay.h 2010-02-24 20:55:52.464882991 +0100
+diff -urN xine-lib-1.1.19.orig/src/xine-engine/video_overlay.h xine-lib-1.1.19/src/xine-engine/video_overlay.h
+--- xine-lib-1.1.19.orig/src/xine-engine/video_overlay.h 2010-03-09 23:17:05.000000000 +0100
++++ xine-lib-1.1.19/src/xine-engine/video_overlay.h 2010-07-26 00:39:10.227784601 +0200
@@ -35,7 +35,7 @@
#define MAX_OBJECTS 50
@@ -4770,9 +4770,9 @@
#define OVERLAY_EVENT_NULL 0
#define OVERLAY_EVENT_SHOW 1
-diff -uNr xine-lib-1.1.18.orig/src/xine-engine/xine.c xine-lib-1.1.18/src/xine-engine/xine.c
---- xine-lib-1.1.18.orig/src/xine-engine/xine.c 2010-02-23 23:27:15.000000000 +0100
-+++ xine-lib-1.1.18/src/xine-engine/xine.c 2010-02-24 20:55:52.465882658 +0100
+diff -urN xine-lib-1.1.19.orig/src/xine-engine/xine.c xine-lib-1.1.19/src/xine-engine/xine.c
+--- xine-lib-1.1.19.orig/src/xine-engine/xine.c 2010-04-29 18:55:02.000000000 +0200
++++ xine-lib-1.1.19/src/xine-engine/xine.c 2010-07-26 00:39:10.227784601 +0200
@@ -294,8 +294,37 @@
pthread_mutex_unlock(&this->revoke_lock);
}
@@ -4943,9 +4943,9 @@
+{
+ stream->first_frame_flag = 1;
+}
-diff -uNr xine-lib-1.1.18.orig/src/xine-engine/xine_internal.h xine-lib-1.1.18/src/xine-engine/xine_internal.h
---- xine-lib-1.1.18.orig/src/xine-engine/xine_internal.h 2010-02-23 23:27:15.000000000 +0100
-+++ xine-lib-1.1.18/src/xine-engine/xine_internal.h 2010-02-24 20:55:52.465882658 +0100
+diff -urN xine-lib-1.1.19.orig/src/xine-engine/xine_internal.h xine-lib-1.1.19/src/xine-engine/xine_internal.h
+--- xine-lib-1.1.19.orig/src/xine-engine/xine_internal.h 2010-03-09 23:17:05.000000000 +0100
++++ xine-lib-1.1.19/src/xine-engine/xine_internal.h 2010-07-26 00:39:10.228784503 +0200
@@ -169,6 +169,9 @@
* be used in combination with acquire_nonblocking() */
void (*release_nonblocking)(xine_ticket_t *self, int irrevocable);
++++++ xine-configure.diff ++++++
--- /var/tmp/diff_new_pack.E98zLp/_old 2010-08-03 18:20:20.000000000 +0200
+++ /var/tmp/diff_new_pack.E98zLp/_new 2010-08-03 18:20:20.000000000 +0200
@@ -1,7 +1,7 @@
-diff -ur xine-lib-1.1.18.orig/configure.ac xine-lib-1.1.18/configure.ac
---- xine-lib-1.1.18.orig/configure.ac 2010-02-24 21:37:21.487134132 +0100
-+++ xine-lib-1.1.18/configure.ac 2010-02-24 21:40:15.697916133 +0100
-@@ -119,6 +119,7 @@
+diff -ur xine-lib-1.1.19.orig/configure.ac xine-lib-1.1.19/configure.ac
+--- xine-lib-1.1.19.orig/configure.ac 2010-07-26 00:57:13.155035643 +0200
++++ xine-lib-1.1.19/configure.ac 2010-07-26 01:00:45.468785507 +0200
+@@ -120,6 +120,7 @@
dnl ---------------------------------------------
AC_PROG_CC
@@ -9,5 +9,3 @@
AM_PROG_AS
case "$host_os" in
-Nur in xine-lib-1.1.18/src/xine-engine: install_plugins_helper.c.
-Nur in xine-lib-1.1.18/src/xine-engine: install_plugins_helper.h.
++++++ xine-lib-1.1.18.1-assert.patch -> xine-lib-1.1.19-assert.patch ++++++
--- xine-lib/xine-lib-1.1.18.1-assert.patch 2010-03-07 01:10:38.000000000 +0100
+++ xine-lib/xine-lib-1.1.19-assert.patch 2010-07-26 01:52:52.000000000 +0200
@@ -1,6 +1,6 @@
-diff -ur xine-lib-1.1.18.orig/src/audio_out/audio_alsa_out.c xine-lib-1.1.18/src/audio_out/audio_alsa_out.c
---- xine-lib-1.1.18.orig/src/audio_out/audio_alsa_out.c 2010-01-14 23:17:54.000000000 +0100
-+++ xine-lib-1.1.18/src/audio_out/audio_alsa_out.c 2010-02-24 21:38:21.022134045 +0100
+diff -ur xine-lib-1.1.19.orig/src/audio_out/audio_alsa_out.c xine-lib-1.1.19/src/audio_out/audio_alsa_out.c
+--- xine-lib-1.1.19.orig/src/audio_out/audio_alsa_out.c 2010-04-11 16:57:37.000000000 +0200
++++ xine-lib-1.1.19/src/audio_out/audio_alsa_out.c 2010-07-26 00:57:55.476784389 +0200
@@ -41,6 +41,7 @@
#ifdef HAVE_ALLOCA_H
#include
@@ -9,5 +9,3 @@
#define ALSA_PCM_NEW_HW_PARAMS_API
#define ALSA_PCM_NEW_SW_PARAMS_API
-Nur in xine-lib-1.1.18/src/xine-engine: install_plugins_helper.c.
-Nur in xine-lib-1.1.18/src/xine-engine: install_plugins_helper.h.
++++++ xine-lib-1.1.18.1-crippled.tar.bz2 -> xine-lib-1.1.19-crippled.tar.bz2 ++++++
++++ 27290 lines of diff (skipped)
++++++ xine-lib-1.1.18.1-demuxcheckfor_mad_ffmpeg.patch -> xine-lib-1.1.19-demuxcheckfor_mad_ffmpeg.patch ++++++
--- xine-lib/xine-lib-1.1.18.1-demuxcheckfor_mad_ffmpeg.patch 2010-03-07 01:11:20.000000000 +0100
+++ xine-lib/xine-lib-1.1.19-demuxcheckfor_mad_ffmpeg.patch 2010-07-26 01:53:34.000000000 +0200
@@ -1,6 +1,6 @@
-diff -ur xine-lib-1.1.18.orig/src/xine-engine/load_plugins.c xine-lib-1.1.18/src/xine-engine/load_plugins.c
---- xine-lib-1.1.18.orig/src/xine-engine/load_plugins.c 2010-01-14 23:17:56.000000000 +0100
-+++ xine-lib-1.1.18/src/xine-engine/load_plugins.c 2010-02-24 21:54:02.396132130 +0100
+diff -ur xine-lib-1.1.19.orig/src/xine-engine/load_plugins.c xine-lib-1.1.19/src/xine-engine/load_plugins.c
+--- xine-lib-1.1.19.orig/src/xine-engine/load_plugins.c 2010-03-09 23:17:05.000000000 +0100
++++ xine-lib-1.1.19/src/xine-engine/load_plugins.c 2010-07-26 01:24:26.098035179 +0200
@@ -2508,9 +2508,18 @@
plugin_catalog_t *catalog = self->plugin_catalog;
++++++ xine-lib-1.1.18.1-glitch-free-pulseaudio.patch -> xine-lib-1.1.19-glitch-free-pulseaudio.patch ++++++
--- xine-lib/xine-lib-1.1.18.1-glitch-free-pulseaudio.patch 2010-03-07 01:11:21.000000000 +0100
+++ xine-lib/xine-lib-1.1.19-glitch-free-pulseaudio.patch 2010-07-26 01:53:35.000000000 +0200
@@ -1,6 +1,6 @@
-diff -ur xine-lib-1.1.18.orig/src/xine-engine/audio_out.c xine-lib-1.1.18/src/xine-engine/audio_out.c
---- xine-lib-1.1.18.orig/src/xine-engine/audio_out.c 2010-02-23 22:59:05.000000000 +0100
-+++ xine-lib-1.1.18/src/xine-engine/audio_out.c 2010-02-24 20:52:10.870884193 +0100
+diff -ur xine-lib-1.1.19.orig/src/xine-engine/audio_out.c xine-lib-1.1.19/src/xine-engine/audio_out.c
+--- xine-lib-1.1.19.orig/src/xine-engine/audio_out.c 2010-07-21 19:43:52.000000000 +0200
++++ xine-lib-1.1.19/src/xine-engine/audio_out.c 2010-07-26 00:34:13.178049961 +0200
@@ -1156,8 +1156,17 @@
/*
++++++ xine-lib-1.1.18.1-ia64-is-not-alpha.diff -> xine-lib-1.1.19-ia64-is-not-alpha.diff ++++++
--- xine-lib/xine-lib-1.1.18.1-ia64-is-not-alpha.diff 2010-03-07 01:11:21.000000000 +0100
+++ xine-lib/xine-lib-1.1.19-ia64-is-not-alpha.diff 2010-07-26 01:53:35.000000000 +0200
@@ -1,7 +1,7 @@
-diff -ur xine-lib-1.1.18.orig/configure.ac xine-lib-1.1.18/configure.ac
---- xine-lib-1.1.18.orig/configure.ac 2010-02-22 21:03:51.000000000 +0100
-+++ xine-lib-1.1.18/configure.ac 2010-02-24 20:47:41.959133782 +0100
-@@ -2381,10 +2381,13 @@
+diff -ur xine-lib-1.1.19.orig/configure.ac xine-lib-1.1.19/configure.ac
+--- xine-lib-1.1.19.orig/configure.ac 2010-07-25 16:37:30.000000000 +0200
++++ xine-lib-1.1.19/configure.ac 2010-07-26 00:30:47.254790180 +0200
+@@ -2395,10 +2395,13 @@
mips-*)
AC_DEFINE_UNQUOTED(FPM_MIPS,,[Define to select libmad fixed point arithmetic implementation])
;;
++++++ xine-lib-1.1.18.1-install-plugins-helper.diff -> xine-lib-1.1.19-install-plugins-helper.diff ++++++
--- xine-lib/xine-lib-1.1.18.1-install-plugins-helper.diff 2010-03-07 01:11:22.000000000 +0100
+++ xine-lib/xine-lib-1.1.19-install-plugins-helper.diff 2010-07-26 01:53:36.000000000 +0200
@@ -1,7 +1,7 @@
-diff -uNr xine-lib-1.1.18.orig/configure.ac xine-lib-1.1.18/configure.ac
---- xine-lib-1.1.18.orig/configure.ac 2010-02-24 22:24:29.445882777 +0100
-+++ xine-lib-1.1.18/configure.ac 2010-02-24 22:26:25.554146234 +0100
-@@ -2631,6 +2631,28 @@
+diff -urN xine-lib-1.1.19.orig/configure.ac xine-lib-1.1.19/configure.ac
+--- xine-lib-1.1.19.orig/configure.ac 2010-07-26 00:48:39.267784541 +0200
++++ xine-lib-1.1.19/configure.ac 2010-07-26 00:54:10.464784907 +0200
+@@ -2645,6 +2645,28 @@
AM_CONDITIONAL(HAVE_W32DLL, test "x$enable_w32dll" != "xno")
@@ -30,9 +30,9 @@
dnl ---------------------------------------------
dnl some include paths ( !!! DO NOT REMOVE !!! )
-diff -uNr xine-lib-1.1.18.orig/src/xine-engine/audio_decoder.c xine-lib-1.1.18/src/xine-engine/audio_decoder.c
---- xine-lib-1.1.18.orig/src/xine-engine/audio_decoder.c 2010-01-14 23:17:55.000000000 +0100
-+++ xine-lib-1.1.18/src/xine-engine/audio_decoder.c 2010-02-24 22:26:25.555133914 +0100
+diff -urN xine-lib-1.1.19.orig/src/xine-engine/audio_decoder.c xine-lib-1.1.19/src/xine-engine/audio_decoder.c
+--- xine-lib-1.1.19.orig/src/xine-engine/audio_decoder.c 2010-07-21 19:43:52.000000000 +0200
++++ xine-lib-1.1.19/src/xine-engine/audio_decoder.c 2010-07-26 00:54:10.465817774 +0200
@@ -41,6 +41,7 @@
#include "xine_internal.h"
@@ -52,9 +52,9 @@
}
if (audio_type != stream->audio_type) {
-diff -uNr xine-lib-1.1.18.orig/src/xine-engine/install_plugins_helper.c xine-lib-1.1.18/src/xine-engine/install_plugins_helper.c
---- xine-lib-1.1.18.orig/src/xine-engine/install_plugins_helper.c 1970-01-01 01:00:00.000000000 +0100
-+++ xine-lib-1.1.18/src/xine-engine/install_plugins_helper.c 2010-02-24 22:26:25.556133119 +0100
+diff -urN xine-lib-1.1.19.orig/src/xine-engine/install_plugins_helper.c xine-lib-1.1.19/src/xine-engine/install_plugins_helper.c
+--- xine-lib-1.1.19.orig/src/xine-engine/install_plugins_helper.c 1970-01-01 01:00:00.000000000 +0100
++++ xine-lib-1.1.19/src/xine-engine/install_plugins_helper.c 2010-07-26 00:54:10.465817774 +0200
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2007 Sascha Sommer
@@ -162,9 +162,9 @@
+ }
+}
+
-diff -uNr xine-lib-1.1.18.orig/src/xine-engine/install_plugins_helper.h xine-lib-1.1.18/src/xine-engine/install_plugins_helper.h
---- xine-lib-1.1.18.orig/src/xine-engine/install_plugins_helper.h 1970-01-01 01:00:00.000000000 +0100
-+++ xine-lib-1.1.18/src/xine-engine/install_plugins_helper.h 2010-02-24 22:26:25.556133119 +0100
+diff -urN xine-lib-1.1.19.orig/src/xine-engine/install_plugins_helper.h xine-lib-1.1.19/src/xine-engine/install_plugins_helper.h
+--- xine-lib-1.1.19.orig/src/xine-engine/install_plugins_helper.h 1970-01-01 01:00:00.000000000 +0100
++++ xine-lib-1.1.19/src/xine-engine/install_plugins_helper.h 2010-07-26 00:54:10.465817774 +0200
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2007 Sascha Sommer
@@ -201,9 +201,9 @@
+
+
+#endif
-diff -uNr xine-lib-1.1.18.orig/src/xine-engine/Makefile.am xine-lib-1.1.18/src/xine-engine/Makefile.am
---- xine-lib-1.1.18.orig/src/xine-engine/Makefile.am 2010-01-21 00:45:27.000000000 +0100
-+++ xine-lib-1.1.18/src/xine-engine/Makefile.am 2010-02-24 22:26:25.556133119 +0100
+diff -urN xine-lib-1.1.19.orig/src/xine-engine/Makefile.am xine-lib-1.1.19/src/xine-engine/Makefile.am
+--- xine-lib-1.1.19.orig/src/xine-engine/Makefile.am 2010-01-21 00:45:27.000000000 +0100
++++ xine-lib-1.1.19/src/xine-engine/Makefile.am 2010-07-26 00:54:10.465817774 +0200
@@ -19,7 +19,7 @@
video_overlay.c osd.c scratch.c demux.c vo_scale.c \
xine_interface.c post.c tvmode.c broadcaster.c io_helper.c \
@@ -223,9 +223,9 @@
noinst_HEADERS = bswap.h ffmpeg_bswap.h
-diff -uNr xine-lib-1.1.18.orig/src/xine-engine/video_decoder.c xine-lib-1.1.18/src/xine-engine/video_decoder.c
---- xine-lib-1.1.18.orig/src/xine-engine/video_decoder.c 2010-02-23 23:27:15.000000000 +0100
-+++ xine-lib-1.1.18/src/xine-engine/video_decoder.c 2010-02-24 22:26:25.557133929 +0100
+diff -urN xine-lib-1.1.19.orig/src/xine-engine/video_decoder.c xine-lib-1.1.19/src/xine-engine/video_decoder.c
+--- xine-lib-1.1.19.orig/src/xine-engine/video_decoder.c 2010-07-21 19:43:52.000000000 +0200
++++ xine-lib-1.1.19/src/xine-engine/video_decoder.c 2010-07-26 00:54:10.466785270 +0200
@@ -37,6 +37,7 @@
#include "xine_internal.h"
@@ -234,7 +234,7 @@
#include
#define SPU_SLEEP_INTERVAL (90000/2)
-@@ -376,6 +377,10 @@
+@@ -380,6 +381,10 @@
stream->video_decoder_plugin = _x_get_video_decoder (stream, streamtype);
_x_stream_info_set(stream, XINE_STREAM_INFO_VIDEO_HANDLED, (stream->video_decoder_plugin != NULL));
@@ -245,9 +245,9 @@
}
if (stream->video_decoder_plugin)
-diff -uNr xine-lib-1.1.18.orig/src/xine-engine/xine.c xine-lib-1.1.18/src/xine-engine/xine.c
---- xine-lib-1.1.18.orig/src/xine-engine/xine.c 2010-02-24 22:24:02.482882309 +0100
-+++ xine-lib-1.1.18/src/xine-engine/xine.c 2010-02-24 22:26:25.559133664 +0100
+diff -urN xine-lib-1.1.19.orig/src/xine-engine/xine.c xine-lib-1.1.19/src/xine-engine/xine.c
+--- xine-lib-1.1.19.orig/src/xine-engine/xine.c 2010-07-26 00:41:44.729784581 +0200
++++ xine-lib-1.1.19/src/xine-engine/xine.c 2010-07-26 00:54:10.467798861 +0200
@@ -1810,6 +1810,15 @@
0, NULL, this);
++++++ xine-lib-1.1.18.1-mjpegplugin.diff -> xine-lib-1.1.19-mjpegplugin.diff ++++++
--- xine-lib/xine-lib-1.1.18.1-mjpegplugin.diff 2010-03-07 01:11:22.000000000 +0100
+++ xine-lib/xine-lib-1.1.19-mjpegplugin.diff 2010-07-26 01:53:36.000000000 +0200
@@ -1,7 +1,7 @@
-diff -uNr xine-lib-1.1.18.orig/configure xine-lib-1.1.18/configure
---- xine-lib-1.1.18.orig/configure 2010-02-23 23:50:53.000000000 +0100
-+++ xine-lib-1.1.18/configure 2010-02-24 21:28:13.318884098 +0100
-@@ -33611,6 +33611,7 @@
+diff -urN xine-lib-1.1.19.orig/configure xine-lib-1.1.19/configure
+--- xine-lib-1.1.19.orig/configure 2010-07-25 16:40:24.000000000 +0200
++++ xine-lib-1.1.19/configure 2010-07-26 00:46:26.524784958 +0200
+@@ -33677,6 +33677,7 @@
echo " * video decoder plugins:"
echo " - MPEG 1,2 - Amiga Bitplane"
echo " - Raw RGB - Raw YUV"
@@ -9,10 +9,10 @@
if test "x$with_external_ffmpeg" = "xyes"; then
echo " - ffmpeg (external library):"
else
-diff -uNr xine-lib-1.1.18.orig/configure.ac xine-lib-1.1.18/configure.ac
---- xine-lib-1.1.18.orig/configure.ac 2010-02-24 21:24:46.643882529 +0100
-+++ xine-lib-1.1.18/configure.ac 2010-02-24 21:28:13.320882133 +0100
-@@ -1104,6 +1104,28 @@
+diff -urN xine-lib-1.1.19.orig/configure.ac xine-lib-1.1.19/configure.ac
+--- xine-lib-1.1.19.orig/configure.ac 2010-07-26 00:41:44.720048157 +0200
++++ xine-lib-1.1.19/configure.ac 2010-07-26 00:46:26.537784872 +0200
+@@ -1109,6 +1109,28 @@
AC_SUBST([SDL_LIBS])
dnl ---------------------------------------------
@@ -41,7 +41,7 @@
dnl check for Libstk
dnl ---------------------------------------------
-@@ -2817,6 +2839,7 @@
+@@ -2831,6 +2853,7 @@
src/libxineadec/gsm610/Makefile
src/libxineadec/nosefart/Makefile
src/libreal/Makefile
@@ -49,7 +49,7 @@
src/post/Makefile
src/post/planar/Makefile
src/post/goom/Makefile
-@@ -3007,6 +3030,9 @@
+@@ -3024,6 +3047,9 @@
dnl audio decoders
echo " * audio decoder plugins:"
echo " - GSM 06.10 - linear PCM"
@@ -58,10 +58,10 @@
+fi
if test "x$with_external_ffmpeg" = "xyes"; then
echo " - ffmpeg (external library):"
- else
-diff -uNr xine-lib-1.1.18.orig/src/Makefile.am xine-lib-1.1.18/src/Makefile.am
---- xine-lib-1.1.18.orig/src/Makefile.am 2010-02-24 21:24:46.643882529 +0100
-+++ xine-lib-1.1.18/src/Makefile.am 2010-02-24 21:28:13.321884189 +0100
+ echo " - Windows Media Audio v1/v2/Pro"
+diff -urN xine-lib-1.1.19.orig/src/Makefile.am xine-lib-1.1.19/src/Makefile.am
+--- xine-lib-1.1.19.orig/src/Makefile.am 2010-07-26 00:41:44.720048157 +0200
++++ xine-lib-1.1.19/src/Makefile.am 2010-07-26 00:46:26.538786101 +0200
@@ -27,6 +27,7 @@
libreal \
libfaad \
@@ -70,9 +70,9 @@
post \
combined \
vdr
-diff -uNr xine-lib-1.1.18.orig/src/Makefile.in xine-lib-1.1.18/src/Makefile.in
---- xine-lib-1.1.18.orig/src/Makefile.in 2010-02-23 23:50:35.000000000 +0100
-+++ xine-lib-1.1.18/src/Makefile.in 2010-02-24 21:28:13.321884189 +0100
+diff -urN xine-lib-1.1.19.orig/src/Makefile.in xine-lib-1.1.19/src/Makefile.in
+--- xine-lib-1.1.19.orig/src/Makefile.in 2010-07-25 16:40:01.000000000 +0200
++++ xine-lib-1.1.19/src/Makefile.in 2010-07-26 00:46:26.539796410 +0200
@@ -453,6 +453,7 @@
libreal \
libfaad \
@@ -81,9 +81,9 @@
post \
combined
-diff -uNr xine-lib-1.1.18.orig/src/mjpeg/Makefile.am xine-lib-1.1.18/src/mjpeg/Makefile.am
---- xine-lib-1.1.18.orig/src/mjpeg/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ xine-lib-1.1.18/src/mjpeg/Makefile.am 2010-02-24 21:28:13.323883132 +0100
+diff -urN xine-lib-1.1.19.orig/src/mjpeg/Makefile.am xine-lib-1.1.19/src/mjpeg/Makefile.am
+--- xine-lib-1.1.19.orig/src/mjpeg/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ xine-lib-1.1.19/src/mjpeg/Makefile.am 2010-07-26 00:46:26.539796410 +0200
@@ -0,0 +1,9 @@
+include $(top_srcdir)/misc/Makefile.common
+
@@ -94,9 +94,9 @@
+xineplug_decode_mjpeg_la_CFLAGS = $(VISIBILITY_FLAG)
+xineplug_decode_mjpeg_la_LDFLAGS = $(xineplug_ldflags)
+endif
-diff -uNr xine-lib-1.1.18.orig/src/mjpeg/Makefile.in xine-lib-1.1.18/src/mjpeg/Makefile.in
---- xine-lib-1.1.18.orig/src/mjpeg/Makefile.in 1970-01-01 01:00:00.000000000 +0100
-+++ xine-lib-1.1.18/src/mjpeg/Makefile.in 2010-02-24 21:28:13.324882254 +0100
+diff -urN xine-lib-1.1.19.orig/src/mjpeg/Makefile.in xine-lib-1.1.19/src/mjpeg/Makefile.in
+--- xine-lib-1.1.19.orig/src/mjpeg/Makefile.in 1970-01-01 01:00:00.000000000 +0100
++++ xine-lib-1.1.19/src/mjpeg/Makefile.in 2010-07-26 00:46:26.540794705 +0200
@@ -0,0 +1,751 @@
+# Makefile.in generated by automake 1.10 from Makefile.am.
+# @configure_input@
@@ -849,9 +849,9 @@
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
-diff -uNr xine-lib-1.1.18.orig/src/mjpeg/xine_mjpeg_decoder.c xine-lib-1.1.18/src/mjpeg/xine_mjpeg_decoder.c
---- xine-lib-1.1.18.orig/src/mjpeg/xine_mjpeg_decoder.c 1970-01-01 01:00:00.000000000 +0100
-+++ xine-lib-1.1.18/src/mjpeg/xine_mjpeg_decoder.c 2010-02-24 21:28:13.325884030 +0100
+diff -urN xine-lib-1.1.19.orig/src/mjpeg/xine_mjpeg_decoder.c xine-lib-1.1.19/src/mjpeg/xine_mjpeg_decoder.c
+--- xine-lib-1.1.19.orig/src/mjpeg/xine_mjpeg_decoder.c 1970-01-01 01:00:00.000000000 +0100
++++ xine-lib-1.1.19/src/mjpeg/xine_mjpeg_decoder.c 2010-07-26 00:46:26.541784690 +0200
@@ -0,0 +1,397 @@
+/*
+ * Copyright (C) 2007 Marcus Meissner
++++++ xine-lib-1.1.18.1-crippled.tar.bz2 -> xine-lib-1.1.19.tar.bz2 ++++++
xine-lib/xine-lib-1.1.18.1-crippled.tar.bz2 xine-lib/xine-lib-1.1.19.tar.bz2 differ: char 11, line 1
++++++ xine-lib-crippled-LOCAL.diff ++++++
--- /var/tmp/diff_new_pack.E98zLp/_old 2010-08-03 18:20:22.000000000 +0200
+++ /var/tmp/diff_new_pack.E98zLp/_new 2010-08-03 18:20:22.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- src/input/input_dvd.c.orig
+++ src/input/input_dvd.c
-@@ -1387,7 +1387,12 @@
+@@ -1393,7 +1393,12 @@
static int dvd_parse_try_open(dvd_input_plugin_t *this, const char *locator)
{
@@ -16,7 +16,7 @@
/* FIXME: we temporarily special-case "dvd:/" for compatibility;
* actually "dvd:/" should play a DVD image stored in /, but for
-@@ -1403,7 +1408,6 @@
+@@ -1409,7 +1414,6 @@
xine_setenv("DVDCSS_RAW_DEVICE", "", 1);
} else {
/* use default DVD device */
@@ -24,7 +24,7 @@
xine_cfg_entry_t raw_device;
if (xine_config_lookup_entry(this->stream->xine,
"media.dvd.raw_device", &raw_device))
-@@ -1411,6 +1415,23 @@
+@@ -1417,6 +1421,23 @@
intended_dvd_device = class->dvd_device;
}
@@ -48,7 +48,7 @@
/* attempt to open DVD */
if (this->opened) {
if (intended_dvd_device == this->current_dvd_device) {
-@@ -1473,8 +1494,11 @@
+@@ -1479,8 +1500,11 @@
}
static int dvd_plugin_open (input_plugin_t *this_gen) {
@@ -61,7 +61,7 @@
char *locator, *locator_orig;
char *title_part;
-@@ -1483,6 +1507,23 @@
+@@ -1489,6 +1513,23 @@
trace_print("Called\n");
++++++ xine-lib-doc-fix-X11R6.diff ++++++
--- /var/tmp/diff_new_pack.E98zLp/_old 2010-08-03 18:20:22.000000000 +0200
+++ /var/tmp/diff_new_pack.E98zLp/_new 2010-08-03 18:20:22.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- doc/faq/faq.sgml.orig
+++ doc/faq/faq.sgml
-@@ -455,12 +455,12 @@
+@@ -413,12 +413,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.
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org