Date: Tue, 8 Aug 2017 20:57:54 +0000 (UTC) From: Mikhail Teterin <mi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r447573 - in head/graphics/pstoedit: . files Message-ID: <201708082057.v78KvsAG007106@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mi Date: Tue Aug 8 20:57:54 2017 New Revision: 447573 URL: https://svnweb.freebsd.org/changeset/ports/447573 Log: Allow building with ImageMagick-7. Also, fix the problem that struck, when libzip.so is present at build-time -- the port's configure would enable one more module breaking plist. The libzip.so is now an unconditional dependency -- whoever wants to, can make it an option. Added: head/graphics/pstoedit/files/patch-imagemagick7 (contents, props changed) Modified: head/graphics/pstoedit/Makefile head/graphics/pstoedit/files/patch-configure head/graphics/pstoedit/pkg-plist Modified: head/graphics/pstoedit/Makefile ============================================================================== --- head/graphics/pstoedit/Makefile Tue Aug 8 20:00:00 2017 (r447572) +++ head/graphics/pstoedit/Makefile Tue Aug 8 20:57:54 2017 (r447573) @@ -3,7 +3,7 @@ PORTNAME= pstoedit PORTVERSION= 3.70 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics print MASTER_SITES= SF @@ -12,7 +12,8 @@ COMMENT= Convert PostScript to other vector graphic fo LICENSE= GPLv2+ -LIB_DEPENDS= libgd.so:graphics/gd +LIB_DEPENDS= libgd.so:graphics/gd \ + libzip.so:archivers/libzip USES= ghostscript libtool localbase pathfix pkgconfig GNU_CONFIGURE= yes @@ -32,7 +33,7 @@ EMF_DESC= WMF/EMF support via libEMF EMF_LIB_DEPENDS= libEMF.so:graphics/libemf EMF_CONFIGURE_ON= --with-libemf-include=${LOCALBASE}/include/libEMF EMF_CONFIGURE_OFF= --without-emf -MAGICK_LIB_DEPENDS= libMagick++-6.so:graphics/ImageMagick +MAGICK_LIB_DEPENDS= libMagick++-*.so:graphics/ImageMagick MAGICK_CONFIGURE_ON= --with-magick MAGICK_CONFIGURE_OFF= --without-magick MING_DESC= Flash support via Ming Modified: head/graphics/pstoedit/files/patch-configure ============================================================================== --- head/graphics/pstoedit/files/patch-configure Tue Aug 8 20:00:00 2017 (r447572) +++ head/graphics/pstoedit/files/patch-configure Tue Aug 8 20:57:54 2017 (r447573) @@ -1,6 +1,6 @@ ---- configure.orig 2013-04-28 20:20:53.000000000 +0200 -+++ configure 2013-05-23 00:23:30.000000000 +0200 -@@ -8167,6 +8167,7 @@ +--- configure 2014-12-28 20:39:58 UTC ++++ configure +@@ -8263,6 +8263,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdlib.h> @@ -8,3 +8,47 @@ #include <stdarg.h> #include <string.h> #include <float.h> +@@ -16701,12 +16702,12 @@ + pkg_cv_LIBMAGICK_CFLAGS="$LIBMAGICK_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ImageMagick++\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "ImageMagick++") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Magick++\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "Magick++") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_LIBMAGICK_CFLAGS=`$PKG_CONFIG --cflags "ImageMagick++" 2>/dev/null` ++ pkg_cv_LIBMAGICK_CFLAGS=`$PKG_CONFIG --cflags "Magick++" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes +@@ -16718,12 +16719,12 @@ + pkg_cv_LIBMAGICK_LIBS="$LIBMAGICK_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ImageMagick++\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "ImageMagick++") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Magick++\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "Magick++") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_LIBMAGICK_LIBS=`$PKG_CONFIG --libs "ImageMagick++" 2>/dev/null` ++ pkg_cv_LIBMAGICK_LIBS=`$PKG_CONFIG --libs "Magick++" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes +@@ -16744,9 +16745,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- LIBMAGICK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ImageMagick++" 2>&1` ++ LIBMAGICK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "Magick++" 2>&1` + else +- LIBMAGICK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ImageMagick++" 2>&1` ++ LIBMAGICK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "Magick++" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBMAGICK_PKG_ERRORS" >&5 Added: head/graphics/pstoedit/files/patch-imagemagick7 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/pstoedit/files/patch-imagemagick7 Tue Aug 8 20:57:54 2017 (r447573) @@ -0,0 +1,77 @@ +By Jan Rekorajski, obtained from: + + http://git.pld-linux.org/gitweb.cgi/packages/pstoedit.git/commitdiff/1db94627498886a91a6e6ed80d0a8b2b6da1a16b + +and made conditional to still work with IM-7. + +(The configure.ac is not currently used by the port.) + +--- configure.ac 2014-12-28 21:39:18.000000000 +0100 ++++ configure.ac 2016-12-25 22:16:29.147826432 +0100 +@@ -299,7 +299,7 @@ + else + if test -n "$PKG_CONFIG"; then + AC_MSG_CHECKING(ImageMagick flags through pkg-config) +- PKG_CHECK_MODULES(LIBMAGICK, ImageMagick++, ++ PKG_CHECK_MODULES(LIBMAGICK, Magick++, + HAVE_LIBMAGICK=yes + LIBMAGICK_CFLAGS="-DHAVE_MAGIC $LIBMAGICK_CFLAGS" + LIBMAGICK_LDFLAGS="$LIBMAGICK_LIBS" , +--- src/drvmagick++.cpp 2015-01-01 18:05:33.000000000 +0100 ++++ src/drvmagick++.cpp 2017-08-08 16:38:28.879138000 -0400 +@@ -121,5 +121,9 @@ void drvMAGICK::create_vpath(VPathList & + switch (elem.getType()) { + case moveto:{ ++#if MagickLibVersion < 0x700 + const Point & p = elem.getPoint(0); ++#else /* MAGICK7 */ ++ const ::Point & p = elem.getPoint(0); ++#endif /* MAGICK7 */ + const Magick::Coordinate coord(p.x_ + x_offset, + currentDeviceHeight - p.y_ + y_offset); +@@ -128,5 +132,9 @@ void drvMAGICK::create_vpath(VPathList & + break; + case lineto:{ ++#if MagickLibVersion < 0x700 + const Point & p = elem.getPoint(0); ++#else /* MAGICK7 */ ++ const ::Point & p = elem.getPoint(0); ++#endif /* MAGICK7 */ + const Magick::Coordinate coord(p.x_ + x_offset, + currentDeviceHeight - p.y_ + y_offset); +@@ -138,7 +146,13 @@ void drvMAGICK::create_vpath(VPathList & + break; + case curveto:{ ++#if MagickLibVersion < 0x700 + const Point & p0 = elem.getPoint(0); + const Point & p1 = elem.getPoint(1); + const Point & p2 = elem.getPoint(2); ++#else /* MAGICK7 */ ++ const ::Point & p0 = elem.getPoint(0); ++ const ::Point & p1 = elem.getPoint(1); ++ const ::Point & p2 = elem.getPoint(2); ++#endif /* MAGICK7 */ + vpath. + push_back(PathCurvetoAbs +@@ -279,5 +293,9 @@ void drvMAGICK::show_path() + } + dasharray[dp.nrOfEntries] = 0; // mark last element ++#if MagickLibVersion < 0x700 + drawList.push_back(DrawableDashArray(dasharray)); // pulls a copy, so we are the owner of dasharray ++#else /* MAGICK7 */ ++ drawList.push_back(DrawableStrokeDashArray(dasharray)); // pulls a copy, so we are the owner of dasharray ++#endif /* MAGICK7 */ + //?? DrawableDashOffset + delete[]dasharray; +@@ -301,5 +319,11 @@ void drvMAGICK::show_path() + drawList.push_back(DrawablePopGraphicContext()); + // Draw everything using completed drawing list ++#if MagickLibVersion < 0x700 + imageptr->draw(drawList); ++#else /* MAGICK7 */ ++ std::vector<Magick::Drawable> drawVect; ++ copy(drawList.begin(),drawList.end(),back_inserter(drawVect)); ++ imageptr->draw(drawVect); ++#endif /* MAGICK7 */ + #endif + Modified: head/graphics/pstoedit/pkg-plist ============================================================================== --- head/graphics/pstoedit/pkg-plist Tue Aug 8 20:00:00 2017 (r447572) +++ head/graphics/pstoedit/pkg-plist Tue Aug 8 20:57:54 2017 (r447573) @@ -22,6 +22,9 @@ lib/libpstoedit.so.0.0.0 %%MAGICK%%lib/pstoedit/libp2edrvmagick++.so %%MAGICK%%lib/pstoedit/libp2edrvmagick++.so.0 %%MAGICK%%lib/pstoedit/libp2edrvmagick++.so.0.0.0 +lib/pstoedit/libp2edrvpptx.so +lib/pstoedit/libp2edrvpptx.so.0 +lib/pstoedit/libp2edrvpptx.so.0.0.0 lib/pstoedit/libp2edrvstd.so lib/pstoedit/libp2edrvstd.so.0 lib/pstoedit/libp2edrvstd.so.0.0.0
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708082057.v78KvsAG007106>