[SCM] ffmpeg/master: remove patch disable-configuration-warning.patch

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Tue Apr 19 11:37:13 UTC 2011


The following commit has been merged in the master branch:
commit b3890b5b1c901fe0251762b7ae1ec6accc922ff6
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Apr 19 13:27:04 2011 +0200

    remove patch disable-configuration-warning.patch
    
    patch needs to be adapted/rewritten for 0.7

diff --git a/debian/patches/disable-configuration-warning.patch b/debian/patches/disable-configuration-warning.patch
deleted file mode 100644
index a7e5cbc..0000000
--- a/debian/patches/disable-configuration-warning.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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 c32050a..3949993 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 0002-Tweak-doxygen-config.patch
-disable-configuration-warning.patch

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list