pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/graphics/libgdiplus libgdiplus: Update to 6.0.1



details:   https://anonhg.NetBSD.org/pkgsrc/rev/4a12f558bf53
branches:  trunk
changeset: 399270:4a12f558bf53
user:      nia <nia%pkgsrc.org@localhost>
date:      Mon Aug 05 16:58:33 2019 +0000

description:
libgdiplus: Update to 6.0.1

Preparing for the mono update.

diffstat:

 graphics/libgdiplus/Makefile                     |   13 +-
 graphics/libgdiplus/distinfo                     |   11 +-
 graphics/libgdiplus/patches/patch-src_gifcodec.c |  164 -----------------------
 3 files changed, 13 insertions(+), 175 deletions(-)

diffs (218 lines):

diff -r f450788a8012 -r 4a12f558bf53 graphics/libgdiplus/Makefile
--- a/graphics/libgdiplus/Makefile      Mon Aug 05 16:57:36 2019 +0000
+++ b/graphics/libgdiplus/Makefile      Mon Aug 05 16:58:33 2019 +0000
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.77 2018/11/14 22:21:42 kleink Exp $
+# $NetBSD: Makefile,v 1.78 2019/08/05 16:58:33 nia Exp $
 
-DISTNAME=      libgdiplus-3.12
-PKGREVISION=   3
+DISTNAME=      libgdiplus-6.0.1
 CATEGORIES=    graphics
-MASTER_SITES=  http://download.mono-project.com/sources/libgdiplus/
+MASTER_SITES=  https://download.mono-project.com/sources/libgdiplus/
 
 MAINTAINER=    kefren%NetBSD.org@localhost
-HOMEPAGE=      http://www.mono-project.com/
+HOMEPAGE=      https://www.mono-project.com/
 COMMENT=       Implementation of the GDI+ API
 LICENSE=       mit
 
@@ -26,9 +25,13 @@
 BUILDLINK_TRANSFORM+=          rm:-Werror
 
 .include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/pango/buildlink3.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/giflib/buildlink3.mk"
+.include "../../graphics/libexif/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff -r f450788a8012 -r 4a12f558bf53 graphics/libgdiplus/distinfo
--- a/graphics/libgdiplus/distinfo      Mon Aug 05 16:57:36 2019 +0000
+++ b/graphics/libgdiplus/distinfo      Mon Aug 05 16:58:33 2019 +0000
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.39 2015/11/03 21:34:07 agc Exp $
+$NetBSD: distinfo,v 1.40 2019/08/05 16:58:33 nia Exp $
 
-SHA1 (libgdiplus-3.12.tar.gz) = 7f7d2b82c0d755bb854fd76d0d62120cdde35d8c
-RMD160 (libgdiplus-3.12.tar.gz) = 23837bce58c2f6082b1455edebad5b7a0c95e842
-SHA512 (libgdiplus-3.12.tar.gz) = 12c58e7ad99e5aa7caf19f64f47bddd399648292f3c2b9ade64e9051b0495bb8772af8ca9cdb6cb664d20c845d7136f028e10e659548bffd35e7604548bb8743
-Size (libgdiplus-3.12.tar.gz) = 688120 bytes
-SHA1 (patch-src_gifcodec.c) = 24e33c94595355fe5762b9488d10187541e97713
+SHA1 (libgdiplus-6.0.1.tar.gz) = ce5f6a431f8caa4bd0559672928bf1ce3d1537c6
+RMD160 (libgdiplus-6.0.1.tar.gz) = f42a9481eb543b4a9015768c81e32835a77b7a41
+SHA512 (libgdiplus-6.0.1.tar.gz) = 7c9337d63ed24953a079c78555c90b99d04b9c56c194731f654932a6291995044ea536b52552fd6814d8cb31e82f1729f84436edb53f8155af894d9d656fd203
+Size (libgdiplus-6.0.1.tar.gz) = 1377124 bytes
diff -r f450788a8012 -r 4a12f558bf53 graphics/libgdiplus/patches/patch-src_gifcodec.c
--- a/graphics/libgdiplus/patches/patch-src_gifcodec.c  Mon Aug 05 16:57:36 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,164 +0,0 @@
-$NetBSD: patch-src_gifcodec.c,v 1.5 2015/05/23 11:52:46 kefren Exp $
-
-Fixes for giflib 5
-
---- src/gifcodec.c.orig        2015-01-05 12:27:06.000000000 +0200
-+++ src/gifcodec.c     2015-05-23 14:47:51.000000000 +0300
-@@ -107,7 +107,7 @@ gdip_gif_inputfunc (GifFileType *gif, Gi
- */
- 
- static int
--AddExtensionBlockMono(SavedImage *New, int Len, BYTE ExtData[])
-+AddExtensionBlockMono(SavedImage *New, int ExtCode, int Len, BYTE ExtData[])
- {
-       ExtensionBlock  *ep;
- 
-@@ -131,7 +131,7 @@ AddExtensionBlockMono(SavedImage *New, i
- 
-       if (ExtData) {
-               memcpy(ep->Bytes, ExtData, Len);
--              ep->Function = New->Function;
-+              ep->Function = ExtCode;
-       }
- 
-       return (GIF_OK);
-@@ -234,20 +234,23 @@ DGifSlurpMono(GifFileType * GifFile, Sav
-                       }
- 
-                       case EXTENSION_RECORD_TYPE: {
--                              if (DGifGetExtension(GifFile, &temp_save.Function, &ExtData) == GIF_ERROR) {
-+                              int ExtCode;
-+                              if (DGifGetExtension(GifFile, &ExtCode, &ExtData) == GIF_ERROR) {
-                                       return (GIF_ERROR);
-                               }
- 
-                               while (ExtData != NULL) {
-                                       /* Create an extension block with our data */
--                                      if (AddExtensionBlockMono(&temp_save, ExtData[0], &ExtData[1]) == GIF_ERROR) {
-+                                      if (AddExtensionBlockMono(&temp_save, ExtCode, ExtData[0], &ExtData[1]) == GIF_ERROR) {
-                                               return (GIF_ERROR);
-                                       }
- 
-                                       if (DGifGetExtensionNext(GifFile, &ExtData) == GIF_ERROR) {
-                                               return (GIF_ERROR);
-                                       }
-+#if GIFLIB_MAJOR < 5
-                                       temp_save.Function = 0;
-+#endif
-                               }
-                               break;
-                       }
-@@ -306,9 +309,9 @@ gdip_load_gif_image (void *stream, GpIma
-       loop_counter = FALSE;
- 
-       if (from_file) {
--              gif = DGifOpen(stream, &gdip_gif_fileinputfunc);
-+              gif = DGifOpen(stream, &gdip_gif_fileinputfunc, NULL);
-       } else {
--              gif = DGifOpen (stream, &gdip_gif_inputfunc);
-+              gif = DGifOpen(stream, &gdip_gif_inputfunc, NULL);
-       }
-       
-       if (gif == NULL) {
-@@ -583,7 +586,7 @@ gdip_load_gif_image (void *stream, GpIma
-       }
- 
-       FreeExtensionMono(&global_extensions);
--      DGifCloseFile (gif);
-+      DGifCloseFile(gif, NULL);
- 
-       *image = result;
-       return Ok;
-@@ -599,7 +602,7 @@ error:     
- 
-       if (gif != NULL) {
-               FreeExtensionMono (&global_extensions);
--              DGifCloseFile (gif);
-+              DGifCloseFile(gif, NULL);
-       }
- 
-       *image = NULL;
-@@ -663,9 +666,9 @@ gdip_save_gif_image (void *stream, GpIma
-       }
- 
-       if (from_file) {
--              fp = EGifOpenFileName (stream, 0);
-+              fp = EGifOpenFileName(stream, 0, NULL);
-       } else {
--              fp = EGifOpen (stream, gdip_gif_outputfunc);
-+              fp = EGifOpen(stream, gdip_gif_outputfunc, NULL);
-       }
-               
-       if (!fp) {
-@@ -704,7 +707,7 @@ gdip_save_gif_image (void *stream, GpIma
-                                       goto error; 
-                               }
- 
--                              cmap = MakeMapObject(cmap_size, 0);
-+                              cmap = GifMakeMapObject(cmap_size, 0);
- 
-                               pixbuf = GdipAlloc(pixbuf_size);
-                               if (pixbuf == NULL) {
-@@ -795,7 +798,7 @@ gdip_save_gif_image (void *stream, GpIma
-                               pixbuf = pixbuf_org;
-                       } else {
-                               cmap_size = 256;
--                              cmap  = MakeMapObject (cmap_size, 0);
-+                              cmap  = GifMakeMapObject(cmap_size, 0);
- 
-                               red = GdipAlloc(pixbuf_size);
-                               green = GdipAlloc(pixbuf_size);
-@@ -826,13 +829,13 @@ gdip_save_gif_image (void *stream, GpIma
-                                               v += 4;
-                                       }
-                               }
--                              if (QuantizeBuffer(bitmap_data->width, bitmap_data->height, &cmap_size, 
-+                              if (GifQuantizeBuffer(bitmap_data->width, bitmap_data->height, &cmap_size, 
-                                               red,  green, blue, pixbuf, cmap->Colors) == GIF_ERROR) {
-                                       goto error;
-                               }
-                       }
- 
--                      cmap->BitsPerPixel = BitSize (cmap_size);
-+                      cmap->BitsPerPixel = GifBitSize(cmap_size);
-                       cmap->ColorCount = 1 << cmap->BitsPerPixel;
- 
-                       if ((frame == 0) && (k == 0)) {
-@@ -850,8 +853,10 @@ gdip_save_gif_image (void *stream, GpIma
-                                               Buffer[0] = 1;
-                                               Buffer[1] = ptr[0];
-                                               Buffer[2] = ptr[1];
--                                              EGifPutExtensionFirst(fp, APPLICATION_EXT_FUNC_CODE, 11, "NETSCAPE2.0");
--                                              EGifPutExtensionLast(fp, APPLICATION_EXT_FUNC_CODE, 3, Buffer);
-+                                              EGifPutExtensionLeader(fp, APPLICATION_EXT_FUNC_CODE);
-+                                              EGifPutExtensionBlock(fp, 11, "NETSCAPE2.0");
-+                                              EGifPutExtensionBlock(fp, 3, Buffer);
-+                                              EGifPutExtensionTrailer(fp);
-                                       }
-                               }
- 
-@@ -903,7 +908,7 @@ gdip_save_gif_image (void *stream, GpIma
-                               pixbuf += bitmap_data->width;
-                       }
- 
--                      FreeMapObject (cmap);
-+                      GifFreeMapObject(cmap);
-                       if (red != NULL) {
-                               GdipFree (red);
-                       }
-@@ -925,13 +930,13 @@ gdip_save_gif_image (void *stream, GpIma
-               }
-       }
- 
--      EGifCloseFile (fp);     
-+      EGifCloseFile(fp, NULL);        
-       
-       return Ok;
- 
- error:
-       if (cmap != NULL) {
--              FreeMapObject (cmap);
-+              GifFreeMapObject(cmap);
-       }
- 
-       if (red != NULL) {



Home | Main Index | Thread Index | Old Index