Date: Fri, 22 Dec 2006 17:24:13 +0800 (CST) From: chinsan <chinsan@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/107086: [PATCH] graphics/GraphicsMagick: Fix build error Message-ID: <20061222092413.8172C11490@chinsan.twbbs.org> Resent-Message-ID: <200612220930.kBM9UIqd002483@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 107086
>Category: ports
>Synopsis: [PATCH] graphics/GraphicsMagick: Fix build error
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Dec 22 09:30:17 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: chinsan
>Release: FreeBSD 6.2-PRERELEASE i386
>Organization:
Taiwan
>Environment:
System: FreeBSD chinsan.twbbs.org 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #3: Mon Dec 4 02:04:40 CST
>Description:
- Fix build error
Added file(s):
- files/patch-coders-png.c
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- GraphicsMagick-1.1.7_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/graphics/GraphicsMagick/Makefile /usr/home/chinsan/project/GraphicsMagick/Makefile
--- /usr/ports/graphics/GraphicsMagick/Makefile Fri Dec 15 16:53:00 2006
+++ /usr/home/chinsan/project/GraphicsMagick/Makefile Sun Dec 17 09:48:01 2006
@@ -7,6 +7,7 @@
PORTNAME= GraphicsMagick
PORTVERSION= 1.1.7
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/
diff -ruN --exclude=CVS /usr/ports/graphics/GraphicsMagick/files/patch-coders-png.c /usr/home/chinsan/project/GraphicsMagick/files/patch-coders-png.c
--- /usr/ports/graphics/GraphicsMagick/files/patch-coders-png.c Thu Jan 1 08:00:00 1970
+++ /usr/home/chinsan/project/GraphicsMagick/files/patch-coders-png.c Fri Dec 15 18:07:14 2006
@@ -0,0 +1,40 @@
+--- coders/png.c.orig Thu Nov 11 07:14:54 2004
++++ coders/png.c Sun Aug 20 15:21:14 2006
+@@ -71,7 +71,7 @@
+ #include "magick/transform.h"
+ #include "magick/utility.h"
+ #if defined(HasPNG)
+-#include "png.h"
++#include "libpng/png.h"
+ #include "zlib.h"
+
+ #if PNG_LIBPNG_VER > 95
+@@ -1567,6 +1567,8 @@
+ num_passes,
+ pass;
+
++ png_structp png_ptr;
++
+ PixelPacket
+ transparent_color;
+
+@@ -1709,18 +1711,6 @@
+ #if defined(PNG_USE_PNGGCCRD) && defined(PNG_ASSEMBLER_CODE_SUPPORTED) \
+ && (PNG_LIBPNG_VER >= 10200)
+ /* Disable thread-unsafe features of pnggccrd */
+- if (png_access_version() >= 10200)
+- {
+- png_uint_32 mmx_disable_mask=0;
+- png_uint_32 asm_flags;
+-
+- mmx_disable_mask |= ( PNG_ASM_FLAG_MMX_READ_COMBINE_ROW \
+- | PNG_ASM_FLAG_MMX_READ_FILTER_SUB \
+- | PNG_ASM_FLAG_MMX_READ_FILTER_AVG \
+- | PNG_ASM_FLAG_MMX_READ_FILTER_PAETH );
+- asm_flags=png_get_asm_flags(png_ptr);
+- png_set_asm_flags(png_ptr, asm_flags & ~mmx_disable_mask);
+- }
+ #endif
+
+ png_read_info(ping,ping_info);
+
--- GraphicsMagick-1.1.7_1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20061222092413.8172C11490>