[Pkg-cli-libs-commits] [taoframework] 87/91: Refreshed dllmap patches

[Jo Shields]

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

directhex pushed a commit to branch master
in repository taoframework.

commit 417b269941923222790e4cbd2e50811811d80d68
Author: Jo Shields <directhex at apebox.org>
Date:   Mon Sep 22 08:19:29 2014 +0000

    Refreshed dllmap patches
---
 debian/patches/200_libavcodec_update.diff | 16 ++++++++--------
 debian/patches/200_libavformat_update     | 16 ++++++++--------
 debian/patches/200_libavutil_update.diff  | 16 ++++++++--------
 debian/patches/200_libswscale_update      | 12 ++++++------
 4 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/debian/patches/200_libavcodec_update.diff b/debian/patches/200_libavcodec_update.diff
index 2081515..d4c095e 100644
--- a/debian/patches/200_libavcodec_update.diff
+++ b/debian/patches/200_libavcodec_update.diff
@@ -3,11 +3,11 @@ Index: taoframework-2.1.svn20090801/src/Tao.FFmpeg/Tao.FFmpeg.dll.config
 --- taoframework-2.1.svn20090801.orig/src/Tao.FFmpeg/Tao.FFmpeg.dll.config	2009-08-01 14:21:36.000000000 +0100
 +++ taoframework-2.1.svn20090801/src/Tao.FFmpeg/Tao.FFmpeg.dll.config	2011-09-03 19:11:09.586279009 +0100
 @@ -1,7 +1,7 @@
- <configuration>
-     <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.53" />
- 
-     <dllmap dll="avformat-52.dll" os="windows" target="avformat-52.dll" />
-     <dllmap dll="avformat-52.dll" os="osx" target="libavformat.so.52" />
+ <configuration>
+     <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="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 0747121..7815025 100644
--- a/debian/patches/200_libavformat_update
+++ b/debian/patches/200_libavformat_update
@@ -3,11 +3,11 @@ Index: taoframework-2.1.svn20090801/src/Tao.FFmpeg/Tao.FFmpeg.dll.config
 --- taoframework-2.1.svn20090801.orig/src/Tao.FFmpeg/Tao.FFmpeg.dll.config	2011-09-03 19:16:13.234340805 +0100
 +++ taoframework-2.1.svn20090801/src/Tao.FFmpeg/Tao.FFmpeg.dll.config	2011-09-03 19:17:04.096341536 +0100
 @@ -5,7 +5,7 @@
- 
-     <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.53" />
- 
-     <dllmap dll="avutil-49.dll" os="windows" target="avutil-49.dll" />
-     <dllmap dll="avutil-49.dll" os="osx" target="libavutil.so.49" />
+ 
+     <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="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 3afb0a1..e8ac09c 100644
--- a/debian/patches/200_libavutil_update.diff
+++ b/debian/patches/200_libavutil_update.diff
@@ -6,11 +6,11 @@ Index: taoframework-2.1.svn20090801/src/Tao.FFmpeg/Tao.FFmpeg.dll.config
 --- taoframework-2.1.svn20090801.orig/src/Tao.FFmpeg/Tao.FFmpeg.dll.config	2011-04-01 21:59:32.752639376 +0100
 +++ taoframework-2.1.svn20090801/src/Tao.FFmpeg/Tao.FFmpeg.dll.config	2011-04-01 22:00:02.525729924 +0100
 @@ -9,7 +9,7 @@
- 
-     <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.51" />
- 
-     <dllmap dll="swscale-0.dll" os="windows" target="swscale-0.dll" />
-     <dllmap dll="swscale-0.dll" os="osx" target="libswscale.so.0" />
+ 
+     <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="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 d86bd6c..9fe092e 100644
--- a/debian/patches/200_libswscale_update
+++ b/debian/patches/200_libswscale_update
@@ -3,9 +3,9 @@ Index: taoframework-2.1.svn20090801/src/Tao.FFmpeg/Tao.FFmpeg.dll.config
 --- taoframework-2.1.svn20090801.orig/src/Tao.FFmpeg/Tao.FFmpeg.dll.config	2011-09-03 19:16:53.556755810 +0100
 +++ taoframework-2.1.svn20090801/src/Tao.FFmpeg/Tao.FFmpeg.dll.config	2011-09-03 19:16:58.652555514 +0100
 @@ -13,5 +13,5 @@
- 
-     <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.2" />
- </configuration>
+ 
+     <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" />
+ </configuration>

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