From: cristy Date: Tue, 13 Sep 2011 12:17:53 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~7011 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3412d85bf0868740807e8dd5ec635f64c19bd973;p=imagemagick --- diff --git a/ImageMagick.spec b/ImageMagick.spec index c7920c8f3..27095f569 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -252,8 +252,8 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc QuickStart.txt ChangeLog Platforms.txt %doc README.txt LICENSE NOTICE AUTHORS.txt NEWS.txt -%{_libdir}/libMagickCore.so.4* -%{_libdir}/libMagickWand.so.4* +%{_libdir}/libMagickCore.so* +%{_libdir}/libMagickWand.so* %{_bindir}/[a-z]* %{_sysconfdir}/%{name} %{_libdir}/%{name}-%{VERSION} @@ -266,21 +266,16 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root,-) %{_bindir}/MagickCore-config -%{_bindir}/Magick-config %{_bindir}/MagickWand-config -%{_bindir}/Wand-config -%{_libdir}/libMagickCore.so -%{_libdir}/libMagickWand.so +%{_libdir}/libMagickCore.so* +%{_libdir}/libMagickWand.so* %{_libdir}/pkgconfig/MagickCore.pc %{_libdir}/pkgconfig/ImageMagick.pc %{_libdir}/pkgconfig/MagickWand.pc -%{_libdir}/pkgconfig/Wand.pc %dir %{_includedir}/%{name} -%{_includedir}/%{name}/magick -%{_includedir}/%{name}/wand -%{_mandir}/man1/Magick-config.* +%{_includedir}/%{name}/MagickCore +%{_includedir}/%{name}/MagickWand %{_mandir}/man1/MagickCore-config.* -%{_mandir}/man1/Wand-config.* %{_mandir}/man1/MagickWand-config.* %files djvu @@ -296,7 +291,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc Magick++/AUTHORS Magick++/ChangeLog Magick++/NEWS Magick++/README %doc www/Magick++/COPYING -%{_libdir}/libMagick++.so.4* +%{_libdir}/libMagick++.so* %files c++-devel %defattr(-,root,root,-) @@ -304,7 +299,7 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/Magick++-config %{_includedir}/%{name}/Magick++ %{_includedir}/%{name}/Magick++.h -%{_libdir}/libMagick++.so +%{_libdir}/libMagick++.so* %{_libdir}/pkgconfig/Magick++.pc %{_libdir}/pkgconfig/ImageMagick++.pc %{_mandir}/man1/Magick++-config.* diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h index 7de73722a..2726a74e3 100644 --- a/MagickCore/magick-config.h +++ b/MagickCore/magick-config.h @@ -12,9 +12,7 @@ /* #undef AUTOTRACE_DELEGATE */ /* Define if coders and filters are to be built as modules. */ -#ifndef MAGICKCORE_BUILD_MODULES -#define MAGICKCORE_BUILD_MODULES 1 -#endif +/* #undef BUILD_MODULES */ /* Define if you have the bzip2 library */ #ifndef MAGICKCORE_BZLIB_DELEGATE @@ -80,9 +78,7 @@ #endif /* Define if you have FFTW library */ -#ifndef MAGICKCORE_FFTW_DELEGATE -#define MAGICKCORE_FFTW_DELEGATE 1 -#endif +/* #undef FFTW_DELEGATE */ /* Location of filter modules */ #ifndef MAGICKCORE_FILTER_PATH @@ -224,9 +220,7 @@ #endif /* Define to 1 if you have the header file. */ -#ifndef MAGICKCORE_HAVE_CL_CL_H -#define MAGICKCORE_HAVE_CL_CL_H 1 -#endif +/* #undef HAVE_CL_CL_H */ /* Define to 1 if you have the header file. */ #ifndef MAGICKCORE_HAVE_COMPLEX_H @@ -438,15 +432,15 @@ #endif /* Define if you have the header file. */ -/* #undef HAVE_LCMS2_H */ +#ifndef MAGICKCORE_HAVE_LCMS2_H +#define MAGICKCORE_HAVE_LCMS2_H 1 +#endif /* Define if you have the header file. */ /* #undef HAVE_LCMS2_LCMS2_H */ /* Define if you have the header file. */ -#ifndef MAGICKCORE_HAVE_LCMS_H -#define MAGICKCORE_HAVE_LCMS_H 1 -#endif +/* #undef HAVE_LCMS_H */ /* Define if you have the header file. */ /* #undef HAVE_LCMS_LCMS_H */ @@ -1169,9 +1163,7 @@ #endif /* Define if you have JBIG library */ -#ifndef MAGICKCORE_JBIG_DELEGATE -#define MAGICKCORE_JBIG_DELEGATE 1 -#endif +/* #undef JBIG_DELEGATE */ /* Define if you have JPEG version 2 "Jasper" library */ #ifndef MAGICKCORE_JP2_DELEGATE @@ -1200,9 +1192,7 @@ #endif /* Define if you have LQR library */ -#ifndef MAGICKCORE_LQR_DELEGATE -#define MAGICKCORE_LQR_DELEGATE 1 -#endif +/* #undef LQR_DELEGATE */ /* Define if using libltdl to support dynamically loadable modules */ #ifndef MAGICKCORE_LTDL_DELEGATE @@ -1214,7 +1204,7 @@ /* Define to the system default library search path. */ #ifndef MAGICKCORE_LT_DLSEARCH_PATH -#define MAGICKCORE_LT_DLSEARCH_PATH "/lib64:/usr/lib64:/lib:/usr/lib:/usr/lib64/R/lib:/usr/lib64/atlas:/opt/modules/pkg/intel/f77/10.0.025/lib:/usr/lib64/llvm:/usr/local/lib:/usr/lib64/mysql:/usr/lib64/nvidia:/usr/lib64/qt-3.3/lib:/usr/lib64/xulrunner-2" +#define MAGICKCORE_LT_DLSEARCH_PATH "/lib64:/usr/lib64:/lib:/usr/lib:/usr/lib64/atlas:/usr/lib/llvm:/usr/lib64/llvm:/usr/lib64/mysql:/usr/lib64/qt-3.3/lib:/usr/lib64/tcl8.5/tclx8.4:/usr/lib64/tcl8.5:/usr/lib/wine/:/usr/lib64/wine/:/usr/lib64/xulrunner-2" #endif /* The archive extension */ @@ -1265,9 +1255,7 @@ /* #undef NO_MINUS_C_MINUS_O */ /* Define if you have OPENEXR library */ -#ifndef MAGICKCORE_OPENEXR_DELEGATE -#define MAGICKCORE_OPENEXR_DELEGATE 1 -#endif +/* #undef OPENEXR_DELEGATE */ /* Define to the address where bug reports for this package should be sent. */ #ifndef MAGICKCORE_PACKAGE_BUGREPORT @@ -1322,9 +1310,7 @@ #endif /* Define if you have RSVG library */ -#ifndef MAGICKCORE_RSVG_DELEGATE -#define MAGICKCORE_RSVG_DELEGATE 1 -#endif +/* #undef RSVG_DELEGATE */ /* Define to the type of arg 1 for `select'. */ #ifndef MAGICKCORE_SELECT_TYPE_ARG1 @@ -1461,9 +1447,7 @@ /* Define if you have WEBP library */ -#ifndef MAGICKCORE_WEBP_DELEGATE -#define MAGICKCORE_WEBP_DELEGATE 1 -#endif +/* #undef WEBP_DELEGATE */ /* Define to use the Windows GDI32 library */ /* #undef WINGDI32_DELEGATE */ @@ -1472,9 +1456,7 @@ /* #undef WITH_DMALLOC */ /* Define if you have WMF library */ -#ifndef MAGICKCORE_WMF_DELEGATE -#define MAGICKCORE_WMF_DELEGATE 1 -#endif +/* #undef WMF_DELEGATE */ /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ @@ -1527,9 +1509,7 @@ /* #undef _MINIX */ /* Define this for the OpenCL Accelerator */ -#ifndef MAGICKCORE__OPENCL -#define MAGICKCORE__OPENCL 1 -#endif +/* #undef _OPENCL */ /* Define to 2 if the system does not provide POSIX.1 features except with this defined. */ diff --git a/MagickCore/version.h b/MagickCore/version.h index 82a94e037..4a791709c 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -27,14 +27,14 @@ extern "C" { */ #define MagickPackageName "ImageMagick" #define MagickCopyright "Copyright (C) 1999-2011 ImageMagick Studio LLC" -#define MagickSVNRevision "exported" +#define MagickSVNRevision "5245" #define MagickLibVersion 0x700 #define MagickLibVersionText "7.0.0" #define MagickLibVersionNumber 7,0,0 #define MagickLibAddendum "-0" #define MagickLibInterface 7 #define MagickLibMinInterface 7 -#define MagickReleaseDate "2011-09-12" +#define MagickReleaseDate "2011-09-13" #define MagickChangeDate "20110801" #define MagickAuthoritativeURL "http://www.imagemagick.org" #if defined(MAGICKCORE_OPENMP_SUPPORT) diff --git a/config/configure.xml b/config/configure.xml index 5d3357535..bf95bee44 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -11,7 +11,7 @@ - +