aboutsummaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorAntoine Brodin <antoine@FreeBSD.org>2015-01-14 18:19:32 +0000
committerAntoine Brodin <antoine@FreeBSD.org>2015-01-14 18:19:32 +0000
commitc6faa705a5fb2824a641c35b5060181b51ca9fe4 (patch)
tree7d0497a4b384b2fe2912162b0c3d7cb597326dbd /graphics
parent78f365008b386f872c3093fc67d24153bd223d1e (diff)
downloadports-c6faa705a5fb2824a641c35b5060181b51ca9fe4.tar.gz
ports-c6faa705a5fb2824a641c35b5060181b51ca9fe4.zip
Notes
Diffstat (limited to 'graphics')
-rw-r--r--graphics/exact-image/Makefile2
-rw-r--r--graphics/gdal/Makefile2
-rw-r--r--graphics/giflib/Makefile34
-rw-r--r--graphics/giflib/distinfo4
-rw-r--r--graphics/giflib/files/patch-Makefile.in27
-rw-r--r--graphics/giflib/files/patch-gif_hash.c10
-rw-r--r--graphics/giflib/files/patch-gif_lib.h18
-rw-r--r--graphics/giflib/files/patch-rgb2gif.c20
-rw-r--r--graphics/giflib/files/quantize.c332
-rw-r--r--graphics/giflib/pkg-plist103
-rw-r--r--graphics/gnash/Makefile2
-rw-r--r--graphics/imlib2/Makefile2
-rw-r--r--graphics/leptonica/Makefile2
-rw-r--r--graphics/mapserver/Makefile2
-rw-r--r--graphics/metapixel/Makefile2
-rw-r--r--graphics/ming/Makefile2
-rw-r--r--graphics/mtpaint/Makefile2
-rw-r--r--graphics/ocaml-images/Makefile2
-rw-r--r--graphics/openimageio/Makefile2
-rw-r--r--graphics/osg-devel/Makefile2
-rw-r--r--graphics/osg/Makefile2
-rw-r--r--graphics/p5-Geo-GDAL/Makefile2
-rw-r--r--graphics/p5-Image-Scale/Makefile2
-rw-r--r--graphics/p5-Imager/Makefile1
-rw-r--r--graphics/php5-swfed/Makefile2
-rw-r--r--graphics/py-ming/Makefile2
-rw-r--r--graphics/py-openimageio/Makefile2
-rw-r--r--graphics/ruby-gdal/Makefile2
-rw-r--r--graphics/simage/Makefile2
-rw-r--r--graphics/simpleviewer/Makefile2
-rw-r--r--graphics/swftools/Makefile2
-rw-r--r--graphics/sxiv/Makefile1
-rw-r--r--graphics/webp/Makefile2
33 files changed, 64 insertions, 532 deletions
diff --git a/graphics/exact-image/Makefile b/graphics/exact-image/Makefile
index c1b5a6ebcdf0..5df4bee6387c 100644
--- a/graphics/exact-image/Makefile
+++ b/graphics/exact-image/Makefile
@@ -3,7 +3,7 @@
PORTNAME= exact-image
PORTVERSION= 0.8.9
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= graphics perl5 python
MASTER_SITES= http://dl.exactcode.de/oss/${PORTNAME}/ LOCAL/bf
diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile
index 531457ab9055..1d67d803df46 100644
--- a/graphics/gdal/Makefile
+++ b/graphics/gdal/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gdal
PORTVERSION= 1.11.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics geography
MASTER_SITES= http://download.osgeo.org/gdal/${PORTVERSION}/ \
ftp://ftp.remotesensing.org/pub/gdal/${PORTVERSION}/ \
diff --git a/graphics/giflib/Makefile b/graphics/giflib/Makefile
index 2de345e778bf..4ff0ca2718b5 100644
--- a/graphics/giflib/Makefile
+++ b/graphics/giflib/Makefile
@@ -2,33 +2,23 @@
# $FreeBSD$
PORTNAME= giflib
-PORTVERSION= 4.2.3
-PORTREVISION= 4
+PORTVERSION= 5.0.5
CATEGORIES= graphics
-MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-4.x
-PKGNAMESUFFIX= ${NOX11SUFFIX}${PKGNAMESUFFIX2}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-5.x
MAINTAINER= portmgr@FreeBSD.org
COMMENT= Tools and library routines for working with GIF images
CONFLICTS= libungif-[0-9]*
-PORTSCOUT= limit:^4\.
-USES= tar:bzip2 libtool shebangfix
-SHEBANG_FILES= ${WRKSRC}/util/gifburst
+USES= tar:bzip2 libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-LMAN1= gif2rgb.1 gifasm.1 gifbg.1 gifclip.1 gifclrmp.1 gifcolor.1 gifcomb.1 \
- gifcompose.1 giffiltr.1 giffix.1 gifflip.1 gifhisto.1 gifinter.1 \
- gifinto.1 gifovly.1 gifpos.1 gifrotat.1 gifrsize.1 gifspnge.1 \
- giftext.1 gifwedge.1 icon2gif.1 raw2gif.1 rgb2gif.1 text2gif.1
-
-OPTIONS_DEFINE= DOCBOOK X11 DOCS
+OPTIONS_DEFINE= DOCBOOK DOCS
OPTIONS_SUB= yes
DOCBOOK_DESC= Generate API documentation (requires DOCS)
-
-X11_CONFIGURE_ENABLE= x11
+INSTALL_TARGET= install-strip
.include <bsd.port.options.mk>
@@ -37,16 +27,7 @@ BUILD_DEPENDS+= xmlto:${PORTSDIR}/textproc/xmlto \
${LOCALBASE}/share/xml/docbook/4.1.2:${PORTSDIR}/textproc/docbook-xml
.endif
-.if ${PORT_OPTIONS:MX11}
-USE_XORG= x11 sm ice
-CPPFLAGS+= -I${LOCALBASE}/include
-LMAN1+= gif2x11.1
-.else
-NOX11SUFFIX= -nox11
-.endif
-
post-patch:
- ${CP} ${FILESDIR}/quantize.c ${WRKSRC}/lib/
.if ! ${PORT_OPTIONS:MDOCBOOK} || ! ${PORT_OPTIONS:MDOCS}
${REINPLACE_CMD} \
-e 's|SUBDIRS = lib util doc pic|SUBDIRS = lib util pic|' \
@@ -54,10 +35,7 @@ post-patch:
.endif
post-install:
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgif.so.4
-.for i in ${LMAN1}
- ${INSTALL_MAN} ${WRKSRC}/doc/${i} ${STAGEDIR}${PREFIX}/man/man1/
-.endfor
+ @${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${STAGEDIR}${PREFIX}/man/man1/
.if ${PORT_OPTIONS:MDOCBOOK} && ${PORT_OPTIONS:MDOCS}
${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}/
diff --git a/graphics/giflib/distinfo b/graphics/giflib/distinfo
index 5a9f3ae3dbbb..84fccc1e3859 100644
--- a/graphics/giflib/distinfo
+++ b/graphics/giflib/distinfo
@@ -1,2 +1,2 @@
-SHA256 (giflib-4.2.3.tar.bz2) = 0ac8d56726f77c8bc9648c93bbb4d6185d32b15ba7bdb702415990f96f3cb766
-SIZE (giflib-4.2.3.tar.bz2) = 560968
+SHA256 (giflib-5.0.5.tar.bz2) = 606d8a366b1c625ab60d62faeca807a799a2b9e88cbdf2a02bfcdf4429bf8609
+SIZE (giflib-5.0.5.tar.bz2) = 651559
diff --git a/graphics/giflib/files/patch-Makefile.in b/graphics/giflib/files/patch-Makefile.in
deleted file mode 100644
index 4238078c379b..000000000000
--- a/graphics/giflib/files/patch-Makefile.in
+++ /dev/null
@@ -1,27 +0,0 @@
---- lib/Makefile.in.orig 2012-05-16 17:59:23.000000000 -0700
-+++ lib/Makefile.in 2012-06-03 22:25:28.000000000 -0700
-@@ -77,7 +77,7 @@
- LTLIBRARIES = $(lib_LTLIBRARIES)
- libgif_la_DEPENDENCIES =
- am_libgif_la_OBJECTS = dgif_lib.lo egif_lib.lo gif_font.lo gif_hash.lo \
-- gifalloc.lo gif_err.lo
-+ gifalloc.lo gif_err.lo quantize.lo
- libgif_la_OBJECTS = $(am_libgif_la_OBJECTS)
- libgif_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-@@ -234,6 +234,7 @@
- gif_hash.h \
- gifalloc.c \
- gif_err.c \
-+ quantize.c \
- gif_lib_private.h
-
- libgif_la_LDFLAGS = -version-info @SHLIBVERSION@
-@@ -319,6 +320,7 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gif_font.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gif_hash.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gifalloc.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quantize.Plo@am__quote@
-
- .c.o:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
diff --git a/graphics/giflib/files/patch-gif_hash.c b/graphics/giflib/files/patch-gif_hash.c
deleted file mode 100644
index 52b564bff909..000000000000
--- a/graphics/giflib/files/patch-gif_hash.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/gif_hash.c.orig 2013-08-29 21:32:18.000000000 +0200
-+++ lib/gif_hash.c 2013-09-03 05:53:45.000000000 +0200
-@@ -21,6 +21,7 @@
- #include <fcntl.h>
- #include <stdio.h>
- #include <string.h>
-+#include <stdlib.h>
-
- #include "gif_lib.h"
- #include "gif_hash.h"
diff --git a/graphics/giflib/files/patch-gif_lib.h b/graphics/giflib/files/patch-gif_lib.h
deleted file mode 100644
index 172e31008233..000000000000
--- a/graphics/giflib/files/patch-gif_lib.h
+++ /dev/null
@@ -1,18 +0,0 @@
---- lib/gif_lib.h.orig 2012-05-06 22:55:48.000000000 +0200
-+++ lib/gif_lib.h 2012-06-03 12:12:23.000000000 +0200
-@@ -180,6 +180,15 @@
- #define D_GIF_ERR_IMAGE_DEFECT 112
- #define D_GIF_ERR_EOF_TOO_SOON 113
-
-+/******************************************************************************
-+ * O.K., here are the routines from GIF_LIB file QUANTIZE.C.
-+******************************************************************************/
-+int QuantizeBuffer(unsigned int Width, unsigned int Height,
-+ int *ColorMapSize, GifByteType * RedInput,
-+ GifByteType * GreenInput, GifByteType * BlueInput,
-+ GifByteType * OutputBuffer,
-+ GifColorType * OutputColorMap);
-+
- /* These are legacy. You probably do not want to call them directly */
- int DGifGetScreenDesc(GifFileType * GifFile);
- int DGifGetRecordType(GifFileType * GifFile, GifRecordType * GifType);
diff --git a/graphics/giflib/files/patch-rgb2gif.c b/graphics/giflib/files/patch-rgb2gif.c
deleted file mode 100644
index e6c82075ba18..000000000000
--- a/graphics/giflib/files/patch-rgb2gif.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- util/rgb2gif.c.orig 2012-05-16 22:31:35.000000000 +0200
-+++ util/rgb2gif.c 2012-06-03 12:23:21.000000000 +0200
-@@ -129,7 +129,7 @@
- * This function returns GIF_OK if succesfull, GIF_ERROR otherwise.
- ******************************************************************************/
- static int
--QuantizeBuffer(unsigned int Width,
-+GifQuantizeBuffer(unsigned int Width,
- unsigned int Height,
- int *ColorMapSize,
- GifByteType * RedInput,
-@@ -428,7 +428,7 @@
- sizeof(GifByteType))) == NULL)
- GIF_EXIT("Failed to allocate memory required, aborted.");
-
-- if (QuantizeBuffer(Width, Height, &ColorMapSize,
-+ if (GifQuantizeBuffer(Width, Height, &ColorMapSize,
- RedBuffer, GreenBuffer, BlueBuffer,
- OutputBuffer, OutputColorMap->Colors) == GIF_ERROR)
- QuitGifError(NULL);
diff --git a/graphics/giflib/files/quantize.c b/graphics/giflib/files/quantize.c
deleted file mode 100644
index fdcfe36efb93..000000000000
--- a/graphics/giflib/files/quantize.c
+++ /dev/null
@@ -1,332 +0,0 @@
-/*****************************************************************************
- * "Gif-Lib" - Yet another gif library.
- *
- * Written by: Gershon Elber IBM PC Ver 0.1, Jun. 1989
- ******************************************************************************
- * Module to quatize high resolution image into lower one. You may want to
- * peek into the following article this code is based on:
- * "Color Image Quantization for frame buffer Display", by Paul Heckbert
- * SIGGRAPH 1982 page 297-307.
- ******************************************************************************
- * History:
- * 5 Jan 90 - Version 1.0 by Gershon Elber.
- *****************************************************************************/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#ifdef __MSDOS__
-#include <dos.h>
-#include <alloc.h>
-#include <graphics.h>
-#endif /* __MSDOS__ */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include "gif_lib.h"
-#include "gif_lib_private.h"
-
-#define ABS(x) ((x) > 0 ? (x) : (-(x)))
-
-#define PROGRAM_NAME "giflib"
-
-/* The colors are stripped to 5 bits per primary color if non MSDOS system
- * or to 4 (not enough memory...) if MSDOS as first step.
- */
-#ifdef __MSDOS__
-#define COLOR_ARRAY_SIZE 4096
-#define BITS_PER_PRIM_COLOR 4
-#define MAX_PRIM_COLOR 0x0f
-#else
-#define COLOR_ARRAY_SIZE 32768
-#define BITS_PER_PRIM_COLOR 5
-#define MAX_PRIM_COLOR 0x1f
-#endif /* __MSDOS__ */
-
-static int SortRGBAxis;
-
-typedef struct QuantizedColorType {
- GifByteType RGB[3];
- GifByteType NewColorIndex;
- long Count;
- struct QuantizedColorType *Pnext;
-} QuantizedColorType;
-
-typedef struct NewColorMapType {
- GifByteType RGBMin[3], RGBWidth[3];
- unsigned int NumEntries; /* # of QuantizedColorType in linked list below */
- unsigned long Count; /* Total number of pixels in all the entries */
- QuantizedColorType *QuantizedColors;
-} NewColorMapType;
-
-static int SubdivColorMap(NewColorMapType * NewColorSubdiv,
- unsigned int ColorMapSize,
- unsigned int *NewColorMapSize);
-static int SortCmpRtn(const VoidPtr Entry1, const VoidPtr Entry2);
-
-/******************************************************************************
- * Quantize high resolution image into lower one. Input image consists of a
- * 2D array for each of the RGB colors with size Width by Height. There is no
- * Color map for the input. Output is a quantized image with 2D array of
- * indexes into the output color map.
- * Note input image can be 24 bits at the most (8 for red/green/blue) and
- * the output has 256 colors at the most (256 entries in the color map.).
- * ColorMapSize specifies size of color map up to 256 and will be updated to
- * real size before returning.
- * Also non of the parameter are allocated by this routine.
- * This function returns GIF_OK if succesfull, GIF_ERROR otherwise.
- ******************************************************************************/
-int
-QuantizeBuffer(unsigned int Width,
- unsigned int Height,
- int *ColorMapSize,
- GifByteType * RedInput,
- GifByteType * GreenInput,
- GifByteType * BlueInput,
- GifByteType * OutputBuffer,
- GifColorType * OutputColorMap) {
-
- unsigned int Index, NumOfEntries;
- int i, j, MaxRGBError[3];
- unsigned int NewColorMapSize;
- long Red, Green, Blue;
- NewColorMapType NewColorSubdiv[256];
- QuantizedColorType *ColorArrayEntries, *QuantizedColor;
-
- ColorArrayEntries = (QuantizedColorType *)malloc(
- sizeof(QuantizedColorType) * COLOR_ARRAY_SIZE);
- if (ColorArrayEntries == NULL) {
- _GifError = E_GIF_ERR_NOT_ENOUGH_MEM;
- return GIF_ERROR;
- }
-
- for (i = 0; i < COLOR_ARRAY_SIZE; i++) {
- ColorArrayEntries[i].RGB[0] = i >> (2 * BITS_PER_PRIM_COLOR);
- ColorArrayEntries[i].RGB[1] = (i >> BITS_PER_PRIM_COLOR) &
- MAX_PRIM_COLOR;
- ColorArrayEntries[i].RGB[2] = i & MAX_PRIM_COLOR;
- ColorArrayEntries[i].Count = 0;
- }
-
- /* Sample the colors and their distribution: */
- for (i = 0; i < (int)(Width * Height); i++) {
- Index = ((RedInput[i] >> (8 - BITS_PER_PRIM_COLOR)) <<
- (2 * BITS_PER_PRIM_COLOR)) +
- ((GreenInput[i] >> (8 - BITS_PER_PRIM_COLOR)) <<
- BITS_PER_PRIM_COLOR) +
- (BlueInput[i] >> (8 - BITS_PER_PRIM_COLOR));
- ColorArrayEntries[Index].Count++;
- }
-
- /* Put all the colors in the first entry of the color map, and call the
- * recursive subdivision process. */
- for (i = 0; i < 256; i++) {
- NewColorSubdiv[i].QuantizedColors = NULL;
- NewColorSubdiv[i].Count = NewColorSubdiv[i].NumEntries = 0;
- for (j = 0; j < 3; j++) {
- NewColorSubdiv[i].RGBMin[j] = 0;
- NewColorSubdiv[i].RGBWidth[j] = 255;
- }
- }
-
- /* Find the non empty entries in the color table and chain them: */
- for (i = 0; i < COLOR_ARRAY_SIZE; i++)
- if (ColorArrayEntries[i].Count > 0)
- break;
- QuantizedColor = NewColorSubdiv[0].QuantizedColors = &ColorArrayEntries[i];
- NumOfEntries = 1;
- while (++i < COLOR_ARRAY_SIZE)
- if (ColorArrayEntries[i].Count > 0) {
- QuantizedColor->Pnext = &ColorArrayEntries[i];
- QuantizedColor = &ColorArrayEntries[i];
- NumOfEntries++;
- }
- QuantizedColor->Pnext = NULL;
-
- NewColorSubdiv[0].NumEntries = NumOfEntries; /* Different sampled colors */
- NewColorSubdiv[0].Count = ((long)Width) * Height; /* Pixels */
- NewColorMapSize = 1;
- if (SubdivColorMap(NewColorSubdiv, *ColorMapSize, &NewColorMapSize) !=
- GIF_OK) {
- free((char *)ColorArrayEntries);
- return GIF_ERROR;
- }
- if (NewColorMapSize < *ColorMapSize) {
- /* And clear rest of color map: */
- for (i = NewColorMapSize; i < *ColorMapSize; i++)
- OutputColorMap[i].Red = OutputColorMap[i].Green =
- OutputColorMap[i].Blue = 0;
- }
-
- /* Average the colors in each entry to be the color to be used in the
- * output color map, and plug it into the output color map itself. */
- for (i = 0; i < NewColorMapSize; i++) {
- if ((j = NewColorSubdiv[i].NumEntries) > 0) {
- QuantizedColor = NewColorSubdiv[i].QuantizedColors;
- Red = Green = Blue = 0;
- while (QuantizedColor) {
- QuantizedColor->NewColorIndex = i;
- Red += QuantizedColor->RGB[0];
- Green += QuantizedColor->RGB[1];
- Blue += QuantizedColor->RGB[2];
- QuantizedColor = QuantizedColor->Pnext;
- }
- OutputColorMap[i].Red = (Red << (8 - BITS_PER_PRIM_COLOR)) / j;
- OutputColorMap[i].Green = (Green << (8 - BITS_PER_PRIM_COLOR)) / j;
- OutputColorMap[i].Blue = (Blue << (8 - BITS_PER_PRIM_COLOR)) / j;
- } else
- fprintf(stderr,
- "\n%s: Null entry in quantized color map - that's weird.\n",
- PROGRAM_NAME);
- }
-
- /* Finally scan the input buffer again and put the mapped index in the
- * output buffer. */
- MaxRGBError[0] = MaxRGBError[1] = MaxRGBError[2] = 0;
- for (i = 0; i < (int)(Width * Height); i++) {
- Index = ((RedInput[i] >> (8 - BITS_PER_PRIM_COLOR)) <<
- (2 * BITS_PER_PRIM_COLOR)) +
- ((GreenInput[i] >> (8 - BITS_PER_PRIM_COLOR)) <<
- BITS_PER_PRIM_COLOR) +
- (BlueInput[i] >> (8 - BITS_PER_PRIM_COLOR));
- Index = ColorArrayEntries[Index].NewColorIndex;
- OutputBuffer[i] = Index;
- if (MaxRGBError[0] < ABS(OutputColorMap[Index].Red - RedInput[i]))
- MaxRGBError[0] = ABS(OutputColorMap[Index].Red - RedInput[i]);
- if (MaxRGBError[1] < ABS(OutputColorMap[Index].Green - GreenInput[i]))
- MaxRGBError[1] = ABS(OutputColorMap[Index].Green - GreenInput[i]);
- if (MaxRGBError[2] < ABS(OutputColorMap[Index].Blue - BlueInput[i]))
- MaxRGBError[2] = ABS(OutputColorMap[Index].Blue - BlueInput[i]);
- }
-
-#ifdef DEBUG
- fprintf(stderr,
- "Quantization L(0) errors: Red = %d, Green = %d, Blue = %d.\n",
- MaxRGBError[0], MaxRGBError[1], MaxRGBError[2]);
-#endif /* DEBUG */
-
- free((char *)ColorArrayEntries);
-
- *ColorMapSize = NewColorMapSize;
-
- return GIF_OK;
-}
-
-/******************************************************************************
- * Routine to subdivide the RGB space recursively using median cut in each
- * axes alternatingly until ColorMapSize different cubes exists.
- * The biggest cube in one dimension is subdivide unless it has only one entry.
- * Returns GIF_ERROR if failed, otherwise GIF_OK.
- ******************************************************************************/
-static int
-SubdivColorMap(NewColorMapType * NewColorSubdiv,
- unsigned int ColorMapSize,
- unsigned int *NewColorMapSize) {
-
- int MaxSize;
- unsigned int i, j, Index = 0, NumEntries, MinColor, MaxColor;
- long Sum, Count;
- QuantizedColorType *QuantizedColor, **SortArray;
-
- while (ColorMapSize > *NewColorMapSize) {
- /* Find candidate for subdivision: */
- MaxSize = -1;
- for (i = 0; i < *NewColorMapSize; i++) {
- for (j = 0; j < 3; j++) {
- if ((((int)NewColorSubdiv[i].RGBWidth[j]) > MaxSize) &&
- (NewColorSubdiv[i].NumEntries > 1)) {
- MaxSize = NewColorSubdiv[i].RGBWidth[j];
- Index = i;
- SortRGBAxis = j;
- }
- }
- }
-
- if (MaxSize == -1)
- return GIF_OK;
-
- /* Split the entry Index into two along the axis SortRGBAxis: */
-
- /* Sort all elements in that entry along the given axis and split at
- * the median. */
- SortArray = (QuantizedColorType **)malloc(
- sizeof(QuantizedColorType *) *
- NewColorSubdiv[Index].NumEntries);
- if (SortArray == NULL)
- return GIF_ERROR;
- for (j = 0, QuantizedColor = NewColorSubdiv[Index].QuantizedColors;
- j < NewColorSubdiv[Index].NumEntries && QuantizedColor != NULL;
- j++, QuantizedColor = QuantizedColor->Pnext)
- SortArray[j] = QuantizedColor;
-
- qsort(SortArray, NewColorSubdiv[Index].NumEntries,
- sizeof(QuantizedColorType *), SortCmpRtn);
-
- /* Relink the sorted list into one: */
- for (j = 0; j < NewColorSubdiv[Index].NumEntries - 1; j++)
- SortArray[j]->Pnext = SortArray[j + 1];
- SortArray[NewColorSubdiv[Index].NumEntries - 1]->Pnext = NULL;
- NewColorSubdiv[Index].QuantizedColors = QuantizedColor = SortArray[0];
- free((char *)SortArray);
-
- /* Now simply add the Counts until we have half of the Count: */
- Sum = NewColorSubdiv[Index].Count / 2 - QuantizedColor->Count;
- NumEntries = 1;
- Count = QuantizedColor->Count;
- while ((Sum -= QuantizedColor->Pnext->Count) >= 0 &&
- QuantizedColor->Pnext != NULL &&
- QuantizedColor->Pnext->Pnext != NULL) {
- QuantizedColor = QuantizedColor->Pnext;
- NumEntries++;
- Count += QuantizedColor->Count;
- }
- /* Save the values of the last color of the first half, and first
- * of the second half so we can update the Bounding Boxes later.
- * Also as the colors are quantized and the BBoxes are full 0..255,
- * they need to be rescaled.
- */
- MaxColor = QuantizedColor->RGB[SortRGBAxis]; /* Max. of first half */
- MinColor = QuantizedColor->Pnext->RGB[SortRGBAxis]; /* of second */
- MaxColor <<= (8 - BITS_PER_PRIM_COLOR);
- MinColor <<= (8 - BITS_PER_PRIM_COLOR);
-
- /* Partition right here: */
- NewColorSubdiv[*NewColorMapSize].QuantizedColors =
- QuantizedColor->Pnext;
- QuantizedColor->Pnext = NULL;
- NewColorSubdiv[*NewColorMapSize].Count = Count;
- NewColorSubdiv[Index].Count -= Count;
- NewColorSubdiv[*NewColorMapSize].NumEntries =
- NewColorSubdiv[Index].NumEntries - NumEntries;
- NewColorSubdiv[Index].NumEntries = NumEntries;
- for (j = 0; j < 3; j++) {
- NewColorSubdiv[*NewColorMapSize].RGBMin[j] =
- NewColorSubdiv[Index].RGBMin[j];
- NewColorSubdiv[*NewColorMapSize].RGBWidth[j] =
- NewColorSubdiv[Index].RGBWidth[j];
- }
- NewColorSubdiv[*NewColorMapSize].RGBWidth[SortRGBAxis] =
- NewColorSubdiv[*NewColorMapSize].RGBMin[SortRGBAxis] +
- NewColorSubdiv[*NewColorMapSize].RGBWidth[SortRGBAxis] - MinColor;
- NewColorSubdiv[*NewColorMapSize].RGBMin[SortRGBAxis] = MinColor;
-
- NewColorSubdiv[Index].RGBWidth[SortRGBAxis] =
- MaxColor - NewColorSubdiv[Index].RGBMin[SortRGBAxis];
-
- (*NewColorMapSize)++;
- }
-
- return GIF_OK;
-}
-
-/****************************************************************************
- * Routine called by qsort to compare to entries.
- ****************************************************************************/
-static int
-SortCmpRtn(const VoidPtr Entry1,
- const VoidPtr Entry2) {
-
- return (*((QuantizedColorType **) Entry1))->RGB[SortRGBAxis] -
- (*((QuantizedColorType **) Entry2))->RGB[SortRGBAxis];
-}
diff --git a/graphics/giflib/pkg-plist b/graphics/giflib/pkg-plist
index 1fe90a202c55..81ad26310a76 100644
--- a/graphics/giflib/pkg-plist
+++ b/graphics/giflib/pkg-plist
@@ -1,90 +1,47 @@
+bin/gif2raw
bin/gif2rgb
-%%X11%%bin/gif2x11
-bin/gifasm
-bin/gifbg
-bin/gifburst
-bin/gifclip
+bin/gifbuild
bin/gifclrmp
-bin/gifcolor
-bin/gifcomb
-bin/gifcompose
-bin/giffiltr
+bin/gifecho
bin/giffix
-bin/gifflip
-bin/gifhisto
-bin/gifinfo
-bin/gifinter
bin/gifinto
-bin/gifovly
-bin/gifpos
-bin/gifrotat
-bin/gifrsize
-bin/gifspnge
bin/giftext
-bin/gifwedge
-bin/icon2gif
-bin/raw2gif
-bin/rgb2gif
-bin/text2gif
+bin/giftool
include/gif_lib.h
lib/libgif.a
lib/libgif.so
-lib/libgif.so.4
-lib/libgif.so.4.1.7
+lib/libgif.so.6
+lib/libgif.so.6.0.1
+man/man1/gif2raw.1.gz
man/man1/gif2rgb.1.gz
-%%X11%%man/man1/gif2x11.1.gz
-man/man1/gifasm.1.gz
man/man1/gifbg.1.gz
-man/man1/gifclip.1.gz
+man/man1/gifbuild.1.gz
man/man1/gifclrmp.1.gz
man/man1/gifcolor.1.gz
-man/man1/gifcomb.1.gz
-man/man1/gifcompose.1.gz
-man/man1/giffiltr.1.gz
+man/man1/gifecho.1.gz
man/man1/giffix.1.gz
-man/man1/gifflip.1.gz
man/man1/gifhisto.1.gz
-man/man1/gifinter.1.gz
man/man1/gifinto.1.gz
-man/man1/gifovly.1.gz
-man/man1/gifpos.1.gz
-man/man1/gifrotat.1.gz
-man/man1/gifrsize.1.gz
-man/man1/gifspnge.1.gz
+man/man1/giflib.1.gz
man/man1/giftext.1.gz
+man/man1/giftool.1.gz
man/man1/gifwedge.1.gz
-man/man1/icon2gif.1.gz
-man/man1/raw2gif.1.gz
-man/man1/rgb2gif.1.gz
-man/man1/text2gif.1.gz
-%%DOCBOOK%%%%DOCSDIR%%/gif2rgb.html
-%%DOCBOOK%%%%DOCSDIR%%/gif2x11.html
-%%DOCBOOK%%%%DOCSDIR%%/gif89.txt
-%%DOCBOOK%%%%DOCSDIR%%/gif_lib.html
-%%DOCBOOK%%%%DOCSDIR%%/gifasm.html
-%%DOCBOOK%%%%DOCSDIR%%/gifbg.html
-%%DOCBOOK%%%%DOCSDIR%%/gifclip.html
-%%DOCBOOK%%%%DOCSDIR%%/gifclrmp.html
-%%DOCBOOK%%%%DOCSDIR%%/gifcolor.html
-%%DOCBOOK%%%%DOCSDIR%%/gifcomb.html
-%%DOCBOOK%%%%DOCSDIR%%/gifcompose.html
-%%DOCBOOK%%%%DOCSDIR%%/giffiltr.html
-%%DOCBOOK%%%%DOCSDIR%%/giffix.html
-%%DOCBOOK%%%%DOCSDIR%%/gifflip.html
-%%DOCBOOK%%%%DOCSDIR%%/gifhisto.html
-%%DOCBOOK%%%%DOCSDIR%%/gifinter.html
-%%DOCBOOK%%%%DOCSDIR%%/gifinto.html
-%%DOCBOOK%%%%DOCSDIR%%/gifovly.html
-%%DOCBOOK%%%%DOCSDIR%%/gifpos.html
-%%DOCBOOK%%%%DOCSDIR%%/gifrotat.html
-%%DOCBOOK%%%%DOCSDIR%%/gifrsize.html
-%%DOCBOOK%%%%DOCSDIR%%/gifspnge.html
-%%DOCBOOK%%%%DOCSDIR%%/giftext.html
-%%DOCBOOK%%%%DOCSDIR%%/gifwedge.html
-%%DOCBOOK%%%%DOCSDIR%%/icon2gif.html
-%%DOCBOOK%%%%DOCSDIR%%/intro.html
-%%DOCBOOK%%%%DOCSDIR%%/liberror.html
-%%DOCBOOK%%%%DOCSDIR%%/lzgif.txt
-%%DOCBOOK%%%%DOCSDIR%%/raw2gif.html
-%%DOCBOOK%%%%DOCSDIR%%/rgb2gif.html
-%%DOCBOOK%%%%DOCSDIR%%/text2gif.html
+%%DOCBOOK%%%%PORTDOCS%%%%DOCSDIR%%/gif2raw.html
+%%DOCBOOK%%%%PORTDOCS%%%%DOCSDIR%%/gif2rgb.html
+%%DOCBOOK%%%%PORTDOCS%%%%DOCSDIR%%/gif87.txt
+%%DOCBOOK%%%%PORTDOCS%%%%DOCSDIR%%/gif89.txt
+%%DOCBOOK%%%%PORTDOCS%%%%DOCSDIR%%/gif_lib.html
+%%DOCBOOK%%%%PORTDOCS%%%%DOCSDIR%%/gifbg.html
+%%DOCBOOK%%%%PORTDOCS%%%%DOCSDIR%%/gifbuild.html
+%%DOCBOOK%%%%PORTDOCS%%%%DOCSDIR%%/gifclrmp.html
+%%DOCBOOK%%%%PORTDOCS%%%%DOCSDIR%%/gifcolor.html
+%%DOCBOOK%%%%PORTDOCS%%%%DOCSDIR%%/gifecho.html
+%%DOCBOOK%%%%PORTDOCS%%%%DOCSDIR%%/giffix.html
+%%DOCBOOK%%%%PORTDOCS%%%%DOCSDIR%%/gifhisto.html
+%%DOCBOOK%%%%PORTDOCS%%%%DOCSDIR%%/gifinto.html
+%%DOCBOOK%%%%PORTDOCS%%%%DOCSDIR%%/giflib.html
+%%DOCBOOK%%%%PORTDOCS%%%%DOCSDIR%%/giftext.html
+%%DOCBOOK%%%%PORTDOCS%%%%DOCSDIR%%/giftool.html
+%%DOCBOOK%%%%PORTDOCS%%%%DOCSDIR%%/gifwedge.html
+%%DOCBOOK%%%%PORTDOCS%%%%DOCSDIR%%/intro.html
+%%DOCBOOK%%%%PORTDOCS%%%%DOCSDIR%%/lzgif.txt
diff --git a/graphics/gnash/Makefile b/graphics/gnash/Makefile
index 5fa3c576b1e2..0e7d1a9cb36d 100644
--- a/graphics/gnash/Makefile
+++ b/graphics/gnash/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gnash
PORTVERSION= 0.8.10
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= graphics
MASTER_SITES= GNU/${PORTNAME}/${PORTVERSION}/
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index 7b0d2d6b6457..53415040d0b2 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -3,7 +3,7 @@
PORTNAME= imlib2
PORTVERSION= 1.4.6
-PORTREVISION= 5
+PORTREVISION= 6
PORTEPOCH= 2
CATEGORIES= graphics enlightenment
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
diff --git a/graphics/leptonica/Makefile b/graphics/leptonica/Makefile
index 3c675a542529..19239706cef4 100644
--- a/graphics/leptonica/Makefile
+++ b/graphics/leptonica/Makefile
@@ -3,7 +3,7 @@
PORTNAME= leptonica
PORTVERSION= 1.70
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= http://www.leptonica.com/source/
diff --git a/graphics/mapserver/Makefile b/graphics/mapserver/Makefile
index 851903f6f822..361fdb2520c1 100644
--- a/graphics/mapserver/Makefile
+++ b/graphics/mapserver/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mapserver
PORTVERSION= 6.4.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics www geography
MASTER_SITES= http://download.osgeo.org/mapserver/
diff --git a/graphics/metapixel/Makefile b/graphics/metapixel/Makefile
index 2a0eafb6071b..4e42f8bca242 100644
--- a/graphics/metapixel/Makefile
+++ b/graphics/metapixel/Makefile
@@ -3,7 +3,7 @@
PORTNAME= metapixel
PORTVERSION= 1.0.2
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= graphics
MASTER_SITES= http://www.complang.tuwien.ac.at/schani/metapixel/files/ \
http://mirror.roe.ch/dist/metapixel/
diff --git a/graphics/ming/Makefile b/graphics/ming/Makefile
index 9ec845cfad6d..bc5a9c1c28e5 100644
--- a/graphics/ming/Makefile
+++ b/graphics/ming/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ming
PORTVERSION= 0.4.5
-PORTREVISION?= 5
+PORTREVISION?= 6
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/Releases/
diff --git a/graphics/mtpaint/Makefile b/graphics/mtpaint/Makefile
index af115951fb14..eb1db1145c1b 100644
--- a/graphics/mtpaint/Makefile
+++ b/graphics/mtpaint/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mtpaint
PORTVERSION= 3.40
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics
MASTER_SITES= SF
diff --git a/graphics/ocaml-images/Makefile b/graphics/ocaml-images/Makefile
index d74a071a766a..2f8066301532 100644
--- a/graphics/ocaml-images/Makefile
+++ b/graphics/ocaml-images/Makefile
@@ -3,7 +3,7 @@
PORTNAME= images
PORTVERSION= 4.0.1
-PORTREVISION= 3
+PORTREVISION= 4
PORTEPOCH= 2
CATEGORIES= graphics
MASTER_SITES= https://bitbucket.org/camlspotter/camlimages/get/
diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile
index 5f135aafe060..39955b036349 100644
--- a/graphics/openimageio/Makefile
+++ b/graphics/openimageio/Makefile
@@ -3,7 +3,7 @@
PORTNAME= openimageio
PORTVERSION= 1.4.14
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES?= graphics multimedia
MAINTAINER?= FreeBSD@Shaneware.biz
diff --git a/graphics/osg-devel/Makefile b/graphics/osg-devel/Makefile
index ad599f7c0ba6..44e683579073 100644
--- a/graphics/osg-devel/Makefile
+++ b/graphics/osg-devel/Makefile
@@ -3,7 +3,7 @@
PORTNAME= osg
PORTVERSION= 3.3.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics
MASTER_SITES= http://trac.openscenegraph.org/downloads/developer_releases/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/graphics/osg/Makefile b/graphics/osg/Makefile
index df3ec455bbe8..ed74f44ff30b 100644
--- a/graphics/osg/Makefile
+++ b/graphics/osg/Makefile
@@ -3,7 +3,7 @@
PORTNAME= osg
PORTVERSION= 3.2.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics
MASTER_SITES= http://trac.openscenegraph.org/downloads/developer_releases/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/graphics/p5-Geo-GDAL/Makefile b/graphics/p5-Geo-GDAL/Makefile
index 5a2de81fcd12..7c0317b5c005 100644
--- a/graphics/p5-Geo-GDAL/Makefile
+++ b/graphics/p5-Geo-GDAL/Makefile
@@ -3,7 +3,7 @@
PORTNAME= Geo-GDAL
PORTVERSION= 1.11.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics perl5
MASTER_SITES= http://download.osgeo.org/gdal/ \
ftp://ftp.remotesensing.org/pub/gdal/ \
diff --git a/graphics/p5-Image-Scale/Makefile b/graphics/p5-Image-Scale/Makefile
index 540225868127..411104d6a2ec 100644
--- a/graphics/p5-Image-Scale/Makefile
+++ b/graphics/p5-Image-Scale/Makefile
@@ -13,6 +13,8 @@ COMMENT= Perl module for fast, high-quality fixed-point image resizing
LICENSE= GPLv2
+BROKEN= Uses undocumented giflib API
+
LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \
libpng.so:${PORTSDIR}/graphics/png \
libgif.so:${PORTSDIR}/graphics/giflib
diff --git a/graphics/p5-Imager/Makefile b/graphics/p5-Imager/Makefile
index 906d5e286c38..c5980227cba4 100644
--- a/graphics/p5-Imager/Makefile
+++ b/graphics/p5-Imager/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Imager
PORTVERSION= 1.001
+PORTREVISION= 1
CATEGORIES= graphics perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/graphics/php5-swfed/Makefile b/graphics/php5-swfed/Makefile
index 0df8262ce4e7..feacc1956df8 100644
--- a/graphics/php5-swfed/Makefile
+++ b/graphics/php5-swfed/Makefile
@@ -3,7 +3,7 @@
PORTNAME= swfed
PORTVERSION= 0.62
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics www
MASTER_SITES= SFJP
MASTER_SITE_SUBDIR= ${PORTNAME}/60548
diff --git a/graphics/py-ming/Makefile b/graphics/py-ming/Makefile
index 8b24ef74864e..a74971100c2b 100644
--- a/graphics/py-ming/Makefile
+++ b/graphics/py-ming/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= ming
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/graphics/py-openimageio/Makefile b/graphics/py-openimageio/Makefile
index 933c2f52f201..04b9fa83de23 100644
--- a/graphics/py-openimageio/Makefile
+++ b/graphics/py-openimageio/Makefile
@@ -1,7 +1,7 @@
# Created by: Shane Ambler
# $FreeBSD$
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics multimedia python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/graphics/ruby-gdal/Makefile b/graphics/ruby-gdal/Makefile
index 55136a303a0d..986118a368df 100644
--- a/graphics/ruby-gdal/Makefile
+++ b/graphics/ruby-gdal/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gdal
PORTVERSION= 1.11.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics ruby
MASTER_SITES= http://download.osgeo.org/gdal/ \
ftp://ftp.remotesensing.org/pub/gdal/ \
diff --git a/graphics/simage/Makefile b/graphics/simage/Makefile
index f30406a667c1..e33c8bdba38b 100644
--- a/graphics/simage/Makefile
+++ b/graphics/simage/Makefile
@@ -3,7 +3,7 @@
PORTNAME= simage
PORTVERSION= 1.7.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics
MASTER_SITES= https://bitbucket.org/Coin3D/coin/downloads/
diff --git a/graphics/simpleviewer/Makefile b/graphics/simpleviewer/Makefile
index ae0129530ef6..f73bd7c22bd4 100644
--- a/graphics/simpleviewer/Makefile
+++ b/graphics/simpleviewer/Makefile
@@ -3,7 +3,7 @@
PORTNAME= simpleviewer
PORTVERSION= 1.7.1553.8560
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/OpenGL%20edition
DISTNAME= sviewgl-src-${PORTVERSION}
diff --git a/graphics/swftools/Makefile b/graphics/swftools/Makefile
index fb1c7b199800..388f3dd5b5e1 100644
--- a/graphics/swftools/Makefile
+++ b/graphics/swftools/Makefile
@@ -3,7 +3,7 @@
PORTNAME= swftools
PORTVERSION= 0.9.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics
MASTER_SITES= http://www.swftools.org/ \
http://www.c-s.li/ports/
diff --git a/graphics/sxiv/Makefile b/graphics/sxiv/Makefile
index ac537e8cdc06..5d95275a72b5 100644
--- a/graphics/sxiv/Makefile
+++ b/graphics/sxiv/Makefile
@@ -3,6 +3,7 @@
PORTNAME= sxiv
PORTVERSION= 1.3.1
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= https://github.com/muennich/sxiv/archive/
DISTNAME= v${PORTVERSION}
diff --git a/graphics/webp/Makefile b/graphics/webp/Makefile
index 744423c34c22..ce1e7542fe1d 100644
--- a/graphics/webp/Makefile
+++ b/graphics/webp/Makefile
@@ -3,7 +3,7 @@
PORTNAME= webp
PORTVERSION= 0.4.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= http://downloads.webmproject.org/releases/webp/
DISTNAME= lib${PORTNAME}-${PORTVERSION}