Hello community,
here is the log from the commit of package xine-lib for openSUSE:Factory checked in at 2012-01-25 15:02:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xine-lib (Old)
and /work/SRC/openSUSE:Factory/.xine-lib.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xine-lib", Maintainer is "MHopf@novell.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xine-lib/xine-lib.changes 2011-10-29 00:18:58.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xine-lib.new/xine-lib.changes 2012-01-25 15:03:00.000000000 +0100
@@ -1,0 +2,39 @@
+Mon Dec 02 22:51:00 UTC 2011 - Manfred.Tremmel@iiv.de
+
+- update to 1.1.20.1
+ * Various bug fixes.
+ * Use the current ImageMagick API (if using ImageMagick).
+ * Fix PVR plugin input building (needs V4L2).
+ * Fixes related to unknown audio & subtitle languages.
+ * Memory leak fixes.
+
+-------------------------------------------------------------------
+Sat Nov 19 15:41:25 UTC 2011 - coolo@suse.com
+
+- add libtool as buildrequire to avoid implicit dependency
+
+-------------------------------------------------------------------
+Sun Nov 13 16:58:00 UTC 2011 - Manfred.Tremmel@iiv.de
+
+- update to 1.1.20
+ * Imagine that there's a large poppy here.
+ * Ensure that file and socket descriptors are marked as CLOEXEC.
+ * Enable FFmpeg's support for AAC LATM audio.
+ * Fix build-time check for dvdnav.
+ * Allow use of GraphicsMagick instead of ImageMagick.
+ * Fix build on Debian GNU/kFreeBSD (broken in 1.1.19).
+ * Add a Japanese translation from Takeshi Hamasaki.
+ * Czech translation update.
+ * New MinGW-w64 port, various portability fixes.
+ * MinGW port updates.
+ * Possibility to disable HW acceleration in directx video output.
+ * Header stripping support in Matroska demuxer.
+ * Update nosefart to 2.7-mls (stability with corrupted NSF files).
+ * Add .ass extension to be recognized as subtitle file. [Bug #123]
+-------------------------------------------------------------------
+Sun Nov 6 03:48:03 UTC 2011 - reddwarf@opensuse.org
+
+- Fix Packman build: since /usr/share/xine/mad is no longer needed
+ don't create it
+
+-------------------------------------------------------------------
Old:
----
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-ffmpeg_abi_change.diff
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-xvmc.patch
xine-lib-1.1.19.tar.bz2
New:
----
xine-lib-1.1.20.1-assert.patch
xine-lib-1.1.20.1-crippled.tar.bz2
xine-lib-1.1.20.1-demuxcheckfor_mad_ffmpeg.patch
xine-lib-1.1.20.1-glitch-free-pulseaudio.patch
xine-lib-1.1.20.1-ia64-is-not-alpha.diff
xine-lib-1.1.20.1-install-plugins-helper.diff
xine-lib-1.1.20.1-mjpegplugin.diff
xine-lib-1.1.20.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xine-lib.spec ++++++
--- /var/tmp/diff_new_pack.aPlQ80/_old 2012-01-25 15:03:02.000000000 +0100
+++ /var/tmp/diff_new_pack.aPlQ80/_new 2012-01-25 15:03:02.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package xine-lib
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 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
@@ -54,6 +54,7 @@
BuildRequires: Mesa-devel libsmbclient-devel libtheora-devel libvorbis-devel
BuildRequires: readline-devel update-desktop-files vcdimager-devel
BuildRequires: speex-devel
+BuildRequires: libtool
%if 0%{suse_version} >= 1210
BuildRequires: libv4l-devel >= 0.8.4
%else
@@ -104,13 +105,13 @@
%if %{with modplug}
BuildRequires: libmodplug-devel
%endif
-Version: 1.1.19
-Release: 7
+Version: 1.1.20.1
+Release: 0
# bug437293
%ifarch ppc64
Obsoletes: xine-lib-64bit
%endif
-%define abiversion 1.29
+%define abiversion 1.30
Summary: Video Player with Plug-Ins
Group: Productivity/Multimedia/Video/Players
License: GPLv2+
@@ -128,7 +129,6 @@
Patch26: xine-lib-doc-fix-X11R6.diff
Patch28: xine-lib-%{version}-ia64-is-not-alpha.diff
Patch31: xine-lib-%{version}-glitch-free-pulseaudio.patch
-Patch32: http://repos.archlinux.org/wsvn/packages/xine-lib/trunk/xine-lib-1.1.19-xvmc...
# *** Addons
Patch50: vdr-xine-0.9.3.diff.bz2
Patch51: vdr-xine-SUSE.diff
@@ -143,7 +143,6 @@
Patch75: xine-lib-v4l-2.6.38.patch
# *** Only working for noncrippled source
Patch80: xine-lib-various-noncrippled.diff
-Patch81: xine-lib-%{version}-ffmpeg_abi_change.diff
%description
xine is a free multimedia player. It plays back CDs, DVDs, and VCDs. It
@@ -638,7 +637,6 @@
%patch26
%patch28 -p1
%patch31 -p1
-%patch32 -p0
%if 0%{suse_version} >= 1110
# set fuzzy=2 to get patch work with crippled and noncrippled tarball
%patch50 -p1 -F2
@@ -662,7 +660,6 @@
%else
# Only apply to uncrippled source
%patch80
-%patch81 -p1
%endif
%patch72 -p1
%patch73 -p1
@@ -734,9 +731,6 @@
LIB="%{buildroot}%{_libdir}/xine/plugins/%{abiversion}"
# install documentation
install -m 0644 %{SOURCE10} COPYING AUTHORS %{buildroot}%{_defaultdocdir}/xine/
-%if !%{with distributable}
-touch ${RPM_BUILD_ROOT}%{_datadir}/xine/mad
-%endif
# remove usless READMEs
rm %{buildroot}%{_defaultdocdir}/xine/README.{irix,solaris,WIN32}
%ifarch %{ix86}
++++++ vdr-xine-0.9.3.diff.bz2 ++++++
--- /var/tmp/diff_new_pack.aPlQ80/_old 2012-01-25 15:03:02.000000000 +0100
+++ /var/tmp/diff_new_pack.aPlQ80/_new 2012-01-25 15:03:02.000000000 +0100
@@ -1,7 +1,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 @@
+diff -uNr xine-lib-1.1.20.orig/configure.ac xine-lib-1.1.20/configure.ac
+--- xine-lib-1.1.20.orig/configure.ac 2011-11-13 17:22:58.385897392 +0100
++++ xine-lib-1.1.20/configure.ac 2011-11-13 17:35:47.563072821 +0100
+@@ -2864,6 +2864,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]],[[]])
-@@ -2892,6 +2893,7 @@
+@@ -2931,6 +2932,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
-@@ -3105,6 +3107,7 @@
+@@ -3145,6 +3147,7 @@
echo " - eq - eq2"
echo " - boxblur - denoise3d"
echo " - unsharp - tvtime"
@@ -25,9 +25,9 @@
echo " * SFX:"
echo " - goom - oscope"
echo " - fftscope - mosaico"
-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
+diff -uNr xine-lib-1.1.20.orig/src/Makefile.am xine-lib-1.1.20/src/Makefile.am
+--- xine-lib-1.1.20.orig/src/Makefile.am 2010-03-09 23:17:05.000000000 +0100
++++ xine-lib-1.1.20/src/Makefile.am 2011-11-13 17:35:47.563072821 +0100
@@ -28,4 +28,5 @@
libfaad \
libmusepack \
@@ -35,9 +35,9 @@
- combined
+ combined \
+ vdr
-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
+diff -uNr xine-lib-1.1.20.orig/src/vdr/combined_vdr.c xine-lib-1.1.20/src/vdr/combined_vdr.c
+--- xine-lib-1.1.20.orig/src/vdr/combined_vdr.c 1970-01-01 01:00:00.000000000 +0100
++++ xine-lib-1.1.20/src/vdr/combined_vdr.c 2011-11-13 17:35:47.563072821 +0100
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2000-2004 the xine project
@@ -83,9 +83,9 @@
+ { PLUGIN_NONE , 0, "" , 0 , NULL , NULL }
+};
+
-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
+diff -uNr xine-lib-1.1.20.orig/src/vdr/combined_vdr.h xine-lib-1.1.20/src/vdr/combined_vdr.h
+--- xine-lib-1.1.20.orig/src/vdr/combined_vdr.h 1970-01-01 01:00:00.000000000 +0100
++++ xine-lib-1.1.20/src/vdr/combined_vdr.h 2011-11-13 17:35:47.567072786 +0100
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2000-2004 the xine project
@@ -179,9 +179,9 @@
+
+#endif /* __COMBINED_VDR_H */
+
-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
+diff -uNr xine-lib-1.1.20.orig/src/vdr/input_vdr.c xine-lib-1.1.20/src/vdr/input_vdr.c
+--- xine-lib-1.1.20.orig/src/vdr/input_vdr.c 1970-01-01 01:00:00.000000000 +0100
++++ xine-lib-1.1.20/src/vdr/input_vdr.c 2011-11-13 17:35:47.567072786 +0100
@@ -0,0 +1,2665 @@
+/*
+ * Copyright (C) 2003-2004 the xine project
@@ -2848,9 +2848,9 @@
+
+ return this;
+}
-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
+diff -uNr xine-lib-1.1.20.orig/src/vdr/Makefile.am xine-lib-1.1.20/src/vdr/Makefile.am
+--- xine-lib-1.1.20.orig/src/vdr/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ xine-lib-1.1.20/src/vdr/Makefile.am 2011-11-13 17:35:47.567072786 +0100
@@ -0,0 +1,13 @@
+include $(top_srcdir)/misc/Makefile.common
+
@@ -2865,9 +2865,9 @@
+
+xineinclude_HEADERS = vdr.h
+noinst_HEADERS = combined_vdr.h
-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
+diff -uNr xine-lib-1.1.20.orig/src/vdr/post_vdr_audio.c xine-lib-1.1.20/src/vdr/post_vdr_audio.c
+--- xine-lib-1.1.20.orig/src/vdr/post_vdr_audio.c 1970-01-01 01:00:00.000000000 +0100
++++ xine-lib-1.1.20/src/vdr/post_vdr_audio.c 2011-11-13 17:35:47.567072786 +0100
@@ -0,0 +1,285 @@
+/*
+ * Copyright (C) 2000-2004 the xine project
@@ -3154,9 +3154,9 @@
+
+ return;
+}
-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
+diff -uNr xine-lib-1.1.20.orig/src/vdr/post_vdr_video.c xine-lib-1.1.20/src/vdr/post_vdr_video.c
+--- xine-lib-1.1.20.orig/src/vdr/post_vdr_video.c 1970-01-01 01:00:00.000000000 +0100
++++ xine-lib-1.1.20/src/vdr/post_vdr_video.c 2011-11-13 17:35:47.567072786 +0100
@@ -0,0 +1,502 @@
+/*
+ * Copyright (C) 2000-2004 the xine project
@@ -3660,9 +3660,9 @@
+
+ return skip;
+}
-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
+diff -uNr xine-lib-1.1.20.orig/src/vdr/vdr.h xine-lib-1.1.20/src/vdr/vdr.h
+--- xine-lib-1.1.20.orig/src/vdr/vdr.h 1970-01-01 01:00:00.000000000 +0100
++++ xine-lib-1.1.20/src/vdr/vdr.h 2011-11-13 17:35:47.567072786 +0100
@@ -0,0 +1,665 @@
+/*
+ * Copyright (C) 2000-2004 the xine project
@@ -4329,9 +4329,9 @@
+
+#endif /* __VDR_H */
+
-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
+diff -uNr xine-lib-1.1.20.orig/src/video_out/video_out_xvmc.c xine-lib-1.1.20/src/video_out/video_out_xvmc.c
+--- xine-lib-1.1.20.orig/src/video_out/video_out_xvmc.c 2011-10-04 23:42:53.000000000 +0200
++++ xine-lib-1.1.20/src/video_out/video_out_xvmc.c 2011-11-13 17:35:47.571072751 +0100
@@ -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 -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
+diff -uNr xine-lib-1.1.20.orig/src/video_out/video_out_xxmc.c xine-lib-1.1.20/src/video_out/video_out_xxmc.c
+--- xine-lib-1.1.20.orig/src/video_out/video_out_xxmc.c 2011-10-04 23:42:53.000000000 +0200
++++ xine-lib-1.1.20/src/video_out/video_out_xxmc.c 2011-11-13 17:35:47.571072751 +0100
@@ -365,15 +365,15 @@
switch(pc_type) {
@@ -4471,9 +4471,9 @@
format, flags);
}
}
-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
+diff -uNr xine-lib-1.1.20.orig/src/video_out/xvmc_mocomp.c xine-lib-1.1.20/src/video_out/xvmc_mocomp.c
+--- xine-lib-1.1.20.orig/src/video_out/xvmc_mocomp.c 2010-03-09 23:17:05.000000000 +0100
++++ xine-lib-1.1.20/src/video_out/xvmc_mocomp.c 2011-11-13 17:35:47.571072751 +0100
@@ -70,9 +70,9 @@
int second_field,
xvmc_macroblocks_t *macroblocks) {
@@ -4487,9 +4487,9 @@
int flags;
lprintf ("xvmc_render_macro_blocks\n");
-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
+diff -uNr xine-lib-1.1.20.orig/src/video_out/xvmc_vld.c xine-lib-1.1.20/src/video_out/xvmc_vld.c
+--- xine-lib-1.1.20.orig/src/video_out/xvmc_vld.c 2010-03-09 23:17:05.000000000 +0100
++++ xine-lib-1.1.20/src/video_out/xvmc_vld.c 2011-11-13 17:35:47.571072751 +0100
@@ -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 -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
+diff -uNr xine-lib-1.1.20.orig/src/xine-engine/accel_xvmc.h xine-lib-1.1.20/src/xine-engine/accel_xvmc.h
+--- xine-lib-1.1.20.orig/src/xine-engine/accel_xvmc.h 2010-03-09 23:17:05.000000000 +0100
++++ xine-lib-1.1.20/src/xine-engine/accel_xvmc.h 2011-11-13 17:35:47.571072751 +0100
@@ -65,6 +65,7 @@
@@ -4546,9 +4546,9 @@
/*
* Register XvMC stream types here.
*/
-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
+diff -uNr xine-lib-1.1.20.orig/src/xine-engine/post.c xine-lib-1.1.20/src/xine-engine/post.c
+--- xine-lib-1.1.20.orig/src/xine-engine/post.c 2011-10-04 23:42:53.000000000 +0200
++++ xine-lib-1.1.20/src/xine-engine/post.c 2011-11-13 17:35:47.571072751 +0100
@@ -144,6 +144,14 @@
if (port->port_lock) pthread_mutex_unlock(port->port_lock);
}
@@ -4601,7 +4601,7 @@
if (frame->proc_frame && !new_frame->proc_frame)
new_frame->proc_frame = post_frame_proc_frame;
if (frame->proc_slice && !new_frame->proc_slice)
-@@ -697,6 +709,7 @@
+@@ -696,6 +708,7 @@
if (!new_port)
return 0;
@@ -4609,7 +4609,7 @@
this->running_ticket->revoke(this->running_ticket, 1);
if (input_port->original_port->status(input_port->original_port, input_port->stream,
-@@ -707,6 +720,7 @@
+@@ -706,6 +719,7 @@
input_port->original_port = new_port;
this->running_ticket->issue(this->running_ticket, 1);
@@ -4617,9 +4617,9 @@
return 1;
}
-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
+diff -uNr xine-lib-1.1.20.orig/src/xine-engine/post.h xine-lib-1.1.20/src/xine-engine/post.h
+--- xine-lib-1.1.20.orig/src/xine-engine/post.h 2011-10-11 10:03:42.000000000 +0200
++++ xine-lib-1.1.20/src/xine-engine/post.h 2011-11-13 17:35:47.571072751 +0100
@@ -177,6 +177,13 @@
/* the new frame function pointers */
vo_frame_t *new_frame;
@@ -4634,10 +4634,10 @@
/* 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 -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 @@
+diff -uNr xine-lib-1.1.20.orig/src/xine-engine/video_out.c xine-lib-1.1.20/src/xine-engine/video_out.c
+--- xine-lib-1.1.20.orig/src/xine-engine/video_out.c 2011-10-04 23:42:53.000000000 +0200
++++ xine-lib-1.1.20/src/xine-engine/video_out.c 2011-11-13 17:35:47.571072751 +0100
+@@ -133,6 +133,9 @@
int frame_drop_cpt;
int frame_drop_suggested;
int crop_left, crop_right, crop_top, crop_bottom;
@@ -4647,7 +4647,7 @@
} vos_t;
-@@ -1068,6 +1071,32 @@
+@@ -1092,6 +1095,32 @@
this->redraw_needed = 1;
}
@@ -4680,7 +4680,7 @@
/* special loop for paused mode
* needed to update screen due overlay changes, resize, window
* movement, brightness adjusting etc.
-@@ -1113,7 +1142,7 @@
+@@ -1137,7 +1166,7 @@
}
pthread_mutex_unlock( &this->free_img_buf_queue->mutex );
@@ -4689,7 +4689,7 @@
pthread_mutex_lock( &this->free_img_buf_queue->mutex );
}
-@@ -1243,7 +1272,10 @@
+@@ -1280,7 +1309,10 @@
"video_out: vpts/clock error, next_vpts=%" PRId64 " cur_vpts=%" PRId64 "\n", next_frame_vpts,vpts);
if (usec_to_sleep > 0)
@@ -4701,7 +4701,7 @@
if (this->discard_frames)
break;
-@@ -1632,6 +1664,9 @@
+@@ -1669,6 +1701,9 @@
free (this->free_img_buf_queue);
free (this->display_img_buf_queue);
@@ -4711,7 +4711,7 @@
free (this);
}
-@@ -1701,6 +1736,15 @@
+@@ -1738,6 +1773,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.
*/
-@@ -1796,6 +1840,7 @@
+@@ -1833,6 +1877,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;
-@@ -1889,6 +1934,9 @@
+@@ -1926,6 +1971,9 @@
"were not scheduled for display in time, xine sends a notification."),
20, NULL, NULL);
@@ -4745,9 +4745,9 @@
if (grabonly) {
-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
+diff -uNr xine-lib-1.1.20.orig/src/xine-engine/video_out.h xine-lib-1.1.20/src/xine-engine/video_out.h
+--- xine-lib-1.1.20.orig/src/xine-engine/video_out.h 2010-04-08 17:04:17.000000000 +0200
++++ xine-lib-1.1.20/src/xine-engine/video_out.h 2011-11-13 17:35:47.575072715 +0100
@@ -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 -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
+diff -uNr xine-lib-1.1.20.orig/src/xine-engine/video_overlay.h xine-lib-1.1.20/src/xine-engine/video_overlay.h
+--- xine-lib-1.1.20.orig/src/xine-engine/video_overlay.h 2010-03-09 23:17:05.000000000 +0100
++++ xine-lib-1.1.20/src/xine-engine/video_overlay.h 2011-11-13 17:35:47.575072715 +0100
@@ -35,7 +35,7 @@
#define MAX_OBJECTS 50
@@ -4770,9 +4770,9 @@
#define OVERLAY_EVENT_NULL 0
#define OVERLAY_EVENT_SHOW 1
-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
+diff -uNr xine-lib-1.1.20.orig/src/xine-engine/xine.c xine-lib-1.1.20/src/xine-engine/xine.c
+--- xine-lib-1.1.20.orig/src/xine-engine/xine.c 2011-10-16 20:59:32.000000000 +0200
++++ xine-lib-1.1.20/src/xine-engine/xine.c 2011-11-13 17:35:47.579072679 +0100
@@ -294,8 +294,37 @@
pthread_mutex_unlock(&this->revoke_lock);
}
@@ -4859,7 +4859,7 @@
return 1;
}
-@@ -2340,3 +2376,83 @@
+@@ -2346,3 +2382,83 @@
return ticket_acquired != 0;
}
@@ -4943,9 +4943,9 @@
+{
+ stream->first_frame_flag = 1;
+}
-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
+diff -uNr xine-lib-1.1.20.orig/src/xine-engine/xine_internal.h xine-lib-1.1.20/src/xine-engine/xine_internal.h
+--- xine-lib-1.1.20.orig/src/xine-engine/xine_internal.h 2011-10-16 20:50:05.000000000 +0200
++++ xine-lib-1.1.20/src/xine-engine/xine_internal.h 2011-11-13 17:35:47.579072679 +0100
@@ -169,6 +169,9 @@
* be used in combination with acquire_nonblocking() */
void (*release_nonblocking)(xine_ticket_t *self, int irrevocable);
++++++ xine-lib-1.1.19-assert.patch -> xine-lib-1.1.20.1-assert.patch ++++++
--- /work/SRC/openSUSE:Factory/xine-lib/xine-lib-1.1.19-assert.patch 2011-09-23 12:51:38.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xine-lib.new/xine-lib-1.1.20.1-assert.patch 2012-01-25 15:02:59.000000000 +0100
@@ -1,6 +1,6 @@
-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
+diff -ur xine-lib-1.1.20.orig/src/audio_out/audio_alsa_out.c xine-lib-1.1.20/src/audio_out/audio_alsa_out.c
+--- xine-lib-1.1.20.orig/src/audio_out/audio_alsa_out.c 2011-10-04 23:42:53.000000000 +0200
++++ xine-lib-1.1.20/src/audio_out/audio_alsa_out.c 2011-11-13 17:54:44.276984269 +0100
@@ -41,6 +41,7 @@
#ifdef HAVE_ALLOCA_H
#include
participants (1)
-
root@hilbert.suse.de