[SCM] ffms2/master: update patch debian/patches/11_fix_build_with_ffmpeg_tunk.diff
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Fri Feb 18 21:28:58 UTC 2011
The following commit has been merged in the master branch:
commit c7676e3e46de14371c91be32653e0ec6a161cbfd
Author: Reinhard Tartler <siretart at tauware.de>
Date: Fri Feb 18 21:57:12 2011 +0100
update patch debian/patches/11_fix_build_with_ffmpeg_tunk.diff
avcore has been removed from trunk now
diff --git a/debian/patches/11_fix_build_with_ffmpeg_tunk.diff b/debian/patches/11_fix_build_with_ffmpeg_tunk.diff
index 76c9d4e..2136647 100644
--- a/debian/patches/11_fix_build_with_ffmpeg_tunk.diff
+++ b/debian/patches/11_fix_build_with_ffmpeg_tunk.diff
@@ -1,7 +1,5 @@
-Index: ffms2/src/config/libs.cpp
-===================================================================
---- ffms2.orig/src/config/libs.cpp
-+++ ffms2/src/config/libs.cpp
+--- a/src/config/libs.cpp
++++ b/src/config/libs.cpp
@@ -20,6 +20,10 @@
#include "msvc-config.h"
@@ -13,7 +11,7 @@ Index: ffms2/src/config/libs.cpp
// 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 @@
+@@ -30,7 +34,6 @@
#pragma comment(lib, "libmoldname.a")
#pragma comment(lib, "libmingwex.a")
#pragma comment(lib, "libz.a")
@@ -21,12 +19,3 @@ Index: ffms2/src/config/libs.cpp
#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")
--
ffms2 packaging
More information about the pkg-multimedia-commits
mailing list