r7520 - in /vdr/vdr-plugin-softdevice/trunk/debian: changelog control patches/00list patches/07_ffmpeg_52.23.1.dpatch

[tiber-guest at users.alioth.debian.org]

Author: tiber-guest
Date: Sun Dec 28 12:12:20 2008
New Revision: 7520

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=7520
Log:
Added 07_ffmpeg_52.23.1.dpatch

Added:
    vdr/vdr-plugin-softdevice/trunk/debian/patches/07_ffmpeg_52.23.1.dpatch
Modified:
    vdr/vdr-plugin-softdevice/trunk/debian/changelog
    vdr/vdr-plugin-softdevice/trunk/debian/control
    vdr/vdr-plugin-softdevice/trunk/debian/patches/00list

Modified: vdr/vdr-plugin-softdevice/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-softdevice/trunk/debian/changelog?rev=7520&op=diff
==============================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-softdevice/trunk/debian/changelog Sun Dec 28 12:12:20 2008
@@ -1,3 +1,9 @@
+vdr-plugin-softdevice (0.5.0-4) experimental; urgency=low
+
+  * Added 07_ffmpeg_52.23.1.dpatch
+
+ -- Tobias Grimm <etobi at debian.org>  Sun, 28 Dec 2008 13:08:34 +0100
+
 vdr-plugin-softdevice (0.5.0-3) experimental; urgency=low
 
   * Build-depend on libswscale-dev because newer ffmpeg packages don't

Modified: vdr/vdr-plugin-softdevice/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-softdevice/trunk/debian/control?rev=7520&op=diff
==============================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/control (original)
+++ vdr/vdr-plugin-softdevice/trunk/debian/control Sun Dec 28 12:12:20 2008
@@ -2,7 +2,7 @@
 Section: misc
 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>, Tobias Grimm <tg at e-tobi.net>, Thomas Günther <tom at toms-cafe.de>
+Uploaders: Thomas Schmidt <tschmidt at debian.org>, Nicolas Huillard <nicolas at huillard.net>, Tobias Grimm <etobi at debian.org>, Thomas Günther <tom at toms-cafe.de>
 Build-Depends: debhelper (>= 5), cdbs, dpatch, vdr-dev (>= 1.6.0-5), gettext,
  pkg-config, libavcodec-dev (>= 0.cvs20060329-4), libavformat-dev (>= 0.cvs20060329-4),
  libswscale-dev, libasound2-dev, libdfb++-dev, libdirectfb-dev, libxv-dev, libx11-dev,

Modified: vdr/vdr-plugin-softdevice/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-softdevice/trunk/debian/patches/00list?rev=7520&op=diff
==============================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/patches/00list (original)
+++ vdr/vdr-plugin-softdevice/trunk/debian/patches/00list Sun Dec 28 12:12:20 2008
@@ -1,2 +1,3 @@
 04_debian_ffmpeg
 06_dfb++
+07_ffmpeg_52.23.1

Added: vdr/vdr-plugin-softdevice/trunk/debian/patches/07_ffmpeg_52.23.1.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-softdevice/trunk/debian/patches/07_ffmpeg_52.23.1.dpatch?rev=7520&op=file
==============================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/patches/07_ffmpeg_52.23.1.dpatch (added)
+++ vdr/vdr-plugin-softdevice/trunk/debian/patches/07_ffmpeg_52.23.1.dpatch Sun Dec 28 12:12:20 2008
@@ -1,0 +1,49 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 07_ffmpeg_52.23.1.dpatch by Tobias Grimm <vdr at e-tobi.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes for ffmpeg API changes.
+
+ at DPATCH@
+--- vdr-plugin-softdevice-0.5.0.orig/mpeg2decoder.h
++++ vdr-plugin-softdevice-0.5.0/mpeg2decoder.h
+@@ -23,6 +23,10 @@
+ #endif
+ }
+ 
++#if LIBAVFORMAT_VERSION_INT >= ((52 << 16) + (23 << 8) + 1)
++    typedef int64_t offset_t;
++#endif
++
+ #include <vdr/plugin.h>
+ #include <vdr/ringbuffer.h>
+ 
+--- vdr-plugin-softdevice-0.5.0.orig/mpeg2decoder.c
++++ vdr-plugin-softdevice-0.5.0/mpeg2decoder.c
+@@ -140,7 +140,12 @@
+ {
+   context=Context;
+   if (context)
++#if LIBAVFORMAT_VERSION_INT >= ((52 << 16) + (23 << 8) + 1)
++        context->error_recognition=1;
++#else
+         context->error_resilience=1;
++#endif
++
+   CMDDEB("Neuer StreamDecoder Pid: %d context %p type %d\n",
+         getpid(),context,context->codec_type );
+   pts=0;
+@@ -1023,8 +1028,13 @@
+ //----------------------------   MPEG Decoder
+ cMpeg2Decoder::cMpeg2Decoder(cAudioOut *AudioOut, cVideoOut *VideoOut)
+ {
++#if LIBAVFORMAT_VERSION_INT >= ((52 << 16) + (23 << 8) + 1)
++  if ( avcodec_version() != LIBAVCODEC_VERSION_INT ) {
++     fprintf(stderr,"Fatal Error! Libavcodec library build(%d) doesn't match avcodec.h build(%d)!!!\n",avcodec_version(),LIBAVCODEC_VERSION_INT);
++#else
+   if ( avcodec_build() != LIBAVCODEC_BUILD ) {
+      fprintf(stderr,"Fatal Error! Libavcodec library build(%d) doesn't match avcodec.h build(%d)!!!\n",avcodec_build(),LIBAVCODEC_BUILD);
++#endif
+      fprintf(stderr,"Check your ffmpeg installation / the pathes in the Makefile!!!\n");
+      exit(-1);
+   };