diff options
author | Rene Ladan <rene@FreeBSD.org> | 2014-05-20 07:00:32 +0000 |
---|---|---|
committer | Rene Ladan <rene@FreeBSD.org> | 2014-05-20 07:00:32 +0000 |
commit | a1bb21b193870c11d35eee643725b0e86ea0739e (patch) | |
tree | 57168984113fdd946061901cba7f7fd0be81ee44 /graphics/GraphicsMagick12/files | |
parent | devel/py-manuel: update to 1.7.2 (diff) |
Remove expired port:
2014-05-20 graphics/GraphicsMagick12: Unmaintained upstream, no ports depending on it. Use graphics/GraphicsMagick13 instead
Diffstat (limited to 'graphics/GraphicsMagick12/files')
-rw-r--r-- | graphics/GraphicsMagick12/files/extra-patch-Makefile.in | 21 | ||||
-rw-r--r-- | graphics/GraphicsMagick12/files/patch-Makefile.in | 20 | ||||
-rw-r--r-- | graphics/GraphicsMagick12/files/patch-coders__jp2.c | 38 | ||||
-rw-r--r-- | graphics/GraphicsMagick12/files/patch-coders__png.c | 232 | ||||
-rw-r--r-- | graphics/GraphicsMagick12/files/patch-configure.in | 29 |
5 files changed, 0 insertions, 340 deletions
diff --git a/graphics/GraphicsMagick12/files/extra-patch-Makefile.in b/graphics/GraphicsMagick12/files/extra-patch-Makefile.in deleted file mode 100644 index ad07b13772c7..000000000000 --- a/graphics/GraphicsMagick12/files/extra-patch-Makefile.in +++ /dev/null @@ -1,21 +0,0 @@ ---- Makefile.in.orig 2008-11-19 17:40:16.000000000 -0500 -+++ Makefile.in 2008-11-19 17:40:58.000000000 -0500 -@@ -9322,7 +9322,7 @@ - info-am: - - install-data-am: install-codersLTLIBRARIES install-configlibDATA \ -- install-configshareDATA install-data-local install-docDATA \ -+ install-configshareDATA install-data-local \ - install-filtersLTLIBRARIES install-includeHEADERS \ - install-ltdlincludeHEADERS install-magickincHEADERS \ - install-magickppincHEADERS install-magickpptopincHEADERS \ -@@ -9671,8 +9671,7 @@ - $(UTILITIES_INSTALL_EXEC_LOCAL_TARGETS) - - install-data-local: $(MAGICK_INSTALL_DATA_LOCAL_TARGETS) \ -- $(PERLMAGICK_INSTALL_DATA_LOCAL_TARGETS) \ -- $(HTML_INSTALL_DATA_TARGETS) -+ $(PERLMAGICK_INSTALL_DATA_LOCAL_TARGETS) - - uninstall-local: $(MAGICK_UNINSTALL_LOCAL_TARGETS) \ - $(PERLMAGICK_UNINSTALL_LOCAL_TARGETS) \ diff --git a/graphics/GraphicsMagick12/files/patch-Makefile.in b/graphics/GraphicsMagick12/files/patch-Makefile.in deleted file mode 100644 index 7c5d272c8bd3..000000000000 --- a/graphics/GraphicsMagick12/files/patch-Makefile.in +++ /dev/null @@ -1,20 +0,0 @@ ---- Makefile.in.orig 2008-05-18 17:22:51.000000000 -0400 -+++ Makefile.in 2008-06-06 18:41:23.620488084 -0400 -@@ -1775,7 +1775,7 @@ - MagickLibConfigPath = @MagickLibConfigPath@ - MagickLibPath = @MagickLibPath@ - MagickShareConfigPath = @MagickShareConfigPath@ --MagickSharePath = @MagickSharePath@ -+MagickSharePath = ${DATADIR} - MogrifyDelegate = @MogrifyDelegate@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -4382,7 +4382,7 @@ - @WITH_PERL_DYNAMIC_FALSE@@WITH_PERL_STATIC_TRUE@@WITH_PERL_TRUE@PERLSTATICNAME = PerlMagick - - # Pkgconfig directory --pkgconfigdir = $(libdir)/pkgconfig -+pkgconfigdir = $(prefix)/libdata/pkgconfig - - # Files to install in Pkgconfig directory - pkgconfig_DATA = \ diff --git a/graphics/GraphicsMagick12/files/patch-coders__jp2.c b/graphics/GraphicsMagick12/files/patch-coders__jp2.c deleted file mode 100644 index 6a2fddd2901b..000000000000 --- a/graphics/GraphicsMagick12/files/patch-coders__jp2.c +++ /dev/null @@ -1,38 +0,0 @@ ---- ./coders/jp2.c.orig 2010-02-23 16:23:04.000000000 -0500 -+++ ./coders/jp2.c 2010-02-23 16:23:24.000000000 -0500 -@@ -681,7 +681,7 @@ - - entry=SetMagickInfo("J2C"); - entry->description=AcquireString("JPEG-2000 Code Stream Syntax"); -- entry->module="JP2"; -+ entry->module=AcquireString("JP2"); - entry->magick=(MagickHandler) IsJPC; - entry->adjoin=False; - entry->seekable_stream=True; -@@ -694,7 +694,7 @@ - - entry=SetMagickInfo("JP2"); - entry->description=AcquireString("JPEG-2000 JP2 File Format Syntax"); -- entry->module="JP2"; -+ entry->module=AcquireString("JP2"); - entry->magick=(MagickHandler) IsJP2; - entry->adjoin=False; - entry->seekable_stream=True; -@@ -707,7 +707,7 @@ - - entry=SetMagickInfo("JPC"); - entry->description=AcquireString("JPEG-2000 Code Stream Syntax"); -- entry->module="JP2"; -+ entry->module=AcquireString("JP2"); - entry->magick=(MagickHandler) IsJPC; - entry->adjoin=False; - entry->seekable_stream=True; -@@ -720,7 +720,7 @@ - - entry=SetMagickInfo("PGX"); - entry->description=AcquireString("JPEG-2000 VM Format"); -- entry->module="JP2"; -+ entry->module=AcquireString("JP2"); - entry->magick=(MagickHandler) IsJPC; - entry->adjoin=False; - entry->seekable_stream=True; diff --git a/graphics/GraphicsMagick12/files/patch-coders__png.c b/graphics/GraphicsMagick12/files/patch-coders__png.c deleted file mode 100644 index dcf0b339174d..000000000000 --- a/graphics/GraphicsMagick12/files/patch-coders__png.c +++ /dev/null @@ -1,232 +0,0 @@ ---- coders/png.c.orig 2010-01-06 23:01:31.000000000 +0100 -+++ coders/png.c 2012-05-10 04:50:59.000000000 +0200 -@@ -75,6 +75,7 @@ - #if defined(HasPNG) - #include "png.h" - #include "zlib.h" -+#include "pngpriv.h" - - #if PNG_LIBPNG_VER > 95 - /* -@@ -1292,7 +1293,7 @@ - " libpng-%.1024s error: %.1024s", PNG_LIBPNG_VER_STRING, - message); - (void) ThrowException2(&image->exception,CoderError,message,image->filename); -- longjmp(ping->jmpbuf,1); -+ longjmp(png_jmpbuf(ping),1); - } - - static void PNGWarningHandler(png_struct *ping,png_const_charp message) -@@ -1593,7 +1594,7 @@ - ThrowReaderException(ResourceLimitError,MemoryAllocationFailed,image); - } - png_pixels=(unsigned char *) NULL; -- if (setjmp(ping->jmpbuf)) -+ if (setjmp(png_jmpbuf(ping))) - { - /* - PNG image is corrupt. -@@ -1955,13 +1956,13 @@ - Image has a transparent background. - */ - transparent_color.red= -- (Quantum)(ping_info->trans_values.red & bit_mask); -+ (Quantum)(ping_info->trans_color.red & bit_mask); - transparent_color.green= -- (Quantum) (ping_info->trans_values.green & bit_mask); -+ (Quantum) (ping_info->trans_color.green & bit_mask); - transparent_color.blue= -- (Quantum) (ping_info->trans_values.blue & bit_mask); -+ (Quantum) (ping_info->trans_color.blue & bit_mask); - transparent_color.opacity= -- (Quantum) (ping_info->trans_values.gray & bit_mask); -+ (Quantum) (ping_info->trans_color.gray & bit_mask); - if (ping_info->color_type == PNG_COLOR_TYPE_GRAY) - { - transparent_color.red=transparent_color.opacity; -@@ -2469,7 +2470,7 @@ - index=indexes[x]; - if (index < ping_info->num_trans) - q->opacity= -- ScaleCharToQuantum(255-ping_info->trans[index]); -+ ScaleCharToQuantum(255-ping_info->trans_alpha[index]); - else - q->opacity=OpaqueOpacity; - q++; -@@ -6054,7 +6055,7 @@ - AcquireSemaphoreInfo(&png_semaphore); - #endif - -- if (setjmp(ping->jmpbuf)) -+ if (setjmp(png_jmpbuf(ping))) - { - /* - PNG write failed. -@@ -6258,13 +6259,13 @@ - /* - Identify which colormap entry is transparent. - */ -- ping_info->trans=MagickAllocateMemory(unsigned char *,number_colors); -- if (ping_info->trans == (unsigned char *) NULL) -+ ping_info->trans_alpha=MagickAllocateMemory(unsigned char *,number_colors); -+ if (ping_info->trans_alpha == (unsigned char *) NULL) - ThrowWriterException(ResourceLimitError,MemoryAllocationFailed, - image); - assert(number_colors <= 256); - for (i=0; i < (long) number_colors; i++) -- ping_info->trans[i]=255; -+ ping_info->trans_alpha[i]=255; - for (y=0; y < (long) image->rows; y++) - { - register const PixelPacket -@@ -6284,7 +6285,7 @@ - - index=indexes[x]; - assert((unsigned long) index < number_colors); -- ping_info->trans[index]=(png_byte) (255- -+ ping_info->trans_alpha[index]=(png_byte) (255- - ScaleQuantumToChar(p->opacity)); - } - p++; -@@ -6292,14 +6293,14 @@ - } - ping_info->num_trans=0; - for (i=0; i < (long) number_colors; i++) -- if (ping_info->trans[i] != 255) -+ if (ping_info->trans_alpha[i] != 255) - ping_info->num_trans=(unsigned short) (i+1); - if (ping_info->num_trans == 0) - ping_info->valid&=(~PNG_INFO_tRNS); - if (!(ping_info->valid & PNG_INFO_tRNS)) - ping_info->num_trans=0; - if (ping_info->num_trans == 0) -- MagickFreeMemory(ping_info->trans); -+ MagickFreeMemory(ping_info->trans_alpha); - /* - Identify which colormap entry is the background color. - */ -@@ -6441,12 +6442,12 @@ - (p->opacity != OpaqueOpacity)) - { - ping_info->valid|=PNG_INFO_tRNS; -- ping_info->trans_values.red=ScaleQuantumToShort(p->red)&mask; -- ping_info->trans_values.green=ScaleQuantumToShort(p->green)&mask; -- ping_info->trans_values.blue=ScaleQuantumToShort(p->blue)&mask; -- ping_info->trans_values.gray= -+ ping_info->trans_color.red=ScaleQuantumToShort(p->red)&mask; -+ ping_info->trans_color.green=ScaleQuantumToShort(p->green)&mask; -+ ping_info->trans_color.blue=ScaleQuantumToShort(p->blue)&mask; -+ ping_info->trans_color.gray= - (png_uint_16) ScaleQuantumToShort(PixelIntensity(p))&mask; -- ping_info->trans_values.index=(unsigned char) -+ ping_info->trans_color.index=(unsigned char) - (ScaleQuantumToChar(MaxRGB-p->opacity)); - } - } -@@ -6467,7 +6468,7 @@ - { - if (p->opacity != OpaqueOpacity) - { -- if (!RGBColorMatchExact(ping_info->trans_values,*p)) -+ if (!RGBColorMatchExact(ping_info->trans_color,*p)) - { - break; /* Can't use RGB + tRNS for multiple - transparent colors. */ -@@ -6480,7 +6481,7 @@ - } - else - { -- if (RGBColorMatchExact(ping_info->trans_values,*p)) -+ if (RGBColorMatchExact(ping_info->trans_color,*p)) - break; /* Can't use RGB + tRNS when another pixel - having the same RGB samples is - transparent. */ -@@ -6498,10 +6499,10 @@ - ping_info->color_type &= 0x03; /* changes 4 or 6 to 0 or 2 */ - if (image->depth == 8) - { -- ping_info->trans_values.red&=0xff; -- ping_info->trans_values.green&=0xff; -- ping_info->trans_values.blue&=0xff; -- ping_info->trans_values.gray&=0xff; -+ ping_info->trans_color.red&=0xff; -+ ping_info->trans_color.green&=0xff; -+ ping_info->trans_color.blue&=0xff; -+ ping_info->trans_color.gray&=0xff; - } - } - } -@@ -6517,7 +6518,7 @@ - { - ping_info->color_type=PNG_COLOR_TYPE_GRAY; - if (save_image_depth == 16 && image->depth == 8) -- ping_info->trans_values.gray*=0x0101; -+ ping_info->trans_color.gray*=0x0101; - } - if (image->depth > QuantumDepth) - image->depth=QuantumDepth; -@@ -6701,13 +6702,13 @@ - ping_info->num_trans=0; - if (ping_info->num_trans != 0) - { -- ping_info->trans=MagickAllocateMemory(unsigned char *, -+ ping_info->trans_alpha=MagickAllocateMemory(unsigned char *, - number_colors); -- if (ping_info->trans == (unsigned char *) NULL) -+ if (ping_info->trans_alpha == (unsigned char *) NULL) - ThrowWriterException(ResourceLimitError, - MemoryAllocationFailed,image); - for (i=0; i < (long) number_colors; i++) -- ping_info->trans[i]=(png_byte) trans[i]; -+ ping_info->trans_alpha[i]=(png_byte) trans[i]; - } - } - -@@ -6726,10 +6727,10 @@ - image->depth=8; - if ((save_image_depth == 16) && (image->depth == 8)) - { -- ping_info->trans_values.red*=0x0101; -- ping_info->trans_values.green*=0x0101; -- ping_info->trans_values.blue*=0x0101; -- ping_info->trans_values.gray*=0x0101; -+ ping_info->trans_color.red*=0x0101; -+ ping_info->trans_color.green*=0x0101; -+ ping_info->trans_color.blue*=0x0101; -+ ping_info->trans_color.gray*=0x0101; - } - } - -@@ -6756,8 +6757,8 @@ - " Setting up bKGD chunk"); - png_set_bKGD(ping,ping_info,&background); - -- ping_info->trans_values.gray=(png_uint_16)(maxval* -- ping_info->trans_values.gray/MaxRGB); -+ ping_info->trans_color.gray=(png_uint_16)(maxval* -+ ping_info->trans_color.gray/MaxRGB); - } - } - if (logging) -@@ -7332,7 +7333,7 @@ - #endif - if (ping_info->valid & PNG_INFO_tRNS) - { -- MagickFreeMemory(ping_info->trans); -+ MagickFreeMemory(ping_info->trans_alpha); - ping_info->valid&=(~PNG_INFO_tRNS); - } - png_destroy_write_struct(&ping,&ping_info); -@@ -8416,10 +8416,10 @@ - { - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " TERM delay: %lu", -- (png_uint_32) (mng_info->ticks_per_second*final_delay/100)); -+ (uint64_t) (mng_info->ticks_per_second*final_delay/100)); - if (image->iterations == 0) - (void) LogMagickEvent(CoderEvent,GetMagickModule(), -- " TERM iterations: %lu",PNG_MAX_UINT); -+ " TERM iterations: %lu", (uint64_t)PNG_MAX_UINT); - else - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Image iterations: %lu", diff --git a/graphics/GraphicsMagick12/files/patch-configure.in b/graphics/GraphicsMagick12/files/patch-configure.in deleted file mode 100644 index e8e1402cef44..000000000000 --- a/graphics/GraphicsMagick12/files/patch-configure.in +++ /dev/null @@ -1,29 +0,0 @@ ---- configure.orig 2010-01-05 20:20:45.000000000 +0100 -+++ configure 2013-12-13 12:20:04.000000000 +0100 -@@ -24299,7 +24299,7 @@ - fi - - -- ac_fn_c_check_header_compile "$LINENO" "freetype/freetype.h" "ac_cv_header_freetype_freetype_h" "$FT2BUILD_H -+ ac_fn_c_check_header_compile "$LINENO" "freetype.h" "ac_cv_header_freetype_freetype_h" "$FT2BUILD_H - " - if test "x$ac_cv_header_freetype_freetype_h" = x""yes; then : - have_freetype_h='yes' -@@ -25089,7 +25089,7 @@ - # - - # Subdirectory under lib to place GraphicsMagick lib files --MagickLibSubdir="${PACKAGE_NAME}-${PACKAGE_VERSION}" -+MagickLibSubdir="${PACKAGE_NAME}" - - cat >>confdefs.h <<_ACEOF - #define MagickLibSubdir "$MagickLibSubdir" -@@ -25193,7 +25193,7 @@ - - # - # Path to GraphicsMagick share files --MagickShareSubdir="${PACKAGE_NAME}-${PACKAGE_VERSION}" -+MagickShareSubdir="${PACKAGE_NAME}" - MagickSharePath="${DATA_DIR}/${MagickShareSubdir}" - MagickSharePathDefine="${MagickSharePath}/" - case "${build_os}" in |