[SCM] ffmpeg/master.snapshot: remove 0004-cpp-hack.patch

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Mon Nov 1 11:02:13 UTC 2010


The following commit has been merged in the master.snapshot branch:
commit 2ff21d64e0bc44fc051825d383ec485b88d07c8f
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Nov 1 09:16:58 2010 +0100

    remove 0004-cpp-hack.patch
    
    experiment didn't work out, applications still need to be patched

diff --git a/debian/patches/0004-cpp-hack.patch b/debian/patches/0004-cpp-hack.patch
deleted file mode 100644
index 92c28f9..0000000
--- a/debian/patches/0004-cpp-hack.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Reinhard Tartler <siretart at tauware.de>
-Subject: [PATCH] unbreak c++ applications naively including FFmpeg headers
-
-UINT64_C and similar aren't standard in C++ unless this macro is
-defined, and ffmpeg headers require it)
-
---- a/libavutil/avutil.h
-+++ b/libavutil/avutil.h
-@@ -78,6 +78,11 @@ enum AVMediaType {
-     AVMEDIA_TYPE_NB
- };
- 
-+/* Debian specific hack to unbreak c++ applications naively including FFmpeg headers */
-+#ifdef __cplusplus
-+#define __STDC_CONSTANT_MACROS
-+#endif
-+
- #include "common.h"
- #include "error.h"
- #include "mathematics.h"
diff --git a/debian/patches/series b/debian/patches/series
index 5576601..3949993 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 0002-Tweak-doxygen-config.patch
-0004-cpp-hack.patch

-- 
FFmpeg packaging



More information about the pkg-multimedia-commits mailing list