mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-16 07:58:04 +00:00
Code Issues Releases Activity

Fix build on 4.x

Browse Source
This commit is contained in:
Michael Nottebrock 2006-12-12 18:21:31 +00:00
parent 495be8b372
commit e5c6be44d9
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=179582
9 changed files with 0 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
graphics/GraphicsMagick/Makefile
View File

@ -79,7 +79,4 @@ CONFIGURE_ARGS+= --with-quantum-depth=16
PLIST_SUB+= Q=16
.endif
post-build test:
cd ${WRKSRC}/tests && ${MAKE} check
.include <bsd.port.post.mk>

39
graphics/GraphicsMagick/files/patch-coders-png.c
View File

@ -1,39 +0,0 @@
--- 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);

21
graphics/GraphicsMagick/files/patch-utility
View File

@ -1,21 +0,0 @@
--- magick/utility.c Sat Apr 2 17:35:06 2005
+++ magick/utility.c Sun Jul 24 18:22:40 2005
@@ -47,4 +47,8 @@
#include "magick/utility.h"
+#if defined(POSIX)
+# include <sys/types.h>
+# include <sys/wait.h>
+#endif
/*
@@ -3874,4 +3878,9 @@
#if defined(POSIX)
status=system(command);
+ if (status == -1)
+ perror(command);
+ else if (WIFSIGNALED(status)) {
+ fprintf(stderr, "Command ``\n%s\n'' terminated due to signal %d\n", command, WTERMSIG(status));
+ }
#elif defined(vms)
status=!system(command);

3
graphics/GraphicsMagick12/Makefile
View File

@ -79,7 +79,4 @@ CONFIGURE_ARGS+= --with-quantum-depth=16
PLIST_SUB+= Q=16
.endif
post-build test:
cd ${WRKSRC}/tests && ${MAKE} check
.include <bsd.port.post.mk>

39
graphics/GraphicsMagick12/files/patch-coders-png.c
View File

@ -1,39 +0,0 @@
--- 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);

21
graphics/GraphicsMagick12/files/patch-utility
View File

@ -1,21 +0,0 @@
--- magick/utility.c Sat Apr 2 17:35:06 2005
+++ magick/utility.c Sun Jul 24 18:22:40 2005
@@ -47,4 +47,8 @@
#include "magick/utility.h"
+#if defined(POSIX)
+# include <sys/types.h>
+# include <sys/wait.h>
+#endif
/*
@@ -3874,4 +3878,9 @@
#if defined(POSIX)
status=system(command);
+ if (status == -1)
+ perror(command);
+ else if (WIFSIGNALED(status)) {
+ fprintf(stderr, "Command ``\n%s\n'' terminated due to signal %d\n", command, WTERMSIG(status));
+ }
#elif defined(vms)
status=!system(command);

3
graphics/GraphicsMagick13/Makefile
View File

@ -79,7 +79,4 @@ CONFIGURE_ARGS+= --with-quantum-depth=16
PLIST_SUB+= Q=16
.endif
post-build test:
cd ${WRKSRC}/tests && ${MAKE} check
.include <bsd.port.post.mk>

39
graphics/GraphicsMagick13/files/patch-coders-png.c
View File

@ -1,39 +0,0 @@
--- 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);

21
graphics/GraphicsMagick13/files/patch-utility
View File

@ -1,21 +0,0 @@
--- magick/utility.c Sat Apr 2 17:35:06 2005
+++ magick/utility.c Sun Jul 24 18:22:40 2005
@@ -47,4 +47,8 @@
#include "magick/utility.h"
+#if defined(POSIX)
+# include <sys/types.h>
+# include <sys/wait.h>
+#endif
/*
@@ -3874,4 +3878,9 @@
#if defined(POSIX)
status=system(command);
+ if (status == -1)
+ perror(command);
+ else if (WIFSIGNALED(status)) {
+ fprintf(stderr, "Command ``\n%s\n'' terminated due to signal %d\n", command, WTERMSIG(status));
+ }
#elif defined(vms)
status=!system(command);