Author: baggins Date: Thu May 13 11:23:02 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 2
- fix problems with 'imread' and GraphicsMagick >= 1.3.8
https://www-old.cae.wisc.edu/pipermail/octave-maintainers/2010-January/014891.html
- S: GraphicsMagick (-libs is not enough for 'imread' to work properly in all
cases)
---- Files affected:
packages/octave:
octave.spec (1.119 -> 1.120) , octave-InitializeMagick.patch (NONE -> 1.1)
(NEW)
---- Diffs:
================================================================
Index: packages/octave/octave.spec
diff -u packages/octave/octave.spec:1.119 packages/octave/octave.spec:1.120
--- packages/octave/octave.spec:1.119 Wed Mar 10 16:46:35 2010
+++ packages/octave/octave.spec Thu May 13 13:22:57 2010
@@ -17,7 +17,7 @@
Summary(zh_CN.UTF-8): GNU Octave - 用于数字计算的高级语言。
Name: octave
Version: 3.2.4
-Release: 1
+Release: 2
Epoch: 2
License: GPL v3+
Group: Applications/Math
@@ -29,6 +29,7 @@
Patch2: %{name}-ncurses.patch
Patch3: %{name}-no-ftgl.patch
Patch4: %{name}-parallel-make.patch
+Patch5: %{name}-InitializeMagick.patch
URL: http://www.octave.org/
BuildRequires: AMD-devel
BuildRequires: CAMD-devel
@@ -61,6 +62,7 @@
BuildRequires: zlib-devel
Requires(post,postun): /sbin/ldconfig
Requires: gnuplot
+Suggests: GraphicsMagick
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -282,6 +284,7 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
%build
RPM_BUILD_NR_THREADS="%(echo "%{__make}" | sed -e
's#.*-j\([[:space:]]*[0-9]\+\)#\1#g')"
@@ -391,6 +394,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.120 2010/05/13 11:22:57 baggins
+- rel 2
+- fix problems with 'imread' and GraphicsMagick >= 1.3.8
+
https://www-old.cae.wisc.edu/pipermail/octave-maintainers/2010-January/014891.html
+- S: GraphicsMagick (-libs is not enough for 'imread' to work properly in all
cases)
+
Revision 1.119 2010/03/10 15:46:35 baggins
- up to 3.2.4
================================================================
Index: packages/octave/octave-InitializeMagick.patch
diff -u /dev/null packages/octave/octave-InitializeMagick.patch:1.1
--- /dev/null Thu May 13 13:23:02 2010
+++ packages/octave/octave-InitializeMagick.patch Thu May 13 13:22:57 2010
@@ -0,0 +1,28 @@
+--- octave-3.2.4/src/DLD-FUNCTIONS/__magick_read__.cc 2009-08-25
10:26:01.000000000 +0200
++++ octave-3.3.51/src/DLD-FUNCTIONS/__magick_read__.cc 2010-03-03
18:49:00.000000000 +0100
+@@ -27,6 +28,7 @@
+
+ #include <cmath>
+
++#include "oct-env.h"
+ #include "defun-dld.h"
+ #include "error.h"
+ #include "ov-struct.h"
+@@ -358,6 +384,17 @@
+
+ #ifdef HAVE_MAGICK
+
++ static bool initialized = false;
++
++ if (! initialized)
++ {
++ std::string program_name = octave_env::get_program_invocation_name ();
++
++ Magick::InitializeMagick (program_name.c_str ());
++
++ initialized = true;
++ }
++
+ if (args.length () > 2 || args.length () < 1 || ! args(0).is_string ()
+ || nargout > 3)
+ {
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/octave/octave.spec?r1=1.119&r2=1.120&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
