r596 - vdr/vdr-plugin-softdevice/trunk/debian

[Tobias Grimm]

Author: tiber-guest
Date: 2005-05-24 20:15:51 +0000 (Tue, 24 May 2005)
New Revision: 596

Added:
   vdr/vdr-plugin-softdevice/trunk/debian/ffmpeg-config-wrapper
Modified:
   vdr/vdr-plugin-softdevice/trunk/debian/TODO.debian
   vdr/vdr-plugin-softdevice/trunk/debian/changelog
   vdr/vdr-plugin-softdevice/trunk/debian/control
   vdr/vdr-plugin-softdevice/trunk/debian/rules
Log:
softdevice: new upstream release, made apckage compile with Marillat ffmpeg too

Modified: vdr/vdr-plugin-softdevice/trunk/debian/TODO.debian
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/TODO.debian	2005-05-24 20:04:53 UTC (rev 595)
+++ vdr/vdr-plugin-softdevice/trunk/debian/TODO.debian	2005-05-24 20:15:51 UTC (rev 596)
@@ -1,2 +1 @@
-- Alsa is required - should package depened somehow on Alsa?
 - Make package for DVB++

Modified: vdr/vdr-plugin-softdevice/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/changelog	2005-05-24 20:04:53 UTC (rev 595)
+++ vdr/vdr-plugin-softdevice/trunk/debian/changelog	2005-05-24 20:15:51 UTC (rev 596)
@@ -1,3 +1,12 @@
+vdr-plugin-softdevice (0.1.2-1) UNRELEASED; urgency=low
+
+  * Tobias Grimm <tg@e-tobi.net>
+    - New upstream release
+    - Disabled libpostproc usage
+    - Use shared ffmpeg libs from Christian Marillat, if available
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>  Sun, 22 May 2005 15:48:54 +0200
+
 vdr-plugin-softdevice (0.1.1-8) unstable; urgency=low
 
   * Tobias Grimm <tg@e-tobi.net>

Modified: vdr/vdr-plugin-softdevice/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/control	2005-05-24 20:04:53 UTC (rev 595)
+++ vdr/vdr-plugin-softdevice/trunk/debian/control	2005-05-24 20:15:51 UTC (rev 596)
@@ -3,7 +3,7 @@
 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
+Build-Depends: debhelper (>> 4.1.16), dpatch, vdr-dev (>=1.3.24-1), zlib1g-dev, libavcodec1-dev | libavcodec2-dev | libavcodeccvs-dev | libavcodec-dev, libavcodec1-dev | libavcodec2-dev | libavcodeccvs-dev | libavformat-dev, libasound2-dev
 Standards-Version: 3.6.1
 
 Package: vdr-plugin-softdevice

Added: vdr/vdr-plugin-softdevice/trunk/debian/ffmpeg-config-wrapper
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/ffmpeg-config-wrapper	2005-05-24 20:04:53 UTC (rev 595)
+++ vdr/vdr-plugin-softdevice/trunk/debian/ffmpeg-config-wrapper	2005-05-24 20:15:51 UTC (rev 596)
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+if [ "$1" = "--link" ] ; then
+    if [ -e /usr/bin/ffmpeg-config ] ; then
+        ffmpeg-config --plugin-libs avcodec avformat
+    else
+        echo "-lavcodec -lavformat"
+    fi
+fi
+
+if [ "$1" = "--compile" ] ; then
+    if [ -e /usr/bin/ffmpeg-config ] ; then
+        ffmpeg-config --cflags
+    else
+        echo "-L/usr/include/ffmpeg/"
+    fi
+fi


Property changes on: vdr/vdr-plugin-softdevice/trunk/debian/ffmpeg-config-wrapper
___________________________________________________________________
Name: svn:executable
   + *

Modified: vdr/vdr-plugin-softdevice/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/rules	2005-05-24 20:04:53 UTC (rev 595)
+++ vdr/vdr-plugin-softdevice/trunk/debian/rules	2005-05-24 20:15:51 UTC (rev 596)
@@ -46,7 +46,7 @@
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
-	$(MAKE) -o .dependencies clean
+	-$(MAKE) -o .dependencies clean
 	rm -f libvdr-*.so.*
 	dh_clean