r2990 - in vdr/vdr-plugin-dxr3/trunk: . debian debian/patches
Tobias Grimm
tiber-guest at costa.debian.org
Sat Jun 24 13:21:46 UTC 2006
Author: tiber-guest
Date: 2006-06-24 13:21:46 +0000 (Sat, 24 Jun 2006)
New Revision: 2990
Added:
vdr/vdr-plugin-dxr3/trunk/debian/
vdr/vdr-plugin-dxr3/trunk/debian/changelog
vdr/vdr-plugin-dxr3/trunk/debian/compat
vdr/vdr-plugin-dxr3/trunk/debian/control
vdr/vdr-plugin-dxr3/trunk/debian/copyright
vdr/vdr-plugin-dxr3/trunk/debian/docs
vdr/vdr-plugin-dxr3/trunk/debian/install
vdr/vdr-plugin-dxr3/trunk/debian/patches/
vdr/vdr-plugin-dxr3/trunk/debian/patches/00list
vdr/vdr-plugin-dxr3/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
vdr/vdr-plugin-dxr3/trunk/debian/patches/02_debian_ffmpeg.dpatch
vdr/vdr-plugin-dxr3/trunk/debian/patches/10_em8300_mc_path.dpatch
vdr/vdr-plugin-dxr3/trunk/debian/patches/90_audioid.dpatch
vdr/vdr-plugin-dxr3/trunk/debian/rules
vdr/vdr-plugin-dxr3/trunk/debian/watch
Log:
Load newtrunk into vdr/vdr-plugin-dxr3/trunk.
Added: vdr/vdr-plugin-dxr3/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-dxr3/trunk/debian/changelog 2006-06-24 13:21:27 UTC (rev 2989)
+++ vdr/vdr-plugin-dxr3/trunk/debian/changelog 2006-06-24 13:21:46 UTC (rev 2990)
@@ -0,0 +1,244 @@
+vdr-plugin-dxr3 (0.2.6-4) UNRELEASED; urgency=low
+
+ * NOT RELEASED YET
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org> Sun, 18 Jun 2006 13:32:26 +0200
+
+vdr-plugin-dxr3 (0.2.6-3) unstable; urgency=low
+
+ * Tobias Grimm <tg at e-tobi.net>
+ - Added libavformat-dev do build dependencies
+ * Thomas Schmidt <tschmidt at debian.org>
+ - Build-Depend on vdr-dev (>=1.4.1-1)
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org> Fri, 16 Jun 2006 21:28:46 +0200
+
+vdr-plugin-dxr3 (0.2.6-1) unstable; urgency=low
+
+ * New upstream release
+ * Thomas Schmidt <tschmidt at debian.org>
+ - Build-Depend on vdr-dev (>=1.4.0-1)
+ * Tobias Grimm <tg at e-tobi.net>
+ - Removed 90_APIVERSION.dpatch
+ - Removed 91_vdr-1.3.42
+ - Updated 02_debian_ffmpeg
+ - Updated 90_audioid
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org> Wed, 3 May 2006 23:06:17 +0200
+
+vdr-plugin-dxr3 (0.2.5-7) unstable; urgency=low
+
+ * Tobias Grimm <tg at e-tobi.net>
+ - Build-Depend on vdr (>=1.3.48-1)
+ - Added 90_APIVERSION.dpatch
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org> Mon, 24 Apr 2006 22:08:30 +0200
+
+vdr-plugin-dxr3 (0.2.5-6) unstable; urgency=low
+
+ * Tobias Grimm <tg at e-tobi.net>
+ - Build-Depend on vdr (>=1.3.46-1)
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org> Wed, 12 Apr 2006 22:14:02 +0200
+
+vdr-plugin-dxr3 (0.2.5-5) unstable; urgency=low
+
+ * Tobias Grimm <tg at e-tobi.net>
+ - Renamed 03_vdr-1.3.42.dpatch to 91_vdr-1.3.42.dpatch
+ - Added 90_audioid.dpatch to fix problems with dvd plugin
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org> Fri, 31 Mar 2006 01:43:17 +0200
+
+vdr-plugin-dxr3 (0.2.5-4) unstable; urgency=low
+
+ * Tobias Grimm <tg at e-tobi.net>
+ - Added 03_vdr-1.3.42.dpatch to fix VDR 1.3.42 compatibility issue
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org> Thu, 30 Mar 2006 23:22:40 +0200
+
+vdr-plugin-dxr3 (0.2.5-3) unstable; urgency=low
+
+ * Tobias Grimm <tg at e-tobi.net>
+ - Build-Depend on vdr (>=1.3.45-1)
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org> Mon, 27 Mar 2006 21:10:08 +0200
+
+vdr-plugin-dxr3 (0.2.5-2) unstable; urgency=low
+
+ * Tobias Grimm <tg at e-tobi.net>
+ - Build-Depend on vdr (>=1.3.41-1)
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org> Tue, 31 Jan 2006 01:40:48 +0100
+
+vdr-plugin-dxr3 (0.2.5-1) unstable; urgency=low
+
+ * Tobias Grimm <tg at e-tobi.net>
+ - New upstream release
+ - Updated 02_debian_ffmpeg.dpatch
+ - Updated 10_em8300_mc_path.dpatch
+ - Build-Depend on vdr-dev (>=1.3.40-1)
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org> Wed, 25 Jan 2006 23:42:41 +0100
+
+vdr-plugin-dxr3 (0.2.4+cvs20050903-5) unstable; urgency=low
+
+ * Build-Depend on vdr (>=1.3.37-1)
+
+ -- Tobias Grimm <tg at e-tobi.net> Sat, 3 Dec 2005 20:56:24 +0100
+
+vdr-plugin-dxr3 (0.2.4+cvs20050903-4) unstable; urgency=low
+
+ * Build-Depend on vdr (>=1.3.33-1)
+
+ -- Tobias Grimm <tg at e-tobi.net> Sun, 2 Oct 2005 10:54:12 +0200
+
+vdr-plugin-dxr3 (0.2.4+cvs20050903-3) unstable; urgency=low
+
+ * Build-Depend on vdr (>=1.3.32-1)
+
+ -- Tobias Grimm <tg at e-tobi.net> Wed, 14 Sep 2005 19:18:02 +0200
+
+vdr-plugin-dxr3 (0.2.4+cvs20050903-2) unstable; urgency=low
+
+ * Removed dependencies to em8300-modules-*
+
+ -- Tobias Grimm <tg at e-tobi.net> Thu, 8 Sep 2005 21:14:44 +0200
+
+vdr-plugin-dxr3 (0.2.4+cvs20050903-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Tobias Grimm <tg at e-tobi.net> Sat, 3 Sep 2005 12:03:33 +0200
+
+vdr-plugin-dxr3 (0.2.4-2) unstable; urgency=low
+
+ * Depend/Build-Depend on vdr (>=1.3.31-1)
+ * Conflict with vdr (>=1.3.31.99)
+ * Use dependencies.sh from vdr-dev to set vdr dependencies and
+ conflicts
+
+ -- Tobias Grimm <tg at e-tobi.net> Tue, 30 Aug 2005 23:08:21 +0200
+
+vdr-plugin-dxr3 (0.2.4-1) unstable; urgency=low
+
+ * New upstream release
+ * Added upstreams CONTRIBUTORS and TODO to installed doc files
+
+ -- Tobias Grimm <tg at e-tobi.net> Sun, 28 Aug 2005 16:32:12 +0200
+
+vdr-plugin-dxr3 (0.2.3-4) unstable; urgency=low
+
+ * Depend/Build-Depend on vdr (>=1.3.30-1)
+ * Conflict with vdr (>=1.3.30.99)
+
+ -- Tobias Grimm <tg at e-tobi.net> Mon, 22 Aug 2005 17:27:16 +0200
+
+vdr-plugin-dxr3 (0.2.3-3) unstable; urgency=low
+
+ * Depend/Build-Depend on vdr (>=1.3.29-1)
+ * Conflict with vdr (>=1.3.30)
+
+ -- Tobias Grimm <tg at e-tobi.net> Mon, 15 Aug 2005 21:10:53 +0200
+
+vdr-plugin-dxr3 (0.2.3-2) unstable; urgency=low
+
+ * Fixed vdr dependency to vdr (>=1.3.28-1)
+
+ -- Tobias Grimm <tg at e-tobi.net> Sat, 13 Aug 2005 21:59:12 +0200
+
+vdr-plugin-dxr3 (0.2.3-1) unstable; urgency=low
+
+ * New upstream release
+ * Made debian/rules svn-buildpackage-save
+ * Adapted watch and copyright to new SourceForge homepage
+ * Adapted patches for dpatch (>= 2.0.9)
+ * Depend/Build-Depend on vdr (>=1.3.28-1)
+ * Conflict with vdr (>=1.3.29)
+ * Bumped Standards-Version to 3.6.2
+ * Using debian/compat now
+ * Using static Debian ffmpeg now
+ * Removed dxr3abstractiondevice patch
+ * Depend on em8300-headers
+
+ -- Tobias Grimm <tg at e-tobi.net> Fri, 12 Aug 2005 22:18:39 +0200
+
+vdr-plugin-dxr3 (0.2.2-7) unstable; urgency=low
+
+ * drop stl patch for sarge; renew module dependencies
+
+ -- Peter Siering <ps at ctmagazin.de> Mon, 11 Oct 2004 9:10:00 +0200
+
+vdr-plugin-dxr3 (0.2.2-6) unstable; urgency=low
+
+ * Added Makefile-fPIC-fix patch to fix potential FTBFS
+ * Adapted control file to alioth packages
+ * Using patchlevel.sh and custom control field "vdr-patchlevel"
+ * Using dh_install now
+ * Removed debian/dirs
+ * Added debian/watch file
+
+ -- Tobias Grimm <tg at e-tobi.net> Wed, 29 Sep 2004 21:20:00 +0200
+
+vdr-plugin-dxr3 (0.2.2-5) unstable; urgency=low
+
+ * incorporate fix in dxr3abstractionsdevice.c
+ proposed by Jon Burgess, it should fix jumping,
+ see http://sourceforge.net/mailarchive/message.php?msg_id=7636983;
+ this could even be fixed in the driver
+
+ -- Peter Siering <ps at ctmagazin.de> Thu, 13 May 2004 09:15:00 +0200
+
+vdr-plugin-dxr3 (0.2.2-4) unstable; urgency=low
+
+ * fix module dependencies for CD-Release (ugly I know)
+
+ -- Peter Siering <ps at ctmagazin.de> Sat, 03 Apr 2004 15:45:00 +0200
+
+vdr-plugin-dxr3 (0.2.2-3) unstable; urgency=low
+
+ * fixed a STL include bug in dxr3vdrincludes.h
+ (see debian/patches/05_stl_include.dpatch)
+
+ -- Tobias Grimm <tg at e-tobi.net> Fri, 16 Jan 2004 02:30:00 +0200
+
+vdr-plugin-dxr3 (0.2.2-2) unstable; urgency=low
+
+ * integrated patchlevel info
+
+ -- Peter Siering <ps at ctmagazin.de> Tue, 13 Jan 2004 23:45:00 +0200
+
+vdr-plugin-dxr3 (0.2.2-1) unstable; urgency=low
+
+ * removed libavcodec1 dependency from control file (will be added
+ automatically by ${shlibs:Depends})
+ * Moved patches to upstream source to debian/patches
+ * upstream HISTORY gets installed with dh_installchangelogs now
+ * removed unnecessary lines from dirs file
+ * New upstream release
+
+ -- Tobias Grimm <tg at e-tobi.net> Tue, 6 Jan 2004 02:10:00 +0200
+
+vdr-plugin-dxr3 (0.2.1-3) unstable; urgency=low
+
+ * move plugins from /usr/share to /usr/lib
+
+ -- Peter Siering <ps at ctmagazin.de> Tue, 4 Oct 2003 11:30:00 +0200
+
+vdr-plugin-dxr3 (0.2.1-2) unstable; urgency=low
+
+ * changed path the plugin expects DXR3 firmware file to be
+ * change dependencies, plugins pulls dx3 kernel module
+
+ -- Peter Siering <ps at ctmagazin.de> Tue, 1 Oct 2003 22:30:00 +0200
+
+vdr-plugin-dxr3 (0.2.1-1) unstable; urgency=low
+
+ * modified to fit new with new libavcodec_1_
+
+ -- Peter Siering <ps at ctmagazin.de> Tue, 25 Sep 2003 15:30:00 +0200
+
+vdr-plugin-dxr3 (0.2.1-0) unstable; urgency=low
+
+ * debianized
+
+ -- Peter Siering <ps at ctmagazin.de> Tue, 17 Sep 2003 22:00:00 +0200
Added: vdr/vdr-plugin-dxr3/trunk/debian/compat
===================================================================
--- vdr/vdr-plugin-dxr3/trunk/debian/compat 2006-06-24 13:21:27 UTC (rev 2989)
+++ vdr/vdr-plugin-dxr3/trunk/debian/compat 2006-06-24 13:21:46 UTC (rev 2990)
@@ -0,0 +1 @@
+4
Added: vdr/vdr-plugin-dxr3/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-dxr3/trunk/debian/control 2006-06-24 13:21:27 UTC (rev 2989)
+++ vdr/vdr-plugin-dxr3/trunk/debian/control 2006-06-24 13:21:46 UTC (rev 2990)
@@ -0,0 +1,16 @@
+Source: vdr-plugin-dxr3
+Section: misc
+Priority: extra
+Maintainer: Peter Siering <ps at ctmagazin.de>
+Origin: ctvdr
+Bugs: mailto:pkg-vdr-dvb-devel at lists.alioth.debian.org
+Build-Depends: debhelper (>> 4.1.16), dpatch (>= 2.0.9), vdr-dev (>= 1.4.1-1), libavcodec-dev, libavformat-dev, em8300-headers
+Standards-Version: 3.6.2
+
+Package: vdr-plugin-dxr3
+Architecture: any
+Depends: ${shlibs:Depends}, ${vdr:Depends}
+Description: Plugin to vdr to use a DXR3/Hollywood+ MPEG decoder as primary interface
+ This plugin for vdr allows using a DXR3/Hollywood+ MPEG
+ decoder card as primary interface.
+XB-VDR-Patchlevel: ${vdr:Patchlevel}
Added: vdr/vdr-plugin-dxr3/trunk/debian/copyright
===================================================================
--- vdr/vdr-plugin-dxr3/trunk/debian/copyright 2006-06-24 13:21:27 UTC (rev 2989)
+++ vdr/vdr-plugin-dxr3/trunk/debian/copyright 2006-06-24 13:21:46 UTC (rev 2990)
@@ -0,0 +1,11 @@
+This package was debianized by Peter Siering <ps at ctmagazin.de> on
+Wed, 17 Sep 2003 22:00:00 +0200.
+
+It was downloaded from http://dxr3.sf.net
+
+Upstream Author: Kai Moeller <dxr3_av at schluenss.de>, Stefan Schluenss <dxr3_osd at schluenss.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-dxr3/trunk/debian/docs
===================================================================
--- vdr/vdr-plugin-dxr3/trunk/debian/docs 2006-06-24 13:21:27 UTC (rev 2989)
+++ vdr/vdr-plugin-dxr3/trunk/debian/docs 2006-06-24 13:21:46 UTC (rev 2990)
@@ -0,0 +1,3 @@
+README
+CONTRIBUTORS
+TODO
Added: vdr/vdr-plugin-dxr3/trunk/debian/install
===================================================================
--- vdr/vdr-plugin-dxr3/trunk/debian/install 2006-06-24 13:21:27 UTC (rev 2989)
+++ vdr/vdr-plugin-dxr3/trunk/debian/install 2006-06-24 13:21:46 UTC (rev 2990)
@@ -0,0 +1 @@
+libvdr-dxr3.so.* usr/lib/vdr/plugins/
Added: vdr/vdr-plugin-dxr3/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-dxr3/trunk/debian/patches/00list 2006-06-24 13:21:27 UTC (rev 2989)
+++ vdr/vdr-plugin-dxr3/trunk/debian/patches/00list 2006-06-24 13:21:46 UTC (rev 2990)
@@ -0,0 +1,5 @@
+01_Makefile-fPIC-fix
+02_debian_ffmpeg
+10_em8300_mc_path
+
+90_audioid
Added: vdr/vdr-plugin-dxr3/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
===================================================================
--- vdr/vdr-plugin-dxr3/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch 2006-06-24 13:21:27 UTC (rev 2989)
+++ vdr/vdr-plugin-dxr3/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch 2006-06-24 13:21:46 UTC (rev 2990)
@@ -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 --exclude=CVS --exclude=.svn ./Makefile /tmp/dpep-work.DI2lOk/vdr-plugin-dxr3-0.2.3-pre2/Makefile
+--- ./Makefile 2005-08-12 20:39:40.000000000 +0200
++++ /tmp/dpep-work.DI2lOk/vdr-plugin-dxr3-0.2.3-pre2/Makefile 2005-08-12 20:40:14.000000000 +0200
+@@ -16,7 +16,7 @@
+ ### The C++ compiler and options:
+
+ CXX = g++
+-CXXFLAGS = -O2 -Wall -Woverloaded-virtual
++CXXFLAGS = -fPIC -O2 -Wall -Woverloaded-virtual
+
+ ### The directory environment:
+
Property changes on: vdr/vdr-plugin-dxr3/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: vdr/vdr-plugin-dxr3/trunk/debian/patches/02_debian_ffmpeg.dpatch
===================================================================
--- vdr/vdr-plugin-dxr3/trunk/debian/patches/02_debian_ffmpeg.dpatch 2006-06-24 13:21:27 UTC (rev 2989)
+++ vdr/vdr-plugin-dxr3/trunk/debian/patches/02_debian_ffmpeg.dpatch 2006-06-24 13:21:46 UTC (rev 2990)
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_debian_ffmpeg.dpatch by Tobias Grimm <tg at e-tobi.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Compile with static Debian ffmpeg libs
+
+ at DPATCH@
+diff -urNad vdr-plugin-dxr3-0.2.6~/Makefile vdr-plugin-dxr3-0.2.6/Makefile
+--- vdr-plugin-dxr3-0.2.6~/Makefile 2006-05-02 20:59:55.000000000 +0200
++++ vdr-plugin-dxr3-0.2.6/Makefile 2006-05-02 21:01:30.000000000 +0200
+@@ -41,8 +41,8 @@
+
+ ### Includes and Defines (add further entries here):
+
+-INCLUDES += -I$(VDRDIR)/include -I$(FFMDIR) -I$(EM8300)
+-LIBS = -L$(FFMDIR)/libavcodec -lavcodec
++INCLUDES += -I$(VDRDIR)/include `ffmpeg-config --cflags` -I$(EM8300)
++LIBS = `ffmpeg-config --plugin-libs avcodec avformat`
+ DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+ DEFINES += -D_GNU_SOURCE
+
Property changes on: vdr/vdr-plugin-dxr3/trunk/debian/patches/02_debian_ffmpeg.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: vdr/vdr-plugin-dxr3/trunk/debian/patches/10_em8300_mc_path.dpatch
===================================================================
--- vdr/vdr-plugin-dxr3/trunk/debian/patches/10_em8300_mc_path.dpatch 2006-06-24 13:21:27 UTC (rev 2989)
+++ vdr/vdr-plugin-dxr3/trunk/debian/patches/10_em8300_mc_path.dpatch 2006-06-24 13:21:46 UTC (rev 2990)
@@ -0,0 +1,20 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+
+## EM8300 Micro Code path
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Changes path to EM8300 micro code file
+
+ at DPATCH@
+diff -urNad vdr-plugin-dxr3-0.2.5~/Makefile vdr-plugin-dxr3-0.2.5/Makefile
+--- vdr-plugin-dxr3-0.2.5~/Makefile 2006-01-15 16:12:22.000000000 +0100
++++ vdr-plugin-dxr3-0.2.5/Makefile 2006-01-15 16:12:50.000000000 +0100
+@@ -50,7 +50,7 @@
+ # where is the microcode for the dxr3 located? em8300 driver version 0.15.2
+ # and later installs it by default to /lib/firmware/em8300.bin, and earlier
+ # versions to /usr/share/misc/em8300.uc.
+-DEFINES += -DMICROCODE=\"/lib/firmware/em8300.bin\"
++DEFINES += -DMICROCODE=\"/usr/lib/em8300/em8300.uc\"
+
+ # use OSD scaler borrowed from the Xine plugin?
+ # comment this out to use the traditional vdr-dxr3 scaler
Property changes on: vdr/vdr-plugin-dxr3/trunk/debian/patches/10_em8300_mc_path.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: vdr/vdr-plugin-dxr3/trunk/debian/patches/90_audioid.dpatch
===================================================================
--- vdr/vdr-plugin-dxr3/trunk/debian/patches/90_audioid.dpatch 2006-06-24 13:21:27 UTC (rev 2989)
+++ vdr/vdr-plugin-dxr3/trunk/debian/patches/90_audioid.dpatch 2006-06-24 13:21:46 UTC (rev 2990)
@@ -0,0 +1,38 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 90_audioid.dpatch by Marco Schluessler <marco at lordzodiac.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes audio playback problem with dvd plugin
+## DP: See also: http://vdr-portal.de/board/thread.php?postid=356853#post356853
+
+ at DPATCH@
+diff -urNad vdr-plugin-dxr3-0.2.6~/dxr3device.c vdr-plugin-dxr3-0.2.6/dxr3device.c
+--- vdr-plugin-dxr3-0.2.6~/dxr3device.c 2006-05-02 21:32:01.000000000 +0200
++++ vdr-plugin-dxr3-0.2.6/dxr3device.c 2006-05-02 21:32:39.000000000 +0200
+@@ -284,6 +284,8 @@
+
+ m_AC3Present = true;
+
++ bool m_isAc3 = ((Id & 0xF0) == 0x80) || Id == 0xbd;
++
+ if ((m_DemuxDevice.GetDemuxMode() == DXR3_DEMUX_TRICK_MODE &&
+ m_DemuxDevice.GetTrickState() == DXR3_FREEZE) ||
+ cDxr3Interface::Instance().IsExternalReleased())
+@@ -299,7 +301,7 @@
+ {
+ retLength = m_DemuxDevice.DemuxAudioPes((const uint8_t*)m_strBuf.data(), m_strBuf.length());
+ } else {
+- retLength = m_DemuxDevice.DemuxPes((const uint8_t*)m_strBuf.data(), m_strBuf.length(), true);
++ retLength = m_DemuxDevice.DemuxPes((const uint8_t*)m_strBuf.data(), m_strBuf.length(), m_isAc3);
+ }
+ }
+ else if (m_PlayMode == pmAudioOnly)
+@@ -308,7 +310,7 @@
+ }
+ else
+ {
+- retLength = m_DemuxDevice.DemuxPes((const uint8_t*)Data, Length, true);
++ retLength = m_DemuxDevice.DemuxPes((const uint8_t*)Data, Length, m_isAc3);
+ }
+
+ Length -= retLength;
Property changes on: vdr/vdr-plugin-dxr3/trunk/debian/patches/90_audioid.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: vdr/vdr-plugin-dxr3/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-dxr3/trunk/debian/rules 2006-06-24 13:21:27 UTC (rev 2989)
+++ vdr/vdr-plugin-dxr3/trunk/debian/rules 2006-06-24 13:21:46 UTC (rev 2990)
@@ -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-dxr3/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: vdr/vdr-plugin-dxr3/trunk/debian/watch
===================================================================
--- vdr/vdr-plugin-dxr3/trunk/debian/watch 2006-06-24 13:21:27 UTC (rev 2989)
+++ vdr/vdr-plugin-dxr3/trunk/debian/watch 2006-06-24 13:21:46 UTC (rev 2990)
@@ -0,0 +1,2 @@
+version=2
+ftp://heanet.dl.sourceforge.net/d/dx/dxr3plugin/vdr-dxr3-([0-9]\.[0-9]\.[0-9])\.tgz
More information about the pkg-vdr-dvb-changes
mailing list