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

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

Author: tiber-guest
Date: Fri May  1 18:07:39 2009
New Revision: 7746

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=7746
Log:
Updated 02_debian_ffmpeg.dpatch to use <libavcodec/*> includes

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=7746&op=diff
==============================================================================
--- vdr/vdr-plugin-dxr3/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-dxr3/trunk/debian/changelog Fri May  1 18:07:39 2009
@@ -1,3 +1,9 @@
+vdr-plugin-dxr3 (0.2.9-3) UNRELEASED; urgency=low
+
+  * Updated 02_debian_ffmpeg.dpatch to use <libavcodec/*> includes
+
+ -- Tobias Grimm <etobi at debian.org>  Fri, 01 May 2009 20:06:52 +0200
+
 vdr-plugin-dxr3 (0.2.9-2) experimental; urgency=low
 
   * ffmpeg's pkg-config seems to be broken in debian-multimedia,

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=7746&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 Fri May  1 18:07:39 2009
@@ -5,9 +5,9 @@
 ## DP: Compile with static Debian ffmpeg libs
 
 @DPATCH@
-diff -urNad vdr-plugin-dxr3-0.2.8~/Makefile vdr-plugin-dxr3-0.2.8/Makefile
---- vdr-plugin-dxr3-0.2.8~/Makefile	2008-07-27 16:33:52.000000000 +0200
-+++ vdr-plugin-dxr3-0.2.8/Makefile	2008-07-27 16:36:40.000000000 +0200
+diff -urNad vdr-plugin-dxr3-0.2.9~/Makefile vdr-plugin-dxr3-0.2.9/Makefile
+--- vdr-plugin-dxr3-0.2.9~/Makefile	2009-05-01 18:13:16.000000000 +0200
++++ vdr-plugin-dxr3-0.2.9/Makefile	2009-05-01 18:14:25.000000000 +0200
 @@ -41,8 +41,8 @@
  
  ### Includes and Defines (add further entries here):
@@ -19,15 +19,15 @@
  DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
  DEFINES += -D_GNU_SOURCE
  
-@@ -55,6 +55,11 @@
- # comment this out to use the traditional vdr-dxr3 scaler
- DEFINES += -DUSE_XINE_SCALER
+diff -urNad vdr-plugin-dxr3-0.2.9~/dxr3ffmpeg.h vdr-plugin-dxr3-0.2.9/dxr3ffmpeg.h
+--- vdr-plugin-dxr3-0.2.9~/dxr3ffmpeg.h	2007-08-12 16:39:57.000000000 +0200
++++ vdr-plugin-dxr3-0.2.9/dxr3ffmpeg.h	2009-05-01 18:13:32.000000000 +0200
+@@ -24,7 +24,7 @@
  
-+NEW_FFMPEG_HEADER_LOCATION := $(wildcard /usr/include/ffmpeg/libavcodec/*)
-+ifneq ($(strip $(NEW_FFMPEG_HEADER_LOCATION)),)
-+  INCLUDES += -I/usr/include/ffmpeg/libavcodec
-+endif
-+
- ### The object files (add further files here):
+ extern "C"
+ {
+-#include <avcodec.h>
++#include <libavcodec/avcodec.h>
+ }
  
- OBJS = $(PLUGIN).o dxr3multichannelaudio.o dxr3sysclock.o dxr3colormanager.o dxr3syncbuffer.o dxr3audiodecoder.o \
+ #include <string.h>