[SCM] blender/master: debian/patches : fixup ffmpeg compat patch

kiniou-guest at users.alioth.debian.org kiniou-guest at users.alioth.debian.org
Mon Jan 2 18:59:33 UTC 2012


The following commit has been merged in the master branch:
commit 72d8f01c6b0637c307f92aec1600d2ba79b79ba2
Author: Kevin Roy <kiniou at gmail.com>
Date:   Mon Jan 2 19:48:25 2012 +0100

    debian/patches : fixup ffmpeg compat patch
    
    Bumped libavformat minor version check from 3 to 4

diff --git a/debian/patches/0009-fix_FTBFS_with_ffmpeg_debian.patch b/debian/patches/0009-fix_FTBFS_with_ffmpeg_debian.patch
index f42dee0..1c23b26 100644
--- a/debian/patches/0009-fix_FTBFS_with_ffmpeg_debian.patch
+++ b/debian/patches/0009-fix_FTBFS_with_ffmpeg_debian.patch
@@ -22,7 +22,7 @@ index dfdad22..5259f69 100644
  #define FFMPEG_HAVE_AVIO 1
  #endif
  
-+#if (LIBAVFORMAT_VERSION_MAJOR < 53) || ((LIBAVFORMAT_VERSION_MAJOR == 53) && (LIBAVFORMAT_VERSION_MINOR < 3))
++#if (LIBAVFORMAT_VERSION_MAJOR < 53) || ((LIBAVFORMAT_VERSION_MAJOR == 53) && (LIBAVFORMAT_VERSION_MINOR < 4))
 +/* XXX The last check above should be (LIBAVFORMAT_VERSION_MINOR < 2),
 + * look at http://patches.libav.org/patch/3333/ but ffmpeg in Debian is
 + * strange: 53.2.0 should have avformat_alloc_output_context2() but it does

-- 
blender packaging



More information about the pkg-multimedia-commits mailing list