r2063 - in vdr/vdr-plugin-advchctrl/trunk: . debian debian/patches
Thomas Günther
tom-guest at costa.debian.org
Mon Mar 20 20:20:12 UTC 2006
Author: tom-guest
Date: 2006-03-20 20:20:10 +0000 (Mon, 20 Mar 2006)
New Revision: 2063
Added:
vdr/vdr-plugin-advchctrl/trunk/debian/
vdr/vdr-plugin-advchctrl/trunk/debian/changelog
vdr/vdr-plugin-advchctrl/trunk/debian/compat
vdr/vdr-plugin-advchctrl/trunk/debian/control
vdr/vdr-plugin-advchctrl/trunk/debian/copyright
vdr/vdr-plugin-advchctrl/trunk/debian/docs
vdr/vdr-plugin-advchctrl/trunk/debian/install
vdr/vdr-plugin-advchctrl/trunk/debian/patches/
vdr/vdr-plugin-advchctrl/trunk/debian/patches/00list
vdr/vdr-plugin-advchctrl/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
vdr/vdr-plugin-advchctrl/trunk/debian/patches/02_advchctrl-0.0.5-warnings.dpatch
vdr/vdr-plugin-advchctrl/trunk/debian/patches/90_advchctrl-0.0.5-1.3.38.dpatch
vdr/vdr-plugin-advchctrl/trunk/debian/postrm
vdr/vdr-plugin-advchctrl/trunk/debian/rules
Log:
Load newtrunk into vdr/vdr-plugin-advchctrl/trunk.
Added: vdr/vdr-plugin-advchctrl/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-advchctrl/trunk/debian/changelog 2006-03-20 20:19:54 UTC (rev 2062)
+++ vdr/vdr-plugin-advchctrl/trunk/debian/changelog 2006-03-20 20:20:10 UTC (rev 2063)
@@ -0,0 +1,6 @@
+vdr-plugin-advchctrl (0.0.5-1) unstable; urgency=low
+
+ * Initial Release.
+
+ -- Stefan Wagner <stefanwag at gmx.at> Sun, 19 Mar 2006 16:21:00 +0100
+
Added: vdr/vdr-plugin-advchctrl/trunk/debian/compat
===================================================================
--- vdr/vdr-plugin-advchctrl/trunk/debian/compat 2006-03-20 20:19:54 UTC (rev 2062)
+++ vdr/vdr-plugin-advchctrl/trunk/debian/compat 2006-03-20 20:20:10 UTC (rev 2063)
@@ -0,0 +1 @@
+4
Added: vdr/vdr-plugin-advchctrl/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-advchctrl/trunk/debian/control 2006-03-20 20:19:54 UTC (rev 2062)
+++ vdr/vdr-plugin-advchctrl/trunk/debian/control 2006-03-20 20:20:10 UTC (rev 2063)
@@ -0,0 +1,16 @@
+Source: vdr-plugin-advchctrl
+Section: misc
+Priority: extra
+Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
+Uploaders: Thomas Günther <tom at toms-cafe.de>, Tobias Grimm <tg at e-tobi.net>, Thomas Schmidt <tschmidt at debian.org>
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.3.41-1), dpatch
+Standards-Version: 3.6.2
+
+Package: vdr-plugin-advchctrl
+Architecture: any
+Depends: ${shlibs:Depends}, ${vdr:Depends}
+Conflicts: ${vdr:Conflicts}
+Description: Plugin for vdr to control volume per channel
+ This plugin stores the volume settings per channel and restores it if
+ switching to a channel.
+XB-VDR-Patchlevel: ${vdr:Patchlevel}
Added: vdr/vdr-plugin-advchctrl/trunk/debian/copyright
===================================================================
--- vdr/vdr-plugin-advchctrl/trunk/debian/copyright 2006-03-20 20:19:54 UTC (rev 2062)
+++ vdr/vdr-plugin-advchctrl/trunk/debian/copyright 2006-03-20 20:20:10 UTC (rev 2063)
@@ -0,0 +1,11 @@
+This package was debianized by Stefan Wagner <stefanwag at gmx.at> on
+Sun, 19 Mar 2006 16:21:00 +0100.
+
+It was downloaded from http://vdr-portal.de/board/thread.php?postid=381115#post381115
+
+Upstream Author: Luke <reklawyks.ekul at online.de>
+
+Copyright:
+
+It may be redistributed under the terms of the GNU GPL, Version 2
+found on Debian systems in the file /usr/share/common-licenses/GPL .
Added: vdr/vdr-plugin-advchctrl/trunk/debian/docs
===================================================================
--- vdr/vdr-plugin-advchctrl/trunk/debian/docs 2006-03-20 20:19:54 UTC (rev 2062)
+++ vdr/vdr-plugin-advchctrl/trunk/debian/docs 2006-03-20 20:20:10 UTC (rev 2063)
@@ -0,0 +1 @@
+README
Added: vdr/vdr-plugin-advchctrl/trunk/debian/install
===================================================================
--- vdr/vdr-plugin-advchctrl/trunk/debian/install 2006-03-20 20:19:54 UTC (rev 2062)
+++ vdr/vdr-plugin-advchctrl/trunk/debian/install 2006-03-20 20:20:10 UTC (rev 2063)
@@ -0,0 +1 @@
+libvdr-advchctrl.so.* usr/lib/vdr/plugins/
Added: vdr/vdr-plugin-advchctrl/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-advchctrl/trunk/debian/patches/00list 2006-03-20 20:19:54 UTC (rev 2062)
+++ vdr/vdr-plugin-advchctrl/trunk/debian/patches/00list 2006-03-20 20:20:10 UTC (rev 2063)
@@ -0,0 +1,4 @@
+01_Makefile-fPIC-fix
+02_advchctrl-0.0.5-warnings
+
+90_advchctrl-0.0.5-1.3.38
Added: vdr/vdr-plugin-advchctrl/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
===================================================================
--- vdr/vdr-plugin-advchctrl/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch 2006-03-20 20:19:54 UTC (rev 2062)
+++ vdr/vdr-plugin-advchctrl/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch 2006-03-20 20:20:10 UTC (rev 2063)
@@ -0,0 +1,20 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+
+## Makefile-fPIC-fix patch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Adds -fPIC to Makefile to fix potential FTBFS.
+
+ at DPATCH@
+diff -urNad /usr/src/cvs/vdrdevel-plugin-rotor/Makefile vdrdevel-plugin-rotor/Makefile
+--- /usr/src/cvs/vdrdevel-plugin-rotor/Makefile Sun May 16 15:48:12 2004
++++ vdrdevel-plugin-rotor/Makefile Sat Sep 11 00:28:18 2004
+@@ -18,7 +18,7 @@
+ ### The C++ compiler and options:
+
+ CXX ?= g++
+-CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
++CXXFLAGS ?= -fPIC -O2 -Wall -Woverloaded-virtual
+
+ ### The directory environment:
+
Added: vdr/vdr-plugin-advchctrl/trunk/debian/patches/02_advchctrl-0.0.5-warnings.dpatch
===================================================================
--- vdr/vdr-plugin-advchctrl/trunk/debian/patches/02_advchctrl-0.0.5-warnings.dpatch 2006-03-20 20:19:54 UTC (rev 2062)
+++ vdr/vdr-plugin-advchctrl/trunk/debian/patches/02_advchctrl-0.0.5-warnings.dpatch 2006-03-20 20:20:10 UTC (rev 2063)
@@ -0,0 +1,69 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_advchctrl-0.0.5-warnings.dpatch by Thomas Günther <tom at toms-cafe.de>
+## http://toms-cafe.de/vdr/download/advchctrl-0.0.5-warnings.diff
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Prevent warnings.
+
+ at DPATCH@
+--- advchctrl-0.0.5/advchctrlosd.c
++++ advchctrl-0.0.5/advchctrlosd.c
+@@ -69,14 +69,10 @@
+ cMutexLock lock(m_Mutex);
+ char buf1[128];
+ char buf2[128];
+- int snr = 50 / 655;
+- int signal = 140;
++//int signal = 140;
+ double barlength[2];
+ int TextLength[2];
+ int offset = 0;
+- int x = OSDWIDTH - OSDCORNERING;
+- int y = 0;
+- int value = 0;
+ int TxtCol;
+
+ cChannel *channel = Channels.GetByNumber(cDevice::PrimaryDevice()->CurrentChannel());
+@@ -96,8 +92,8 @@
+ // m_Osd->DrawRectangle((OSDWIDTH-OSDCORNERING - 15), OSDSTATUSWIN_Y(0),(OSDWIDTH-OSDCORNERING-12), OSDSTATUSWIN_Y(offset+OSDROWHEIGHT-1), advchctrlTheme[advchctrlConfig.theme].clrTitleBackground);
+ // }
+ offset += OSDROWHEIGHT + 15;
+- snprintf(buf1, sizeof(buf1), "%s%", tr("Default volume"));
+- snprintf(buf2, sizeof(buf2), "%s%", tr("Channel volume"));
++ snprintf(buf1, sizeof(buf1), "%s", tr("Default volume"));
++ snprintf(buf2, sizeof(buf2), "%s", tr("Channel volume"));
+ TextLength[0] = m_Font->Width(buf1);
+ TextLength[1] = m_Font->Width(buf2);
+ // TxtCol = (advchctrlConfig.theme == eThemeSTTNG ? advchctrlTheme[advchctrlConfig.theme].clrTitleText: advchctrlTheme[advchctrlConfig.theme].clrInactiveText);
+@@ -121,9 +117,9 @@
+ // m_Osd->DrawRectangle(OSDSTATUSWIN_X(0), OSDSTATUSWIN_Y(OSDSTATUSHEIGHT)-OSDROWHEIGHT, OSDSTATUSWIN_X(0), OSDSTATUSWIN_Y(OSDSTATUSHEIGHT), advchctrlTheme[advchctrlConfig.theme].clrRed);
+ m_Osd->DrawRectangle(OSDSTATUSWIN_X(0) + OSDWIDTH/4, OSDSTATUSWIN_Y(OSDSTATUSHEIGHT)-OSDROWHEIGHT, OSDSTATUSWIN_X(0) + (2 * OSDWIDTH/4), OSDSTATUSWIN_Y(OSDSTATUSHEIGHT), advchctrlTheme[advchctrlConfig.theme].clrGreen);
+
+- snprintf(buf1, sizeof(buf1), "%s%", tr("Reset"));
++ snprintf(buf1, sizeof(buf1), "%s", tr("Reset"));
+ TextLength[0] = m_Font->Width(buf1);
+- m_Osd->DrawText(OSDSTATUSWIN_X(0) + (1.5 *OSDWIDTH/4)-TextLength[0]/2, OSDSTATUSWIN_Y(OSDSTATUSHEIGHT)-OSDROWHEIGHT, buf1, advchctrlTheme[advchctrlConfig.theme].clrTitleText, advchctrlTheme[advchctrlConfig.theme].clrGreen, m_Font);
++ m_Osd->DrawText(OSDSTATUSWIN_X(0) + int(1.5 *OSDWIDTH/4)-TextLength[0]/2, OSDSTATUSWIN_Y(OSDSTATUSHEIGHT)-OSDROWHEIGHT, buf1, advchctrlTheme[advchctrlConfig.theme].clrTitleText, advchctrlTheme[advchctrlConfig.theme].clrGreen, m_Font);
+ // m_Osd->DrawRectangle(OSDSTATUSWIN_X(4), OSDSTATUSWIN_Y(OSDSTATUSHEIGHT)-OSDROWHEIGHT, OSDSTATUSWIN_X(5), OSDSTATUSWIN_Y(OSDSTATUSHEIGHT), advchctrlTheme[advchctrlConfig.theme].clrBlue);
+
+ m_Osd->DrawEllipse(0, OSDSTATUSWIN_Y(OSDSTATUSHEIGHT-OSDCORNERING), OSDCORNERING, OSDSTATUSWIN_Y(OSDSTATUSHEIGHT), clrTransparent, -3);
+@@ -148,9 +144,6 @@
+ void cAdvChCtrlOsd::Show(void)
+ {
+ DEBUGOSD("%s()\n", __PRETTY_FUNCTION__);
+- int apid[2] = {0, 0};
+- int dpid[2] = {0, 0};
+- char *dev = NULL;
+
+ m_Osd = cOsdProvider::NewOsd(((Setup.OSDWidth - OSDWIDTH) / 2) + Setup.OSDLeft + advchctrlConfig.osdoffset, ((Setup.OSDHeight - OSDHEIGHT) / 2) + Setup.OSDTop);
+ if (m_Osd) {
+@@ -173,9 +166,6 @@
+ void cAdvChCtrlOsd::ChannelSwitch(const cDevice * device, int channelNumber)
+ {
+ DEBUGOSD("%s(%d,%d)\n", __PRETTY_FUNCTION__, device->DeviceNumber(), channelNumber);
+- int apid[2] = {0, 0};
+- int dpid[2] = {0, 0};
+- char *dev = NULL;
+
+ if (!device->IsPrimaryDevice() || !channelNumber || cDevice::PrimaryDevice()->CurrentChannel() != channelNumber)
+ return;
Added: vdr/vdr-plugin-advchctrl/trunk/debian/patches/90_advchctrl-0.0.5-1.3.38.dpatch
===================================================================
--- vdr/vdr-plugin-advchctrl/trunk/debian/patches/90_advchctrl-0.0.5-1.3.38.dpatch 2006-03-20 20:19:54 UTC (rev 2062)
+++ vdr/vdr-plugin-advchctrl/trunk/debian/patches/90_advchctrl-0.0.5-1.3.38.dpatch 2006-03-20 20:20:10 UTC (rev 2063)
@@ -0,0 +1,40 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 90_advchctrl-0.0.5-1.3.38.dpatch by Thomas Günther <tom at toms-cafe.de>
+## http://toms-cafe.de/vdr/download/advchctrl-0.0.5-1.3.38.diff
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Changes for VDR >= 1.3.38.
+
+ at DPATCH@
+--- advchctrl-0.0.5/advchctrl.c
++++ advchctrl-0.0.5/advchctrl.c
+@@ -123,9 +123,15 @@
+ }
+ }
+
++#if VDRVERSNUM >= 10338
++void cStatusAdvChCtrl::Replaying(const cControl *Control, const char *Name, const char *FileName, bool On)
++{
++ isInReplayMode = On;
++#else
+ void cStatusAdvChCtrl::Replaying(const cControl *Control, const char *Name)
+ {
+ isInReplayMode = (Name != NULL ? true : false);
++#endif
+ DEBUGVOL ("cStatusAdvChCtrl::Replaying <%s> <%s>", Name, (isInReplayMode ? "yes" : "no"));
+ if (!(ActualVolume == advchctrlConfig.defaultvolume) && isInReplayMode)
+ {
+--- advchctrl-0.0.5/advchctrl.h
++++ advchctrl-0.0.5/advchctrl.h
+@@ -16,7 +16,11 @@
+ protected:
+ virtual void ChannelSwitch (const cDevice *Device, int ChannelNumber);
+ virtual void SetVolume (int Volume, bool Absolute);
++#if VDRVERSNUM >= 10338
++ virtual void Replaying (const cControl *Control, const char *Name, const char *FileName, bool On);
++#else
+ virtual void Replaying (const cControl *Control, const char *Name);
++#endif
+ };
+
+ class cPluginAdvChCtrl : public cPlugin {
Added: vdr/vdr-plugin-advchctrl/trunk/debian/postrm
===================================================================
--- vdr/vdr-plugin-advchctrl/trunk/debian/postrm 2006-03-20 20:19:54 UTC (rev 2062)
+++ vdr/vdr-plugin-advchctrl/trunk/debian/postrm 2006-03-20 20:20:10 UTC (rev 2063)
@@ -0,0 +1,9 @@
+#! /bin/sh
+set -e
+
+# Remove configuration file
+if [ "$1" = "purge" ]; then
+ /bin/rm -f /var/lib/vdr/plugins/AdvChCtrl.conf || true
+fi
+
+#DEBHELPER#
Added: vdr/vdr-plugin-advchctrl/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-advchctrl/trunk/debian/rules 2006-03-20 20:19:54 UTC (rev 2062)
+++ vdr/vdr-plugin-advchctrl/trunk/debian/rules 2006-03-20 20:20:10 UTC (rev 2063)
@@ -0,0 +1,97 @@
+#!/usr/bin/make -f
+# 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
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -g
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+ INSTALL_PROGRAM += -s
+endif
+
+# Set VDR=vdr or VDR=vdrdevel - vdrdevel always uses dpatch
+VDR=$(shell dh_listpackages | grep "^vdr.*-" | head -n 1 | sed -e "s/-.*//")
+ifeq ($(VDR), vdrdevel)
+ DPATCH=yes
+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
+
+configure: configure-stamp
+configure-stamp: patch-stamp
+ dh_testdir
+ touch configure-stamp
+
+build: build-stamp
+build-stamp: configure-stamp
+ dh_testdir
+ $(MAKE) all DVBDIR=/usr VDRDIR=/usr/include/$(VDR) LIBDIR=.
+ touch build-stamp
+
+clean: clean-patched unpatch
+clean-patched:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp configure-stamp
+ -$(MAKE) -o .dependencies clean
+ rm -f libvdr-*.so.*
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+ 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
+ /usr/lib/$(VDR)-dev/patchlevel.sh subst
+ /usr/lib/$(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
Property changes on: vdr/vdr-plugin-advchctrl/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
More information about the pkg-vdr-dvb-changes
mailing list