r2406 - in vdr/vdr-plugin-muggle/trunk/debian: . patches

[Tobias Grimm]

Author: tiber-guest
Date: 2006-04-13 15:57:53 +0000 (Thu, 13 Apr 2006)
New Revision: 2406

Added:
   vdr/vdr-plugin-muggle/trunk/debian/patches/02_mjpegtools-1.6.2.dpatch
Modified:
   vdr/vdr-plugin-muggle/trunk/debian/changelog
   vdr/vdr-plugin-muggle/trunk/debian/control
   vdr/vdr-plugin-muggle/trunk/debian/patches/00list
Log:
- Depend on mjpegtools (>=1:1.8.0)
- Added patch to fix issue with mjpegtools > 1.6.2 (-S 420mpeg2)


Modified: vdr/vdr-plugin-muggle/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/changelog	2006-04-12 23:05:16 UTC (rev 2405)
+++ vdr/vdr-plugin-muggle/trunk/debian/changelog	2006-04-13 15:57:53 UTC (rev 2406)
@@ -1,3 +1,12 @@
+vdr-plugin-muggle (0.1.9-8) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Tobias Grimm <tg at e-tobi.net>
+    - Depend on mjpegtools (>=1:1.8.0)
+    - Added patch to fix issue with mjpegtools > 1.6.2 (-S 420mpeg2)
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Thu, 13 Apr 2006 00:48:12 +0200
+
 vdr-plugin-muggle (0.1.9-7) unstable; urgency=low
 
   * Thomas Schmidt <tschmidt at debian.org>

Modified: vdr/vdr-plugin-muggle/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/control	2006-04-12 23:05:16 UTC (rev 2405)
+++ vdr/vdr-plugin-muggle/trunk/debian/control	2006-04-13 15:57:53 UTC (rev 2406)
@@ -8,7 +8,7 @@
 
 Package: vdr-plugin-muggle
 Architecture: any
-Depends: ${shlibs:Depends}, ${vdr:Depends}, mjpegtools, netpbm
+Depends: ${shlibs:Depends}, ${vdr:Depends}, mjpegtools (>=1:1.8.0), netpbm
 Suggests: mysql-server, mysql-client
 Conflicts: ${vdr:Conflicts}
 Description: Media juggle plugin for VDR

Modified: vdr/vdr-plugin-muggle/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/patches/00list	2006-04-12 23:05:16 UTC (rev 2405)
+++ vdr/vdr-plugin-muggle/trunk/debian/patches/00list	2006-04-13 15:57:53 UTC (rev 2406)
@@ -1,2 +1,3 @@
 01_vdr-1.3.38-fix
+02_mjpegtools-1.6.2
 03_image_convert.sh-path

Added: vdr/vdr-plugin-muggle/trunk/debian/patches/02_mjpegtools-1.6.2.dpatch
===================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/patches/02_mjpegtools-1.6.2.dpatch	2006-04-12 23:05:16 UTC (rev 2405)
+++ vdr/vdr-plugin-muggle/trunk/debian/patches/02_mjpegtools-1.6.2.dpatch	2006-04-13 15:57:53 UTC (rev 2406)
@@ -0,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_mjpegtools-1.6.2.dpatch by Tobias Grimm <tg at e-tobi.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Makes image conversion compatible with mjpegtools > 1.6.2
+
+ at DPATCH@
+diff -urNad vdr-plugin-muggle-0.1.9~/scripts/image_convert.sh vdr-plugin-muggle-0.1.9/scripts/image_convert.sh
+--- vdr-plugin-muggle-0.1.9~/scripts/image_convert.sh	2005-10-11 21:28:10.000000000 +0200
++++ vdr-plugin-muggle-0.1.9/scripts/image_convert.sh	2006-04-13 17:43:25.000000000 +0200
+@@ -65,13 +65,13 @@
+   pnmscale $S $TMP | \
+     pnmpad -black -width 704 -height 480 | \
+     ppmntsc | \
+-    ppmtoy4m -v 0 -n 1 -r -F 30000:1001 | \
++    ppmtoy4m -v 0 -n 1 -r -F 30000:1001 -S 420mpeg2 | \
+     mpeg2enc -f 7 -T 90 -F 4 -nn -a 2 -v 0 -o "$MPG"
+ else
+   pnmscale $S $TMP | \
+     pnmpad -black -width 704 -height 576 | \
+     ppmntsc --pal | \
+-    ppmtoy4m -v 0 -n 1 -r -F 25:1 | \
++    ppmtoy4m -v 0 -n 1 -r -F 25:1 -S 420mpeg2 | \
+     mpeg2enc -f 7 -T 90 -F 3 -np -a 2 -v 0 -o "$MPG"
+ fi
+ #


Property changes on: vdr/vdr-plugin-muggle/trunk/debian/patches/02_mjpegtools-1.6.2.dpatch
___________________________________________________________________
Name: svn:executable
   + *