r6206 - in /vdr/vdr-plugin-xineliboutput/branches/etch/debian: ./ patches/
tiber-guest at users.alioth.debian.org
tiber-guest at users.alioth.debian.org
Sat Feb 16 19:35:57 UTC 2008
Author: tiber-guest
Date: Sat Feb 16 19:35:57 2008
New Revision: 6206
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=6206
Log:
* Merged trunk (1.0.0~rc2+cvs20080216.1656-1) into Etch branch
* Etch specific changes:
- Build-depend on libxine-dev (<< 1.1.3), libxine-dev (>= 1.1.2)
- Don't let libxine1-xvdr depend on libxine1-ffmpeg
* New Upstream Snapshot
* Build-depend on vdr-dev (>= 1.5.7-1)
* Removed 90_xineliboutput-1.0.0rc2-1.5.3.dpatch
* Updated 02_vdr-include-path.dpatch
* Build-Depend on libxine-dev (>=1.1.10)
* Set urgency to high to not delay the transition of xine-lib to testing
* Build-Depend on libxine-dev (>=1.1.9) (Closes: #460239, #461025)
* Added Provides: libxine-xvdr to libxine1-xvdr (Closes: #440605)
* Fixed typo in package description (Closes: #455066)
* Switched Build-System to cdbs, Build-Depend on cdbs
* Added Homepage field to debian/control
* Renamed XS-Vcs-* fields to Vcs-* in debian/control
* Bumped Standards-Version to 3.7.3
* Use ${binary:Version} instead of ${Source-Version} to make package
binNMUable
* Force rebuild for new vdr release
* Build-Depend on libxine-dev (>=1.1.8) and bumped shlibs accordingly
(Closes: #441641, #441881)
* Renamed and fixed libxine-xvdr.install and fixed MAKE_OPTIONS to point to
the correct NOSIGNAL_IMAGE_FILE (Closes: #439987)
* Fixed installation of libxine1-xvdr
* Renamed libxine-xvdr to libxine1-xvdr to match common xine plugin
naming scheme
* Let libxine1-xvdr depend on libxine1-ffmpeg
* Added 01_gnome-screensaver.dpatch
* Build-Depend on libdbus-glib-1-dev
* As suggested by Reinhard Tartler, force a tighter dependency on libxine1
by using a shlibs.local and build-depending on (libxine-dev << 1.1.8),
(libxine-dev >= 1.1.7)
Added:
vdr/vdr-plugin-xineliboutput/branches/etch/debian/libxine1-xvdr.install
vdr/vdr-plugin-xineliboutput/branches/etch/debian/patches/01_gnome-screensaver.dpatch
vdr/vdr-plugin-xineliboutput/branches/etch/debian/shlibs.local
Removed:
vdr/vdr-plugin-xineliboutput/branches/etch/debian/libxine-xvdr.install
vdr/vdr-plugin-xineliboutput/branches/etch/debian/patches/90_xineliboutput-1.0.0rc2-1.5.3.dpatch
vdr/vdr-plugin-xineliboutput/branches/etch/debian/patches/91_vdr-xineliboutput-1.0.0rc2-vdr-1.5.9-compile-fix.dpatch
Modified:
vdr/vdr-plugin-xineliboutput/branches/etch/debian/changelog
vdr/vdr-plugin-xineliboutput/branches/etch/debian/control
vdr/vdr-plugin-xineliboutput/branches/etch/debian/patches/00list
vdr/vdr-plugin-xineliboutput/branches/etch/debian/patches/02_vdr-include-path.dpatch
vdr/vdr-plugin-xineliboutput/branches/etch/debian/rules
vdr/vdr-plugin-xineliboutput/branches/etch/debian/vdr-plugin-xineliboutput.install
Modified: vdr/vdr-plugin-xineliboutput/branches/etch/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/branches/etch/debian/changelog?rev=6206&op=diff
==============================================================================
--- vdr/vdr-plugin-xineliboutput/branches/etch/debian/changelog (original)
+++ vdr/vdr-plugin-xineliboutput/branches/etch/debian/changelog Sat Feb 16 19:35:57 2008
@@ -1,48 +1,104 @@
-vdr-plugin-xineliboutput (1.0.0~rc2-2etch7) unstable; urgency=low
-
- * Force rebuild
-
- -- Tobias Grimm <tg at e-tobi.net> Sun, 25 Nov 2007 18:34:21 +0100
-
-vdr-plugin-xineliboutput (1.0.0~rc2-2etch6) unstable; urgency=low
-
- * Release for vdrdevel 1.5.12
-
- -- Thomas Günther <tom at toms-cafe.de> Tue, 20 Nov 2007 23:46:35 +0100
-
-vdr-plugin-xineliboutput (1.0.0~rc2-2etch5) unstable; urgency=low
-
- * Release for vdrdevel 1.5.11
-
- -- Thomas Günther <tom at toms-cafe.de> Tue, 6 Nov 2007 23:34:26 +0100
-
-vdr-plugin-xineliboutput (1.0.0~rc2-2etch4) unstable; urgency=low
-
- * Release for vdrdevel 1.5.10
-
- -- Thomas Günther <tom at toms-cafe.de> Tue, 16 Oct 2007 23:51:06 +0200
-
-vdr-plugin-xineliboutput (1.0.0~rc2-2etch3) unstable; urgency=low
-
- [ Thomas Günther ]
- * Added 91_vdr-xineliboutput-1.0.0rc2-vdr-1.5.9-compile-fix.dpatch
+vdr-plugin-xineliboutput (1.0.0~rc2+cvs20080216.1656-1etch1) experimental; urgency=low
+
+ * Merged trunk (1.0.0~rc2+cvs20080216.1656-1) into Etch branch
+ * Etch specific changes:
+ - Build-depend on libxine-dev (<< 1.1.3), libxine-dev (>= 1.1.2)
+ - Don't let libxine1-xvdr depend on libxine1-ffmpeg
+
+ -- Tobias Grimm <tg at e-tobi.net> Sat, 16 Feb 2008 20:35:49 +0100
+
+vdr-plugin-xineliboutput (1.0.0~rc2+cvs20080216.1656-1) experimental; urgency=low
+
+ * New Upstream Snapshot
+ * Build-depend on vdr-dev (>= 1.5.7-1)
+ * Removed 90_xineliboutput-1.0.0rc2-1.5.3.dpatch
+ * Updated 02_vdr-include-path.dpatch
+
+ -- Tobias Grimm <tg at e-tobi.net> Sat, 16 Feb 2008 18:25:40 +0100
+
+vdr-plugin-xineliboutput (1.0.0~rc2-13) unstable; urgency=high
+
+ * Build-Depend on libxine-dev (>=1.1.10)
+ * Set urgency to high to not delay the transition of xine-lib to testing
+
+ -- Thomas Schmidt <tschmidt at debian.org> Sun, 27 Jan 2008 13:24:50 +0100
+
+vdr-plugin-xineliboutput (1.0.0~rc2-12) unstable; urgency=low
+
+ * Build-Depend on libxine-dev (>=1.1.9) (Closes: #460239, #461025)
+
+ -- Tobias Grimm <tg at e-tobi.net> Fri, 11 Jan 2008 21:33:18 +0100
+
+vdr-plugin-xineliboutput (1.0.0~rc2-11) unstable; urgency=low
+
+ * Added Provides: libxine-xvdr to libxine1-xvdr (Closes: #440605)
+
+ -- Thomas Schmidt <tschmidt at debian.org> Sun, 30 Dec 2007 01:13:27 +0100
+
+vdr-plugin-xineliboutput (1.0.0~rc2-10) unstable; urgency=low
[ Tobias Grimm ]
+ * Fixed typo in package description (Closes: #455066)
+
+ [ Thomas Schmidt ]
+ * Switched Build-System to cdbs, Build-Depend on cdbs
+ * Added Homepage field to debian/control
+ * Renamed XS-Vcs-* fields to Vcs-* in debian/control
+ * Bumped Standards-Version to 3.7.3
+ * Use ${binary:Version} instead of ${Source-Version} to make package
+ binNMUable
+
+ -- Thomas Schmidt <tschmidt at debian.org> Sun, 30 Dec 2007 00:54:47 +0100
+
+vdr-plugin-xineliboutput (1.0.0~rc2-9) unstable; urgency=low
+
+ * Force rebuild for new vdr release
+
+ -- Tobias Grimm <tg at e-tobi.net> Wed, 28 Nov 2007 09:19:03 +0100
+
+vdr-plugin-xineliboutput (1.0.0~rc2-8) unstable; urgency=low
+
+ * Build-Depend on libxine-dev (>=1.1.8) and bumped shlibs accordingly
+ (Closes: #441641, #441881)
+
+ -- Thomas Schmidt <tschmidt at debian.org> Tue, 11 Sep 2007 20:53:00 +0200
+
+vdr-plugin-xineliboutput (1.0.0~rc2-7) unstable; urgency=low
+
+ * Renamed and fixed libxine-xvdr.install and fixed MAKE_OPTIONS to point to
+ the correct NOSIGNAL_IMAGE_FILE (Closes: #439987)
+
+ -- Thomas Schmidt <tschmidt at debian.org> Wed, 29 Aug 2007 09:35:53 +0200
+
+vdr-plugin-xineliboutput (1.0.0~rc2-6) unstable; urgency=low
+
+ * Fixed installation of libxine1-xvdr
+
+ -- Tobias Grimm <tg at e-tobi.net> Sat, 25 Aug 2007 14:34:20 +0200
+
+vdr-plugin-xineliboutput (1.0.0~rc2-5) unstable; urgency=low
+
* Reformatted debian/copyright
-
- -- Thomas Günther <tom at toms-cafe.de> Fri, 7 Sep 2007 01:03:36 +0200
-
-vdr-plugin-xineliboutput (1.0.0~rc2-2etch2) unstable; urgency=low
-
- * Release for vdrdevel 1.5.8
-
- -- Thomas Günther <tom at toms-cafe.de> Thu, 23 Aug 2007 01:09:15 +0200
-
-vdr-plugin-xineliboutput (1.0.0~rc2-2etch1) unstable; urgency=low
-
- * Release for vdrdevel 1.5.6
-
- -- Thomas Günther <tom at toms-cafe.de> Tue, 14 Aug 2007 01:46:28 +0200
+ * Renamed libxine-xvdr to libxine1-xvdr to match common xine plugin
+ naming scheme
+ * Let libxine1-xvdr depend on libxine1-ffmpeg
+
+ -- Tobias Grimm <tg at e-tobi.net> Sun, 12 Aug 2007 16:47:22 +0200
+
+vdr-plugin-xineliboutput (1.0.0~rc2-4) UNRELEASED; urgency=low
+
+ * Added 01_gnome-screensaver.dpatch
+ * Build-Depend on libdbus-glib-1-dev
+
+ -- Thomas Schmidt <tschmidt at debian.org> Mon, 2 Jul 2007 21:47:02 +0200
+
+vdr-plugin-xineliboutput (1.0.0~rc2-3) unstable; urgency=low
+
+ * As suggested by Reinhard Tartler, force a tighter dependency on libxine1
+ by using a shlibs.local and build-depending on (libxine-dev << 1.1.8),
+ (libxine-dev >= 1.1.7)
+
+ -- Tobias Grimm <tg at e-tobi.net> Thu, 28 Jun 2007 23:23:12 +0200
vdr-plugin-xineliboutput (1.0.0~rc2-2) unstable; urgency=low
Modified: vdr/vdr-plugin-xineliboutput/branches/etch/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/branches/etch/debian/control?rev=6206&op=diff
==============================================================================
--- vdr/vdr-plugin-xineliboutput/branches/etch/debian/control (original)
+++ vdr/vdr-plugin-xineliboutput/branches/etch/debian/control Sat Feb 16 19:35:57 2008
@@ -3,10 +3,11 @@
Priority: extra
Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
Uploaders: Tobias Grimm <tg at e-tobi.net>, Thomas Schmidt <tschmidt at debian.org>, Thomas Günther <tom at toms-cafe.de>
-Build-Depends: debhelper (>> 4.1.16), dpatch, vdr-dev (>= 1.4.7-2), libxine-dev (>= 1.1.1), libjpeg62-dev, libxv-dev, libx11-dev, libxext-dev, sharutils
-Standards-Version: 3.7.2
-XS-Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/trunk/
-XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/trunk/
+Build-Depends: debhelper (>> 4.1.16), cdbs, dpatch, vdr-dev (>= 1.5.7-1), gettext, libxine-dev (<< 1.1.3), libxine-dev (>= 1.1.2), libjpeg62-dev, libxv-dev, libx11-dev, libxext-dev, sharutils, libdbus-glib-1-dev
+Standards-Version: 3.7.3
+Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/trunk/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/trunk/
+Homepage: http://sourceforge.net/projects/xineliboutput
Package: vdr-plugin-xineliboutput
Architecture: any
@@ -18,35 +19,38 @@
Package: libxineliboutput-fbfe
Architecture: any
-Depends: ${shlibs:Depends}, vdr-plugin-xineliboutput (= ${Source-Version}), libxine-xvdr (= ${Source-Version})
-Description: Local Frambebuffer frontend for the xineliboutput plugin
+Depends: ${shlibs:Depends}, vdr-plugin-xineliboutput (= ${binary:Version}), libxine1-xvdr (= ${binary:Version})
+Description: Local framebuffer frontend for the xineliboutput plugin
The xineliboutput vdr plugin requires this library to provide the built-in
local frontend for framebuffer devices.
Package: libxineliboutput-sxfe
Architecture: any
-Depends: ${shlibs:Depends}, vdr-plugin-xineliboutput (= ${Source-Version}), libxine-xvdr (= ${Source-Version})
+Depends: ${shlibs:Depends}, vdr-plugin-xineliboutput (= ${binary:Version}), libxine1-xvdr (= ${binary:Version})
Description: Local X-Server frontend for the xineliboutput plugin
The xineliboutput vdr plugin requires this library to provide the built-in
local frontend for X, Xv or XvMC window systems.
Package: xineliboutput-fbfe
Architecture: any
-Depends: ${shlibs:Depends}, libxine-xvdr (= ${Source-Version})
+Depends: ${shlibs:Depends}, libxine1-xvdr (= ${binary:Version})
Description: Remote Framebuffer frontend for vdr-plugin-xineliboutput
This frambuffer remote frontend plays back streams provided by
vdr-plugin-xineliboutput.
Package: xineliboutput-sxfe
Architecture: any
-Depends: ${shlibs:Depends}, libxine-xvdr (= ${Source-Version})
+Depends: ${shlibs:Depends}, libxine1-xvdr (= ${binary:Version})
Description: Remote X-Server frontend for vdr-plugin-xineliboutput
This X/Xv/XvMc remote frontend plays back streams provided by
vdr-plugin-xineliboutput.
-Package: libxine-xvdr
+Package: libxine1-xvdr
Architecture: any
Depends: ${shlibs:Depends}
+Replaces: libxine-xvdr (<< 1.0.0~rc2-5)
+Provides: libxine-xvdr
+Conflicts: libxine-xvdr (<< 1.0.0~rc2-5)
Description: Xine input plugin for vdr-plugin-xineliboutput streams
This plugin adds a new mrl "xvdr://" to Xine, which allows to play back
streams provided by vdr-plugin-xineliboutput.
Added: vdr/vdr-plugin-xineliboutput/branches/etch/debian/libxine1-xvdr.install
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/branches/etch/debian/libxine1-xvdr.install?rev=6206&op=file
==============================================================================
--- vdr/vdr-plugin-xineliboutput/branches/etch/debian/libxine1-xvdr.install (added)
+++ vdr/vdr-plugin-xineliboutput/branches/etch/debian/libxine1-xvdr.install Sat Feb 16 19:35:57 2008
@@ -1,0 +1,1 @@
+debian/nosignal.mpg /usr/share/libxine1-xvdr/
Modified: vdr/vdr-plugin-xineliboutput/branches/etch/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/branches/etch/debian/patches/00list?rev=6206&op=diff
==============================================================================
--- vdr/vdr-plugin-xineliboutput/branches/etch/debian/patches/00list (original)
+++ vdr/vdr-plugin-xineliboutput/branches/etch/debian/patches/00list Sat Feb 16 19:35:57 2008
@@ -1,4 +1,3 @@
+01_gnome-screensaver
02_vdr-include-path
10_nosignal
-90_xineliboutput-1.0.0rc2-1.5.3
-91_vdr-xineliboutput-1.0.0rc2-vdr-1.5.9-compile-fix
Added: vdr/vdr-plugin-xineliboutput/branches/etch/debian/patches/01_gnome-screensaver.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/branches/etch/debian/patches/01_gnome-screensaver.dpatch?rev=6206&op=file
==============================================================================
--- vdr/vdr-plugin-xineliboutput/branches/etch/debian/patches/01_gnome-screensaver.dpatch (added)
+++ vdr/vdr-plugin-xineliboutput/branches/etch/debian/patches/01_gnome-screensaver.dpatch Sat Feb 16 19:35:57 2008
@@ -1,0 +1,271 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_gnome-screensaver.dpatch by Alex Stansfield <mailing-lists at jinkies.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Allows vdr-sxfe to disable gnome-screensaver
+
+ at DPATCH@
+diff -urNad vdr-plugin-xineliboutput-1.0.0~rc2~/Makefile vdr-plugin-xineliboutput-1.0.0~rc2/Makefile
+--- vdr-plugin-xineliboutput-1.0.0~rc2~/Makefile 2007-05-18 13:10:37.000000000 +0200
++++ vdr-plugin-xineliboutput-1.0.0~rc2/Makefile 2007-07-02 21:42:19.000000000 +0200
+@@ -27,6 +27,9 @@
+
+ ifeq ($(XINELIBOUTPUT_X11), 1)
+ #$(warning Detected X11)
++
++ # Check for DBUS libs, if they exist we'll compile gnome screensaver support
++ XINELIBOUTPUT_DBUS = $(shell (pkg-config --exists dbus-glib-1 >/dev/null 2>&1 && echo "1") || echo "0")
+ else
+ $(warning ********************************************************)
+ $(warning X11 not detected ! X11 frontends will not be compiled. )
+@@ -46,6 +49,7 @@
+
+ USE_ICONV = 1
+ #XINELIBOUTPUT_X11 = 1
++#XINELIBOUTPUT_DBUS = 1
+ #XINELIBOUTPUT_FB = 1
+ #XINELIBOUTPUT_XINEPLUGIN = 1
+ #XINELIBOUTPUT_VDRPLUGIN = 1
+@@ -233,6 +237,14 @@
+ DEFINES += -DSTARTUP_IMAGE_FILE='"$(STARTUP_IMAGE_FILE)"'
+ endif
+
++# dbus define, libs and includes for gnome screensaver support
++ifeq ($(XINELIBOUTPUT_DBUS), 1)
++ DEFINES += -DHAVE_DBUS_GLIB
++ LIBS_DBUS += $(shell pkg-config --libs dbus-glib-1 2>/dev/null)
++ INCLUDES += $(shell pkg-config --cflags dbus-glib-1 2>/dev/null)
++endif
++
++
+
+ ###
+ ### configuration
+@@ -259,8 +271,13 @@
+ endif
+
+ ifeq ($(XINELIBOUTPUT_X11), 1)
+- OBJS_SXFE_SO = xine_sxfe_frontend.o xine/post.o
+- OBJS_SXFE = xine_sxfe_frontend_standalone.o xine/post.o tools/vdrdiscovery_standalone.o
++ ifeq ($(XINELIBOUTPUT_DBUS), 1)
++ OBJS_SXFE_SO = xine_sxfe_frontend.o xine/post.o gnome_screensaver.o
++ OBJS_SXFE = xine_sxfe_frontend_standalone.o xine/post.o tools/vdrdiscovery_standalone.o gnome_screensaver.o
++ else
++ OBJS_SXFE_SO = xine_sxfe_frontend.o xine/post.o
++ OBJS_SXFE = xine_sxfe_frontend_standalone.o xine/post.o tools/vdrdiscovery_standalone.o
++ endif
+ else
+ OBJS_SXFE_SO =
+ OBJS_SXFE =
+@@ -330,7 +347,7 @@
+
+ xine_sxfe_frontend.o: xine_sxfe_frontend.c xine_frontend.c xine_frontend.h \
+ xine_input_vdr.h xine_osd_command.h xine/post.h logdefs.h \
+- xineliboutput.c
++ xineliboutput.c gnome_screensaver.c
+ $(CC) $(CFLAGS) -c $(DEFINES) $(INCLUDES) $(OPTFLAGS) xine_sxfe_frontend.c
+ xine_fbfe_frontend.o: xine_fbfe_frontend.c xine_frontend.c xine_frontend.h \
+ xine_input_vdr.h xine_osd_command.h xine/post.h logdefs.h \
+@@ -339,13 +356,15 @@
+ xine_sxfe_frontend_standalone.o: xine_sxfe_frontend.c xine_frontend.c \
+ xine_frontend.h xine_input_vdr.h xine_osd_command.h \
+ xine/post.h logdefs.h xine_frontend_main.c xine_frontend_lirc.c \
+- xineliboutput.c tools/vdrdiscovery.h
++ xineliboutput.c tools/vdrdiscovery.h gnome_screensaver.c
+ $(CC) $(CFLAGS) -c $(DEFINES) -DFE_STANDALONE $(INCLUDES) $(OPTFLAGS) xine_sxfe_frontend.c -o $@
+ xine_fbfe_frontend_standalone.o: xine_fbfe_frontend.c xine_frontend.c \
+ xine_frontend.h xine_input_vdr.h xine_osd_command.h \
+ xine/post.h logdefs.h xine_frontend_main.c xine_frontend_lirc.c \
+ xineliboutput.c tools/vdrdiscovery.h
+ $(CC) $(CFLAGS) -c $(DEFINES) -DFE_STANDALONE $(INCLUDES) $(OPTFLAGS) xine_fbfe_frontend.c -o $@
++gnome_screensaver.o: gnome_screensaver.c gnome_screensaver.h
++ $(CC) $(CFLAGS) -c $(DEFINES) -DFE_STANDALONE $(INCLUDES) $(OPTFLAGS) gnome_screensaver.c
+
+
+ ###
+@@ -383,11 +402,11 @@
+
+ ifeq ($(XINELIBOUTPUT_X11), 1)
+ $(VDRPLUGIN_SXFE_SO): $(OBJS_SXFE_SO)
+- $(CC) $(CFLAGS) $(LDFLAGS_SO) $(OBJS_SXFE_SO) $(LIBS_X11) $(LIBS_XINE) -o $@
++ $(CC) $(CFLAGS) $(LDFLAGS_SO) $(OBJS_SXFE_SO) $(LIBS_X11) ${LIBS_DBUS} $(LIBS_XINE) -o $@
+ @-rm -rf $(LIBDIR)/$(VDRPLUGIN_SXFE_SO).$(VERSION)
+ @cp $@ $(LIBDIR)/$(VDRPLUGIN_SXFE_SO).$(VERSION)
+ $(VDRSXFE): $(OBJS_SXFE)
+- $(CC) -g $(OBJS_SXFE) $(LIBS_X11) -ljpeg $(LIBS_XINE) -o $@
++ $(CC) -g $(OBJS_SXFE) $(LIBS_X11) ${LIBS_DBUS} -ljpeg $(LIBS_XINE) -o $@
+ endif
+
+ ifeq ($(XINELIBOUTPUT_FB), 1)
+diff -urNad vdr-plugin-xineliboutput-1.0.0~rc2~/gnome_screensaver.c vdr-plugin-xineliboutput-1.0.0~rc2/gnome_screensaver.c
+--- vdr-plugin-xineliboutput-1.0.0~rc2~/gnome_screensaver.c 1970-01-01 01:00:00.000000000 +0100
++++ vdr-plugin-xineliboutput-1.0.0~rc2/gnome_screensaver.c 2007-07-02 21:42:19.000000000 +0200
+@@ -0,0 +1,122 @@
++/*
++ * gnome_screensaver.c v0.0.7
++ *
++ * Enable/Disable the GNOME screensaver
++ * Supports GNOME screensaver API 2.14 and 2.15
++ *
++ * Call gnome_screensaver_control(1) to enable and
++ * gnome_screensaver_control(0) to disable
++ *
++ */
++
++#include <stdlib.h>
++#include <unistd.h>
++#include <dbus/dbus-glib.h>
++#include <stdio.h>
++#include <stdarg.h>
++#include <string.h>
++
++#define NEED_x_syslog
++#define LOG_MODULENAME "[vdr-fe] "
++
++#include "logdefs.h"
++#include "gnome_screensaver.h"
++
++#define GS_SERVICE "org.gnome.ScreenSaver"
++#define GS_PATH "/org/gnome/ScreenSaver"
++#define GS_INTERFACE "org.gnome.ScreenSaver"
++
++#define GS_APPLICATION_NAME "vdr-sxfe"
++#define GS_REASON_FOR_INHIBIT "Watching TV"
++
++// Log Messages
++#define MSG_OpenBusConnectionError "Failed to open connection to bus: %s"
++#define MSG_RemoteMethodException "Caught remote method exception %s: %s"
++#define MSG_GnomeAPI215Failed "GNOME screensaver 2.15 API failed, trying 2.14 API"
++#define MSG_GError "Error: %s"
++#define MSG_GNOMEScreensaverEnabled "GNOME screensaver enabled"
++#define MSG_GNOMEScreensaverDisabled "GNOME screensaver disabled"
++
++static guint32 cookie;
++
++void gnome_screensaver_control(int enable)
++{
++ DBusGConnection *connection;
++ GError *error;
++ DBusGProxy *proxy;
++ gboolean ret;
++
++ g_type_init();
++
++ /* Get a connection to the session bus */
++ error = NULL;
++ connection = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
++ if (connection == NULL) {
++ LOGERR(MSG_OpenBusConnectionError, error->message);
++ g_error_free(error);
++ return;
++ }
++
++ /* Create a proxy object */
++ proxy = dbus_g_proxy_new_for_name(connection,
++ GS_SERVICE, GS_PATH, GS_INTERFACE);
++
++ /* Enable the screensaver */
++ if (enable) {
++ /* First call the GNOME screensaver 2.15 API method */
++ error = NULL;
++ ret =
++ dbus_g_proxy_call(proxy, "UnInhibit", &error, G_TYPE_UINT,
++ cookie, G_TYPE_INVALID, G_TYPE_INVALID);
++
++ /* If this fails, try the GNOME screensaver 2.14 API */
++ if (!ret && error->domain == DBUS_GERROR
++ && error->code == DBUS_GERROR_UNKNOWN_METHOD) {
++ LOGERR(MSG_GnomeAPI215Failed);
++ g_error_free(error);
++ error = NULL;
++ ret =
++ dbus_g_proxy_call(proxy, "AllowActivation", &error,
++ G_TYPE_INVALID, G_TYPE_INVALID);
++ }
++ }
++ /* Disable the screensaver */
++ else {
++ /* First call the GNOME screensaver 2.15 API method */
++ error = NULL;
++ ret =
++ dbus_g_proxy_call(proxy, "Inhibit", &error, G_TYPE_STRING,
++ GS_APPLICATION_NAME, G_TYPE_STRING,
++ GS_REASON_FOR_INHIBIT, G_TYPE_INVALID,
++ G_TYPE_UINT, cookie, G_TYPE_INVALID);
++
++ /* If this fails, try the GNOME screensaver 2.14 API */
++ if (!ret && error->domain == DBUS_GERROR
++ && error->code == DBUS_GERROR_UNKNOWN_METHOD) {
++ LOGERR(MSG_GnomeAPI215Failed);
++ g_error_free(error);
++ error = NULL;
++ ret =
++ dbus_g_proxy_call(proxy, "InhibitActivation", &error,
++ G_TYPE_STRING, GS_REASON_FOR_INHIBIT,
++ G_TYPE_INVALID, G_TYPE_INVALID);
++ }
++ }
++
++ if (!ret) {
++ /* Check if it's a remote exception or a regular GError */
++ if (error->domain == DBUS_GERROR
++ && error->code == DBUS_GERROR_REMOTE_EXCEPTION) {
++ LOGERR(MSG_RemoteMethodException, dbus_g_error_get_name(error), error->message);
++ }
++ else {
++ LOGERR(MSG_GError, error->message);
++ }
++ g_error_free(error);
++ }
++ else {
++ LOGMSG(enable ? MSG_GNOMEScreensaverEnabled : MSG_GNOMEScreensaverDisabled);
++ }
++
++ g_object_unref(proxy);
++}
+diff -urNad vdr-plugin-xineliboutput-1.0.0~rc2~/gnome_screensaver.h vdr-plugin-xineliboutput-1.0.0~rc2/gnome_screensaver.h
+--- vdr-plugin-xineliboutput-1.0.0~rc2~/gnome_screensaver.h 1970-01-01 01:00:00.000000000 +0100
++++ vdr-plugin-xineliboutput-1.0.0~rc2/gnome_screensaver.h 2007-07-02 21:42:19.000000000 +0200
+@@ -0,0 +1,6 @@
++#ifndef _GNOME_SCREENSAVER_H
++#define _GNOME_SCREENSAVER_H
++
++extern void gnome_screensaver_control(int enable);
++
++#endif /* !_GNOME_SCREENSAVER_H */
+diff -urNad vdr-plugin-xineliboutput-1.0.0~rc2~/xine_sxfe_frontend.c vdr-plugin-xineliboutput-1.0.0~rc2/xine_sxfe_frontend.c
+--- vdr-plugin-xineliboutput-1.0.0~rc2~/xine_sxfe_frontend.c 2007-03-17 13:41:21.000000000 +0100
++++ vdr-plugin-xineliboutput-1.0.0~rc2/xine_sxfe_frontend.c 2007-07-02 21:42:19.000000000 +0200
+@@ -63,6 +63,10 @@
+
+ #include "xine_frontend.h"
+ #include "xine/post.h"
++
++#ifdef HAVE_DBUS_GLIB
++# include "gnome_screensaver.h"
++#endif
+
+ #define MWM_HINTS_DECORATIONS (1L << 1)
+ #define PROP_MWM_HINTS_ELEMENTS 5
+@@ -561,6 +565,10 @@
+ }
+ #endif
+
++#ifdef HAVE_DBUS_GLIB
++ gnome_screensaver_control(0);
++#endif
++
+ this->xine_visual_type = XINE_VISUAL_TYPE_X11;
+ this->vis.display = this->display;
+ this->vis.screen = this->screen;
+@@ -881,6 +889,10 @@
+
+ if(this && this->display) {
+
++#ifdef HAVE_DBUS_GLIB
++ gnome_screensaver_control(1);
++#endif
++
+ if(this->xine)
+ this->fe.xine_exit(this_gen);
+
Modified: vdr/vdr-plugin-xineliboutput/branches/etch/debian/patches/02_vdr-include-path.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/branches/etch/debian/patches/02_vdr-include-path.dpatch?rev=6206&op=diff
==============================================================================
--- vdr/vdr-plugin-xineliboutput/branches/etch/debian/patches/02_vdr-include-path.dpatch (original)
+++ vdr/vdr-plugin-xineliboutput/branches/etch/debian/patches/02_vdr-include-path.dpatch Sat Feb 16 19:35:57 2008
@@ -5,15 +5,15 @@
## DP: Fixes strange VDRINCDIR usage in Makefile.
@DPATCH@
-diff -urNad vdr-plugin-xineliboutput-1.0.0~rc1~/Makefile vdr-plugin-xineliboutput-1.0.0~rc1/Makefile
---- vdr-plugin-xineliboutput-1.0.0~rc1~/Makefile 2007-01-29 00:20:47.000000000 +0100
-+++ vdr-plugin-xineliboutput-1.0.0~rc1/Makefile 2007-03-31 14:55:50.000000000 +0200
-@@ -191,7 +191,7 @@
+diff -urNad vdr-plugin-xineliboutput-1.0.0~rc2+cvs20080216.1656~/Makefile vdr-plugin-xineliboutput-1.0.0~rc2+cvs20080216.1656/Makefile
+--- vdr-plugin-xineliboutput-1.0.0~rc2+cvs20080216.1656~/Makefile 2008-02-16 17:58:46.000000000 +0100
++++ vdr-plugin-xineliboutput-1.0.0~rc2+cvs20080216.1656/Makefile 2008-02-16 17:59:49.000000000 +0100
+@@ -221,7 +221,7 @@
-DXINELIBOUTPUT_VERSION='"$(VERSION)"'
# check for yaegp patch
--DEFINES += $(shell grep -q 'vidWin' \$(VDRINCDIR)/vdr/osd.h && echo "-DYAEGP_PATCH")
-+DEFINES += $(shell grep -q 'vidWin' \$(VDRDIR)/osd.h && echo "-DYAEGP_PATCH")
-
- ifeq ($(XINELIBOUTPUT_XINEPLUGIN), 1)
- CFLAGS += $(shell xine-config --cflags)
+-YAEPG = $(shell grep -q 'vidWin' \$(VDRINCDIR)/vdr/osd.h && echo "1")
++YAEPG = $(shell grep -q 'vidWin' \$(VDRDIR)/osd.h && echo "1")
+ ifeq ($(YAEPG), 1)
+ DEFINES += -DYAEGP_PATCH
+ endif
Modified: vdr/vdr-plugin-xineliboutput/branches/etch/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/branches/etch/debian/rules?rev=6206&op=diff
==============================================================================
--- vdr/vdr-plugin-xineliboutput/branches/etch/debian/rules (original)
+++ vdr/vdr-plugin-xineliboutput/branches/etch/debian/rules Sat Feb 16 19:35:57 2008
@@ -1,100 +1,38 @@
#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -g
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
-
-# To use dpatch uncomment the following line and set Build-Depends to dpatch
-DPATCH=yes
-
-ifdef DPATCH
-include /usr/share/dpatch/dpatch.make
-else
-patch:
-patch-stamp:
-unpatch:
-endif
+DEB_INSTALL_CHANGELOGS_ALL = HISTORY
# install target directory for xine plugins
-XINEPLUGINDIR=libxine-xvdr/$(shell xine-config --plugindir)
+XINEPLUGINDIR = libxine1-xvdr/$(shell xine-config --plugindir)
MAKE_OPTIONS = DVBDIR=/usr VDRDIR=/usr/include/vdr LIBDIR=. \
- NOSIGNAL_IMAGE_FILE=/usr/share/libxine-xvdr/nosignal.mpg
+ LOCALEDIR=debian/tmp/usr/share/locale \
+ NOSIGNAL_IMAGE_FILE=/usr/share/libxine1-xvdr/nosignal.mpg
-configure: configure-stamp
-configure-stamp: patch-stamp
- dh_testdir
- touch configure-stamp
+common-build-arch::
+ $(MAKE) all $(MAKE_OPTIONS)
-build: build-stamp
-build-stamp: configure-stamp
- dh_testdir
- $(MAKE) all $(MAKE_OPTIONS)
- touch build-stamp
+clean::
+ $(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
+ rm -f libvdr-*.so.*
-clean: clean-patched unpatch
-clean-patched:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
- -$(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
- rm -f libvdr-*.so.*
- dh_clean
+common-binary-predeb-arch::
+ sh /usr/share/vdr-dev/patchlevel.sh subst
+ sh /usr/share/vdr-dev/dependencies.sh
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
+install/vdr-plugin-xineliboutput::
install -d debian/$(XINEPLUGINDIR)/post/
install xineplug_inp_xvdr.so debian/$(XINEPLUGINDIR)/
install xineplug_post_*.so debian/$(XINEPLUGINDIR)/post/
- dh_install
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
-# dh_installdebconf
- dh_installdocs
- dh_installexamples
-# dh_installmenu
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
-# dh_installman
-# dh_installinfo
-# dh_undocumented
- dh_installchangelogs HISTORY
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
-# dh_makeshlibs
- dh_installdeb
-# dh_perl
- dh_shlibdeps
- sh /usr/share/vdr-dev/patchlevel.sh subst
- sh /usr/share/vdr-dev/dependencies.sh
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure \
- clean-patched patch unpatch
+VERSION_DATE = $(shell /bin/date --utc +%0Y%0m%0d.%0k%0M)
+VERSION_ID = 1.0.0~rc2+cvs$(VERSION_DATE)
+get-orig-source:
+ echo Downloading vdr-live $(VERSION_ID) from cvs...
+ cvs -z3 -d:pserver:anonymous at xineliboutput.cvs.sourceforge.net:/cvsroot/xineliboutput export -DNOW vdr-xineliboutput
+ tar cvfz "../vdr-plugin-xineliboutput_$(VERSION_ID).orig.tar.gz" vdr-xineliboutput
+ rm -rf vdr-xineliboutput
+ dch -v "$(VERSION_ID)-1" "New Upstream Snapshot"
Added: vdr/vdr-plugin-xineliboutput/branches/etch/debian/shlibs.local
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/branches/etch/debian/shlibs.local?rev=6206&op=file
==============================================================================
--- vdr/vdr-plugin-xineliboutput/branches/etch/debian/shlibs.local (added)
+++ vdr/vdr-plugin-xineliboutput/branches/etch/debian/shlibs.local Sat Feb 16 19:35:57 2008
@@ -1,0 +1,1 @@
+libxine 1 libxine1 (>= 1.1.2), libxine1 (<< 1.1.3)
Modified: vdr/vdr-plugin-xineliboutput/branches/etch/debian/vdr-plugin-xineliboutput.install
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/branches/etch/debian/vdr-plugin-xineliboutput.install?rev=6206&op=diff
==============================================================================
--- vdr/vdr-plugin-xineliboutput/branches/etch/debian/vdr-plugin-xineliboutput.install (original)
+++ vdr/vdr-plugin-xineliboutput/branches/etch/debian/vdr-plugin-xineliboutput.install Sat Feb 16 19:35:57 2008
@@ -1,2 +1,3 @@
libvdr-xineliboutput.so.* usr/lib/vdr/plugins/
debian/plugin.xineliboutput.conf etc/vdr/plugins/
+debian/tmp/usr/share/locale
More information about the pkg-vdr-dvb-changes
mailing list