[Midnightbsd-cvs] mports [21261] trunk/x11-toolkits/libgdiplus: libgdiplus 3.12
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Mar 25 21:49:10 EDT 2016
Revision: 21261
http://svnweb.midnightbsd.org/mports/?rev=21261
Author: laffer1
Date: 2016-03-25 21:49:10 -0400 (Fri, 25 Mar 2016)
Log Message:
-----------
libgdiplus 3.12
Modified Paths:
--------------
trunk/x11-toolkits/libgdiplus/Makefile
trunk/x11-toolkits/libgdiplus/distinfo
trunk/x11-toolkits/libgdiplus/files/patch-src_gifcodec.c
Removed Paths:
-------------
trunk/x11-toolkits/libgdiplus/pkg-plist
Modified: trunk/x11-toolkits/libgdiplus/Makefile
===================================================================
--- trunk/x11-toolkits/libgdiplus/Makefile 2016-03-26 01:47:16 UTC (rev 21260)
+++ trunk/x11-toolkits/libgdiplus/Makefile 2016-03-26 01:49:10 UTC (rev 21261)
@@ -1,7 +1,7 @@
# $MidnightBSD$
PORTNAME= libgdiplus
-PORTVERSION= 3.8
+PORTVERSION= 3.12
CATEGORIES= x11-toolkits
MASTER_SITES= http://download.mono-project.com/sources/${PORTNAME}/
@@ -16,7 +16,7 @@
libcairo.so:${PORTSDIR}/graphics/cairo
GNU_CONFIGURE= yes
-USES= gmake libtool:keepla pathfix pkgconfig
+USES= cpe gmake libtool:keepla pathfix pkgconfig
USE_GNOME= glib20
USE_LDCONFIG= yes
USE_XORG= x11
@@ -23,5 +23,13 @@
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
+CPE_VENDOR= mono-project
+PLIST_FILES= lib/libgdiplus.a \
+ lib/libgdiplus.la \
+ lib/libgdiplus.so \
+ lib/libgdiplus.so.0 \
+ lib/libgdiplus.so.0.0.0 \
+ libdata/pkgconfig/libgdiplus.pc
+
.include <bsd.port.mk>
Modified: trunk/x11-toolkits/libgdiplus/distinfo
===================================================================
--- trunk/x11-toolkits/libgdiplus/distinfo 2016-03-26 01:47:16 UTC (rev 21260)
+++ trunk/x11-toolkits/libgdiplus/distinfo 2016-03-26 01:49:10 UTC (rev 21261)
@@ -1,2 +1,2 @@
-SHA256 (libgdiplus-3.8.tar.gz) = 6a3cfb4a1b67dd09197c385bacb8654f8d7ff49499f39c57825e1a8f77e69b28
-SIZE (libgdiplus-3.8.tar.gz) = 688029
+SHA256 (libgdiplus-3.12.tar.gz) = e61c4dc1bc2ba993e4f79029472efcf5760eb9e60eb20d9cd31f0ebe9113bfc9
+SIZE (libgdiplus-3.12.tar.gz) = 688120
Modified: trunk/x11-toolkits/libgdiplus/files/patch-src_gifcodec.c
===================================================================
--- trunk/x11-toolkits/libgdiplus/files/patch-src_gifcodec.c 2016-03-26 01:47:16 UTC (rev 21260)
+++ trunk/x11-toolkits/libgdiplus/files/patch-src_gifcodec.c 2016-03-26 01:49:10 UTC (rev 21261)
@@ -1,14 +1,9 @@
-$OpenBSD: patch-src_gifcodec_c,v 1.2 2014/07/18 16:00:28 ajacoutot Exp $
-
-giflib 5.0+
-http://cvsweb.netbsd.org/bsdweb.cgi/~checkout~/pkgsrc/graphics/libgdiplus/patches/patch-src_gifcodec.c?rev=1.2
-
---- src/gifcodec.c.orig Fri Dec 2 18:23:12 2011
-+++ src/gifcodec.c Fri Jul 18 15:30:15 2014
-@@ -39,8 +39,12 @@ GUID gdip_gif_image_format_guid = {0xb96b3cb0U, 0x0728
-
+--- src/gifcodec.c.orig 2015-01-05 10:27:06 UTC
++++ src/gifcodec.c
+@@ -40,9 +40,13 @@ GUID gdip_gif_image_format_guid = {0xb96
#include "gifcodec.h"
+ #ifdef EgifOpen
-/* giflib declares this incorrectly as EgifOpen */
+/* giflib declares this incorrectly as EgifOpen up to 4.1.2
+ GIF_LIB_VERSION is defined up to 4.1.6, and prototype is changed in 5.0,
@@ -15,11 +10,12 @@
+ so it is safe to use it as check condition */
+#ifdef GIF_LIB_VERSION
extern GifFileType *EGifOpen(void *userData, OutputFunc writeFunc);
+ #endif
+#endif
/* Data structure used for callback */
typedef struct
-@@ -129,7 +133,11 @@ AddExtensionBlockMono(SavedImage *New, int Len, BYTE E
+@@ -131,7 +135,11 @@ AddExtensionBlockMono(SavedImage *New, i
if (ExtData) {
memcpy(ep->Bytes, ExtData, Len);
@@ -31,7 +27,7 @@
}
return (GIF_OK);
-@@ -232,7 +240,11 @@ DGifSlurpMono(GifFileType * GifFile, SavedImage *Trail
+@@ -234,7 +242,11 @@ DGifSlurpMono(GifFileType * GifFile, Sav
}
case EXTENSION_RECORD_TYPE: {
@@ -43,7 +39,7 @@
return (GIF_ERROR);
}
-@@ -245,7 +257,9 @@ DGifSlurpMono(GifFileType * GifFile, SavedImage *Trail
+@@ -247,7 +259,9 @@ DGifSlurpMono(GifFileType * GifFile, Sav
if (DGifGetExtensionNext(GifFile, &ExtData) == GIF_ERROR) {
return (GIF_ERROR);
}
@@ -53,7 +49,7 @@
}
break;
}
-@@ -304,9 +318,17 @@ gdip_load_gif_image (void *stream, GpImage **image, BO
+@@ -306,9 +320,17 @@ gdip_load_gif_image (void *stream, GpIma
loop_counter = FALSE;
if (from_file) {
@@ -71,9 +67,33 @@
}
if (gif == NULL) {
-@@ -661,9 +683,17 @@ gdip_save_gif_image (void *stream, GpImage *image, BOO
+@@ -583,7 +605,11 @@ gdip_load_gif_image (void *stream, GpIma
}
+ FreeExtensionMono(&global_extensions);
++#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
++ DGifCloseFile (gif, NULL);
++#else
+ DGifCloseFile (gif);
++#endif
+
+ *image = result;
+ return Ok;
+@@ -599,7 +625,11 @@ error:
+
+ if (gif != NULL) {
+ FreeExtensionMono (&global_extensions);
++#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
++ DGifCloseFile (gif, NULL);
++#else
+ DGifCloseFile (gif);
++#endif
+ }
+
+ *image = NULL;
+@@ -663,9 +693,17 @@ gdip_save_gif_image (void *stream, GpIma
+ }
+
if (from_file) {
+#if GIFLIB_MAJOR >= 5
+ fp = EGifOpenFileName (stream, 0, NULL);
@@ -89,7 +109,7 @@
}
if (!fp) {
-@@ -702,7 +732,11 @@ gdip_save_gif_image (void *stream, GpImage *image, BOO
+@@ -704,7 +742,11 @@ gdip_save_gif_image (void *stream, GpIma
goto error;
}
@@ -101,7 +121,7 @@
pixbuf = GdipAlloc(pixbuf_size);
if (pixbuf == NULL) {
-@@ -793,7 +827,11 @@ gdip_save_gif_image (void *stream, GpImage *image, BOO
+@@ -795,7 +837,11 @@ gdip_save_gif_image (void *stream, GpIma
pixbuf = pixbuf_org;
} else {
cmap_size = 256;
@@ -113,7 +133,7 @@
red = GdipAlloc(pixbuf_size);
green = GdipAlloc(pixbuf_size);
-@@ -824,13 +862,21 @@ gdip_save_gif_image (void *stream, GpImage *image, BOO
+@@ -826,13 +872,21 @@ gdip_save_gif_image (void *stream, GpIma
v += 4;
}
}
@@ -135,7 +155,7 @@
cmap->ColorCount = 1 << cmap->BitsPerPixel;
if ((frame == 0) && (k == 0)) {
-@@ -848,8 +894,15 @@ gdip_save_gif_image (void *stream, GpImage *image, BOO
+@@ -850,8 +904,15 @@ gdip_save_gif_image (void *stream, GpIma
Buffer[0] = 1;
Buffer[1] = ptr[0];
Buffer[2] = ptr[1];
@@ -151,7 +171,7 @@
}
}
-@@ -901,7 +954,11 @@ gdip_save_gif_image (void *stream, GpImage *image, BOO
+@@ -903,7 +964,11 @@ gdip_save_gif_image (void *stream, GpIma
pixbuf += bitmap_data->width;
}
@@ -163,8 +183,18 @@
if (red != NULL) {
GdipFree (red);
}
-@@ -929,7 +986,11 @@ gdip_save_gif_image (void *stream, GpImage *image, BOO
+@@ -925,13 +990,21 @@ gdip_save_gif_image (void *stream, GpIma
+ }
+ }
++#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
++ EGifCloseFile (fp, NULL);
++#else
+ EGifCloseFile (fp);
++#endif
+
+ return Ok;
+
error:
if (cmap != NULL) {
+#if GIFLIB_MAJOR >= 5
Deleted: trunk/x11-toolkits/libgdiplus/pkg-plist
===================================================================
--- trunk/x11-toolkits/libgdiplus/pkg-plist 2016-03-26 01:47:16 UTC (rev 21260)
+++ trunk/x11-toolkits/libgdiplus/pkg-plist 2016-03-26 01:49:10 UTC (rev 21261)
@@ -1,6 +0,0 @@
-lib/libgdiplus.a
-lib/libgdiplus.la
-lib/libgdiplus.so
-lib/libgdiplus.so.0
-lib/libgdiplus.so.0.0.0
-libdata/pkgconfig/libgdiplus.pc
More information about the Midnightbsd-cvs
mailing list