r1995 - in vdr/vdr-plugin-xine/trunk/debian: . patches
Tobias Grimm
tiber-guest at costa.debian.org
Wed Mar 8 22:13:15 UTC 2006
Author: tiber-guest
Date: 2006-03-08 22:13:14 +0000 (Wed, 08 Mar 2006)
New Revision: 1995
Added:
vdr/vdr-plugin-xine/trunk/debian/patches/01_upstream.dpatch
vdr/vdr-plugin-xine/trunk/debian/patches/02_constness.dpatch
vdr/vdr-plugin-xine/trunk/debian/patches/03_hack_xine-lib_stable.dpatch
Removed:
vdr/vdr-plugin-xine/trunk/debian/patches/02_grab.dpatch
vdr/vdr-plugin-xine/trunk/debian/patches/03_format_strings.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_Makefile-fPIC-fix.dpatch
vdr/vdr-plugin-xine/trunk/debian/patches/01_debian.dpatch
Log:
-New upstream release.
-Synced with Darren Salt's package 0.7.7-2.ds
Modified: vdr/vdr-plugin-xine/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-xine/trunk/debian/changelog 2006-03-08 21:56:19 UTC (rev 1994)
+++ vdr/vdr-plugin-xine/trunk/debian/changelog 2006-03-08 22:13:14 UTC (rev 1995)
@@ -1,9 +1,18 @@
-vdr-plugin-xine (0.7.6-7) unstable; urgency=low
+vdr-plugin-xine (0.7.7-1) unstable; urgency=low
* NOT RELEASED YET
* Thomas Schmidt <tschmidt at debian.org>
- 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
+ + 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
-- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org> Thu, 2 Feb 2006 15:28:25 +0100
Modified: vdr/vdr-plugin-xine/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-xine/trunk/debian/patches/00list 2006-03-08 21:56:19 UTC (rev 1994)
+++ vdr/vdr-plugin-xine/trunk/debian/patches/00list 2006-03-08 22:13:14 UTC (rev 1995)
@@ -1,4 +1,5 @@
01_debian
01_Makefile-fPIC-fix
-02_grab
-03_format_strings
+01_upstream
+02_constness
+03_hack_xine-lib_stable
Modified: vdr/vdr-plugin-xine/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
===================================================================
--- vdr/vdr-plugin-xine/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch 2006-03-08 21:56:19 UTC (rev 1994)
+++ vdr/vdr-plugin-xine/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch 2006-03-08 22:13:14 UTC (rev 1995)
@@ -6,15 +6,15 @@
## DP: Adds -fPIC to Makefile
@DPATCH@
-diff -urNad vdr-plugin-xine-0.7.6/Makefile /tmp/dpep.xhL2DW/vdr-plugin-xine-0.7.6/Makefile
---- vdr-plugin-xine-0.7.6/Makefile 2005-09-11 21:30:06.000000000 +0200
-+++ /tmp/dpep.xhL2DW/vdr-plugin-xine-0.7.6/Makefile 2005-11-01 22:26:40.402979600 +0100
-@@ -16,7 +16,7 @@
- ### The C++ compiler and options:
+diff -urNad vdr-plugin-xine-0.7.7~/Makefile vdr-plugin-xine-0.7.7/Makefile
+--- vdr-plugin-xine-0.7.7~/Makefile 2006-03-08 23:09:04.000000000 +0100
++++ vdr-plugin-xine-0.7.7/Makefile 2006-03-08 23:09:29.000000000 +0100
+@@ -17,7 +17,7 @@
CXX ?= g++
+ #CXX = /soft/gcc-4.1-20060113/bin/g++ -I/soft/include -L/soft/lib
-CXXFLAGS ?= -O2 -g -Wall -Woverloaded-virtual
+CXXFLAGS ?= -O2 -fPIC -g -Wall -Woverloaded-virtual
- #CXXFLAGS ?= -O0 -g3 -Wall -Woverloaded-virtual
+ #CXXFLAGS ?= -O0 -g3 -Wall -Woverloaded-virtual -Wformat=2 -Wextra
### The directory environment:
Modified: vdr/vdr-plugin-xine/trunk/debian/patches/01_debian.dpatch
===================================================================
--- vdr/vdr-plugin-xine/trunk/debian/patches/01_debian.dpatch 2006-03-08 21:56:19 UTC (rev 1994)
+++ vdr/vdr-plugin-xine/trunk/debian/patches/01_debian.dpatch 2006-03-08 22:13:14 UTC (rev 1995)
@@ -6,9 +6,9 @@
## DP: Package-specific bits
@DPATCH@
-diff -urNad vdr-plugin-xine-0.7.0/Make.config /tmp/dpep.bQLd5z/vdr-plugin-xine-0.7.0/Make.config
---- vdr-plugin-xine-0.7.0/Make.config 2005-01-30 00:24:29.000000000 +0000
-+++ /tmp/dpep.bQLd5z/vdr-plugin-xine-0.7.0/Make.config 2005-01-30 00:24:30.000000000 +0000
+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
@@ -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.0/Makefile /tmp/dpep.bQLd5z/vdr-plugin-xine-0.7.0/Makefile
---- vdr-plugin-xine-0.7.0/Makefile 2005-01-30 00:24:29.000000000 +0000
-+++ /tmp/dpep.bQLd5z/vdr-plugin-xine-0.7.0/Makefile 2005-01-30 00:24:46.000000000 +0000
-@@ -28,7 +28,7 @@
+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 @@
### Allow user defined options to overwrite defaults:
@@ -28,7 +28,7 @@
INCLUDES += `xine-config --cflags`
-@@ -39,10 +39,10 @@
+@@ -40,10 +40,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"):
-@@ -105,7 +105,16 @@
+@@ -106,7 +106,16 @@
libvdr-$(PLUGIN).so: $(OBJS) Makefile
$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
Added: vdr/vdr-plugin-xine/trunk/debian/patches/01_upstream.dpatch
===================================================================
--- vdr/vdr-plugin-xine/trunk/debian/patches/01_upstream.dpatch 2006-03-08 21:56:19 UTC (rev 1994)
+++ vdr/vdr-plugin-xine/trunk/debian/patches/01_upstream.dpatch 2006-03-08 22:13:14 UTC (rev 1995)
@@ -0,0 +1,37 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_upstream.dpatch by Reinhard Nissl <rnissl at gmx.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patches posted to the VDR list.
+
+ at DPATCH@
+diff -urNad vdr-plugin-xine-0.7.7~/xineDevice.c vdr-plugin-xine-0.7.7/xineDevice.c
+--- vdr-plugin-xine-0.7.7~/xineDevice.c 2006-02-13 21:18:52.000000000 +0000
++++ vdr-plugin-xine-0.7.7/xineDevice.c 2006-02-15 20:37:24.337315895 +0000
+@@ -156,7 +156,7 @@
+ m_xineLib.execFuncStillFrame();
+ m_xineLib.execFuncWait();
+
+-// for (int i = 0; i < 2; i++)
++ for (int i = 0; i < 2; i++)
+ m_xineLib.showNoSignal();
+
+ PushOut();
+@@ -975,7 +975,7 @@
+
+ m_xineLib.pause(false);
+
+- for (int i = 0; i < 1 /* 4 */; i++)
++ for (int i = 0; i < 2 /* 4 */; i++)
+ {
+ //fprintf(stderr, " (%d) ", i);
+ int r = PlayVideo1(Data, Length, true);
+@@ -984,7 +984,7 @@
+ }
+
+ PushOut();
+- m_xineLib.execFuncFlush(0);
++// m_xineLib.execFuncFlush(0);
+ m_xineLib.execFuncFlush();
+
+ // ::fprintf(stderr, "------------\n");
Added: vdr/vdr-plugin-xine/trunk/debian/patches/02_constness.dpatch
===================================================================
--- vdr/vdr-plugin-xine/trunk/debian/patches/02_constness.dpatch 2006-03-08 21:56:19 UTC (rev 1994)
+++ vdr/vdr-plugin-xine/trunk/debian/patches/02_constness.dpatch 2006-03-08 22:13:14 UTC (rev 1995)
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_constness.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~/xine.c vdr-plugin-xine-0.7.7/xine.c
+--- vdr-plugin-xine-0.7.7~/xine.c 2006-02-14 21:17:03.000000000 +0000
++++ vdr-plugin-xine-0.7.7/xine.c 2006-02-14 21:17:04.501963573 +0000
+@@ -17,9 +17,9 @@
+
+
+
+-static const char *VERSION = "0.7.7";
+-static const char *DESCRIPTION = "Software based playback using xine";
+-//static const char *MAINMENUENTRY = "xine - Toggle prebuffer setting";
++static const char VERSION[] = "0.7.7";
++static const char DESCRIPTION[] = "Software based playback using xine";
++//static const char MAINMENUENTRY[] = "xine - Toggle prebuffer setting";
+
+
+
Deleted: vdr/vdr-plugin-xine/trunk/debian/patches/02_grab.dpatch
===================================================================
--- vdr/vdr-plugin-xine/trunk/debian/patches/02_grab.dpatch 2006-03-08 21:56:19 UTC (rev 1994)
+++ vdr/vdr-plugin-xine/trunk/debian/patches/02_grab.dpatch 2006-03-08 22:13:14 UTC (rev 1995)
@@ -1,192 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_grab.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.6~/xineDevice.c vdr-plugin-xine-0.7.6/xineDevice.c
---- vdr-plugin-xine-0.7.6~/xineDevice.c 2006-01-12 00:43:12.000000000 +0000
-+++ vdr-plugin-xine-0.7.6/xineDevice.c 2006-01-12 00:43:12.715161206 +0000
-@@ -2487,18 +2487,13 @@
- return Length;
- }
-
-- bool cXineDevice::GrabImage(const char *FileName, bool Jpeg /* = true */, int Quality /* = -1 */, int SizeX /* = -1 */, int SizeY /* = -1 */)
-+ uchar *cXineDevice::GrabImage(int &Size, bool Jpeg /* = true */, int Quality /* = -1 */, int SizeX /* = -1 */, int SizeY /* = -1 */)
- {
- xfprintf(stderr, "GrabImage ...\n\n");
--
-- if (m_xineLib.execFuncGrabImage(FileName, Jpeg, Quality, SizeX, SizeY))
-- {
-- xfprintf(stderr, "\nGrabImage succeeded.\n");
-- return true;
-- }
-
-- xfprintf(stderr, "\nGrabImage failed.\n");
-- return false;
-+ uchar *result = m_xineLib.execFuncGrabImage(Size, Jpeg, Quality, SizeX, SizeY);
-+ xfprintf(stderr, result ? "\nGrabImage succeeded.\n" : "\nGrabImage failed.\n");
-+ return result;
- }
-
- int64_t cXineDevice::GetSTC(void)
-diff -urNad vdr-plugin-xine-0.7.6~/xineDevice.h vdr-plugin-xine-0.7.6/xineDevice.h
---- vdr-plugin-xine-0.7.6~/xineDevice.h 2006-01-12 00:43:12.000000000 +0000
-+++ vdr-plugin-xine-0.7.6/xineDevice.h 2006-01-12 00:43:12.715161206 +0000
-@@ -66,7 +66,7 @@
- int PlayCommon2(const uchar *Data, int Length);
- int PlayCommon3(const uchar *Data, int Length);
-
-- virtual bool GrabImage(const char *FileName, bool Jpeg = true, int Quality = -1, int SizeX = -1, int SizeY = -1);
-+ virtual uchar *GrabImage(int &Size, bool Jpeg = true, int Quality = -1, int SizeX = -1, int SizeY = -1);
- virtual void SetVideoFormat(bool VideoFormat16_9);
- virtual void SetVolumeDevice(int Volume);
-
-diff -urNad vdr-plugin-xine-0.7.6~/xineLib.c vdr-plugin-xine-0.7.6/xineLib.c
---- vdr-plugin-xine-0.7.6~/xineLib.c 2006-01-12 00:43:12.000000000 +0000
-+++ vdr-plugin-xine-0.7.6/xineLib.c 2006-01-12 00:45:33.377856050 +0000
-@@ -3444,7 +3444,7 @@
- #define PNMTOJPEG "pnmtojpeg"
- #endif
-
-- bool cXineLib::execFuncGrabImage(const char *FileName, bool Jpeg, int Quality, int SizeX, int SizeY)
-+ uchar *cXineLib::execFuncGrabImage(int &Size, bool Jpeg, int Quality, int SizeX, int SizeY)
- {
- if (!isConnected())
- return false;
-@@ -3453,7 +3453,7 @@
- cMutexLock ioLock(&m_ioMutex);
-
- if (!isConnected())
-- return false;
-+ return NULL;
-
- data_grab_image_t data;
- data.header.func = func_grab_image;
-@@ -3465,32 +3465,32 @@
-
- off_t n = xread(fd_result, (char *)&resultUnion, sizeof (resultUnion.header));
- if (n != sizeof (resultUnion.header))
-- return false;
-+ return NULL;
-
- if (data.header.func != resultUnion.header.func)
-- return false;
-+ return NULL;
-
- result_grab_image_t *result = &resultUnion.grab_image;
-
- n = xread(fd_result, (char *)result + sizeof (result->header), sizeof (*result) - sizeof (result->header));
- if (n != sizeof (*result) - sizeof (result->header))
-- return false;
-+ return NULL;
-
- const size_t frameSize = result->header.len - sizeof (*result);
-
- // ::fprintf(stderr, "frameSize: %d\n", frameSize);
-
- if (frameSize <= 0)
-- return false;
-+ return NULL;
-
- uint8_t *img = (uint8_t *)::malloc(frameSize);
- if (!img)
-- return false;
-+ return NULL;
-
- if (frameSize != (size_t)xread(fd_result, img, frameSize))
- {
- ::free(img);
-- return false;
-+ return NULL;
- }
-
- if (XINE_IMGFMT_YUY2 == result->format)
-@@ -3499,7 +3499,7 @@
- if (!img2)
- {
- ::free(img);
-- return false;
-+ return NULL;
- }
-
- ::memset(img2, 0x80, frameSize);
-@@ -3531,11 +3531,10 @@
- int videoH = -1;
- execFuncVideoSize(videoX, videoY, videoW, videoH);
-
-- bool success = false;
--
-- int outfd = ::open(FileName, O_CREAT /* | O_EXCL */ | O_TRUNC | O_RDWR, 0644);
-- if (-1 != outfd)
-+ FILE *fd = ::tmpfile();
-+ if (fd)
- {
-+ int outfd = fileno(fd);
- int sizeX = SizeX;
- int sizeY = SizeY;
-
-@@ -3595,22 +3594,41 @@
- , result->width, result->height
- , 25, 1
- , ratioX, ratioY);
--
-- success = (frameSize == ::fwrite(img, 1, frameSize, f));
--
-- ::pclose(f);
-+
-+ if (frameSize == ::fwrite(img, 1, frameSize, f))
-+ {
-+ ::pclose(f); // close the pipe here, grab the image in one go
-+ ::free(img);
-+ img = NULL;
-+
-+ Size = (int) lseek (outfd, 0, SEEK_END);
-+ lseek (outfd, 0, SEEK_SET);
-+
-+ if (Size != -1)
-+ {
-+ img = (uint8_t *)::malloc(Size);
-+ if (img && Size != ::read(outfd, img, Size))
-+ {
-+ ::free(img);
-+ img = NULL;
-+ }
-+ }
-+ }
-+ else
-+ ::pclose(f);
- }
-
- ::free(cmd);
-- ::close(outfd);
-+
-+ ::fclose(fd);
-+
-+ return (uchar *)img;
- }
--
-- ::free(img);
-
-- return success;
-+ ::free(img);
- }
-
-- return false;
-+ return NULL;
- }
-
- bool cXineLib::execFuncGetPTS(int64_t &pts)
-diff -urNad vdr-plugin-xine-0.7.6~/xineLib.h vdr-plugin-xine-0.7.6/xineLib.h
---- vdr-plugin-xine-0.7.6~/xineLib.h 2006-01-12 00:43:12.000000000 +0000
-+++ vdr-plugin-xine-0.7.6/xineLib.h 2006-01-12 00:43:12.715161206 +0000
-@@ -254,7 +254,7 @@
- bool execFuncMetronom(int64_t pts, uint32_t flags = 0);
- bool execFuncNop();
- bool execFuncSetPrebuffer(int frames);
-- bool execFuncGrabImage(const char *FileName, bool Jpeg, int Quality, int SizeX, int SizeY);
-+ uchar *execFuncGrabImage(int &Size, bool Jpeg, int Quality, int SizeX, int SizeY);
- bool execFuncGetPTS(int64_t &pts);
- bool execFuncVideoSize(int &videoLeft, int &videoTop, int &videoWidth, int &videoHeight);
-
Deleted: vdr/vdr-plugin-xine/trunk/debian/patches/03_format_strings.dpatch
===================================================================
--- vdr/vdr-plugin-xine/trunk/debian/patches/03_format_strings.dpatch 2006-03-08 21:56:19 UTC (rev 1994)
+++ vdr/vdr-plugin-xine/trunk/debian/patches/03_format_strings.dpatch 2006-03-08 22:13:14 UTC (rev 1995)
@@ -1,111 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-
-## 03_format_strings.dpatch by Darren Salt
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix some missing-format-string bugs.
-
- at DPATCH@
-diff -urNad vdr-plugin-xine-0.7.6~/xineLib.c vdr-plugin-xine-0.7.6/xineLib.c
---- vdr-plugin-xine-0.7.6~/xineLib.c 2006-01-12 01:21:23.599614013 +0000
-+++ vdr-plugin-xine-0.7.6/xineLib.c 2006-01-12 01:21:47.774014821 +0000
-@@ -1912,8 +1912,8 @@
- }
- else
- {
-- ::fprintf(stderr, ("vdr-xine: error: couldn't open '" + noSignalFileName + "'!\n").c_str());
-- esyslog(("vdr-xine: error: couldn't open '" + noSignalFileName + "'!\n").c_str());
-+ ::fprintf(stderr, "vdr-xine: error: couldn't open '%s'!\n", noSignalFileName.c_str());
-+ esyslog("vdr-xine: error: couldn't open '%s'!\n", noSignalFileName.c_str());
- }
-
- assert(remote);
-@@ -1953,69 +1953,32 @@
-
- const mode_t origUmask = ::umask(0);
-
-- if (::mkdir(m_fifoDir.c_str(), 0755) < 0)
-- {
-- perror(("vdr-xine: error: couldn't create directory '" + m_fifoDir + "'").c_str());
-- esyslog(("vdr-xine: error: couldn't create directory '" + m_fifoDir + "'").c_str());
--
-- ::umask(origUmask);
-- return false;
-- }
--
-- if (::mknod(m_fifoNameExtControl.c_str(), 0666 | S_IFIFO, 0) < 0)
-- {
-- perror(("vdr-xine: error: couldn't create fifo '" + m_fifoNameExtControl + "'").c_str());
-- esyslog(("vdr-xine: error: couldn't create fifo '" + m_fifoNameExtControl + "'").c_str());
--
-- ::umask(origUmask);
-- return false;
-- }
--
-- if (::mknod(m_fifoNameExtResult.c_str(), 0644 | S_IFIFO, 0) < 0)
-- {
-- perror(("vdr-xine: error: couldn't create fifo '" + m_fifoNameExtResult + "'").c_str());
-- esyslog(("vdr-xine: error: couldn't create fifo '" + m_fifoNameExtResult + "'").c_str());
--
-- ::umask(origUmask);
-- return false;
-- }
--
-- if (::mknod(m_fifoNameControl.c_str(), 0644 | S_IFIFO, 0) < 0)
-- {
-- perror(("vdr-xine: error: couldn't create fifo '" + m_fifoNameControl + "'").c_str());
-- esyslog(("vdr-xine: error: couldn't create fifo '" + m_fifoNameControl + "'").c_str());
--
-- ::umask(origUmask);
-- return false;
-- }
--
-- if (::mknod(m_fifoNameResult.c_str(), 0666 | S_IFIFO, 0) < 0)
-- {
-- perror(("vdr-xine: error: couldn't create fifo '" + m_fifoNameResult + "'").c_str());
-- esyslog(("vdr-xine: error: couldn't create fifo '" + m_fifoNameResult + "'").c_str());
--
-- ::umask(origUmask);
-- return false;
-- }
-+#define MkFifo(String, Mask) \
-+ do { if (::mknod((String).c_str(), (Mask) | S_IFIFO, 0) < 0) \
-+ { \
-+ string msg = "vdr-xine: error: couldn't create fifo '" + (String) + "'"; \
-+ perror(msg.c_str()); \
-+ esyslog("%s", msg.c_str()); \
-+ ::umask(origUmask); \
-+ return false; \
-+ } } while (0)
-
-- if (::mknod(m_fifoNameRemote.c_str(), 0666 | S_IFIFO, 0) < 0)
-+ if (::mkdir(m_fifoDir.c_str(), 0755) < 0)
- {
-- perror(("vdr-xine: error: couldn't create fifo '" + m_fifoNameRemote + "'").c_str());
-- esyslog(("vdr-xine: error: couldn't create fifo '" + m_fifoNameRemote + "'").c_str());
--
-+ string msg = "vdr-xine: error: couldn't create directory '" + m_fifoDir + "'";
-+ perror(msg.c_str());
-+ esyslog("%s", msg.c_str());
- ::umask(origUmask);
- return false;
- }
-
-- if (::mknod(m_fifoNameStream.c_str(), 0644 | S_IFIFO, 0) < 0)
-- {
-- perror(("vdr-xine: error: couldn't create fifo '" + m_fifoNameStream + "'").c_str());
-- esyslog(("vdr-xine: error: couldn't create fifo '" + m_fifoNameStream + "'").c_str());
-+ MkFifo(m_fifoNameExtControl, 0666);
-+ MkFifo(m_fifoNameExtResult, 0644);
-+ MkFifo(m_fifoNameControl, 0644);
-+ MkFifo(m_fifoNameResult, 0666);
-+ MkFifo(m_fifoNameRemote, 0666);
-+ MkFifo(m_fifoNameStream, 0644);
-
-- ::umask(origUmask);
-- return false;
-- }
--
- ::umask(origUmask);
-
- if (!Start())
Added: 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-08 21:56:19 UTC (rev 1994)
+++ vdr/vdr-plugin-xine/trunk/debian/patches/03_hack_xine-lib_stable.dpatch 2006-03-08 22:13:14 UTC (rev 1995)
@@ -0,0 +1,107 @@
+#! /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