[ImageMagick/f16] Patch delegates.xml for ffmpeg (bug #750383)
Orion Poplawski
orion at fedoraproject.org
Thu Nov 3 15:48:46 UTC 2011
commit 70ef81d90bee4842089bca4ce3adfa74949a084c
Author: Orion Poplawski <orion at cora.nwra.com>
Date: Thu Nov 3 09:48:41 2011 -0600
Patch delegates.xml for ffmpeg (bug #750383)
ImageMagick-delegates.patch | 13 +++++++++++++
ImageMagick.spec | 8 +++++++-
2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/ImageMagick-delegates.patch b/ImageMagick-delegates.patch
new file mode 100644
index 0000000..258c23d
--- /dev/null
+++ b/ImageMagick-delegates.patch
@@ -0,0 +1,13 @@
+Index: config/delegates.xml.in
+===================================================================
+--- config/delegates.xml.in (revision 4784)
++++ config/delegates.xml.in (working copy)
+@@ -80,7 +80,7 @@
+ <delegate decode="ilbm" command=""@ILBMDecodeDelegate@" "%i" > "%o""/>
+ <delegate decode="man" command=""@MANDelegate@" -man -Tps "%i" > "%o""/>
+ <delegate decode="mpeg:decode" command=""@MPEGDecodeDelegate@" -v -1 -vframes %S -i "%i" -vcodec pam -an -f rawvideo -y "%u.pam" 2> "%Z""/>
+- <delegate encode="mpeg:encode" stealth="True" command=""@MPEGEncodeDelegate@" -v -1 -mbd rd -trellis 2 -cmp 2 -subcmp 2 -g 300 -pass 1/2 -i "%M%%d.jpg" "%u.%m" 2> "%Z""/>
++ <delegate encode="mpeg:encode" stealth="True" command=""@MPEGEncodeDelegate@" -v -1 -mbd rd -trellis 2 -cmp 2 -subcmp 2 -g 300 -i "%M%%d.jpg" "%u.%m" 2> "%Z""/>
+ <delegate decode="sid" command=""@MrSIDDecodeDelegate@" -if sid -i "%i" -of tif -o "%o" > "%u""/>
+ <delegate decode="pcl:color" stealth="True" command=""@PCLDelegate@" -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 "-sDEVICE=@PCLColorDevice@" -dTextAlphaBits=%u -dGraphicsAlphaBits=%u "-r%s" %s "-sOutputFile=%s" "%s""/>
+ <delegate decode="pcl:cmyk" stealth="True" command=""@PCLDelegate@" -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 "-sDEVICE=@PCLCMYKDevice@" -dTextAlphaBits=%u -dGraphicsAlphaBits=%u "-r%s" %s "-sOutputFile=%s" "%s""/>
diff --git a/ImageMagick.spec b/ImageMagick.spec
index 2f27474..570c007 100644
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -3,13 +3,15 @@
Name: ImageMagick
Version: %{VER}.%{Patchlevel}
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: An X application for displaying and manipulating images
Group: Applications/Multimedia
License: ImageMagick
Url: http://www.imagemagick.org/
Source0: ftp://ftp.ImageMagick.org/pub/%{name}/%{name}-%{VER}-%{Patchlevel}.tar.xz
Patch1: ImageMagick-6.4.0-multilib.patch
+#Upstream patch for ffmpeg support
+Patch2: ImageMagick-delegates.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel
@@ -128,6 +130,7 @@ however.
%prep
%setup -q -n %{name}-%{VER}-%{Patchlevel}
%patch1 -p1 -b .multilib
+%patch2 -p0 -b .delegates
sed -i 's/libltdl.la/libltdl.so/g' configure
iconv -f ISO-8859-1 -t UTF-8 README.txt > README.txt.tmp
touch -r README.txt README.txt.tmp
@@ -303,6 +306,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Nov 2 2011 Orion Poplawski <orion at cora.nwra.com> - 6.7.0.10-4
+- Patch delegates.xml for ffmpeg (bug #750383)
+
* Thu Jul 21 2011 Petr Sabata <contyk at redhat.com> - 6.7.0.10-3
- Perl mass rebuild
More information about the scm-commits
mailing list