r3546 - in vdr/vdr-plugin-softdevice/trunk/debian: . patches

[Tobias Grimm]

Author: tiber-guest
Date: 2006-10-01 15:14:51 +0000 (Sun, 01 Oct 2006)
New Revision: 3546

Added:
   vdr/vdr-plugin-softdevice/trunk/debian/patches/05_FFMPEG_VERSION.dpatch
Modified:
   vdr/vdr-plugin-softdevice/trunk/debian/changelog
   vdr/vdr-plugin-softdevice/trunk/debian/patches/00list
Log:
Added 05_FFMPEG_VERSION.dpatch


Modified: vdr/vdr-plugin-softdevice/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/changelog	2006-10-01 09:42:49 UTC (rev 3545)
+++ vdr/vdr-plugin-softdevice/trunk/debian/changelog	2006-10-01 15:14:51 UTC (rev 3546)
@@ -1,3 +1,9 @@
+vdr-plugin-softdevice (0.2.3a-7) unstable; urgency=low
+
+  * Added 05_FFMPEG_VERSION.dpatch
+
+ -- Tobias Grimm <tg at e-tobi.net>  Sun,  1 Oct 2006 17:14:18 +0200
+
 vdr-plugin-softdevice (0.2.3a-6) unstable; urgency=low
 
   [ Thomas Schmidt ]

Modified: vdr/vdr-plugin-softdevice/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/patches/00list	2006-10-01 09:42:49 UTC (rev 3545)
+++ vdr/vdr-plugin-softdevice/trunk/debian/patches/00list	2006-10-01 15:14:51 UTC (rev 3546)
@@ -1,4 +1,5 @@
 02_disable_unsupported_output
 03_no_sub_libs
 04_debian_ffmpeg
+05_FFMPEG_VERSION
 06_dfb++

Added: vdr/vdr-plugin-softdevice/trunk/debian/patches/05_FFMPEG_VERSION.dpatch
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/patches/05_FFMPEG_VERSION.dpatch	                        (rev 0)
+++ vdr/vdr-plugin-softdevice/trunk/debian/patches/05_FFMPEG_VERSION.dpatch	2006-10-01 15:14:51 UTC (rev 3546)
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05_FFMPEG_VERSION.dpatch by Tobias Grimm <tg at e-tobi.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: In SVN revions 5502 FFMPEG_VERSION has been removed from avcodec.h,
+## DP: So we need to use LIBAVCODEC_VERSION now
+
+ at DPATCH@
+--- vdr-plugin-softdevice-0.2.3a.orig/softdevice.c
++++ vdr-plugin-softdevice-0.2.3a/softdevice.c
+@@ -187,8 +187,8 @@
+ #endif
+     fprintf(stderr,"[softdevice] Initializing Video Out\n");
+     fprintf(stderr,
+-            "[softdevice] ffmpeg version(%s) build(%d)\n",
+-            FFMPEG_VERSION, LIBAVCODEC_BUILD);
++            "[softdevice] libavcodec version(%s) build(%d)\n",
++            AV_STRINGIFY(LIBAVCODEC_VERSION), LIBAVCODEC_BUILD);
+     setupStore.outputMethod = method;
+ #ifdef USE_SUBPLUGINS
+     switch (method) {