[SCM] blender/master: Updated patch 0009 to fix FTBFS

mfv-guest at users.alioth.debian.org mfv-guest at users.alioth.debian.org
Tue Jan 24 10:09:05 UTC 2012


The following commit has been merged in the master branch:
commit 8fe06db59cf76b3023e397f0abc551f6dcf220b2
Author: Matteo F. Vescovi <mfv.debian at gmail.com>
Date:   Sat Jan 21 15:36:50 2012 +0100

    Updated patch 0009 to fix FTBFS
    
    Thanks: Thomas Preud'homme

diff --git a/debian/patches/0009-fix_FTBFS_with_ffmpeg_debian.patch b/debian/patches/0009-fix_FTBFS_with_ffmpeg_debian.patch
index 1c23b26..acfa75c 100644
--- a/debian/patches/0009-fix_FTBFS_with_ffmpeg_debian.patch
+++ b/debian/patches/0009-fix_FTBFS_with_ffmpeg_debian.patch
@@ -1,4 +1,4 @@
-From 63b4c577c951245904fd59ac8c6021bab18b0de4 Mon Sep 17 00:00:00 2001
+>From 63b4c577c951245904fd59ac8c6021bab18b0de4 Mon Sep 17 00:00:00 2001
 From: Antonio Ospite <ospite at studenti.unina.it>
 Date: Sat, 17 Dec 2011 15:45:16 +0100
 Subject: [PATCH] Make blender compile with FFmpeg from Debian.
@@ -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 < 4))
++#if (LIBAVFORMAT_VERSION_MAJOR < 53) || ((LIBAVFORMAT_VERSION_MAJOR == 53) && (LIBAVFORMAT_VERSION_MINOR < 21))
 +/* 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