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

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

Author: tiber-guest
Date: Sun Jul 27 14:42:21 2008
New Revision: 7350

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=7350
Log:
Updated 02_debian_ffmpeg.dpatch to make dxr3 compile with new ffmpeg
versions

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=7350&op=diff
==============================================================================
--- vdr/vdr-plugin-dxr3/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-dxr3/trunk/debian/changelog Sun Jul 27 14:42:21 2008
@@ -1,3 +1,10 @@
+vdr-plugin-dxr3 (0.2.8-3) experimental; urgency=low
+
+  * Updated 02_debian_ffmpeg.dpatch to make dxr3 compile with new ffmpeg
+    versions
+
+ -- Tobias Grimm <tg at e-tobi.net>  Sun, 27 Jul 2008 16:41:35 +0200
+
 vdr-plugin-dxr3 (0.2.8-2) experimental; urgency=low
 
   * Dropped patchlevel control field

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=7350&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 Sun Jul 27 14:42:21 2008
@@ -6,16 +6,28 @@
 
 @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-05-01 23:25:44.000000000 +0200
-+++ vdr-plugin-dxr3-0.2.8/Makefile	2008-05-01 23:27:11.000000000 +0200
+--- 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
 @@ -41,8 +41,8 @@
  
  ### Includes and Defines (add further entries here):
  
 -INCLUDES += -I$(VDRDIR)/include -I$(FFMDIR) -I$(FFMDIR)/libavcodec -I$(EM8300)
 -LIBS     = -L$(FFMDIR)/libavcodec -lavcodec
-+INCLUDES += -I$(VDRDIR)/include `ffmpeg-config --cflags` -I$(EM8300)
-+LIBS     = `ffmpeg-config --libs avcodec`
++INCLUDES += -I$(VDRDIR)/include `pkg-config --cflags libavcodec` -I$(EM8300)
++LIBS     = `pkg-config --libs libavcodec`
  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
+ 
++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):
+ 
+ OBJS = $(PLUGIN).o dxr3multichannelaudio.o dxr3sysclock.o dxr3colormanager.o dxr3syncbuffer.o dxr3audiodecoder.o \