[SCM] ffms2/master: add upstream patches for ftbfs with gcc and ffmpeg-trunk

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

The following commit has been merged in the master branch:
commit 783cd12473748434e9ddcba89a9944154ad66e66
Author: Rico Tzschichholz <ricotz at t-online.de>
Date:   Fri Feb 18 09:07:41 2011 +0100

    add upstream patches for ftbfs with gcc and ffmpeg-trunk

diff --git a/debian/changelog b/debian/changelog
index 9a7f3c2..3ee6bce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,11 @@ ffms2 (2.15-1) UNRELEASED; urgency=low
   * debian/patches:
     + drop UINT64_C-buildfix.patch is upstream
     + fix and refresh symbol-visibility.patch
+    + add 10_fix_GCC_build.diff,
+      add 11_fix_build_with_ffmpeg_tunk.diff
+      - both can be dropped with next upstream
 
- -- Rico Tzschichholz <ricotz at ubuntu.com>  Fri, 18 Feb 2011 09:00:46 +0100
+ -- Rico Tzschichholz <ricotz at ubuntu.com>  Fri, 18 Feb 2011 09:03:46 +0100
 
 ffms2 (2.13-2) experimental; urgency=low
 
diff --git a/debian/patches/10_fix_GCC_build.diff b/debian/patches/10_fix_GCC_build.diff
new file mode 100644
index 0000000..f8a1283
--- /dev/null
+++ b/debian/patches/10_fix_GCC_build.diff
@@ -0,0 +1,13 @@
+Index: ffms2/src/core/utils.cpp
+===================================================================
+--- ffms2.orig/src/core/utils.cpp
++++ ffms2/src/core/utils.cpp
+@@ -230,7 +230,7 @@
+ template<class T> static void safe_aligned_reallocz(T *&ptr, size_t old_size, size_t new_size) {
+ 	void *newalloc = av_mallocz(new_size);
+ 	if (newalloc) {
+-		memcpy(newalloc, ptr, min(old_size, new_size));
++		memcpy(newalloc, ptr, FFMIN(old_size, new_size));
+ 	}
+ 	av_free(ptr);
+ 	ptr = static_cast<T*>(newalloc);
diff --git a/debian/patches/11_fix_build_with_ffmpeg_tunk.diff b/debian/patches/11_fix_build_with_ffmpeg_tunk.diff
new file mode 100644
index 0000000..76c9d4e
--- /dev/null
+++ b/debian/patches/11_fix_build_with_ffmpeg_tunk.diff
@@ -0,0 +1,32 @@
+Index: ffms2/src/config/libs.cpp
+===================================================================
+--- ffms2.orig/src/config/libs.cpp
++++ ffms2/src/config/libs.cpp
+@@ -20,6 +20,10 @@
+ 
+ #include "msvc-config.h"
+ 
++extern "C" {
++#include <libavutil/avutil.h>
++}
++
+ // someone claimed that the borland c++ compiler defines _MSC_VER too,
+ // but nobody cares about borland so let them suffer
+ #ifdef _MSC_VER
+@@ -30,13 +34,15 @@
+ #pragma comment(lib, "libmoldname.a")
+ #pragma comment(lib, "libmingwex.a")
+ #pragma comment(lib, "libz.a")
+-#pragma comment(lib, "libavcore.a")
+ #pragma comment(lib, "libavutil.a")
+ #pragma comment(lib, "libavcodec.a")
+ #pragma comment(lib, "libavformat.a")
+ #pragma comment(lib, "libswscale.a")
+ #pragma comment(lib, "libwsock32.a")
+ 
++#if (LIBAVUTIL_VERSION_INT) < (AV_VERSION_INT(50,38,0))
++#	pragma comment(lib, "libavcore.a")
++#endif
+ 
+ #if defined(WITH_LIBPOSTPROC) && defined(FFMS_USE_POSTPROC)
+ #pragma comment(lib, "libpostproc.a")
diff --git a/debian/patches/series b/debian/patches/series
index 63c767a..89bf4d8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
+10_fix_GCC_build.diff
+11_fix_build_with_ffmpeg_tunk.diff
 symbol-visibility.patch

-- 
ffms2 packaging