[Pkg-cli-libs-commits] [taoframework] 01/04: Fix FTBFS with ffmpeg

[Balint Reczey]

This is an automated email from the git hooks/post-receive script.

rbalint pushed a commit to branch master
in repository taoframework.

commit 77faba60fca3a0b778ee038906bdf46240258619
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Mon Aug 10 22:26:09 2015 +0200

    Fix FTBFS with ffmpeg
    
    Closes: #793015
---
 debian/control                            | 6 +++---
 debian/patches/200_libavcodec_update.diff | 2 +-
 debian/patches/200_libavformat_update     | 2 +-
 debian/patches/200_libavutil_update.diff  | 2 +-
 debian/patches/200_libswscale_update      | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/control b/debian/control
index 44ca692..54c45d9 100644
--- a/debian/control
+++ b/debian/control
@@ -9,8 +9,8 @@ Build-Depends: debhelper (>= 7.0.50~), quilt (>= 0.46-7~)
 Build-Depends-Indep: cli-common-dev (>= 0.4.4),
                      freeglut3-dev,
                      libalut-dev,
-                     libavcodec-dev (>= 5:3:0.svn20090303),
-                     libavformat-dev (>= 5:3:0.svn20090303),
+                     libavcodec-dev (>= 7:2.7.1),
+                     libavformat-dev (>= 7:2.7.1),
                      libdevil-dev,
                      libfreetype6-dev,
                      libftgl-dev,
@@ -28,7 +28,7 @@ Build-Depends-Indep: cli-common-dev (>= 0.4.4),
                      libsdl-ttf2.0-dev,
                      libsdl1.2-dev,
                      libsmpeg-dev,
-                     libswscale-dev,
+                     libswscale-dev (>= 7:2.7.1),
                      libx11-dev,
                      mono-devel (>= 2.4.3),
                      monodoc-base
diff --git a/debian/patches/200_libavcodec_update.diff b/debian/patches/200_libavcodec_update.diff
index 8789d11..13a2c51 100644
--- a/debian/patches/200_libavcodec_update.diff
+++ b/debian/patches/200_libavcodec_update.diff
@@ -7,7 +7,7 @@ Index: taoframework/src/Tao.FFmpeg/Tao.FFmpeg.dll.config
      <dllmap dll="avcodec-51.dll" os="windows" target="avcodec-51.dll" />
      <dllmap dll="avcodec-51.dll" os="osx" target="libavcodec.so.51" />
 -    <dllmap dll="avcodec-51.dll" os="!windows,osx" target="libavcodec.so.51" />
-+    <dllmap dll="avcodec-51.dll" os="!windows,osx" target="libavcodec.so.56" />
++    <dllmap dll="avcodec-51.dll" os="!windows,osx" target="libavcodec-ffmpeg.so.56" />
  
      <dllmap dll="avformat-52.dll" os="windows" target="avformat-52.dll" />
      <dllmap dll="avformat-52.dll" os="osx" target="libavformat.so.52" />
diff --git a/debian/patches/200_libavformat_update b/debian/patches/200_libavformat_update
index 6329beb..77067c6 100644
--- a/debian/patches/200_libavformat_update
+++ b/debian/patches/200_libavformat_update
@@ -7,7 +7,7 @@ Index: taoframework/src/Tao.FFmpeg/Tao.FFmpeg.dll.config
      <dllmap dll="avformat-52.dll" os="windows" target="avformat-52.dll" />
      <dllmap dll="avformat-52.dll" os="osx" target="libavformat.so.52" />
 -    <dllmap dll="avformat-52.dll" os="!windows,osx" target="libavformat.so.52" />
-+    <dllmap dll="avformat-52.dll" os="!windows,osx" target="libavformat.so.56" />
++    <dllmap dll="avformat-52.dll" os="!windows,osx" target="libavformat-ffmpeg.so.56" />
  
      <dllmap dll="avutil-49.dll" os="windows" target="avutil-49.dll" />
      <dllmap dll="avutil-49.dll" os="osx" target="libavutil.so.49" />
diff --git a/debian/patches/200_libavutil_update.diff b/debian/patches/200_libavutil_update.diff
index 1527835..7b897aa 100644
--- a/debian/patches/200_libavutil_update.diff
+++ b/debian/patches/200_libavutil_update.diff
@@ -10,7 +10,7 @@ Index: taoframework/src/Tao.FFmpeg/Tao.FFmpeg.dll.config
      <dllmap dll="avutil-49.dll" os="windows" target="avutil-49.dll" />
      <dllmap dll="avutil-49.dll" os="osx" target="libavutil.so.49" />
 -    <dllmap dll="avutil-49.dll" os="!windows,osx" target="libavutil.so.49" />
-+    <dllmap dll="avutil-49.dll" os="!windows,osx" target="libavutil.so.54" />
++    <dllmap dll="avutil-49.dll" os="!windows,osx" target="libavutil-ffmpeg.so.54" />
  
      <dllmap dll="swscale-0.dll" os="windows" target="swscale-0.dll" />
      <dllmap dll="swscale-0.dll" os="osx" target="libswscale.so.0" />
diff --git a/debian/patches/200_libswscale_update b/debian/patches/200_libswscale_update
index 25e4736..af5a531 100644
--- a/debian/patches/200_libswscale_update
+++ b/debian/patches/200_libswscale_update
@@ -7,5 +7,5 @@ Index: taoframework/src/Tao.FFmpeg/Tao.FFmpeg.dll.config
      <dllmap dll="swscale-0.dll" os="windows" target="swscale-0.dll" />
      <dllmap dll="swscale-0.dll" os="osx" target="libswscale.so.0" />
 -    <dllmap dll="swscale-0.dll" os="!windows,osx" target="libswscale.so.0" />
-+    <dllmap dll="swscale-0.dll" os="!windows,osx" target="libswscale.so.3" />
++    <dllmap dll="swscale-0.dll" os="!windows,osx" target="libswscale-ffmpeg.so.3" />
  </configuration>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-libs/packages/taoframework.git