r47076 - in /packages/cimg/trunk/debian/patches: 20_include_ltiffxx.patch 30_do_not_build_minc2_examples.patch use_pkg-config.patch

[tille at users.alioth.debian.org]

Author: tille
Date: Thu Jul  9 15:24:16 2015
New Revision: 47076

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=47076
Log:
Update patches for new version

Added:
    packages/cimg/trunk/debian/patches/use_pkg-config.patch
Modified:
    packages/cimg/trunk/debian/patches/20_include_ltiffxx.patch
    packages/cimg/trunk/debian/patches/30_do_not_build_minc2_examples.patch

Modified: packages/cimg/trunk/debian/patches/20_include_ltiffxx.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/cimg/trunk/debian/patches/20_include_ltiffxx.patch?rev=47076&op=diff
==============================================================================
--- packages/cimg/trunk/debian/patches/20_include_ltiffxx.patch	(original)
+++ packages/cimg/trunk/debian/patches/20_include_ltiffxx.patch	Thu Jul  9 15:24:16 2015
@@ -4,12 +4,12 @@
 
 --- a/examples/Makefile
 +++ b/examples/Makefile
-@@ -182,7 +182,7 @@ CIMG_JPEG_LDFLAGS = -ljpeg
+@@ -182,7 +182,7 @@ CIMG_JPEG_LIBS = -ljpeg
  # Flags to enable native support for TIFF image files, using the TIFF library.
  # ( http://www.libtiff.org/ )
  CIMG_TIFF_CFLAGS = -Dcimg_use_tiff
--CIMG_TIFF_LDFLAGS = -ltiff
-+CIMG_TIFF_LDFLAGS = -ltiff -ltiffxx
+-CIMG_TIFF_LIBS = -ltiff
++CIMG_TIFF_LIBS = -ltiff -ltiffxx
  
  # Flags to enable native support for MINC2 image files, using the MINC2 library.
  # ( http://en.wikibooks.org/wiki/MINC/Reference/MINC2.0_Users_Guide )

Modified: packages/cimg/trunk/debian/patches/30_do_not_build_minc2_examples.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/cimg/trunk/debian/patches/30_do_not_build_minc2_examples.patch?rev=47076&op=diff
==============================================================================
--- packages/cimg/trunk/debian/patches/30_do_not_build_minc2_examples.patch	(original)
+++ packages/cimg/trunk/debian/patches/30_do_not_build_minc2_examples.patch	Thu Jul  9 15:24:16 2015
@@ -3,16 +3,17 @@
  There seems to be some change in parallel to cimg-dev 1.5 in minc library which leads to
    ../CImg.h:298:35: fatal error: minc_io_simple_volume.h: No such file or directory
  if this is not commented out
+
 --- a/examples/Makefile
 +++ b/examples/Makefile
-@@ -186,8 +186,8 @@ CIMG_TIFF_LDFLAGS = -ltiff -ltiffxx
+@@ -186,8 +186,8 @@ CIMG_TIFF_LIBS = -ltiff -ltiffxx
  
  # Flags to enable native support for MINC2 image files, using the MINC2 library.
  # ( http://en.wikibooks.org/wiki/MINC/Reference/MINC2.0_Users_Guide )
 -CIMG_MINC2_CFLAGS = -Dcimg_use_minc2 -I${HOME}/local/include
--CIMG_MINC2_LDFLAGS = -lminc_io -lvolume_io2 -lminc2 -lnetcdf -lhdf5 -lz -L${HOME}/local/lib
+-CIMG_MINC2_LIBS = -lminc_io -lvolume_io2 -lminc2 -lnetcdf -lhdf5 -lz -L${HOME}/local/lib
 +# CIMG_MINC2_CFLAGS = -Dcimg_use_minc2 -I${HOME}/local/include
-+# CIMG_MINC2_LDFLAGS = -lminc_io -lvolume_io2 -lminc2 -lnetcdf -lhdf5 -lz -L${HOME}/local/lib
++# CIMG_MINC2_LIBS = -lminc_io -lvolume_io2 -lminc2 -lnetcdf -lhdf5 -lz -L${HOME}/local/lib
  
  # Flags to enable native support for EXR image files, using the OpenEXR library.
  # ( http://www.openexr.com/ )

Added: packages/cimg/trunk/debian/patches/use_pkg-config.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/cimg/trunk/debian/patches/use_pkg-config.patch?rev=47076&op=file
==============================================================================
--- packages/cimg/trunk/debian/patches/use_pkg-config.patch	(added)
+++ packages/cimg/trunk/debian/patches/use_pkg-config.patch	Thu Jul  9 15:24:16 2015
@@ -0,0 +1,19 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Updated: Mon, 15 Sep 2014 17:16:57 +0200
+Bug-Debian: http://bugs.debian.org/761564
+Description: Newer imagemagick version does not supply Magick++-config
+ command any more but pkg-config can be used instead
+
+--- a/examples/Makefile
++++ b/examples/Makefile
+@@ -211,8 +211,8 @@ CIMG_CURL_LIBS = -lcurl
+ 
+ # Flags to enable native support of most classical image file formats, using the Magick++ library.
+ # ( http://www.imagemagick.org/Magick++/ )
+-CIMG_MAGICK_CFLAGS = -Dcimg_use_magick `Magick++-config --cppflags` `Magick++-config --cxxflags`
+-CIMG_MAGICK_LIBS = `Magick++-config --ldflags` `Magick++-config --libs`
++CIMG_MAGICK_CFLAGS = -Dcimg_use_magick `pkg-config --cflags Magick++`
++CIMG_MAGICK_LIBS = `pkg-config --libs Magick++`
+ 
+ # Flags to enable faster Discrete Fourier Transform computation, using the FFTW3 library
+ # ( http://www.fftw.org/ )