r548 - in vdr/vdr-plugin-softdevice/trunk: . debian debian/patches
Tobias Grimm
pkg-vdr-dvb-changes@lists.alioth.debian.org
Fri, 20 May 2005 22:13:29 +0000
Author: tiber-guest
Date: 2005-05-20 22:13:28 +0000 (Fri, 20 May 2005)
New Revision: 548
Added:
vdr/vdr-plugin-softdevice/trunk/debian/
vdr/vdr-plugin-softdevice/trunk/debian/TODO.debian
vdr/vdr-plugin-softdevice/trunk/debian/changelog
vdr/vdr-plugin-softdevice/trunk/debian/compat
vdr/vdr-plugin-softdevice/trunk/debian/control
vdr/vdr-plugin-softdevice/trunk/debian/copyright
vdr/vdr-plugin-softdevice/trunk/debian/docs
vdr/vdr-plugin-softdevice/trunk/debian/install
vdr/vdr-plugin-softdevice/trunk/debian/patches/
vdr/vdr-plugin-softdevice/trunk/debian/patches/00list
vdr/vdr-plugin-softdevice/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
vdr/vdr-plugin-softdevice/trunk/debian/patches/02_disable_unsupported_output.dpatch
vdr/vdr-plugin-softdevice/trunk/debian/patches/03_no_sub_libs.dpatch
vdr/vdr-plugin-softdevice/trunk/debian/patches/04_debian_ffmpeg.dpatch
vdr/vdr-plugin-softdevice/trunk/debian/rules
vdr/vdr-plugin-softdevice/trunk/debian/watch
Log:
Load newtrunk into vdr/vdr-plugin-softdevice/trunk.
Added: vdr/vdr-plugin-softdevice/trunk/debian/TODO.debian
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/TODO.debian 2005-05-20 22:13:11 UTC (rev 547)
+++ vdr/vdr-plugin-softdevice/trunk/debian/TODO.debian 2005-05-20 22:13:28 UTC (rev 548)
@@ -0,0 +1,2 @@
+- Alsa is required - should package depened somehow on Alsa?
+- Make package for DVB++
Added: vdr/vdr-plugin-softdevice/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/changelog 2005-05-20 22:13:11 UTC (rev 547)
+++ vdr/vdr-plugin-softdevice/trunk/debian/changelog 2005-05-20 22:13:28 UTC (rev 548)
@@ -0,0 +1,249 @@
+vdr-plugin-softdevice (0.1.1-8) unstable; urgency=low
+
+ * Tobias Grimm <tg@e-tobi.net>
+ - Fixed debian/copyright
+ - Use debian/compat, set debhelper compatibility to 4
+ - Use dh_install
+ - Don't install empty plugin.softdevice.conf anymore
+ - Using standard debian/rules now
+ - Added debian/watch file for uscan
+ - Removed debian/dirs
+ - Replaced old patchlevel tag with XB-VDR-Patchlevel
+ - Set Standards-Version to 3.6.1
+ - Set Architecture to any
+ - Depend on debhelper (>> 4.1.16)
+ - Removed unnecessary non-source dependencies
+ - Added libpostproc-dev, libavcodec-dev and libavformat-dev dependencies
+ - Removed old debian/patches directory
+ - Extracted all changes to the Makefile into dpatch patches
+ - Added 01_Makefile-fPIC-fix.dpatch
+ - Changed maintainer to Debian VDR Team
+ - Depend/Build-Depend on vdr (>=1.3.24-1)
+ - Conflict with vdr (>=1.3.25)
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org> Thu, 19 May 2005 20:07:25 +0200
+
+vdr-plugin-softdevice (0.1.1-nh.7) unstable; urgency=low
+
+ * New VDR version (NH)
+
+ -- Nicolas Huillard <nicolas@huillard.net> Thu, 28 Apr 2005 17:09:01 +0200
+
+vdr-plugin-softdevice (0.1.1-nh.6) unstable; urgency=low
+
+ * Using DirectFB 0.9.22-20050424 (NH)
+ * commented-out all code in video-dfb.c : static void reportCardInfo
+ (IDirectFB *dfb) because DFBCardCapabilities does not exist anymore in
+ DirectFB (Subject: Re: [Softdevice-devel] latest softdevice CVS & latest
+ DirectFB & DFB++ cvs broken?? From: Torgeir Veimo <torgeir@pobox.com> To:
+ softdevice-devel@berlios.de Date: Tue, 12 Apr 2005 00:58:15 +0100)
+
+ -- Nicolas Huillard <nicolas@huillard.net> Sun, 24 Apr 2005 23:57:15 +0200
+
+vdr-plugin-softdevice (0.1.1-nh.5) unstable; urgency=low
+
+ * New upstream version, with VDR 1.3.23 Darren Salt
+ * Depends on libavcodeccvs / libavcodeccvs-dev (NH)
+ * Output methods build as a single lib, for runvdr to run them correctly
+ * Also : Apr 24 18:56:20 vdr vdr[6787]: [softdevice] could not load
+ (./PLUGINS/lib/libvdr-softdevice-fb.so.1.3.23)[./PLUGINS/lib/libvdr-softdevice-fb.so.1.3.23:
+ cannot open shared object file: No such file or directory] exiting
+ * Recompile with out "not as root" patch for DirectFB to run (NH)
+
+ -- Nicolas Huillard <nicolas@huillard.net> Sun, 24 Apr 2005 19:54:04 +0200
+
+vdr-plugin-softdevice (0.1.1-nh.3) unstable; urgency=low
+
+ * New upstream version, with VDR 1.3.23 Darren Salt
+ * Depends on libavcodeccvs / libavcodeccvs-dev (NH)
+ * Output methods build as a single lib, for runvdr to run them correctly
+ * Also : Apr 24 18:56:20 vdr vdr[6787]: [softdevice] could not load
+ (./PLUGINS/lib/libvdr-softdevice-fb.so.1.3.23)[./PLUGINS/lib/libvdr-softdevice-fb.so.1.3.23:
+ cannot open shared object file: No such file or directory] exiting
+
+ -- Nicolas Huillard <nicolas@huillard.net> Sun, 24 Apr 2005 18:57:27 +0200
+
+vdr-plugin-softdevice (0.1.1-nh.2) unstable; urgency=low
+
+ * New upstream version, with VDR 1.3.23 Darren Salt
+ * Depends on libavcodeccvs / libavcodeccvs-dev (NH)
+
+ -- Nicolas Huillard <nicolas@huillard.net> Sun, 24 Apr 2005 18:39:08 +0200
+
+vdr-plugin-softdevice (0.1.1-nh.1) unstable; urgency=low
+
+ * New upstream version, with VDR 1.3.23 Darren Salt
+
+ -- Nicolas Huillard <nicolas@huillard.net> Sun, 24 Apr 2005 18:32:43 +0200
+
+vdr-plugin-softdevice (0.0.7cvs-20040927.1) unstable; urgency=low
+
+ * recompile with vdr + ffdecsa
+
+ -- Nicolas Huillard <nicolas@huillard.net> Mon, 27 Sep 2004 23:44:27 +0200
+
+vdr-plugin-softdevice (0.0.7cvs-20040813.2) unstable; urgency=low
+
+ * recompile with vdr + csa
+
+ -- Nicolas Huillard <nicolas@huillard.net> Fri, 13 Aug 2004 15:43:16 +0200
+
+vdr-plugin-softdevice (0.0.7cvs-20040813.1) unstable; urgency=low
+
+ * slight improve of the Makefile mods
+ * activated MMX2, AKA SSE (see /proc/cpuinfo)
+
+ -- Nicolas Huillard <nicolas@huillard.net> Fri, 13 Aug 2004 00:04:30 +0200
+
+vdr-plugin-softdevice (0.0.7cvs-20040810.1) unstable; urgency=low
+
+ * fresh cvs checkout 20040810
+
+ -- Nicolas Huillard <nicolas@huillard.net> Tue, 10 Aug 2004 12:12:29 +0200
+
+vdr-plugin-softdevice (0.0.7cvs-20040805.1) unstable; urgency=low
+
+ * fresh cvs checkout 20040805
+ * Makefile réadapté à ma conf...
+ * pas de -DUSE_MMX2 ni de PP_LIBAVCODEC
+
+ -- Nicolas Huillard <nicolas@huillard.net> Thu, 5 Aug 2004 23:07:03 +0200
+
+vdr-plugin-softdevice (0.0.7pre2-20040803.1) unstable; urgency=low
+
+ * recompilation après installation de ffmpeg 0.4.9pre1
+
+ -- Nicolas Huillard <nicolas@huillard.net> Wed, 4 Aug 2004 00:50:43 +0200
+
+vdr-plugin-softdevice (0.0.7pre2-20040802.2) unstable; urgency=low
+
+ * patch de Stephan Lucke pour OSD alpha
+ * essai avec 0x80 au lieu de 0xff
+
+ -- Nicolas Huillard <nicolas@huillard.net> Mon, 2 Aug 2004 23:17:00 +0200
+
+vdr-plugin-softdevice (0.0.7pre2-20040802.1) unstable; urgency=low
+
+ * patch de Stephan Lucke pour OSD alpha
+ * Subject: [vdr] Re: Softdevice 0.0.7pre2 crash w/ DFB, CLE266
+ * Date: Mon, 2 Aug 2004 07:13:57 +0200
+
+ -- Nicolas Huillard <nicolas@huillard.net> Mon, 2 Aug 2004 23:06:07 +0200
+
+vdr-plugin-softdevice (0.0.7pre2-20040801.1) unstable; urgency=low
+
+ * throw dans IDirectFBDisplayLayer::SetScreenLocation()
+ * changement de 720x576 en dur par 1280x1024
+
+ -- Nicolas Huillard <nicolas@huillard.net> Sun, 1 Aug 2004 12:39:23 +0200
+
+vdr-plugin-softdevice (0.0.7pre2-20040731.7) unstable; urgency=low
+
+ * throw dans IDirectFBDisplayLayer::SetScreenLocation()
+ * explication de l'exception
+
+ -- Nicolas Huillard <nicolas@huillard.net> Sat, 31 Jul 2004 16:42:00 +0200
+
+vdr-plugin-softdevice (0.0.7pre2-20040731.6) unstable; urgency=low
+
+ * throw dans IDirectFBDisplayLayer::SetScreenLocation()
+ * sans MMX2
+
+ -- Nicolas Huillard <nicolas@huillard.net> Sat, 31 Jul 2004 16:25:51 +0200
+
+vdr-plugin-softdevice (0.0.7pre2-20040731.5) unstable; urgency=low
+
+ * throw dans IDirectFBDisplayLayer::SetScreenLocation()
+ * autre test
+
+ -- Nicolas Huillard <nicolas@huillard.net> Sat, 31 Jul 2004 16:08:00 +0200
+
+vdr-plugin-softdevice (0.0.7pre2-20040731.4) unstable; urgency=low
+
+ * throw dans IDirectFBDisplayLayer::SetScreenLocation()
+ * autre test
+
+ -- Nicolas Huillard <nicolas@huillard.net> Sat, 31 Jul 2004 15:49:51 +0200
+
+vdr-plugin-softdevice (0.0.7pre2-20040731.3) unstable; urgency=low
+
+ * throw dans IDirectFBDisplayLayer::SetScreenLocation()
+ * video-dfb.c :
+ 497 //if (desc.caps & DLCAPS_SCREEN_LOCATION)
+ 498 if (0)
+
+ -- Nicolas Huillard <nicolas@huillard.net> Sat, 31 Jul 2004 14:52:05 +0200
+
+vdr-plugin-softdevice (0.0.7pre2-20040731.2) unstable; urgency=low
+
+ * Recompile after DirectFB patch
+ * Epia user with DirectFB have to place "disable-module=cle266" in
+ /etc/directfbrc to get a working OSD and have to apply attached patch to
+ DirectFB
+
+ -- Nicolas Huillard <nicolas@huillard.net> Sat, 31 Jul 2004 14:12:32 +0200
+
+vdr-plugin-softdevice (0.0.7pre2-1) unstable; urgency=low
+
+ * New upstream version
+
+ -- Nicolas Huillard <nicolas@huillard.net> Sat, 31 Jul 2004 12:44:19 +0200
+
+vdr-plugin-softdevice (0.0.6-1.nh8) unstable; urgency=low
+
+ * dlc.options = (DFBDisplayLayerOptions)( DLOP_DST_COLORKEY |
+ DLOP_DEINTERLACING );
+ * dlc.pixelformat = DSPF_YUY2;
+ * #define COLORKEY 0,0,0
+
+ -- Nicolas Huillard <nicolas@huillard.net> Wed, 30 Jun 2004 00:17:13 +0200
+
+vdr-plugin-softdevice (0.0.6-1.nh7) unstable; urgency=low
+
+ * dlc.options = (DFBDisplayLayerOptions)( DLOP_DST_COLORKEY |
+ DLOP_DEINTERLACING );
+ * dlc.pixelformat = DSPF_YV12;
+
+ -- Nicolas Huillard <nicolas@huillard.net> Fri, 25 Jun 2004 00:15:02 +0200
+
+vdr-plugin-softdevice (0.0.6-1.nh6) unstable; urgency=low
+
+ * dlc.pixelformat = DSPF_YUY2 in SetParams
+
+ -- Nicolas Huillard <nicolas@huillard.net> Fri, 18 Jun 2004 00:52:02 +0200
+
+vdr-plugin-softdevice (0.0.6-1.nh5) unstable; urgency=low
+
+ * DLOP_NONE in SetParams
+
+ -- Nicolas Huillard <nicolas@huillard.net> Fri, 18 Jun 2004 00:35:02 +0200
+
+vdr-plugin-softdevice (0.0.6-1.nh4) unstable; urgency=low
+
+ * Xv support + bugfix in DFB
+
+ -- Nicolas Huillard <nicolas@huillard.net> Tue, 8 Jun 2004 10:15:32 +0200
+
+vdr-plugin-softdevice (0.0.6-1.nh3) unstable; urgency=low
+
+ * set default mode to 720x576 instead of 768x576 (NH)
+
+ -- Nicolas Huillard <nicolas@huillard.net> Tue, 8 Jun 2004 01:07:57 +0200
+
+vdr-plugin-softdevice (0.0.6-1.nh2) unstable; urgency=low
+
+ * compiled with DirectFB 0.9.21 (CVS)
+
+ -- Nicolas Huillard <nicolas@huillard.net> Sun, 6 Jun 2004 19:58:27 +0200
+
+vdr-plugin-softdevice (0.0.6-1.nh1) unstable; urgency=low
+
+ * compiled with DirectFB
+
+ -- Nicolas Huillard <nicolas@huillard.net> Sat, 5 Jun 2004 14:41:24 +0200
+
+vdr-plugin-softdevice (0.0.6-1) unstable; urgency=low
+
+ * debianized
+
+ -- Nicolas Huillard <nicolas@huillard.net> Wed, 2 Jun 2004 23:44:21 +0200
Added: vdr/vdr-plugin-softdevice/trunk/debian/compat
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/compat 2005-05-20 22:13:11 UTC (rev 547)
+++ vdr/vdr-plugin-softdevice/trunk/debian/compat 2005-05-20 22:13:28 UTC (rev 548)
@@ -0,0 +1 @@
+4
Added: vdr/vdr-plugin-softdevice/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/control 2005-05-20 22:13:11 UTC (rev 547)
+++ vdr/vdr-plugin-softdevice/trunk/debian/control 2005-05-20 22:13:28 UTC (rev 548)
@@ -0,0 +1,16 @@
+Source: vdr-plugin-softdevice
+Section: misc
+Priority: extra
+Maintainer: Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>
+Uploaders: Thomas Schmidt <tschmidt@debian.org>, Nicolas huillard <nicolas@huillard.net>
+Build-Depends: debhelper (>> 4.1.16), dpatch, vdr-dev (>=1.3.24-1), zlib1g-dev, libpostproc-dev, libavcodec-dev, libavformat-dev, libasound2-dev
+Standards-Version: 3.6.1
+
+Package: vdr-plugin-softdevice
+Architecture: any
+Depends: ${shlibs:Depends}, vdr (>=1.3.24-1)
+Conflicts: vdr (>=1.3.25)
+Description: VDR plugin for frame-buffer output
+ This plugin is a MPEG2 decoder. It can be used as an output device for VDR.
+ Possible output devices are Xv, DirectFB, Vidix or a framebuffer.
+XB-VDR-Patchlevel: ${patchlevel}
Added: vdr/vdr-plugin-softdevice/trunk/debian/copyright
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/copyright 2005-05-20 22:13:11 UTC (rev 547)
+++ vdr/vdr-plugin-softdevice/trunk/debian/copyright 2005-05-20 22:13:28 UTC (rev 548)
@@ -0,0 +1,14 @@
+This package was debianized by Nicolas Huillard <nicolas@huillard.net> on
+Wed, 2 Jun 2004 22:37:36 +0200
+
+It was downloaded from http://softdevice.berlios.de/
+
+Upstream Authors: Roland Praml (Initial versions)
+ Stefan Lucke
+ Torgeir Veimo
+ Martin Wache
+
+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-softdevice/trunk/debian/docs
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/docs 2005-05-20 22:13:11 UTC (rev 547)
+++ vdr/vdr-plugin-softdevice/trunk/debian/docs 2005-05-20 22:13:28 UTC (rev 548)
@@ -0,0 +1 @@
+README
Added: vdr/vdr-plugin-softdevice/trunk/debian/install
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/install 2005-05-20 22:13:11 UTC (rev 547)
+++ vdr/vdr-plugin-softdevice/trunk/debian/install 2005-05-20 22:13:28 UTC (rev 548)
@@ -0,0 +1 @@
+libvdr-softdevice.so.* usr/lib/vdr/plugins/
Added: vdr/vdr-plugin-softdevice/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/patches/00list 2005-05-20 22:13:11 UTC (rev 547)
+++ vdr/vdr-plugin-softdevice/trunk/debian/patches/00list 2005-05-20 22:13:28 UTC (rev 548)
@@ -0,0 +1,4 @@
+01_Makefile-fPIC-fix
+02_disable_unsupported_output
+03_no_sub_libs
+04_debian_ffmpeg
Added: vdr/vdr-plugin-softdevice/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch 2005-05-20 22:13:11 UTC (rev 547)
+++ vdr/vdr-plugin-softdevice/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch 2005-05-20 22:13:28 UTC (rev 548)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_Makefile-fPIC-fix.dpatch by Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Adds -fPIC to Makefile
+
+@DPATCH@
+diff -urNad softdevice-0.1.1/Makefile /tmp/dpep.Tg2iZ1/softdevice-0.1.1/Makefile
+--- softdevice-0.1.1/Makefile 2005-03-19 23:01:21.000000000 +0100
++++ /tmp/dpep.Tg2iZ1/softdevice-0.1.1/Makefile 2005-05-20 22:35:21.000000000 +0200
+@@ -122,7 +122,7 @@
+ ### normally you shoudn't have to touch something below this line
+
+ CXX ?= g++
+-CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual -L$(LIBAVCODEC)
++CXXFLAGS ?= -fPIC -O2 -Wall -Woverloaded-virtual -L$(LIBAVCODEC)
+
+ ### The directory environment:
+
Added: vdr/vdr-plugin-softdevice/trunk/debian/patches/02_disable_unsupported_output.dpatch
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/patches/02_disable_unsupported_output.dpatch 2005-05-20 22:13:11 UTC (rev 547)
+++ vdr/vdr-plugin-softdevice/trunk/debian/patches/02_disable_unsupported_output.dpatch 2005-05-20 22:13:28 UTC (rev 548)
@@ -0,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_disable_unsupported_output.dpatch by Tobias Grimm <tg@e-tobi.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Disable output options, not supported in Debian yet
+
+@DPATCH@
+diff -urNad softdevice-0.1.1/Makefile /tmp/dpep.ky9wBa/softdevice-0.1.1/Makefile
+--- softdevice-0.1.1/Makefile 2005-03-19 23:01:21.000000000 +0100
++++ /tmp/dpep.ky9wBa/softdevice-0.1.1/Makefile 2005-05-20 22:23:26.000000000 +0200
+@@ -25,13 +25,13 @@
+ XV_SUPPORT=1
+
+ # DFB is very experimental (works only with my matrox G200, comments are welcome)
+-DFB_SUPPORT=1
++#DFB_SUPPORT=1
+
+ # FB is unaccellerated and should work with any FB with 16bit color depth
+ FB_SUPPORT=1
+
+ # Vidix support by Vadim Catana
+-VIDIX_SUPPORT=1
++#VIDIX_SUPPORT=1
+
+ # Set this if you want to use DPMS
+ LIBXDPMS_SUPPORT = 1
Added: vdr/vdr-plugin-softdevice/trunk/debian/patches/03_no_sub_libs.dpatch
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/patches/03_no_sub_libs.dpatch 2005-05-20 22:13:11 UTC (rev 547)
+++ vdr/vdr-plugin-softdevice/trunk/debian/patches/03_no_sub_libs.dpatch 2005-05-20 22:13:28 UTC (rev 548)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_no_sub_libs.dpatch by Tobias Grimm <tg@e-tobi.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Compile everything into one plugin lib.
+
+@DPATCH@
+diff -urNad softdevice-0.1.1/Makefile /tmp/dpep.dX4H8x/softdevice-0.1.1/Makefile
+--- softdevice-0.1.1/Makefile 2005-03-19 23:01:21.000000000 +0100
++++ /tmp/dpep.dX4H8x/softdevice-0.1.1/Makefile 2005-05-20 22:26:11.000000000 +0200
+@@ -55,7 +55,7 @@
+
+ # -----------------------------------------------------------------------------
+ # if you want output methods build as a single lib comment the following line
+-USE_SUBPLUGINS = 1
++#USE_SUBPLUGINS = 1
+
+ # -----------------------------------------------------------------------------
+ # framebuffer device name
Added: vdr/vdr-plugin-softdevice/trunk/debian/patches/04_debian_ffmpeg.dpatch
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/patches/04_debian_ffmpeg.dpatch 2005-05-20 22:13:11 UTC (rev 547)
+++ vdr/vdr-plugin-softdevice/trunk/debian/patches/04_debian_ffmpeg.dpatch 2005-05-20 22:13:28 UTC (rev 548)
@@ -0,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_debian_ffmpeg.dpatch by Tobias Grimm <tg@e-tobi.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Compile with static Debian ffmpeg libs
+
+@DPATCH@
+diff -urNad softdevice-0.1.1/Makefile /tmp/dpep.M0zRP2/softdevice-0.1.1/Makefile
+--- softdevice-0.1.1/Makefile 2005-05-20 22:36:02.000000000 +0200
++++ /tmp/dpep.M0zRP2/softdevice-0.1.1/Makefile 2005-05-20 22:36:32.000000000 +0200
+@@ -86,7 +86,7 @@
+ #
+ #
+ # DON'T touch this:
+-FFMPEGLIBS = -lavcodec -lavformat
++FFMPEGLIBS = `ffmpeg-config --plugin-libs avcodec avformat`
+ #
+ # -----------------------------------------------------------------------------
+ # Depending on your ffmpeg lib you may need some additional libs
+@@ -122,7 +122,7 @@
+ ### normally you shoudn't have to touch something below this line
+
+ CXX ?= g++
+-CXXFLAGS ?= -fPIC -O2 -Wall -Woverloaded-virtual -L$(LIBAVCODEC)
++CXXFLAGS ?= -fPIC -O2 -Wall -Woverloaded-virtual `ffmpeg-config --cflags`
+
+ ### The directory environment:
+
Added: vdr/vdr-plugin-softdevice/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/rules 2005-05-20 22:13:11 UTC (rev 547)
+++ vdr/vdr-plugin-softdevice/trunk/debian/rules 2005-05-20 22:13:28 UTC (rev 548)
@@ -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=. \
+ LIBAVCODEC=/usr/include/ffmpeg
+ 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
+ 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-softdevice/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: vdr/vdr-plugin-softdevice/trunk/debian/watch
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/watch 2005-05-20 22:13:11 UTC (rev 547)
+++ vdr/vdr-plugin-softdevice/trunk/debian/watch 2005-05-20 22:13:28 UTC (rev 548)
@@ -0,0 +1,2 @@
+version=2
+http://download.berlios.de/softdevice/vdr-softdevice-(.*)\.tgz