r8680 - in /vdr/vdr-plugin-image/trunk/debian: changelog patches/00list patches/02_ffmpeg-20100426.dpatch

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

Author: tom-guest
Date: Wed Jun  9 00:19:16 2010
New Revision: 8680

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=8680
Log:
Added 02_ffmpeg-20100426.dpatch

Added:
    vdr/vdr-plugin-image/trunk/debian/patches/02_ffmpeg-20100426.dpatch
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=8680&op=diff
==============================================================================
--- vdr/vdr-plugin-image/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-image/trunk/debian/changelog Wed Jun  9 00:19:16 2010
@@ -1,3 +1,9 @@
+vdr-plugin-image (0.3.0-6) experimental; urgency=low
+
+  * Added 02_ffmpeg-20100426.dpatch
+
+ -- Thomas Günther <tom at toms-cafe.de>  Wed, 09 Jun 2010 01:56:54 +0200
+
 vdr-plugin-image (0.3.0-5) experimental; urgency=low
 
   * Added 01_fix-PLUGIN-definition.dpatch

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=8680&op=diff
==============================================================================
--- vdr/vdr-plugin-image/trunk/debian/patches/00list (original)
+++ vdr/vdr-plugin-image/trunk/debian/patches/00list Wed Jun  9 00:19:16 2010
@@ -1,1 +1,2 @@
 01_fix-PLUGIN-definition
+02_ffmpeg-20100426

Added: vdr/vdr-plugin-image/trunk/debian/patches/02_ffmpeg-20100426.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-image/trunk/debian/patches/02_ffmpeg-20100426.dpatch?rev=8680&op=file
==============================================================================
--- vdr/vdr-plugin-image/trunk/debian/patches/02_ffmpeg-20100426.dpatch (added)
+++ vdr/vdr-plugin-image/trunk/debian/patches/02_ffmpeg-20100426.dpatch Wed Jun  9 00:19:16 2010
@@ -1,0 +1,27 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_ffmpeg-20100426.dpatch by Thomas Günther <tom at toms-cafe.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Adapt to newer ffmpeg versions.
+
+ at DPATCH@
+--- ./liboutput/Makefile
++++ ./liboutput/Makefile
+@@ -44,6 +44,7 @@
+ endif
+ 
+ DEFINES  += -D_GNU_SOURCE
++DEFINES  += -D__STDC_CONSTANT_MACROS
+ 
+ ifdef PKG-INCLUDES
+ INCLUDES += $(shell $(PKG-CONFIG) --cflags $(PKG-INCLUDES))
+--- ./Makefile
++++ ./Makefile
+@@ -75,6 +75,7 @@
+ 
+ DEFINES  += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+ DEFINES  += -D_GNU_SOURCE
++DEFINES  += -D__STDC_CONSTANT_MACROS
+ LIBS += liboutput/liboutput.a libimage/libimage.a
+ 
+ INCLUDES += -I$(VDRDIR)/include -I.