[patch] opendx-4.4.4-r4.patch

opendx-4.4.4-r4.patch (text/plain), 2.53 KB, created by Andrew Savchenko on 2013-03-31 18:59:38 UTC

diff -Naurd /usr/portage/sci-visualization/opendx/files/opendx-4.4.4-magick.patch /usr/local/portage/sci-visualization/opendx/files/opendx-4.4.4-magick.patch
--- /usr/portage/sci-visualization/opendx/files/opendx-4.4.4-magick.patch	2012-08-02 03:21:41.000000000 +0400
+++ /usr/local/portage/sci-visualization/opendx/files/opendx-4.4.4-magick.patch	2013-03-31 21:55:54.687182394 +0400
@@ -39,52 +39,3 @@
  #endif
      }
      return (OK);
---- dx-4.4.4.orig/configure.ac
-+++ dx-4.4.4/configure.ac
-@@ -799,7 +799,29 @@
- LIB_MAGICK=''
- if test "$with_magick" != 'no'
- then
--    AS_MESSAGE([checking for ImageMagick support ......])
-+    found=0
-+    static_lib="libGraphicsMagick.a"
-+    PKG_CHECK_MODULES(GraphicsMagick, GraphicsMagick, [found=1], [found=0])
-+    MAGICK_CFLAGS="$GraphicsMagick_CFLAGS"
-+    MAGICK_LIBS="$GraphicsMagick_LIBS"
-+    if test $found -eq 0
-+    then
-+        static_lib="libMagick.a"
-+        PKG_CHECK_MODULES(ImageMagick, ImageMagick, [found=1], [found=0])
-+        MAGICK_CFLAGS="$ImageMagick_CFLAGS"
-+        MAGICK_LIBS="$ImageMagick_LIBS"
-+    fi
-+    if test $found -eq 1
-+    then
-+	CFLAGS="$CFLAGS $MAGICK_CFLAGS"
-+dnl UNIQUIFY will remove duplicate library tokens leaving the last instance.
-+	AC_UTILS_UNIQUIFY([$LIBS $MAGICK_LIBS], LIBS)
-+	FMT_LIBS="$FMT_LIBS $static_lib"
-+	AC_DEFINE(HAVE_LIBMAGICK, 1, [Define to 1 if you have the ImageMagick libraries])
-+        have_magick='yes'
-+dnl legacy checks installations without pkg-config
-+    else
-+    AS_MESSAGE([checking for ImageMagick support (no pkg-config) ......])
-     AC_CHECK_PROG(HAVE_MC, Magick-config, yes, no)
- 
-     failed=0;
-@@ -866,6 +888,7 @@
-   fi
- fi
- fi
-+fi
- 
- AC_LANG([C++])
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[int a = true;]])],
---- dx-4.4.4.orig/src/exec/dxmods/Makefile.am
-+++ dx-4.4.4/src/exec/dxmods/Makefile.am
-@@ -113,4 +113,5 @@
- 	$(SOURCES6) \
- 	$(SOURCES7)
- 
-+libDXMODS_la_LIBADD = @MAGICK_LIBS@
- @LOCALMAKE@
diff -Naurd /usr/portage/sci-visualization/opendx/opendx-4.4.4-r4.ebuild /usr/local/portage/sci-visualization/opendx/opendx-4.4.4-r4.ebuild
--- /usr/portage/sci-visualization/opendx/opendx-4.4.4-r4.ebuild	2012-10-25 00:01:29.000000000 +0400
+++ /usr/local/portage/sci-visualization/opendx/opendx-4.4.4-r4.ebuild	2013-03-31 22:53:33.695452550 +0400
@@ -28,7 +28,7 @@
 	cdf? ( sci-libs/cdf )
 	netcdf? ( sci-libs/netcdf )
 	tiff? ( media-libs/tiff )
-	imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick ) )"
+	imagemagick? ( media-gfx/imagemagick )"
 
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"