r7569 - in /vdr/vdr-plugin-dxr3/trunk/debian: changelog patches/02_debian_ffmpeg.dpatch

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

Author: tiber-guest
Date: Mon Feb 23 17:44:02 2009
New Revision: 7569

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=7569
Log:
ffmpeg's pkg-config seems to be broken in debian-multimedia,
therefore adding manual include path /usr/include/ffmpeg/libavcodec
in 02_debian_ffmpeg.dpatch

Modified:
    vdr/vdr-plugin-dxr3/trunk/debian/changelog
    vdr/vdr-plugin-dxr3/trunk/debian/patches/02_debian_ffmpeg.dpatch

Modified: vdr/vdr-plugin-dxr3/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-dxr3/trunk/debian/changelog?rev=7569&op=diff
==============================================================================
--- vdr/vdr-plugin-dxr3/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-dxr3/trunk/debian/changelog Mon Feb 23 17:44:02 2009
@@ -1,3 +1,11 @@
+vdr-plugin-dxr3 (0.2.9-2) experimental; urgency=low
+
+  * ffmpeg's pkg-config seems to be broken in debian-multimedia,
+    therefore adding manual include path /usr/include/ffmpeg/libavcodec
+    in 02_debian_ffmpeg.dpatch
+
+ -- Tobias Grimm <etobi at debian.org>  Mon, 23 Feb 2009 18:40:06 +0100
+
 vdr-plugin-dxr3 (0.2.9-1) experimental; urgency=low
 
   * New upstream release

Modified: vdr/vdr-plugin-dxr3/trunk/debian/patches/02_debian_ffmpeg.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-dxr3/trunk/debian/patches/02_debian_ffmpeg.dpatch?rev=7569&op=diff
==============================================================================
--- vdr/vdr-plugin-dxr3/trunk/debian/patches/02_debian_ffmpeg.dpatch (original)
+++ vdr/vdr-plugin-dxr3/trunk/debian/patches/02_debian_ffmpeg.dpatch Mon Feb 23 17:44:02 2009
@@ -1,5 +1,5 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_debian_ffmpeg.dpatch by Tobias Grimm <tg at e-tobi.net>
+## 02_debian_ffmpeg.dpatch by Tobias Grimm <tg at e-tobi.net>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Compile with static Debian ffmpeg libs
@@ -14,7 +14,7 @@
  
 -INCLUDES += -I$(VDRDIR)/include -I$(FFMDIR) -I$(FFMDIR)/libavcodec -I$(EM8300)
 -LIBS     = -L$(FFMDIR)/libavcodec -lavcodec
-+INCLUDES += -I$(VDRDIR)/include `pkg-config --cflags libavcodec` -I$(EM8300)
++INCLUDES += -I$(VDRDIR)/include `pkg-config --cflags libavcodec` -I/usr/include/ffmpeg/libavcodec -I$(EM8300)
 +LIBS     = `pkg-config --libs libavcodec`
  DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
  DEFINES += -D_GNU_SOURCE