components/imagemagick/patches/la.patch
changeset 1255 b7b09f9348b7
parent 168 5884bc1edfdf
child 3798 c0f7a9f723ca
child 6072 a1b208a8235a
--- a/components/imagemagick/patches/la.patch	Tue Apr 09 15:40:14 2013 -0700
+++ b/components/imagemagick/patches/la.patch	Tue Apr 09 22:03:20 2013 -0700
@@ -1,53 +1,33 @@
-*** ImageMagick-6.3.4/magick/module.c.orig	Thu Apr 12 20:00:07 2007
---- ImageMagick-6.3.4/magick/module.c	Thu Apr 12 20:00:45 2007
-***************
-*** 71,77 ****
-    Define declarations.
-  */
-  #if defined(HasLTDL)
-! #  define ModuleGlobExpression "*.la"
-  #else
-  #  if defined(_DEBUG)
-  #    define ModuleGlobExpression "IM_MOD_DB_*.dll"
---- 71,77 ----
-    Define declarations.
-  */
-  #if defined(HasLTDL)
-! #  define ModuleGlobExpression "*.so"
-  #else
-  #  if defined(_DEBUG)
-  #    define ModuleGlobExpression "IM_MOD_DB_*.dll"
-***************
-*** 1271,1277 ****
-    (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",tag);
-    assert(name != (char *) NULL);
-  #if defined(HasLTDL)
-!   (void) FormatMagickString(name,MaxTextExtent,"%s.la",tag);
-    (void) LocaleLower(name);
-  #else
-  #if defined(__WINDOWS__)
---- 1271,1277 ----
-    (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",tag);
-    assert(name != (char *) NULL);
-  #if defined(HasLTDL)
-!   (void) FormatMagickString(name,MaxTextExtent,"%s.so",tag);
-    (void) LocaleLower(name);
-  #else
-  #if defined(__WINDOWS__)
-***************
-*** 1322,1328 ****
-  #if !defined(HasLTDL)
-    (void) FormatMagickString(name,MaxTextExtent,"%s.dll",tag);
-  #else
-!   (void) FormatMagickString(name,MaxTextExtent,"%s.la",tag);
-    (void) LocaleLower(name);
-  #endif
-  }
---- 1322,1328 ----
-  #if !defined(HasLTDL)
-    (void) FormatMagickString(name,MaxTextExtent,"%s.dll",tag);
-  #else
-!   (void) FormatMagickString(name,MaxTextExtent,"%s.so",tag);
-    (void) LocaleLower(name);
-  #endif
-  }
+To avoid dependency on libtool/libltdl, change "*.la" extension
+to "*.so"
+-----------------------------------------------------------------
+
+--- ImageMagick-6.7.8/magick/module.c	Sun Dec 18 17:54:26 2011
++++ ImageMagick-6.7.8/magick/module.c	Thu Oct  4 00:00:46 2012
+@@ -72,7 +72,7 @@
+   Define declarations.
+ */
+ #if defined(MAGICKCORE_LTDL_DELEGATE)
+-#  define ModuleGlobExpression "*.la"
++#  define ModuleGlobExpression "*.so"
+ #else
+ #  if defined(_DEBUG)
+ #    define ModuleGlobExpression "IM_MOD_DB_*.dll"
+@@ -1454,7 +1454,7 @@
+   (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",tag);
+   assert(name != (char *) NULL);
+ #if defined(MAGICKCORE_LTDL_DELEGATE)
+-  (void) FormatLocaleString(name,MaxTextExtent,"%s.la",tag);
++  (void) FormatLocaleString(name,MaxTextExtent,"%s.so",tag);
+   (void) LocaleLower(name);
+ #else
+ #if defined(MAGICKCORE_WINDOWS_SUPPORT)
+@@ -1505,7 +1505,7 @@
+ #if !defined(MAGICKCORE_LTDL_DELEGATE)
+   (void) FormatLocaleString(name,MaxTextExtent,"%s.dll",tag);
+ #else
+-  (void) FormatLocaleString(name,MaxTextExtent,"%s.la",tag);
++  (void) FormatLocaleString(name,MaxTextExtent,"%s.so",tag);
+ #endif
+ }
+