SOURCES: ImageMagick-ac.patch, ImageMagick-libpath.patch, ImageMag...
baggins
baggins at pld-linux.org
Mon Sep 17 17:01:53 CEST 2007
Author: baggins Date: Mon Sep 17 15:01:53 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- up to 6.3.5-9
---- Files affected:
SOURCES:
ImageMagick-ac.patch (1.4 -> 1.5) , ImageMagick-libpath.patch (1.13 -> 1.14) , ImageMagick-link.patch (1.4 -> 1.5)
---- Diffs:
================================================================
Index: SOURCES/ImageMagick-ac.patch
diff -u SOURCES/ImageMagick-ac.patch:1.4 SOURCES/ImageMagick-ac.patch:1.5
--- SOURCES/ImageMagick-ac.patch:1.4 Sat Feb 24 15:21:02 2007
+++ SOURCES/ImageMagick-ac.patch Mon Sep 17 17:01:48 2007
@@ -6,19 +6,19 @@
FPX_LIBS=''
+AC_LANG_PUSH(C++)
+AC_REQUIRE_CPP
- if test "$with_fpx" != 'no'
- then
- AC_MSG_CHECKING(for FlashPIX components )
- AC_MSG_RESULT()
+ if test "$with_fpx" != 'no'; then
+ AC_MSG_RESULT([-------------------------------------------------------------])
+ AC_MSG_RESULT([Checking for FlashPIX support])
+ AC_MSG_RESULT([-------------------------------------------------------------])
failed=0;
passed=0;
- AC_LANG_PUSH(C++)
AC_CHECK_HEADER(fpxlib.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`)
AC_CHECK_LIB(fpx,FPX_OpenImageByFilename,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
- AC_LANG_POP
- AC_MSG_CHECKING(if FlashPIX package is complete)
- if test $passed -gt 0
- then
+ AC_MSG_CHECKING([if FlashPIX package is complete])
+ if test $passed -gt 0; then
+ if test $failed -gt 0; then
@@ -1399,6 +1399,7 @@
AC_MSG_RESULT(no)
fi
@@ -27,15 +27,13 @@
AM_CONDITIONAL(HasFPX, test "$have_fpx" = 'yes')
AC_SUBST(FPX_LIBS)
-@@ -1949,10 +1950,6 @@
- then
- CPPFLAGS="$CPPFLAGS -I${xml2_prefix}/include/libxml2"
+@@ -1949,9 +1950,6 @@
+ if test -d "${xml2_prefix}/include/libxml2"; then
+ CPPFLAGS="$CPPFLAGS -I${xml2_prefix}/include/libxml2"
+ fi
+- if test "${xml2_prefix}" != '/usr'; then
+- LDFLAGS="$LDFLAGS -L${xml2_prefix}/lib"
+- fi
fi
-- if test "${xml2_prefix}" != '/usr'
-- then
-- LDFLAGS="$LDFLAGS -L${xml2_prefix}/lib"
-- fi
- fi
- failed=0;
- passed=0;
-
+ failed=0;
+ passed=0;
================================================================
Index: SOURCES/ImageMagick-libpath.patch
diff -u SOURCES/ImageMagick-libpath.patch:1.13 SOURCES/ImageMagick-libpath.patch:1.14
--- SOURCES/ImageMagick-libpath.patch:1.13 Wed Dec 27 22:09:36 2006
+++ SOURCES/ImageMagick-libpath.patch Mon Sep 17 17:01:48 2007
@@ -1,11 +1,11 @@
--- ImageMagick-5.5.7/configure.ac.orig 2003-05-31 16:41:34.000000000 +0200
+++ ImageMagick-5.5.7/configure.ac 2003-07-18 08:27:51.000000000 +0200
@@ -2194,7 +2194,7 @@
- # Determine path to pick up ImageMagick library from for use with building PerlMagick
+ # Determine path to pick up Magick library from for use with building PerlMagick
MAGICKLIBDIR="${LIB_DIR}"
MAGICKLIB="-L${MAGICKLIBDIR} -lMagick"
--if test $with_perl_static = 'yes'
-+if test $with_perl_static = 'yes' -o $with_perl_dynamic = 'yes'
- then
- # Find out where libtool hides its uninstalled libraries (as libtool_objdir)
- eval `./libtool --config|grep '^objdir='|sed -e 's/^objdir/libtool_objdir/'`
+-if test $with_perl_static = 'yes'; then
++if test $with_perl_static = 'yes' -o $with_perl_dynamic = 'yes'; then
+ # Find out where libtool hides its uninstalled libraries (as libtool_objdir)
+ libtool_objdir=$objdir
+
================================================================
Index: SOURCES/ImageMagick-link.patch
diff -u SOURCES/ImageMagick-link.patch:1.4 SOURCES/ImageMagick-link.patch:1.5
--- SOURCES/ImageMagick-link.patch:1.4 Sat Feb 24 15:21:03 2007
+++ SOURCES/ImageMagick-link.patch Mon Sep 17 17:01:48 2007
@@ -1,33 +1,32 @@
--- ImageMagick-6.2.6/configure.ac.orig 2006-03-14 23:34:03.535115000 +0100
+++ ImageMagick-6.2.6/configure.ac 2006-03-14 23:53:45.212965250 +0100
@@ -1260,7 +1260,7 @@
- if test "$no_x" != 'yes'
- then
- LDFLAGS="$LDFLAGS $X_LIBS"
-- X11_LIBS="$X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
-+ X11_LIBS="-lX11 $X_EXTRA_LIBS"
- LIBS="$X11_LIBS $LIBS"
- CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+ AC_MSG_RESULT([Checking for X11 support])
+ AC_MSG_RESULT([-------------------------------------------------------------])
+ LDFLAGS="$LDFLAGS $X_LIBS"
+- X11_LIBS="$X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
++ X11_LIBS="-lX11 $X_EXTRA_LIBS"
+ LIBS="$X11_LIBS $LIBS"
+ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
@@ -1290,7 +1290,7 @@
- AC_CHECK_LIB([Xext],[XShapeCombineMask],[XEXT_LIBS='-lXext' ; AC_DEFINE(HasShape,1,X11 server supports shape extension)],[],[])
-
- AC_CHECK_LIB(Xt,XtSetEventDispatcher,XT_LIBS='-lXt',,)
-- LIBS="$XEXT_LIBS $XT_LIBS $LIBS"
-+ LIBS="$XEXT_LIBS $LIBS"
+ #
+ AC_CHECK_LIB([Xext],[XShapeCombineMask],[XEXT_LIBS='-lXext' ; AC_DEFINE(HasShape,1,X11 server supports shape extension)],[],[])
+ AC_CHECK_LIB(Xt,XtSetEventDispatcher,XT_LIBS='-lXt',,)
+- LIBS="$XEXT_LIBS $XT_LIBS $LIBS"
++ LIBS="$XEXT_LIBS $LIBS"
fi
- if test "$no_x" != 'yes'
- then
+ if test "$no_x" != 'yes'; then
+ have_x='yes'
@@ -2726,9 +2726,9 @@
+ # Build library dependency list for libMagick
#
- if test "$with_modules" != 'no'
- then
-- MAGICK_DEP_LIBS="$LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JPEG_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $XT_LIBS $BZLIB_LIBS $ZLIB_LIBS $GDI32_LIBS $THREAD_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $THREAD_LIBS $USER_LIBS"
-+ MAGICK_DEP_LIBS="$LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JPEG_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $BZLIB_LIBS $ZLIB_LIBS $GDI32_LIBS $THREAD_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $THREAD_LIBS $USER_LIBS"
+ if test "$with_modules" != 'no'; then
+- MAGICK_DEP_LIBS="$LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JPEG_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $XT_LIBS $BZLIB_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $GOMP_LIBS $THREAD_LIBS"
++ MAGICK_DEP_LIBS="$LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JPEG_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $BZLIB_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $GOMP_LIBS $THREAD_LIBS"
else
-- MAGICK_DEP_LIBS="$JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JP2_LIBS $JPEG_LIBS $GS_LIBS $PNG_LIBS $DJVU_LIBS $FPX_LIBS $FONTCONFIG_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $XT_LIBS $IPC_LIBS $X11_LIBS $BZLIB_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $THREAD_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $THREAD_LIBS $USER_LIBS"
-+ MAGICK_DEP_LIBS="$JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JP2_LIBS $JPEG_LIBS $GS_LIBS $PNG_LIBS $DJVU_LIBS $FPX_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $BZLIB_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $THREAD_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $THREAD_LIBS $USER_LIBS"
+- MAGICK_DEP_LIBS="$JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JP2_LIBS $JPEG_LIBS $GS_LIBS $PNG_LIBS $DJVU_LIBS $FPX_LIBS $FONTCONFIG_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $XT_LIBS $IPC_LIBS $X11_LIBS $BZLIB_LIBS $OPENEXR_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $GOMP_LIBS $THREAD_LIBS"
++ MAGICK_DEP_LIBS="$JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JP2_LIBS $JPEG_LIBS $GS_LIBS $PNG_LIBS $DJVU_LIBS $FPX_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $BZLIB_LIBS $OPENEXR_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $GOMP_LIBS $THREAD_LIBS"
fi
AC_SUBST(MAGICK_DEP_LIBS)
-
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/ImageMagick-ac.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/ImageMagick-libpath.patch?r1=1.13&r2=1.14&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/ImageMagick-link.patch?r1=1.4&r2=1.5&f=u
More information about the pld-cvs-commit
mailing list