[SCM] videotrans/master: debian/patches/04-update_imagemagick.patch

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 38150ed30538ba1cf248a75a14438216852533a0
Author: Alessio Treglia <alessio.treglia at smartodds.co.uk>
Date:   Tue Feb 24 11:02:47 2015 +0000

    debian/patches/04-update_imagemagick.patch
    
    - Update movie-title script to make it work with latest version of
      ImageMagick.

diff --git a/debian/patches/04-update_imagemagick.patch b/debian/patches/04-update_imagemagick.patch
new file mode 100644
index 0000000..9ab5c44
--- /dev/null
+++ b/debian/patches/04-update_imagemagick.patch
@@ -0,0 +1,30 @@
+Description: Refresh src/movie-title.in against ImageMagick's latest version.
+Origin: upstream
+From:
+ http://sourceforge.net/p/videotrans/bugs/18/
+ http://sourceforge.net/p/videotrans/bugs/17/
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=778866
+---
+ src/movie-title.in |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- videotrans.orig/src/movie-title.in
++++ videotrans/src/movie-title.in
+@@ -275,7 +275,7 @@ fi
+ # Find out how large the title images are and decide on a mode accordingly
+ ###############################################################################
+ 
+-identify -format "%w %h" "${TITLE}/${title_frames%% *}" > "${TEMP}"
++identify -format "%w %h\n" "${TITLE}/${title_frames%% *}" > "${TEMP}"
+ read xx yy < "${TEMP}"
+ rm -f "${TEMP}"
+ message "Title images are ${xx} by ${yy} pixels."
+@@ -679,7 +679,7 @@ done > "${TEMP}.convert"
+ 
+ # Create the overlay image using the commands that were generated above
+ 
+-convert -depth 8 -matte -colorspace Transparent -type PaletteMatte \
++convert -depth 8 -matte -colorspace Transparent \
+ 	"${datadir}/videotrans/null.png" \
+ 	-background "rgba(0,0,0,0)" -splice "`expr ${xx} - 1 || :`x`expr ${yy} - 1 || :`+0+0" \
+ 	-draw "@${TEMP}.convert" "${OUTPUT}-overlay.png"
diff --git a/debian/patches/series b/debian/patches/series
index c9e66a9..094aadc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01-fix_shebang.patch
 02-buildsystem.patch
 03-ffmpeg_to_avconv.patch
+04-update_imagemagick.patch

-- 
videotrans packaging