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

Sun Jul 31 10:45:03 UTC 2005

Author: tiber-guest
Date: 2005-07-31 10:45:03 +0000 (Sun, 31 Jul 2005)
New Revision: 814

Added:
   vdr/vdr-plugin-softdevice/trunk/debian/patches/05_offset_t.dpatch
   vdr/vdr-plugin-softdevice/trunk/debian/patches/06_dfb++.dpatch
Removed:
   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/patches/00list
   vdr/vdr-plugin-softdevice/trunk/debian/patches/02_disable_unsupported_output.dpatch
Log:
softdevice: enabled dfb++-support (dfb++ will be uploaded to sid soon)


Modified: vdr/vdr-plugin-softdevice/trunk/debian/TODO.debian
===================================================================

--- vdr/vdr-plugin-softdevice/trunk/debian/TODO.debian	2005-07-20 17:22:41 UTC (rev 813)
+++ vdr/vdr-plugin-softdevice/trunk/debian/TODO.debian	2005-07-31 10:45:03 UTC (rev 814)
@@ -1 +1,7 @@
-- Make package for DVB++
+TODO:
+
+- ???
+
+DONE:
+
+- Make package for DVB++ -> done by Guillem Jover

Modified: vdr/vdr-plugin-softdevice/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/changelog	2005-07-20 17:22:41 UTC (rev 813)
+++ vdr/vdr-plugin-softdevice/trunk/debian/changelog	2005-07-31 10:45:03 UTC (rev 814)
@@ -6,6 +6,10 @@
     - Depend/Build-Depend on vdr (>=1.3.27-1)
     - Conflict with vdr (>=1.3.28)
     - Converted debian/changelog to UTF-8, to make lintian happy
+  * Tobias Grimm <tg at e-tobi.net>
+    - Bumped Standards-Version to 3.6.2
+    - Using dfb++ now
+    - Now again only the official debian ffmpeg package is used
 
  -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Sun, 19 Jun 2005 17:58:06 +0200
 

Modified: vdr/vdr-plugin-softdevice/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/control	2005-07-20 17:22:41 UTC (rev 813)
+++ vdr/vdr-plugin-softdevice/trunk/debian/control	2005-07-31 10:45:03 UTC (rev 814)
@@ -3,8 +3,8 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Thomas Schmidt <tschmidt at debian.org>, Nicolas huillard <nicolas at huillard.net>
-Build-Depends: debhelper (>> 4.1.16), dpatch, vdr-dev (>=1.3.27-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
+Build-Depends: debhelper (>> 4.1.16), dpatch, vdr-dev (>=1.3.27-1), zlib1g-dev, libavcodec-dev (>=0.cvs20050626-2sarge1), libavformat-dev (>=0.cvs20050626-2sarge1), libasound2-dev, libdfb++-dev
+Standards-Version: 3.6.2
 
 Package: vdr-plugin-softdevice
 Architecture: any

Deleted: vdr/vdr-plugin-softdevice/trunk/debian/ffmpeg-config-wrapper
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/ffmpeg-config-wrapper	2005-07-20 17:22:41 UTC (rev 813)
+++ vdr/vdr-plugin-softdevice/trunk/debian/ffmpeg-config-wrapper	2005-07-31 10:45:03 UTC (rev 814)
@@ -1,17 +0,0 @@
-#!/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

Modified: vdr/vdr-plugin-softdevice/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/patches/00list	2005-07-20 17:22:41 UTC (rev 813)
+++ vdr/vdr-plugin-softdevice/trunk/debian/patches/00list	2005-07-31 10:45:03 UTC (rev 814)
@@ -2,3 +2,5 @@
 02_disable_unsupported_output
 03_no_sub_libs
 04_debian_ffmpeg
+05_offset_t
+06_dfb++

Modified: 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-07-20 17:22:41 UTC (rev 813)
+++ vdr/vdr-plugin-softdevice/trunk/debian/patches/02_disable_unsupported_output.dpatch	2005-07-31 10:45:03 UTC (rev 814)
@@ -5,17 +5,10 @@
 ## DP: Disable output options, not supported in Debian yet
 
 @DPATCH@
-diff -urNad vdr-plugin-softdevice-0.1.2/Makefile /tmp/dpep.SfUpzg/vdr-plugin-softdevice-0.1.2/Makefile
---- vdr-plugin-softdevice-0.1.2/Makefile	2005-05-27 21:37:38.000000000 +0200
-+++ /tmp/dpep.SfUpzg/vdr-plugin-softdevice-0.1.2/Makefile	2005-05-27 21:40:28.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
+diff -urNad --exclude=CVS --exclude=.svn ./Makefile /tmp/dpep-work.YfKVET/vdr-plugin-softdevice-0.1.2/Makefile
+--- ./Makefile	2005-07-31 12:33:32.000000000 +0200
++++ /tmp/dpep-work.YfKVET/vdr-plugin-softdevice-0.1.2/Makefile	2005-07-31 12:34:35.000000000 +0200
+@@ -31,7 +31,7 @@
  FB_SUPPORT=1
  
  # Vidix support by Vadim Catana

Added: vdr/vdr-plugin-softdevice/trunk/debian/patches/05_offset_t.dpatch
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/patches/05_offset_t.dpatch	2005-07-20 17:22:41 UTC (rev 813)
+++ vdr/vdr-plugin-softdevice/trunk/debian/patches/05_offset_t.dpatch	2005-07-31 10:45:03 UTC (rev 814)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05_offset_t.dpatch by Tobias Grimm <tg at e-tobi.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix return type to offset_t to for ffmpeg cvs20050626
+
+ at DPATCH@
+--- vdr-plugin-softdevice-0.1.2.orig/mpeg2decoder.c
++++ vdr-plugin-softdevice-0.1.2/mpeg2decoder.c
+@@ -922,7 +922,7 @@
+      return -1;
+ };
+      
+-static int seek_RingBuffer(void *opaque, offset_t offset, int whence) {
++static offset_t seek_RingBuffer(void *opaque, offset_t offset, int whence) {
+      cMpeg2Decoder *Dec=(cMpeg2Decoder *)(opaque);
+      if (Dec) 
+        return Dec->seek(offset, whence);


Property changes on: vdr/vdr-plugin-softdevice/trunk/debian/patches/05_offset_t.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: vdr/vdr-plugin-softdevice/trunk/debian/patches/06_dfb++.dpatch
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/patches/06_dfb++.dpatch	2005-07-20 17:22:41 UTC (rev 813)
+++ vdr/vdr-plugin-softdevice/trunk/debian/patches/06_dfb++.dpatch	2005-07-31 10:45:03 UTC (rev 814)
@@ -0,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 06_dfb++.dpatch by Tobias Grimm <tg at e-tobi.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad --exclude=CVS --exclude=.svn ./Makefile /tmp/dpep-work.knwtrD/vdr-plugin-softdevice-0.1.2/Makefile
+--- ./Makefile	2005-07-31 12:37:16.000000000 +0200
++++ /tmp/dpep-work.knwtrD/vdr-plugin-softdevice-0.1.2/Makefile	2005-07-31 12:39:11.000000000 +0200
+@@ -160,16 +160,16 @@
+ 
+ ifdef DFB_SUPPORT
+   ifdef USE_SUBPLUGINS
+-    DFB_LIBS  = -L/usr/local/lib -ldfb++
++    DFB_LIBS  = -L/usr/lib -ldfb++
+     DFB_OBJS  = video.o video-dfb.o
+     ALL_OBJS += $(DFB_OBJS)
+     TARGETS  += libvdr-$(PLUGIN)-dfb.so
+   else
+     OBJS     += video-dfb.o
+-    LIBS     += -L/usr/local/lib -ldfb++
++    LIBS     += -L/usr/lib -ldfb++
+   endif
+   DEFINES  += -DDFB_SUPPORT
+-  INCLUDES += -I/usr/local/include/dfb++ -I/usr/local/include/directfb
++  INCLUDES += -I/usr/include/dfb++ -I/usr/include/directfb
+ endif
+ 
+ ifdef FB_SUPPORT


Property changes on: vdr/vdr-plugin-softdevice/trunk/debian/patches/06_dfb++.dpatch
___________________________________________________________________
Name: svn:executable
   + *


