Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2015Q1

Browse Source
This commit is contained in:
sambuc
2016-01-21 23:40:00 +01:00
committed by sambuc
parent 9a8c06dafb
commit 4af1cdf7a9
25114 changed files with 870539 additions and 795424 deletions
Download Patch File Download Diff File Expand all files Collapse all files
multimedia/ming/Makefile
+4 -4
View File
@@ -1,12 +1,12 @@
# $NetBSD: Makefile,v 1.20 2013/07/05 13:29:41 ryoon Exp $
# $NetBSD: Makefile,v 1.24 2014/09/28 03:00:45 obache Exp $
#
.include "Makefile.common"
PKGREVISION= 1
PKGREVISION= 4
CATEGORIES= multimedia
MAINTAINER= obache@NetBSD.org
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.libming.org/
COMMENT= SWF output library
LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2
@@ -36,6 +36,6 @@ INSTALL_DIRS= . docs/man
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../mk/giflib.buildlink3.mk"
.include "../../graphics/giflib/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
multimedia/ming/buildlink3.mk
+3 -3
View File
@@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.17 2013/07/05 13:29:41 ryoon Exp $
# $NetBSD: buildlink3.mk,v 1.19 2014/05/31 15:56:27 wiz Exp $
BUILDLINK_TREE+= ming
@@ -6,12 +6,12 @@ BUILDLINK_TREE+= ming
MING_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.ming+= ming>=0.4.3
BUILDLINK_ABI_DEPENDS.ming+= ming>=0.4.5nb1
BUILDLINK_ABI_DEPENDS.ming+= ming>=0.4.5nb2
BUILDLINK_PKGSRCDIR.ming?= ../../multimedia/ming
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../mk/giflib.buildlink3.mk"
.include "../../graphics/giflib/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.endif # MING_BUILDLINK3_MK
multimedia/ming/distinfo
+5 -5
View File
@@ -1,10 +1,10 @@
$NetBSD: distinfo,v 1.12 2013/07/06 07:43:13 ryoon Exp $
$NetBSD: distinfo,v 1.15 2014/05/16 10:01:16 obache Exp $
SHA1 (ming-0.4.5.tar.gz) = 97c201040729917bf7c62da9616a87f4a920f473
RMD160 (ming-0.4.5.tar.gz) = 9ef9cf769a03c6e356dca299c85e06a2cdd6a155
Size (ming-0.4.5.tar.gz) = 15029578 bytes
SHA1 (patch-ae) = 614e322330d2d2ab1e0ef1beadf1395014ecd880
SHA1 (patch-src_blocks_gifdbl.c) = a33f2dda09620961211ac367e872d994231d3f20
SHA1 (patch-src_libming.h) = 49cab5c2d31115ea9ab909cea88dfc52f1bdbee0
SHA1 (patch-util_gif2dbl.c) = 04383fd7a43af02d9e85e8bea0fa2328cfdfc617
SHA1 (patch-util_gif2mask.c) = 5a87deca141b561725725a32971e68837ac6f4e1
SHA1 (patch-src_blocks_gifdbl.c) = 212535b773d373a9836facb9bbc248749ca9d552
SHA1 (patch-src_libming.h) = bba5e6f93913359b7109e3b18177f819989be98f
SHA1 (patch-util_gif2dbl.c) = bd897674d5146ac6d6c2b4df6399f18e283c22e6
SHA1 (patch-util_gif2mask.c) = b98e2bcbbf6e3237acf71aaa02f3e36f6fb62dfd
multimedia/ming/patches/patch-src_blocks_gifdbl.c
+27 -6
View File
@@ -1,24 +1,45 @@
$NetBSD: patch-src_blocks_gifdbl.c,v 1.1 2013/07/06 07:43:13 ryoon Exp $
$NetBSD: patch-src_blocks_gifdbl.c,v 1.3 2014/05/16 10:00:33 obache Exp $
* Fix build with giflib 5.0.
* Fix build with giflib>=5.0.
--- src/blocks/gifdbl.c.orig 2010-10-10 07:19:23.000000000 +0000
+++ src/blocks/gifdbl.c
@@ -227,7 +227,7 @@ SWFDBLBitmapData newSWFDBLBitmapData_fro
@@ -203,7 +203,13 @@ readGif(GifFileType *file, dblData resul
}
/* Done! */
- DGifCloseFile(file);
+#if (GIFLIB_MAJOR + 0) >= 5 && (GIFLIB_MINOR + 0 >= 1) || (GIFLIB_MAJOR + 0 ) > 5
+ DGifCloseFile(file, NULL);
+#else
+ if (DGifCloseFile(file) != GIF_OK) {
+ free(file);
+ }
+#endif
result->data = malloc(outsize = (int)floor(size*1.01+12));
@@ -227,7 +233,11 @@ SWFDBLBitmapData newSWFDBLBitmapData_fro
SWFDBLBitmapData ret;
struct dbl_data gifdata;
- if((file = DGifOpenFileName(fileName)) == NULL)
+#if (GIFLIB_MAJOR + 0) >= 5
+ if((file = DGifOpenFileName(fileName, NULL)) == NULL)
+#else
if((file = DGifOpenFileName(fileName)) == NULL)
+#endif
return NULL;
if(!readGif(file, &gifdata))
return NULL;
@@ -246,7 +246,7 @@ SWFDBLBitmapData newSWFDBLBitmapData_fro
@@ -246,7 +256,11 @@ SWFDBLBitmapData newSWFDBLBitmapData_fro
SWFDBLBitmapData ret;
struct dbl_data gifdata;
- if((file = DGifOpen(input, (InputFunc) gifReadFunc)) == NULL)
+#if (GIFLIB_MAJOR + 0) >= 5
+ if((file = DGifOpen(input, (InputFunc) gifReadFunc, NULL)) == NULL)
+#else
if((file = DGifOpen(input, (InputFunc) gifReadFunc)) == NULL)
+#endif
return NULL;
if(!readGif(file, &gifdata))
return NULL;
multimedia/ming/patches/patch-src_libming.h
+15 -5
View File
@@ -1,6 +1,6 @@
$NetBSD: patch-src_libming.h,v 1.1 2013/07/06 07:43:13 ryoon Exp $
$NetBSD: patch-src_libming.h,v 1.3 2014/05/16 10:00:33 obache Exp $
* Introduce custom PrintGifError() from util/qprintf.c of giflib 5.0.4.
* Introduce custom PrintGifError() from util/qprintf.c of giflib>=5.
--- src/libming.h.orig 2013-06-08 14:08:51.000000000 +0000
+++ src/libming.h
@@ -12,20 +12,30 @@ $NetBSD: patch-src_libming.h,v 1.1 2013/07/06 07:43:13 ryoon Exp $
#include "ming.h"
@@ -78,9 +79,14 @@ typedef unsigned char BOOL;
@@ -78,9 +79,26 @@ typedef unsigned char BOOL;
#if GIFLIB_GIFERRORSTRING
static void
-PrintGifError(void)
+#if (GIFLIB_MAJOR + 0) >= 5
+PrintGifError(int ErrorCode)
+#else
PrintGifError(void)
+#endif
{
- fprintf(stderr, "\nGIF-LIB error: %s.\n", GifErrorString());
+#if (GIFLIB_MAJOR + 0) >= 5
+# if GIFLIB_MAJOR == 5 && GIFLIB_MINOR == 0
+ char *Err = GifErrorString(ErrorCode);
+# else
+ const char *Err = GifErrorString(ErrorCode);
+# endif
+
+ if (Err != NULL)
+ fprintf(stderr, "\nGIF-LIB error: %s.\n", Err);
+ else
+ fprintf(stderr, "\nGIF-LIB undefined error %d.\n", ErrorCode);
+#else
fprintf(stderr, "\nGIF-LIB error: %s.\n", GifErrorString());
+#endif
}
#endif
multimedia/ming/patches/patch-util_gif2dbl.c
+41 -7
View File
@@ -1,30 +1,64 @@
$NetBSD: patch-util_gif2dbl.c,v 1.1 2013/07/06 07:43:13 ryoon Exp $
$NetBSD: patch-util_gif2dbl.c,v 1.3 2014/05/16 10:00:33 obache Exp $
* Fix build with giflib 5.0.4.
* Catch error with gifib 5.0 manner.
--- util/gif2dbl.c.orig 2013-06-08 14:08:51.000000000 +0000
+++ util/gif2dbl.c
@@ -19,10 +19,12 @@
@@ -19,10 +19,18 @@
#include "libming.h"
+int ErrorCode;
+
+#if (GIFLIB_MAJOR + 0) >= 5
+void error(char *msg, int ErrorCode)
+#else
void error(char *msg)
+#endif
{
printf("%s:\n\n", msg);
- PrintGifError();
+#if (GIFLIB_MAJOR + 0) >= 5
+ PrintGifError(ErrorCode);
+#else
PrintGifError();
+#endif
exit(-1);
}
@@ -59,7 +61,7 @@ unsigned char *readGif(char *fileName, i
@@ -58,12 +66,22 @@ unsigned char *readGif(char *fileName, i
unsigned char *data;
unsigned char *p;
int i, nColors, size, alpha, bgColor, alignedWidth;
+#if (GIFLIB_MAJOR + 0) >= 5
+ int ErrorCode;
- if((file = DGifOpenFileName(fileName)) == NULL)
+ if((file = DGifOpenFileName(fileName, &ErrorCode)) == NULL)
+ error("Error opening file", ErrorCode);
+#else
if((file = DGifOpenFileName(fileName)) == NULL)
error("Error opening file");
+#endif
if(DGifSlurp(file) != GIF_OK)
+#if (GIFLIB_MAJOR + 0) >= 5
+ error("Error slurping file", file->Error);
+#else
error("Error slurping file");
+#endif
/* data should now be available */
@@ -190,7 +208,13 @@ unsigned char *readGif(char *fileName, i
}
/* Done! */
- DGifCloseFile(file);
+#if (GIFLIB_MAJOR + 0) >= 5 && (GIFLIB_MINOR >= 1) || (GIFLIB_MAJOR + 0) > 5
+ DGifCloseFile(file, NULL);
+#else
+ if (DGifCloseFile(file) != GIF_OK) {
+ free(file);
+ }
+#endif
*length = size;
return data;
multimedia/ming/patches/patch-util_gif2mask.c
+26 -7
View File
@@ -1,30 +1,49 @@
$NetBSD: patch-util_gif2mask.c,v 1.1 2013/07/06 07:43:13 ryoon Exp $
$NetBSD: patch-util_gif2mask.c,v 1.2 2014/05/16 10:00:33 obache Exp $
* Fix build with giflib 5.0.4.
* Catch error with gifib 5.0 manner.
--- util/gif2mask.c.orig 2013-06-08 14:08:51.000000000 +0000
+++ util/gif2mask.c
@@ -13,10 +13,12 @@
@@ -13,10 +13,18 @@
#define max(a,b,c) (((a)>(b))?(((c)>(a))?(c):(a)):(((c)>(b))?(c):(b)))
+int ErrorCode;
+
+#if (GIFLIB_MAJOR + 0) >= 5
+void error(char *msg, int ErrorCode)
+#else
void error(char *msg)
+#endif
{
printf("%s:\n\n", msg);
- PrintGifError();
+#if (GIFLIB_MAJOR + 0) >= 5
+ PrintGifError(ErrorCode);
+#else
PrintGifError();
+#endif
exit(-1);
}
@@ -28,7 +30,7 @@ unsigned char *readGif(char *fileName, i
@@ -27,12 +35,22 @@ unsigned char *readGif(char *fileName, i
unsigned char colorMap[256];
unsigned char *data;
int i, nColors, size;
+#if (GIFLIB_MAJOR + 0) >= 5
+ int ErrorCode;
- if((file = DGifOpenFileName(fileName)) == NULL)
+ if((file = DGifOpenFileName(fileName, &ErrorCode)) == NULL)
+ error("Error opening file", ErrorCode);
+#else
if((file = DGifOpenFileName(fileName)) == NULL)
error("Error opening file");
+#endif
if(DGifSlurp(file) != GIF_OK)
+#if (GIFLIB_MAJOR + 0) >= 5
+ error("Error slurping file", file->Error);
+#else
error("Error slurping file");
+#endif
/* data should now be available */