From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- dev-dotnet/libgdiplus/Manifest | 12 + .../files/libgdiplus-2.10.1-libpng15.patch | 164 ++++++++++++ .../files/libgdiplus-2.10.9-freetype251.patch | 12 + .../libgdiplus-2.10.9-giflib-quantizebuffer.patch | 296 +++++++++++++++++++++ .../libgdiplus/files/libgdiplus-2.10.9-gold.patch | 16 ++ dev-dotnet/libgdiplus/libgdiplus-2.10.9-r1.ebuild | 69 +++++ dev-dotnet/libgdiplus/libgdiplus-2.10.9-r2.ebuild | 70 +++++ dev-dotnet/libgdiplus/libgdiplus-2.10.9-r3.ebuild | 68 +++++ dev-dotnet/libgdiplus/libgdiplus-4.2-r2.ebuild | 50 ++++ dev-dotnet/libgdiplus/libgdiplus-4.2-r3.ebuild | 50 ++++ dev-dotnet/libgdiplus/metadata.xml | 8 + 11 files changed, 815 insertions(+) create mode 100644 dev-dotnet/libgdiplus/Manifest create mode 100644 dev-dotnet/libgdiplus/files/libgdiplus-2.10.1-libpng15.patch create mode 100644 dev-dotnet/libgdiplus/files/libgdiplus-2.10.9-freetype251.patch create mode 100644 dev-dotnet/libgdiplus/files/libgdiplus-2.10.9-giflib-quantizebuffer.patch create mode 100644 dev-dotnet/libgdiplus/files/libgdiplus-2.10.9-gold.patch create mode 100644 dev-dotnet/libgdiplus/libgdiplus-2.10.9-r1.ebuild create mode 100644 dev-dotnet/libgdiplus/libgdiplus-2.10.9-r2.ebuild create mode 100644 dev-dotnet/libgdiplus/libgdiplus-2.10.9-r3.ebuild create mode 100644 dev-dotnet/libgdiplus/libgdiplus-4.2-r2.ebuild create mode 100644 dev-dotnet/libgdiplus/libgdiplus-4.2-r3.ebuild create mode 100644 dev-dotnet/libgdiplus/metadata.xml (limited to 'dev-dotnet/libgdiplus') diff --git a/dev-dotnet/libgdiplus/Manifest b/dev-dotnet/libgdiplus/Manifest new file mode 100644 index 000000000000..279d415bc287 --- /dev/null +++ b/dev-dotnet/libgdiplus/Manifest @@ -0,0 +1,12 @@ +AUX libgdiplus-2.10.1-libpng15.patch 5491 BLAKE2B 3b0a6f05957dd01e6ebb86d782ec2fc85d5731d5d6f8a4e46403584551c9ae1e0684b1dcae845b0d1e5da50d27837f6fd2491e9928f7a9564a0c2be5737823c7 SHA512 292e8f83cd5a10c99a543a0fe85a9b2770e29627f60afd7e6ab7824b135870d9bfb20c8919ec9104110e645a039f69e7378d9295c330423a2725bb8840ceeffd +AUX libgdiplus-2.10.9-freetype251.patch 295 BLAKE2B af03eb04b32f679913212c819f87c6e8e6a7227f751594d750ae18964db1285cc6edd303f281412800b73fd9de032c31236bf87aba4169a4397e47c57c07a212 SHA512 8b7dd826770f3ab0f6b58f8265f46b8d51c64abb2be7e10e105f3515283eedb3bc087ceb20f47c310f076bc1d81ce89c19d30e8a9daef8941a7d0333abd25f26 +AUX libgdiplus-2.10.9-giflib-quantizebuffer.patch 12869 BLAKE2B f0ffb4f31cc54cd9aad10a6923f7e57349955c991e838dd49f9a304dd7e04e85b2cbd6767aad8300206d751ff6911196cdbc4be6bccc75bf93a7067a76a18cbb SHA512 3ad5ebd2bf9ef980dd273df9b036284d2217cee9ba09dbb6fa9d5b54da132eab0460597a63c53947d7d3f16b1079284413139937cc58b4694b102d1061e776c9 +AUX libgdiplus-2.10.9-gold.patch 443 BLAKE2B 9d4cefaae631a2db9bde84d2ff7cc619ec5af97349afd5226abccb11bd6c1cb86b265670dc57b4029fde2d480236752c53f7021e505153f4551503d9fc8ff9e9 SHA512 93434d106d165cf167332ac6b0fe800eecd39f752ade2c38817ac13bfd69170d3df7e504f2dc0099ef62adc1c05790925fc99e0613bd519bee2df7dec8984912 +DIST libgdiplus-2.10.9.tar.bz2 2074317 BLAKE2B ddbdc22d61734e9141f7d05b45867b1c0ac89903a74d23a3b05d247913aaac5350a603a5d7acb85338b2e9877b077c3c4b43839b33b2f6507b76035124cb43b4 SHA512 7f1944795c7ede5fd92a6d7e8d7d6cf2ef3c154e656b83e769b417f8f7195dd975084afe3c3cd1dda1ecb2c1167f76c0b5714cd16d549ff056add09763c6b26c +DIST libgdiplus-4.2.tar.gz 687398 BLAKE2B e9b5912cb63de9692861b09ceeb5ad55fa6999960fddbbe55382f957591e68bede91550c2d49ed4bc78d118288ca6b35a2b2ab69f87f9fcc289b7fe2b1853b7a SHA512 102d1e07a106fa32640a20c4843bf82b3f628c5b7a3813d39c7712f2cd09d80dc5adb337a8d5bdbae065f876a0c433a5d8fcb7d761dff5ee08c48cac2cd2344e +EBUILD libgdiplus-2.10.9-r1.ebuild 1523 BLAKE2B 847c523bde5b3abd495e4c76082d280efa16f209a881f07d3fe7532878786a361ab5f2fc7be625f8727dcefd0ba77f3bf1a8854ea0b7a1a8e15e9737716369b9 SHA512 a9dbc3ef37a1afafeffd9c9d281b875cee2eee7fcf5c85d9fd10dff1c27f4f5e2d5057f9f38e39bd33291a1dd3dbfb1feb6563b4f67e17139773e57f8a94446e +EBUILD libgdiplus-2.10.9-r2.ebuild 1583 BLAKE2B 32d47adb2856d6c7b8e753dbe4007b4d33603006ba82812c4d9e94cff330f26a90f553dfac494efdee917ae02d80d31219a349d9fc9b7c6adad5e3575d9dfc8a SHA512 5b25404630bfc2c784bec27774753fcfbc1929eca72cf18b6009a464bb869fd072f0cf1c97edafa7b121cff1e011276d9923d48ec594db49fce8ad6203c54166 +EBUILD libgdiplus-2.10.9-r3.ebuild 1528 BLAKE2B 27e5d30b24b4f95f7cabaf03e84cd4bae4bc36f94ef6f2adc70524cceac7010fa836fd637de9adf70b816ff39d3f12dfcb9fe692be99b743373f3b0b67e8d0b0 SHA512 0850083e0c58534b631ef1907d32bc6262e5d148382b05749dd0369d7e6b44353a1bdd3fb5ac16c5f7b03e5dbc4e26f6ff7868337da5e0305ba517e784a17ec1 +EBUILD libgdiplus-4.2-r2.ebuild 1132 BLAKE2B 4336653b18726b170b65ddef6d838379dd2295bbda68a37271a63a8ce4d9e0d67c46fd740822d7c923489e772d1393e44fe6eb87bdf36808c16c438397d0cc5f SHA512 ffc9919aae1e9147405efb36f7148e0d82b744dab6572d24d7de7c58047ce352751b35a79e23a6323e67e2a68b8647d33ff670f98f3d375822a363ee0c1657cc +EBUILD libgdiplus-4.2-r3.ebuild 1125 BLAKE2B 4f70257e8ba0e5f344b1d08609e134b2bfa2d555b3e684eacde35d2a421168b34dd34b8422bda05ed7d44086a56d5a8e07c9f09cab532bd8d23329892c64cd8e SHA512 7ab12be48cd06814507ec263f9703b284b4a1bcb78b9751c941914310f23deefd639cd3f920de6a5c1a01808402b0fd235ac8ce3d8a1c5c2d5cee5ffa0bdffda +MISC metadata.xml 255 BLAKE2B 495c21dcece437a54ddf2ba6c003601ac84e8ff4f4dd814be0cdae9bb3b6d81ce49f3b00f47ad9ca73f1c9a8b11ed9addaa3c5b8352857813e76d994d020292f SHA512 2ad078558aba9045a782316fc558ea3c6edf579a77a87c0096e3a85ac78a73904a5ceb48cec15ed30fafacc79a66fcf6836acac43d311d1840ccdd62fc2a6896 diff --git a/dev-dotnet/libgdiplus/files/libgdiplus-2.10.1-libpng15.patch b/dev-dotnet/libgdiplus/files/libgdiplus-2.10.1-libpng15.patch new file mode 100644 index 000000000000..31a1c01629d8 --- /dev/null +++ b/dev-dotnet/libgdiplus/files/libgdiplus-2.10.1-libpng15.patch @@ -0,0 +1,164 @@ +$NetBSD: patch-aa,v 1.8 2011/01/21 10:21:51 wiz Exp $ + +Fix build with png-1.5. + +--- src/pngcodec.c.orig 2010-11-03 16:52:54.000000000 +0000 ++++ src/pngcodec.c +@@ -116,10 +116,15 @@ gdip_load_png_properties (png_structp pn + bitmap_data->dpi_horz = png_get_x_pixels_per_inch(png_ptr, info_ptr); + bitmap_data->dpi_vert = png_get_y_pixels_per_inch(png_ptr, info_ptr); + #elif defined(PNG_pHYs_SUPPORTED) +- if ((info_ptr->valid & PNG_INFO_pHYs) && (info_ptr->phys_unit_type == PNG_RESOLUTION_METER)) { +- bitmap_data->image_flags |= ImageFlagsHasRealDPI; +- bitmap_data->dpi_horz = info_ptr->x_pixels_per_unit * 0.0254; +- bitmap_data->dpi_vert = info_ptr->y_pixels_per_unit * 0.0254; ++ if (png_get_valid (png_ptr, info_ptr, PNG_INFO_pHYs)) { ++ png_uint_32 res_x, res_y; ++ int unit_type; ++ png_get_pHYs (png_ptr, info_ptr, &res_x, &res_y, &unit_type); ++ if (unit_type == PNG_RESOLUTION_METER) { ++ bitmap_data->image_flags |= ImageFlagsHasRealDPI; ++ bitmap_data->dpi_horz = res_x * 0.0254; ++ bitmap_data->dpi_vert = res_y * 0.0254; ++ } + } + #endif + /* default to screen resolution (if nothing was provided or available) */ +@@ -130,7 +135,7 @@ gdip_load_png_properties (png_structp pn + #if defined(PNG_iCCP_SUPPORTED) + { + png_charp name; +- png_charp profile; ++ png_bytep profile; + png_uint_32 proflen; + int compression_type; + +@@ -292,6 +297,11 @@ gdip_load_png_image_from_file_or_stream + ImageFlags colourspace_flag; + int i; + int j; ++ png_colorp png_palette; ++ int png_num_palette; ++ png_bytep trans_alpha; ++ int num_trans; ++ png_color_16p trans_color; + + width = png_get_image_width (png_ptr, info_ptr); + height = png_get_image_height (png_ptr, info_ptr); +@@ -309,6 +319,8 @@ gdip_load_png_image_from_file_or_stream + } + + /* Copy palette. */ ++ png_get_PLTE (png_ptr, info_ptr, &png_palette, &png_num_palette); ++ + num_colours = 1 << bit_depth; + + if (png_get_color_type (png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY) { +@@ -321,8 +333,8 @@ gdip_load_png_image_from_file_or_stream + colourspace_flag = ImageFlagsColorSpaceRGB; + + palette_entries = num_colours; +- if (palette_entries > info_ptr->num_palette) { +- palette_entries = info_ptr->num_palette; ++ if (palette_entries > png_num_palette) { ++ palette_entries = png_num_palette; + } + + palette = GdipAlloc (sizeof(ColorPalette) + (num_colours - 1) * sizeof(ARGB)); +@@ -331,29 +343,30 @@ gdip_load_png_image_from_file_or_stream + + for (i=0; i < palette_entries; i++) { + set_pixel_bgra (&palette->Entries[i], 0, +- info_ptr->palette[i].blue, +- info_ptr->palette[i].green, +- info_ptr->palette[i].red, ++ png_palette[i].blue, ++ png_palette[i].green, ++ png_palette[i].red, + 0xFF); /* alpha */ + } + } + ++ png_get_tRNS (png_ptr, info_ptr, &trans_alpha, &num_trans, &trans_color); + /* Make sure transparency is respected. */ +- if (info_ptr->num_trans > 0) { ++ if (num_trans > 0) { + palette->Flags |= PaletteFlagsHasAlpha; + colourspace_flag |= ImageFlagsHasAlpha; + +- if (info_ptr->num_trans > info_ptr->num_palette) { +- info_ptr->num_trans = info_ptr->num_palette; ++ if (num_trans > png_num_palette) { ++ num_trans = png_num_palette; + } + +- for (i=0; i < info_ptr->num_trans; i++) { ++ for (i=0; i < num_trans; i++) { + set_pixel_bgra(&palette->Entries[i], 0, +- info_ptr->palette[i].blue, +- info_ptr->palette[i].green, +- info_ptr->palette[i].red, ++ png_palette[i].blue, ++ png_palette[i].green, ++ png_palette[i].red, + #if PNG_LIBPNG_VER > 10399 +- info_ptr->trans_alpha [i]); /* alpha */ ++ trans_alpha [i]); /* alpha */ + #else + info_ptr->trans[i]); /* alpha */ + #endif +@@ -398,6 +411,8 @@ gdip_load_png_image_from_file_or_stream + BYTE bit_depth; + int stride; + int interlace; ++ png_colorp png_palette; ++ int png_num_palette; + png_bytep *row_pointers; + BYTE *rawptr; + int i, j; +@@ -490,32 +505,33 @@ gdip_load_png_image_from_file_or_stream + png_byte palette = 0; + png_byte pix = *rowp++; + ++ png_get_PLTE (png_ptr, info_ptr, &png_palette, &png_num_palette); + palette = (pix >> 6) & 0x03; + set_pixel_bgra (rawptr, 0, +- info_ptr->palette[palette].blue, +- info_ptr->palette[palette].green, +- info_ptr->palette[palette].red, ++ png_palette[palette].blue, ++ png_palette[palette].green, ++ png_palette[palette].red, + 0xFF); /* alpha */ + + palette = (pix >> 4) & 0x03; + set_pixel_bgra (rawptr, 4, +- info_ptr->palette[palette].blue, +- info_ptr->palette[palette].green, +- info_ptr->palette[palette].red, ++ png_palette[palette].blue, ++ png_palette[palette].green, ++ png_palette[palette].red, + 0xFF); /* alpha */ + + palette = (pix >> 2) & 0x03; + set_pixel_bgra (rawptr, 8, +- info_ptr->palette[palette].blue, +- info_ptr->palette[palette].green, +- info_ptr->palette[palette].red, ++ png_palette[palette].blue, ++ png_palette[palette].green, ++ png_palette[palette].red, + 0xFF); /* alpha */ + + palette = pix & 0x03; + set_pixel_bgra (rawptr, 12, +- info_ptr->palette[palette].blue, +- info_ptr->palette[palette].green, +- info_ptr->palette[palette].red, ++ png_palette[palette].blue, ++ png_palette[palette].green, ++ png_palette[palette].red, + 0xFF); /* alpha */ + rawptr += 16; + } diff --git a/dev-dotnet/libgdiplus/files/libgdiplus-2.10.9-freetype251.patch b/dev-dotnet/libgdiplus/files/libgdiplus-2.10.9-freetype251.patch new file mode 100644 index 000000000000..b4faa06d6415 --- /dev/null +++ b/dev-dotnet/libgdiplus/files/libgdiplus-2.10.9-freetype251.patch @@ -0,0 +1,12 @@ +--- libgdiplus-2.10.9/src/gdiplus-private.h ++++ libgdiplus-2.10.9/src/gdiplus-private.h +@@ -30,7 +30,8 @@ + #include + #include + #include +-#include ++#include ++#include FT_TRUETYPE_TABLES_H + #include + #include + diff --git a/dev-dotnet/libgdiplus/files/libgdiplus-2.10.9-giflib-quantizebuffer.patch b/dev-dotnet/libgdiplus/files/libgdiplus-2.10.9-giflib-quantizebuffer.patch new file mode 100644 index 000000000000..f65c349af772 --- /dev/null +++ b/dev-dotnet/libgdiplus/files/libgdiplus-2.10.9-giflib-quantizebuffer.patch @@ -0,0 +1,296 @@ +diff -uNr libgdiplus-2.10.9/src/gifcodec.c libgdiplus-2.10.9-funtoo/src/gifcodec.c +--- libgdiplus-2.10.9/src/gifcodec.c 2011-12-02 18:23:12.000000000 +0100 ++++ libgdiplus-2.10.9-funtoo/src/gifcodec.c 2013-10-08 18:06:44.643554570 +0200 +@@ -39,6 +39,293 @@ + + #include "gifcodec.h" + ++#define COLOR_ARRAY_SIZE 32768 ++#define BITS_PER_PRIM_COLOR 5 ++#define MAX_PRIM_COLOR 0x1f ++ ++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; ++ ++ ++/**************************************************************************** ++ * Routine called by qsort to compare two entries. ++ ****************************************************************************/ ++static int ++SortCmpRtn(const void *Entry1, ++ const void *Entry2) { ++ ++ return (*((QuantizedColorType **) Entry1))->RGB[SortRGBAxis] - ++ (*((QuantizedColorType **) Entry2))->RGB[SortRGBAxis]; ++} ++ ++/****************************************************************************** ++ * 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 (QuantizedColor->Pnext != NULL && ++ (Sum -= QuantizedColor->Pnext->Count) >= 0 && ++ 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 */ ++ /* coverity[var_deref_op] */ ++ 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; ++} ++ ++/****************************************************************************** ++ * 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. ++ ******************************************************************************/ ++static 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) { ++ 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", ++ "libgdiplus"); ++ } ++ ++ /* 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; ++} ++ + /* giflib declares this incorrectly as EgifOpen */ + extern GifFileType *EGifOpen(void *userData, OutputFunc writeFunc); diff --git a/dev-dotnet/libgdiplus/files/libgdiplus-2.10.9-gold.patch b/dev-dotnet/libgdiplus/files/libgdiplus-2.10.9-gold.patch new file mode 100644 index 000000000000..379ae941ef40 --- /dev/null +++ b/dev-dotnet/libgdiplus/files/libgdiplus-2.10.9-gold.patch @@ -0,0 +1,16 @@ + tests/Makefile.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/tests/Makefile.in b/tests/Makefile.in +index 97f5f4e..c02ca25 100644 +--- a/tests/Makefile.in ++++ b/tests/Makefile.in +@@ -228,7 +228,7 @@ DEPS = \ + $(top_builddir)/src/libgdiplus.la + + LDADDS = \ +- $(top_builddir)/src/libgdiplus.la ++ $(top_builddir)/src/libgdiplus.la -lX11 -lglib-2.0 + + testgdi_DEPENDENCIES = $(TEST_DEPS) + testgdi_LDADD = $(LDADDS) diff --git a/dev-dotnet/libgdiplus/libgdiplus-2.10.9-r1.ebuild b/dev-dotnet/libgdiplus/libgdiplus-2.10.9-r1.ebuild new file mode 100644 index 000000000000..0855565ff626 --- /dev/null +++ b/dev-dotnet/libgdiplus/libgdiplus-2.10.9-r1.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" + +inherit base eutils mono flag-o-matic + +DESCRIPTION="Library for using System.Drawing with mono" +HOMEPAGE="http://www.mono-project.com" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris" +SRC_URI="http://download.mono-project.com/sources/${PN}/${P}.tar.bz2" + +IUSE="cairo" + +RDEPEND=">=dev-libs/glib-2.16:2 + >=media-libs/freetype-2.3.7 + >=media-libs/fontconfig-2.6 + >=media-libs/libpng-1.4:0 + x11-libs/libXrender + x11-libs/libX11 + x11-libs/libXt + >=x11-libs/cairo-1.8.4[X] + media-libs/libexif + >=media-libs/giflib-4.1.3 + virtual/jpeg:0 + media-libs/tiff:0 + !cairo? ( >=x11-libs/pango-1.20 )" +DEPEND="${RDEPEND}" + +RESTRICT="test" + +PATCHES=("${FILESDIR}/${P}-gold.patch" + "${FILESDIR}/${PN}-2.10.1-libpng15.patch" + "${FILESDIR}/${PN}-2.10.9-freetype251.patch") + +src_prepare() { + base_src_prepare + sed -i -e 's:ungif:gif:g' configure || die +} + +src_configure() { + append-flags -fno-strict-aliasing + econf --disable-dependency-tracking \ + --disable-static \ + --with-cairo=system \ + $(use !cairo && printf %s --with-pango) +} + +src_compile() { + emake "$@" +} + +src_install () { + emake -j1 DESTDIR="${D}" "$@" install #nowarn + mono_multilib_comply + local commondoc=( AUTHORS ChangeLog README TODO ) + for docfile in "${commondoc[@]}" + do + [[ -e "${docfile}" ]] && dodoc "${docfile}" + done + if [[ "${DOCS[@]}" ]] + then + dodoc "${DOCS[@]}" + fi + prune_libtool_files +} diff --git a/dev-dotnet/libgdiplus/libgdiplus-2.10.9-r2.ebuild b/dev-dotnet/libgdiplus/libgdiplus-2.10.9-r2.ebuild new file mode 100644 index 000000000000..795c7bdb517c --- /dev/null +++ b/dev-dotnet/libgdiplus/libgdiplus-2.10.9-r2.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" + +inherit base eutils mono flag-o-matic + +DESCRIPTION="Library for using System.Drawing with mono" +HOMEPAGE="http://www.mono-project.com" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris" +SRC_URI="http://download.mono-project.com/sources/${PN}/${P}.tar.bz2" + +IUSE="cairo" + +RDEPEND=">=dev-libs/glib-2.16:2 + >=media-libs/freetype-2.3.7 + >=media-libs/fontconfig-2.6 + >=media-libs/libpng-1.4:0 + x11-libs/libXrender + x11-libs/libX11 + x11-libs/libXt + >=x11-libs/cairo-1.8.4[X] + media-libs/libexif + >=media-libs/giflib-4.2.3 + virtual/jpeg:0 + media-libs/tiff:0 + !cairo? ( >=x11-libs/pango-1.20 )" +DEPEND="${RDEPEND}" + +RESTRICT="test" + +PATCHES=("${FILESDIR}/${P}-gold.patch" + "${FILESDIR}/${PN}-2.10.1-libpng15.patch" + "${FILESDIR}/${PN}-2.10.9-giflib-quantizebuffer.patch" + "${FILESDIR}/${PN}-2.10.9-freetype251.patch") + +src_prepare() { + base_src_prepare + sed -i -e 's:ungif:gif:g' configure || die +} + +src_configure() { + append-flags -fno-strict-aliasing + econf --disable-dependency-tracking \ + --disable-static \ + --with-cairo=system \ + $(use !cairo && printf %s --with-pango) +} + +src_compile() { + emake "$@" +} + +src_install () { + emake -j1 DESTDIR="${D}" "$@" install #nowarn + mono_multilib_comply + local commondoc=( AUTHORS ChangeLog README TODO ) + for docfile in "${commondoc[@]}" + do + [[ -e "${docfile}" ]] && dodoc "${docfile}" + done + if [[ "${DOCS[@]}" ]] + then + dodoc "${DOCS[@]}" + fi + prune_libtool_files +} diff --git a/dev-dotnet/libgdiplus/libgdiplus-2.10.9-r3.ebuild b/dev-dotnet/libgdiplus/libgdiplus-2.10.9-r3.ebuild new file mode 100644 index 000000000000..2e71897c3048 --- /dev/null +++ b/dev-dotnet/libgdiplus/libgdiplus-2.10.9-r3.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit eutils dotnet flag-o-matic + +DESCRIPTION="Library for using System.Drawing with mono" +HOMEPAGE="http://www.mono-project.com" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris" +SRC_URI="http://download.mono-project.com/sources/${PN}/${P}.tar.bz2" + +IUSE="cairo" + +RDEPEND=">=dev-libs/glib-2.16:2 + >=media-libs/freetype-2.3.7 + >=media-libs/fontconfig-2.6 + >=media-libs/libpng-1.4:0 + x11-libs/libXrender + x11-libs/libX11 + x11-libs/libXt + >=x11-libs/cairo-1.8.4[X] + media-libs/libexif + >=media-libs/giflib-4.2.3 + virtual/jpeg:0 + media-libs/tiff:0 + !cairo? ( >=x11-libs/pango-1.20 )" +DEPEND="${RDEPEND}" + +RESTRICT="test" + +PATCHES=("${FILESDIR}/${P}-gold.patch" + "${FILESDIR}/${PN}-2.10.1-libpng15.patch" + "${FILESDIR}/${PN}-2.10.9-giflib-quantizebuffer.patch") + +src_prepare() { + base_src_prepare + sed -i -e 's:ungif:gif:g' configure || die +} + +src_configure() { + append-flags -fno-strict-aliasing + econf --disable-dependency-tracking \ + --disable-static \ + --with-cairo=system \ + $(use !cairo && printf %s --with-pango) +} + +src_compile() { + emake "$@" +} + +src_install () { + emake -j1 DESTDIR="${D}" "$@" install #nowarn + dotnet_multilib_comply + local commondoc=( AUTHORS ChangeLog README TODO ) + for docfile in "${commondoc[@]}" + do + [[ -e "${docfile}" ]] && dodoc "${docfile}" + done + if [[ "${DOCS[@]}" ]] + then + dodoc "${DOCS[@]}" + fi + prune_libtool_files +} diff --git a/dev-dotnet/libgdiplus/libgdiplus-4.2-r2.ebuild b/dev-dotnet/libgdiplus/libgdiplus-4.2-r2.ebuild new file mode 100644 index 000000000000..61cc4064fe54 --- /dev/null +++ b/dev-dotnet/libgdiplus/libgdiplus-4.2-r2.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit eutils dotnet + +DESCRIPTION="Library for using System.Drawing with mono" +HOMEPAGE="http://www.mono-project.com" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris" +SRC_URI="http://download.mono-project.com/sources/${PN}/${P}.tar.gz" + +IUSE="cairo" + +RDEPEND=">=dev-libs/glib-2.2.3:2 + >=media-libs/freetype-2.3.7:2 + >=media-libs/fontconfig-2.6 + >=media-libs/libpng-1.4:0= + x11-libs/libXrender + x11-libs/libX11 + x11-libs/libXt + >=x11-libs/cairo-1.8.4[X] + media-libs/libexif + >=media-libs/giflib-5.1.2:= + virtual/jpeg:0 + media-libs/tiff:0 + !cairo? ( >=x11-libs/pango-1.20 )" +DEPEND="${RDEPEND}" + +src_configure() { + econf \ + --disable-dependency-tracking \ + --disable-static \ + $(usex cairo "" "--with-pango") +} + +src_install () { + default + + dotnet_multilib_comply + local commondoc=( AUTHORS ChangeLog README TODO ) + for docfile in "${commondoc[@]}"; do + [[ -e "${docfile}" ]] && dodoc "${docfile}" + done + [[ "${DOCS[@]}" ]] && dodoc "${DOCS[@]}" + prune_libtool_files +} diff --git a/dev-dotnet/libgdiplus/libgdiplus-4.2-r3.ebuild b/dev-dotnet/libgdiplus/libgdiplus-4.2-r3.ebuild new file mode 100644 index 000000000000..644527fcf0ed --- /dev/null +++ b/dev-dotnet/libgdiplus/libgdiplus-4.2-r3.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit eutils + +DESCRIPTION="Library for using System.Drawing with mono" +HOMEPAGE="http://www.mono-project.com" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris" +SRC_URI="http://download.mono-project.com/sources/${PN}/${P}.tar.gz" + +IUSE="cairo" + +RDEPEND=">=dev-libs/glib-2.2.3:2 + >=media-libs/freetype-2.3.7 + >=media-libs/fontconfig-2.6 + >=media-libs/libpng-1.4:0 + x11-libs/libXrender + x11-libs/libX11 + x11-libs/libXt + >=x11-libs/cairo-1.8.4[X] + media-libs/libexif + >=media-libs/giflib-5.1.2 + virtual/jpeg:0 + media-libs/tiff:0 + !cairo? ( >=x11-libs/pango-1.20 )" +DEPEND="${RDEPEND}" + +src_configure() { + econf \ + --disable-dependency-tracking \ + --disable-static \ + $(usex cairo "" "--with-pango") +} + +src_install () { + default + + dotnet_multilib_comply + local commondoc=( AUTHORS ChangeLog README TODO ) + for docfile in "${commondoc[@]}"; do + [[ -e "${docfile}" ]] && dodoc "${docfile}" + done + [[ "${DOCS[@]}" ]] && dodoc "${DOCS[@]}" + prune_libtool_files +} diff --git a/dev-dotnet/libgdiplus/metadata.xml b/dev-dotnet/libgdiplus/metadata.xml new file mode 100644 index 000000000000..1e9986c4a0cb --- /dev/null +++ b/dev-dotnet/libgdiplus/metadata.xml @@ -0,0 +1,8 @@ + + + + + dotnet@gentoo.org + Gentoo Dotnet Project + + -- cgit v1.2.3