vdr/xine-lib-vdr/debian/patches 00list 01_am_maintainer_mode.dpatch 02_from_cvs.dpatch 03_vdr-xine_patch.dpatch 99_autoconf.dpatch
Darren Salt
pkg-vdr-dvb-changes@lists.alioth.debian.org
Mon, 04 Apr 2005 22:29:12 +0000
Update of /cvsroot/pkg-vdr-dvb/vdr/xine-lib-vdr/debian/patches
In directory haydn:/tmp/cvs-serv2129/debian/patches
Added Files:
00list 01_am_maintainer_mode.dpatch 02_from_cvs.dpatch
03_vdr-xine_patch.dpatch 99_autoconf.dpatch
Log Message:
Import of VDR-patched xine-lib.
--- NEW FILE: 00list ---
01_am_maintainer_mode
02_from_cvs
03_vdr-xine_patch
99_autoconf
--- NEW FILE: 03_vdr-xine_patch.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 01_vdr-xine_patch.dpatch by Reinhard Nissl
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: VDR plugin.
@DPATCH@
diff -urNad xine-lib-vdr-1.0/configure.ac /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/configure.ac
--- xine-lib-vdr-1.0/configure.ac 2005-02-12 22:01:42.000000000 +0000
+++ /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/configure.ac 2005-02-12 22:01:43.000000000 +0000
@@ -2254,6 +2254,7 @@
src/xine-utils/Makefile
src/xine-engine/Makefile
src/xine-engine/xineintl.h
+src/vdr/Makefile
win32/Makefile
win32/contrib/Makefile
win32/contrib/pthreads/Makefile
@@ -2312,7 +2313,7 @@
[...3069 lines suppressed...]
+
+ stream->xine->port_ticket->release(stream->xine->port_ticket, 0);
+
+ return redraw_needed;
+}
diff -urNad xine-lib-vdr-1.0/src/xine-engine/xine_internal.h /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/src/xine-engine/xine_internal.h
--- xine-lib-vdr-1.0/src/xine-engine/xine_internal.h 2004-12-19 20:24:31.000000000 +0000
+++ /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/src/xine-engine/xine_internal.h 2005-02-12 22:01:43.000000000 +0000
@@ -342,6 +342,11 @@
* private function prototypes:
*/
+int _x_continue_stream_processing(xine_stream_t *stream);
+void _x_trigger_relaxed_frame_drop_mode(xine_stream_t *stream);
+void _x_query_buffer_usage(xine_stream_t *stream, int *num_video_buffers, int *num_audio_buffers, int *num_video_frames, int *num_audio_frames);
+int _x_query_unprocessed_osd_events(xine_stream_t *stream);
+
void _x_handle_stream_end (xine_stream_t *stream, int non_user);
/* report message to UI. usually these are async errors */
--- NEW FILE: 01_am_maintainer_mode.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 01_am_maintainer_mode.dpatch by <ds@flibble.youmustbejoking.demon.co.uk>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.
@DPATCH@
diff -urNad xine-lib-vdr-1-rc7/configure.ac /tmp/dpep.XGGKrs/xine-lib-vdr-1-rc7/configure.ac
--- xine-lib-vdr-1-rc7/configure.ac 2004-11-21 21:48:22.000000000 +0000
+++ /tmp/dpep.XGGKrs/xine-lib-vdr-1-rc7/configure.ac 2004-11-21 21:49:03.000000000 +0000
@@ -6,6 +6,8 @@
AC_CONFIG_SRCDIR([src/xine-engine/xine.c])
AC_CONFIG_LIBOBJ_DIR([lib])
+AM_MAINTAINER_MODE
+
dnl
dnl Require autoconf version 2.53
dnl
--- NEW FILE: 99_autoconf.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 99_autoconf.dpatch by Darren Salt
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.
@DPATCH@
diff -urNad xine-lib-vdr-1.0/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/Makefile.in
--- xine-lib-vdr-1.0/Makefile.in 2005-02-13 01:06:48.000000000 +0000
+++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/Makefile.in 2005-02-13 01:07:52.000000000 +0000
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004 Free Software Foundation, Inc.
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
[...81840 lines suppressed...]
$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-data-hook install-exec \
- install-exec-am install-info install-info-am install-man \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- uninstall uninstall-am uninstall-hook uninstall-info-am
+ dvi-am info info-am install install-am install-data \
+ install-data-am install-exec install-exec-am install-info \
+ install-info-am install-man install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ mostlyclean-libtool uninstall uninstall-am uninstall-info-am
$(XINE_LIB):
--- NEW FILE: 02_from_cvs.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 02_from_cvs.dpatch by xine developers
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: cvs diff -uN -rxine-1_0-release -rxine-1_0
## DP: (without the Wndws-specific and non-distributed bits)
@DPATCH@
--- ./AUTHORS 13 Dec 2004 04:04:35 -0000 1.217
+++ ./AUTHORS 9 Feb 2005 19:38:44 -0000 1.217.2.1
@@ -128,6 +128,10 @@
VCD interpretation code in the extended VCD plugin from VCDImager
by Herbert Valerio Riedel http://vcdimager.org
+ CD I/O routines for the above from GNU libcdio
+ by Rocky Bernstein and Herbert Valerio Riedel
+ http://www.gnu.org/software/libcdio
+
Goom - visual effects generator
[...107793 lines suppressed...]
#ifndef XML_PARSER_H
@@ -60,6 +60,18 @@
int xml_parser_get_property_bool (xml_node_t *node, const char *name,
int def_value);
+/* for output:
+ * returns an escaped string (free() it when done)
+ * input must be in ASCII or UTF-8
+ */
+
+typedef enum {
+ XML_ESCAPE_NO_QUOTE,
+ XML_ESCAPE_SINGLE_QUOTE,
+ XML_ESCAPE_DOUBLE_QUOTE
+} xml_escape_quote_t;
+char *xml_escape_string (const char *s, xml_escape_quote_t quote_type);
+
/* for debugging purposes: dump read-in xml tree in a nicely
* indented fashion
*/