r2117 - in vdr/vdr-plugin-xine/trunk/debian: . patches
Tobias Grimm
tiber-guest at costa.debian.org
Sat Mar 25 22:50:15 UTC 2006
Author: tiber-guest
Date: 2006-03-25 22:50:15 +0000 (Sat, 25 Mar 2006)
New Revision: 2117
Added:
vdr/vdr-plugin-xine/trunk/debian/patches/03_extra_keys.dpatch
Removed:
vdr/vdr-plugin-xine/trunk/debian/patches/03_hack_xine-lib_stable.dpatch
Modified:
vdr/vdr-plugin-xine/trunk/debian/changelog
vdr/vdr-plugin-xine/trunk/debian/patches/00list
vdr/vdr-plugin-xine/trunk/debian/patches/01_debian.dpatch
vdr/vdr-plugin-xine/trunk/debian/patches/02_constness.dpatch
Log:
Synced with Darren Salt's package 0.7.8-1.ds
Modified: vdr/vdr-plugin-xine/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-xine/trunk/debian/changelog 2006-03-25 22:18:58 UTC (rev 2116)
+++ vdr/vdr-plugin-xine/trunk/debian/changelog 2006-03-25 22:50:15 UTC (rev 2117)
@@ -5,11 +5,8 @@
- Build-Depend on vdr-dev (>=1.3.41-1)
* Tobias Grimm <tg at e-tobi.net>
- New upstream release.
- - Synced with Darren Salt's package 0.7.7-2.ds
- + 01_upstream.dpatch - fix frame display when moving cut marks
+ - Synced with Darren Salt's package 0.7.8-1.ds
+ 02_constness.dpatch - sprinkled a little constness dust where appropriate
- + 03_hack_xine-lib_stable.dpatch to allow plugin to not require
- xine-lib CVS HEAD :-(
+ Removed 02_grab.dpatch, 03_format_strings.dpatch (integrated in upstream)
+ Updated 01_debian.dpatch
Modified: vdr/vdr-plugin-xine/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-xine/trunk/debian/patches/00list 2006-03-25 22:18:58 UTC (rev 2116)
+++ vdr/vdr-plugin-xine/trunk/debian/patches/00list 2006-03-25 22:50:15 UTC (rev 2117)
@@ -1,5 +1,4 @@
01_debian
-01_Makefile-fPIC-fix
-01_upstream
+#01_upstream
02_constness
-03_hack_xine-lib_stable
+#03_extra_keys
Modified: vdr/vdr-plugin-xine/trunk/debian/patches/01_debian.dpatch
===================================================================
--- vdr/vdr-plugin-xine/trunk/debian/patches/01_debian.dpatch 2006-03-25 22:18:58 UTC (rev 2116)
+++ vdr/vdr-plugin-xine/trunk/debian/patches/01_debian.dpatch 2006-03-25 22:50:15 UTC (rev 2117)
@@ -6,9 +6,9 @@
## DP: Package-specific bits
@DPATCH@
-diff -urNad vdr-plugin-xine-0.7.7~/Make.config vdr-plugin-xine-0.7.7/Make.config
---- vdr-plugin-xine-0.7.7~/Make.config 2006-02-14 21:13:44.000000000 +0000
-+++ vdr-plugin-xine-0.7.7/Make.config 2006-02-14 21:13:45.310807367 +0000
+diff -urNad vdr-plugin-xine-0.7.8~/Make.config vdr-plugin-xine-0.7.8/Make.config
+--- vdr-plugin-xine-0.7.8~/Make.config 2006-03-21 01:05:54.000000000 +0000
++++ vdr-plugin-xine-0.7.8/Make.config 2006-03-21 01:05:55.290710274 +0000
@@ -0,0 +1,6 @@
+INCLUDES+=-I/usr/include/freetype2
+DVBDIR=.
@@ -16,10 +16,10 @@
+LIBDIR=$(DESTDIR)/usr/lib/vdr/plugins
+VIDEODIR=/video
+DATA_DIR=$(DESTDIR)/usr/share/vdr/vdr-xine
-diff -urNad vdr-plugin-xine-0.7.7~/Makefile vdr-plugin-xine-0.7.7/Makefile
---- vdr-plugin-xine-0.7.7~/Makefile 2006-02-14 21:13:44.000000000 +0000
-+++ vdr-plugin-xine-0.7.7/Makefile 2006-02-14 21:13:45.310807367 +0000
-@@ -29,7 +29,7 @@
+diff -urNad vdr-plugin-xine-0.7.8~/Makefile vdr-plugin-xine-0.7.8/Makefile
+--- vdr-plugin-xine-0.7.8~/Makefile 2006-03-21 01:05:54.000000000 +0000
++++ vdr-plugin-xine-0.7.8/Makefile 2006-03-21 01:05:55.294710016 +0000
+@@ -30,7 +30,7 @@
### Allow user defined options to overwrite defaults:
@@ -28,7 +28,7 @@
INCLUDES += `xine-config --cflags`
-@@ -40,10 +40,10 @@
+@@ -41,10 +41,10 @@
#VDR_XINE_SET_VIDEO_WINDOW = 1
# where are these utilities for image grabbing? (default: anywhere on your PATH)
@@ -43,7 +43,7 @@
### The version number of VDR (taken from VDR's "config.h"):
-@@ -106,7 +106,16 @@
+@@ -107,7 +107,16 @@
libvdr-$(PLUGIN).so: $(OBJS) Makefile
$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
Modified: vdr/vdr-plugin-xine/trunk/debian/patches/02_constness.dpatch
===================================================================
--- vdr/vdr-plugin-xine/trunk/debian/patches/02_constness.dpatch 2006-03-25 22:18:58 UTC (rev 2116)
+++ vdr/vdr-plugin-xine/trunk/debian/patches/02_constness.dpatch 2006-03-25 22:50:15 UTC (rev 2117)
@@ -12,7 +12,7 @@
--static const char *VERSION = "0.7.7";
+-static const char *VERSION = "0.7.8";
-static const char *DESCRIPTION = "Software based playback using xine";
-//static const char *MAINMENUENTRY = "xine - Toggle prebuffer setting";
+static const char VERSION[] = "0.7.7";
Added: vdr/vdr-plugin-xine/trunk/debian/patches/03_extra_keys.dpatch
===================================================================
--- vdr/vdr-plugin-xine/trunk/debian/patches/03_extra_keys.dpatch 2006-03-25 22:18:58 UTC (rev 2116)
+++ vdr/vdr-plugin-xine/trunk/debian/patches/03_extra_keys.dpatch 2006-03-25 22:50:15 UTC (rev 2117)
@@ -0,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_extra_keys.dpatch by <ds at flibble.youmustbejoking.demon.co.uk>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad vdr-plugin-xine-0.7.7~/xineRemote.c vdr-plugin-xine-0.7.7/xineRemote.c
+--- vdr-plugin-xine-0.7.7~/xineRemote.c 2006-02-03 20:34:58.000000000 +0000
++++ vdr-plugin-xine-0.7.7/xineRemote.c 2006-03-20 04:22:52.231723315 +0000
+@@ -52,6 +52,15 @@
+ #else
+ kNone,
+ #endif
++#if VDRVERSNUM >= 10344 // FIXME - probably 10345
++ kNext,
++ kPrevious,
++ kChanPrev,
++#else
++ kNone,
++ kNone,
++ kNone,
++#endif
+ };
+
+ cXineRemote::cXineRemote(const bool remoteOn)
Deleted: vdr/vdr-plugin-xine/trunk/debian/patches/03_hack_xine-lib_stable.dpatch
===================================================================
--- vdr/vdr-plugin-xine/trunk/debian/patches/03_hack_xine-lib_stable.dpatch 2006-03-25 22:18:58 UTC (rev 2116)
+++ vdr/vdr-plugin-xine/trunk/debian/patches/03_hack_xine-lib_stable.dpatch 2006-03-25 22:50:15 UTC (rev 2117)
@@ -1,107 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_hack_xine-lib_stable.dpatch by <ds at flibble.youmustbejoking.demon.co.uk>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad vdr-plugin-xine-0.7.7~/xineCommon.h vdr-plugin-xine-0.7.7/xineCommon.h
---- vdr-plugin-xine-0.7.7~/xineCommon.h 2006-02-14 21:27:07.000000000 +0000
-+++ vdr-plugin-xine-0.7.7/xineCommon.h 2006-02-14 21:27:57.931830583 +0000
-@@ -17,9 +17,14 @@
-
- #define MIN_INPUT_VDR_VERSION 707
-
-+// Hack to make this plugin work with stable xine-lib
-+#define XINE_INPUT_VDR_VERSION (MIN_INPUT_VDR_VERSION)
-+
-+#if 0
- #if !defined(XINE_INPUT_VDR_VERSION) || XINE_INPUT_VDR_VERSION < MIN_INPUT_VDR_VERSION
- #error xine/input_vdr.h does not match. Please patch and reinstall xine as mentioned in INSTALL!
- #endif
-+#endif
-
- #include <vdr/config.h> // poisened
-
-diff -urNad vdr-plugin-xine-0.7.7~/xineLib.c vdr-plugin-xine-0.7.7/xineLib.c
---- vdr-plugin-xine-0.7.7~/xineLib.c 2006-02-12 21:36:48.000000000 +0000
-+++ vdr-plugin-xine-0.7.7/xineLib.c 2006-02-14 21:40:42.262546734 +0000
-@@ -2288,6 +2288,9 @@
-
- bool cXineLib::checkXineVersion()
- {
-+#if 1
-+ return true;
-+#else
- int32_t version = 0;
- execFuncGetVersion(version);
-
-@@ -2295,9 +2298,9 @@
- return true;
-
- xfprintf(stderr, "vdr-xine: Client reports unsupported version %d => disconnecting!\n", version);
--
- disconnect();
- return false;
-+#endif
- }
-
- bool cXineLib::checkConnect()
-@@ -3028,7 +3031,7 @@
- data.header.func = func_clear;
- data.header.len = sizeof (data);
- data.n = n;
-- data.s = 0;
-+// data.s = 0;
-
- // first clear will discard xine's buffers to make some available for pushOut()
- if (sizeof (data) != xwrite(fd_control, &data, sizeof (data)))
-@@ -3040,7 +3043,7 @@
- if (!pushOut())
- return false;
-
-- data.s = 1;
-+// data.s = 1;
-
- // second clear will discard xine's buffers which contain data from pushOut()
- if (sizeof (data) != xwrite(fd_control, &data, sizeof (data)))
-@@ -3691,7 +3694,8 @@
-
- return NULL;
- }
--
-+
-+#if 0
- bool cXineLib::execFuncGetVersion(int32_t &version)
- {
- if (!isConnected())
-@@ -3702,7 +3706,7 @@
-
- if (!isConnected())
- return false;
--
-+
- data_get_version_t data;
- data.header.func = func_get_version;
- data.header.len = sizeof (data);
-@@ -3731,6 +3735,7 @@
-
- return false;
- }
-+#endif
-
- bool cXineLib::execFuncGetPTS(int64_t &pts)
- {
-diff -urNad vdr-plugin-xine-0.7.7~/xineLib.h vdr-plugin-xine-0.7.7/xineLib.h
---- vdr-plugin-xine-0.7.7~/xineLib.h 2006-02-03 21:16:46.000000000 +0000
-+++ vdr-plugin-xine-0.7.7/xineLib.h 2006-02-14 21:40:05.468919178 +0000
-@@ -262,7 +262,9 @@
- bool execFuncGetPTS(int64_t &pts);
- bool execFuncVideoSize(int &videoLeft, int &videoTop, int &videoWidth, int &videoHeight);
-
-+#if 0
- bool execFuncGetVersion(int32_t &version);
-+#endif
-
- uchar *execFuncGrabImage(const char *FileName, int &Size, bool Jpeg, int Quality, int SizeX, int SizeY);
-
More information about the pkg-vdr-dvb-changes
mailing list