- updated Magick patch to compile with ImageMagick 5.2.9

Changed files:
    ClanLib-Magick.patch -> 1.2
    ClanLib.spec -> 1.41

diff --git a/ClanLib-Magick.patch b/ClanLib-Magick.patch
index d20708f460bb26c2aa1b795e45115964827bfc69..1739d9af39b33776fb47a61c7703366b73665e78 100644 (file)
--- a/ClanLib-Magick.patch
+++ b/ClanLib-Magick.patch
@@ -1,12 +1,20 @@
-
-This patch makes ClanLib-0.4.3 compile with ImageMagick-5.1.1
-I know it probably could be done i one ImageMagick call, but I don't know what
-the code was ment to do.
-
-diff -durN ClanLib-0.4.3.orig/Sources/Magick/provider_magick.cpp ClanLib-0.4.3/Sources/Magick/provider_magick.cpp
+diff -Nur ClanLib-0.4.3.orig/Sources/Magick/provider_magick.cpp ClanLib-0.4.3/Sources/Magick/provider_magick.cpp
 --- ClanLib-0.4.3.orig/Sources/Magick/provider_magick.cpp      Mon Mar 13 18:12:50 2000
-+++ ClanLib-0.4.3/Sources/Magick/provider_magick.cpp   Wed Apr 19 10:04:12 2000
-@@ -138,12 +138,9 @@
++++ ClanLib-0.4.3/Sources/Magick/provider_magick.cpp   Fri Mar 16 22:31:13 2001
+@@ -126,10 +126,11 @@
+ {
+       Image *image;
+       ImageInfo image_info;
++      ExceptionInfo exception_info;
+ 
+       GetImageInfo(&image_info);
+       strcpy(image_info.filename, name.c_str());
+-      image = ReadImage(&image_info);
++      image = ReadImage(&image_info, &exception_info);
+ //            if (!image)
+ //                    throw CL_Error("error while trying to open file with the Magick provider");
+       cl_assert(image);
+@@ -138,12 +139,9 @@
        height = image->rows;
        pitch = width * get_bytes_per_pixel();
        
@@ -17,11 +25,11 @@ diff -durN ClanLib-0.4.3.orig/Sources/Magick/provider_magick.cpp ClanLib-0.4.3/S
 +      float *rgbadata = new float[width*height*4];
        
 -      GetPixels(image, rdata, gdata, bdata, adata);
-+      GetPixels(image, 0,0,width,height,"RGBA",FloatPixel,rgbadata);
++      DispatchImage(image, 0,0,width,height,"RGBA",FloatPixel,rgbadata);
        DestroyImage(image);
        
        // here comes the tricky part ... hmhmhm... Quicky Mart
-@@ -186,10 +183,10 @@
+@@ -186,10 +184,10 @@
        for (int y=0; y<height; y++)
                for (int x=0; x<width; x++)
                {
@@ -36,7 +44,7 @@ diff -durN ClanLib-0.4.3.orig/Sources/Magick/provider_magick.cpp ClanLib-0.4.3/S
  
                        switch (get_bytes_per_pixel())
                        {
-@@ -212,10 +209,7 @@
+@@ -212,10 +210,7 @@
                        }
                }
  

diff --git a/ClanLib.spec b/ClanLib.spec
index d1317ab547ba85fa20ecb9a0fa691398779a3aaa..37788383addc6b1fb9ed46bcc8fc2bf8d069e379 100644 (file)
--- a/ClanLib.spec
+++ b/ClanLib.spec
@@ -12,16 +12,14 @@ Patch0:             %{name}-OPT.patch
 Patch1:                %{name}-Magick.patch
 URL:           http://clanlib.org
 Requires:      Hermes >= 1.3.1
-BuildRequires: libpng >= 1.0.8
-BuildRequires: zlib-devel
+BuildRequires: libpng-devel >= 1.0.8
 BuildRequires: Hermes-devel >= 1.3.1
 BuildRequires: libstdc++-devel
 BuildRequires: XFree86-devel
 BuildRequires: svgalib-devel
 BuildRequires: OpenGL-devel
-BuildRequires: ImageMagick-devel >= 5.1.1
+BuildRequires: ImageMagick-devel >= 5.2.9
 BuildRequires: libmikmod-devel
-BuildRequires: libpng >= 1.0.8
 BuildRequires: perl
 BuildRequires: libggi-devel
 BuildRequires: libgii-devel
@@ -98,8 +96,8 @@ Requires:     %{name} = %{version}
 This is the GGI target for ClanLib.
 
 %description -l pl GGI
-
 Obs³uga OpenGL dla ClanLib-a.
+
 %package X11
 Summary:       X11 target for ClanLib
 Summary(pl):   obs³uga X11 dla ClanLib
@@ -139,10 +137,10 @@ Group(pl):        Programowanie/Biblioteki
 Requires:      %{name} = %{version}
 
 %description MikMod
-MikMod module for ClanLib
+MikMod module for ClanLib.
 
 %description -l pl MikMod
-Modu³ Mikmod dla ClanLib
+Modu³ Mikmod dla ClanLib-a.
 
 %package static
 Summary:       ClanLib development package
@@ -158,7 +156,7 @@ needed to compile new ClanLib applications.
 
 %description -l pl static
 Programistyczne dodatki do ClanLib-a, zawieraj± pliki nag³ówkowe
-potrzebne do kompilacji programów korzystaj±cych z CleanLib.
+potrzebne do kompilacji programów korzystaj±cych z ClanLib.
 
 %prep
 %setup -q