r6970 - in /vdr/vdr-plugin-image/trunk/debian: changelog patches/00list patches/02_new-ffmpeg-header-location.dpatch

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

Author: tiber-guest
Date: Wed May 21 20:29:15 2008
New Revision: 6970

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=6970
Log:
Added 02_new-ffmpeg-header-location.dpatch

Added:
    vdr/vdr-plugin-image/trunk/debian/patches/02_new-ffmpeg-header-location.dpatch   (with props)
Modified:
    vdr/vdr-plugin-image/trunk/debian/changelog
    vdr/vdr-plugin-image/trunk/debian/patches/00list

Modified: vdr/vdr-plugin-image/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-image/trunk/debian/changelog?rev=6970&op=diff
==============================================================================
--- vdr/vdr-plugin-image/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-image/trunk/debian/changelog Wed May 21 20:29:15 2008
@@ -8,6 +8,7 @@
   * Now really switched Build-System to cdbs
   * Build-depend on libavutilcvs-dev, liblame-dev and libxvidcore-dev because
     of a bug in libavcodeccvs51 (20070329-0.0etch1)
+  * Added 02_new-ffmpeg-header-location.dpatch
 
  -- Tobias Grimm <tg at e-tobi.net>  Wed, 21 May 2008 20:39:02 +0200
 

Modified: vdr/vdr-plugin-image/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-image/trunk/debian/patches/00list?rev=6970&op=diff
==============================================================================
--- vdr/vdr-plugin-image/trunk/debian/patches/00list (original)
+++ vdr/vdr-plugin-image/trunk/debian/patches/00list Wed May 21 20:29:15 2008
@@ -1,2 +1,3 @@
 01_Makefile-fPIC-fix
 01_new-ffmpeg
+02_new-ffmpeg-header-location

Added: vdr/vdr-plugin-image/trunk/debian/patches/02_new-ffmpeg-header-location.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-image/trunk/debian/patches/02_new-ffmpeg-header-location.dpatch?rev=6970&op=file
==============================================================================
--- vdr/vdr-plugin-image/trunk/debian/patches/02_new-ffmpeg-header-location.dpatch (added)
+++ vdr/vdr-plugin-image/trunk/debian/patches/02_new-ffmpeg-header-location.dpatch Wed May 21 20:29:15 2008
@@ -1,0 +1,71 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_new-ffmpeg-header-location.dpatch by Tobias Grimm <tg at e-tobi.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Allows the plugin to be compiled with old and new ffmpeg header locations
+
+ at DPATCH@
+diff -urNad vdr-plugin-image-0.2.7~/Makefile vdr-plugin-image-0.2.7/Makefile
+--- vdr-plugin-image-0.2.7~/Makefile	2008-05-21 22:17:20.000000000 +0200
++++ vdr-plugin-image-0.2.7/Makefile	2008-05-21 22:17:20.000000000 +0200
+@@ -104,6 +104,12 @@
+ endif
+ endif
+ 
++NEW_FFMPEG_HEADER_LOCATION := $(wildcard /usr/include/ffmpeg/libavcodec/*)
++ifneq ($(strip $(NEW_FFMPEG_HEADER_LOCATION)),)
++  DEFINES  += -DNEW_FFMPEG_HEADER_LOCATION
++  INCLUDES += -I/usr/include/ffmpeg
++endif
++
+ ifndef WITHOUT_LIBEXIF
+   PKG-INCLUDES += libexif
+   PKG-LIBS += libexif
+diff -urNad vdr-plugin-image-0.2.7~/liboutput/Makefile vdr-plugin-image-0.2.7/liboutput/Makefile
+--- vdr-plugin-image-0.2.7~/liboutput/Makefile	2008-05-21 22:17:20.000000000 +0200
++++ vdr-plugin-image-0.2.7/liboutput/Makefile	2008-05-21 22:18:16.000000000 +0200
+@@ -34,6 +34,12 @@
+   PKG-INCLUDES += libavcodec
+ endif
+ 
++NEW_FFMPEG_HEADER_LOCATION := $(wildcard /usr/include/ffmpeg/libavcodec/*)
++ifneq ($(strip $(NEW_FFMPEG_HEADER_LOCATION)),)
++  DEFINES  += -DNEW_FFMPEG_HEADER_LOCATION
++  INCLUDES += -I/usr/include/ffmpeg
++endif
++
+ DEFINES  += -D_GNU_SOURCE
+ 
+ ifdef PKG-INCLUDES
+diff -urNad vdr-plugin-image-0.2.7~/liboutput/encode.c vdr-plugin-image-0.2.7/liboutput/encode.c
+--- vdr-plugin-image-0.2.7~/liboutput/encode.c	2008-05-21 22:17:20.000000000 +0200
++++ vdr-plugin-image-0.2.7/liboutput/encode.c	2008-05-21 22:17:20.000000000 +0200
+@@ -31,9 +31,13 @@
+ #ifdef FFMDIR
+ #include <swscale.h>
+ #else
++#ifdef NEW_FFMPEG_HEADER_LOCATION
++#include <libswscale/swscale.h>
++#else
+ #include <ffmpeg/swscale.h>
+ #endif
+ #endif
++#endif
+ }
+ 
+ #include "encode.h"
+diff -urNad vdr-plugin-image-0.2.7~/liboutput/encode.h vdr-plugin-image-0.2.7/liboutput/encode.h
+--- vdr-plugin-image-0.2.7~/liboutput/encode.h	2008-05-21 22:17:20.000000000 +0200
++++ vdr-plugin-image-0.2.7/liboutput/encode.h	2008-05-21 22:17:20.000000000 +0200
+@@ -29,7 +29,11 @@
+ #ifdef FFMDIR
+ #include <avcodec.h>
+ #else
++#ifdef NEW_FFMPEG_HEADER_LOCATION
++#include <libavcodec/avcodec.h>
++#else
+ #include <ffmpeg/avcodec.h>
++#endif
+ #endif 
+ }
+ 

Propchange: vdr/vdr-plugin-image/trunk/debian/patches/02_new-ffmpeg-header-location.dpatch
------------------------------------------------------------------------------
    svn:executable = *