[53794] trunk/dports/graphics/pdf2djvu

blb at macports.org blb at macports.org
Mon Jul 13 22:41:14 PDT 2009


Revision: 53794
          http://trac.macports.org/changeset/53794
Author:   blb at macports.org
Date:     2009-07-13 22:41:13 -0700 (Mon, 13 Jul 2009)
Log Message:
-----------
graphics/pdf2djvu - version update to 0.5.10; fix error when building against poppler 0.11.x, ticket #20279, thanks to devans for the patch; disable opportunistic linking to GraphicsMagick

Modified Paths:
--------------
    trunk/dports/graphics/pdf2djvu/Portfile

Added Paths:
-----------
    trunk/dports/graphics/pdf2djvu/files/
    trunk/dports/graphics/pdf2djvu/files/patch-configure.disableGM.diff
    trunk/dports/graphics/pdf2djvu/files/patch-pdf2djvu.cc.diff

Modified: trunk/dports/graphics/pdf2djvu/Portfile
===================================================================
--- trunk/dports/graphics/pdf2djvu/Portfile	2009-07-14 05:05:41 UTC (rev 53793)
+++ trunk/dports/graphics/pdf2djvu/Portfile	2009-07-14 05:41:13 UTC (rev 53794)
@@ -2,7 +2,7 @@
 
 PortSystem          1.0
 name                pdf2djvu
-version             0.5.9
+version             0.5.10
 categories          graphics textproc
 maintainers         blb openmaintainer
 description         Convert PDF to DjVu
@@ -18,14 +18,16 @@
 distname            ${name}_${version}
 worksrcdir          ${name}-${version}
 
-checksums           md5     2ef80c2c1b2578b8b59640d72c2bd6df \
-                    sha1    8e01f9281240d1728b0a3c420f80581614439d2f \
-                    rmd160  c4f287ff281883fe6e7cd7e4fb29004bd58ffa35
+checksums           md5     83f43a712a7c560d484045c3e791b104 \
+                    sha1    2e67725f3cb58f5458b74119d0c38503f49d8b1c \
+                    rmd160  29f6c56a9c770ab10104b8ff726a9505b7781b9c
 
 depends_build       port:pkgconfig
 
 depends_lib         port:djvulibre port:poppler port:libiconv
 
+patchfiles          patch-pdf2djvu.cc.diff patch-configure.disableGM.diff
+
 post-destroot {
    xinstall -m 644 -W ${worksrcpath}/doc ${name}.1 \
       ${destroot}${prefix}/share/man/man1

Added: trunk/dports/graphics/pdf2djvu/files/patch-configure.disableGM.diff
===================================================================
--- trunk/dports/graphics/pdf2djvu/files/patch-configure.disableGM.diff	                        (rev 0)
+++ trunk/dports/graphics/pdf2djvu/files/patch-configure.disableGM.diff	2009-07-14 05:41:13 UTC (rev 53794)
@@ -0,0 +1,45 @@
+--- configure.orig	2009-07-12 04:59:30.000000000 -0600
++++ configure	2009-07-13 23:31:31.000000000 -0600
+@@ -3140,8 +3140,8 @@
+         pkg_cv_GRAPHICSMAGICK_CFLAGS="$GRAPHICSMAGICK_CFLAGS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"GraphicsMagick++\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "GraphicsMagick++") 2>&5
++    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"GraphicsMagickDisabled\"") >&5
++  ($PKG_CONFIG --exists --print-errors "GraphicsMagickDisabled") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+@@ -3158,8 +3158,8 @@
+         pkg_cv_GRAPHICSMAGICK_LIBS="$GRAPHICSMAGICK_LIBS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"GraphicsMagick++\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "GraphicsMagick++") 2>&5
++    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"GraphicsMagickDisabled\"") >&5
++  ($PKG_CONFIG --exists --print-errors "GraphicsMagickDisabled") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+@@ -3182,9 +3182,9 @@
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        GRAPHICSMAGICK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "GraphicsMagick++"`
++	        GRAPHICSMAGICK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "GraphicsMagickDisabled"`
+         else
+-	        GRAPHICSMAGICK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "GraphicsMagick++"`
++	        GRAPHICSMAGICK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "GraphicsMagickDisabled"`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$GRAPHICSMAGICK_PKG_ERRORS" >&5
+@@ -3207,7 +3207,7 @@
+ #define HAVE_GRAPHICSMAGICK 1
+ _ACEOF
+ 
+-    graphicsmagick_version=`$PKG_CONFIG --modversion GraphicsMagick++`
++    graphicsmagick_version=`$PKG_CONFIG --modversion GraphicsMagickDisabled`
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define GRAPHICSMAGICK_VERSION_STRING "$graphicsmagick_version"

Added: trunk/dports/graphics/pdf2djvu/files/patch-pdf2djvu.cc.diff
===================================================================
--- trunk/dports/graphics/pdf2djvu/files/patch-pdf2djvu.cc.diff	                        (rev 0)
+++ trunk/dports/graphics/pdf2djvu/files/patch-pdf2djvu.cc.diff	2009-07-14 05:41:13 UTC (rev 53794)
@@ -0,0 +1,40 @@
+--- pdf2djvu.cc.orig	2009-07-13 10:31:59.000000000 -0700
++++ pdf2djvu.cc	2009-07-13 10:41:53.000000000 -0700
+@@ -285,28 +285,34 @@
+   void drawImage(pdf::gfx::State *state, pdf::Object *object, pdf::Stream *stream, int width, int height,
+     pdf::gfx::ImageColorMap *color_map, int *mask_colors, pdf::Bool inline_image)
+   {
++    pdf::Bool interpolate = 1;
++
+     if (is_foreground_color_map(color_map) || config.no_render)
+       return;
+-    Renderer::drawImage(state, object, stream, width, height, color_map, mask_colors, inline_image);
++    Renderer::drawImage(state, object, stream, width, height, color_map, interpolate, mask_colors, inline_image);
+   }
+ 
+   void drawMaskedImage(pdf::gfx::State *state, pdf::Object *object, pdf::Stream *stream, int width, int height,
+     pdf::gfx::ImageColorMap *color_map, pdf::Stream *mask_stream, int mask_width, int mask_height, pdf::Bool mask_invert)
+   {
++    pdf::Bool interpolate, maskInterpolate = 1;
++    
+     if (is_foreground_color_map(color_map) || config.no_render)
+       return;
+     Renderer::drawMaskedImage(state, object, stream, width, height,
+-      color_map, mask_stream, mask_width, mask_height, mask_invert);
++      color_map, interpolate, mask_stream, mask_width, mask_height, mask_invert, maskInterpolate);
+   }
+ 
+   void drawSoftMaskedImage(pdf::gfx::State *state, pdf::Object *object, pdf::Stream *stream,
+     int width, int height, pdf::gfx::ImageColorMap *color_map, pdf::Stream *mask_stream,
+     int mask_width, int mask_height,	pdf::gfx::ImageColorMap *mask_color_map)
+   {
++    pdf::Bool interpolate, maskInterpolate = 1;
++
+     if (is_foreground_color_map(color_map) || config.no_render)
+       return;
+     Renderer::drawSoftMaskedImage(state, object, stream, width, height,
+-      color_map, mask_stream, mask_width, mask_height, mask_color_map);
++      color_map, interpolate, mask_stream, mask_width, mask_height, mask_color_map, maskInterpolate);
+   }
+ 
+   pdf::Bool interpretType3Chars() { return gFalse; }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090713/eea60736/attachment.html>


More information about the macports-changes mailing list