[SCM] ffmpeg/master: Disable warning about library configuration mismatch

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Tue Mar 29 21:10:32 UTC 2011


The following commit has been merged in the master branch:
commit c8d70325672d5ff188a7f0cf27a92c626f83e0e2
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Mar 29 22:54:34 2011 +0200

    Disable warning about library configuration mismatch

diff --git a/debian/patches/disable-configuration-warning.patch b/debian/patches/disable-configuration-warning.patch
new file mode 100644
index 0000000..a7e5cbc
--- /dev/null
+++ b/debian/patches/disable-configuration-warning.patch
@@ -0,0 +1,24 @@
+From: Reinhard Tartler <siretart at tauware.de>
+Bugs-Debian: http://bugs.debian.org/619530
+Forwarded: not-needed
+Description: Disable warning about library configuration mismatch
+ Since Debian ships differently configured libraries in the same package,
+ this warning happens in many typical configurations all the time. See
+ the Debian bugtrail for an example. 
+
+--- a/cmdutils.c
++++ b/cmdutils.c
+@@ -323,13 +323,7 @@ static void print_all_lib_versions(FILE*
+ 
+ static void maybe_print_config(const char *lib, const char *cfg)
+ {
+-    static int warned_cfg;
+-
+     if (strcmp(FFMPEG_CONFIGURATION, cfg)) {
+-        if (!warned_cfg) {
+-            fprintf(stderr, "  WARNING: library configuration mismatch\n");
+-            warned_cfg = 1;
+-        }
+         fprintf(stderr, "  %-11s configuration: %s\n", lib, cfg);
+     }
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 3949993..c32050a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0002-Tweak-doxygen-config.patch
+disable-configuration-warning.patch

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list