summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--multimedia/ming/distinfo8
-rw-r--r--multimedia/ming/patches/patch-src_blocks_gifdbl.c11
-rw-r--r--multimedia/ming/patches/patch-src_libming.h4
-rw-r--r--multimedia/ming/patches/patch-util_gif2dbl.c11
-rw-r--r--multimedia/mplayer-share/distinfo6
-rw-r--r--multimedia/mplayer-share/patches/patch-libmpdemux_demux__gif.c10
-rw-r--r--multimedia/mplayer-share/patches/patch-libvo_vo__gif89a.c14
7 files changed, 46 insertions, 18 deletions
diff --git a/multimedia/ming/distinfo b/multimedia/ming/distinfo
index 22f86fe00db..714ff7a6f18 100644
--- a/multimedia/ming/distinfo
+++ b/multimedia/ming/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.12 2013/07/06 07:43:13 ryoon Exp $
+$NetBSD: distinfo,v 1.13 2014/05/16 09:43:30 wiz 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-src_blocks_gifdbl.c) = 8138151af51ed032561af3159814fc7ceae08a47
+SHA1 (patch-src_libming.h) = 130f02a12a28cc62afc6cfe007ebb301e30c161b
+SHA1 (patch-util_gif2dbl.c) = aca8c93c0dbe4cb637bc7efc48ab3ea724719a49
SHA1 (patch-util_gif2mask.c) = 5a87deca141b561725725a32971e68837ac6f4e1
diff --git a/multimedia/ming/patches/patch-src_blocks_gifdbl.c b/multimedia/ming/patches/patch-src_blocks_gifdbl.c
index c1761810be9..2f89e278329 100644
--- a/multimedia/ming/patches/patch-src_blocks_gifdbl.c
+++ b/multimedia/ming/patches/patch-src_blocks_gifdbl.c
@@ -1,9 +1,18 @@
-$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.2 2014/05/16 09:43:30 wiz Exp $
* Fix build with giflib 5.0.
--- src/blocks/gifdbl.c.orig 2010-10-10 07:19:23.000000000 +0000
+++ src/blocks/gifdbl.c
+@@ -203,7 +203,7 @@ readGif(GifFileType *file, dblData resul
+ }
+
+ /* Done! */
+- DGifCloseFile(file);
++ DGifCloseFile(file, NULL);
+
+ result->data = malloc(outsize = (int)floor(size*1.01+12));
+
@@ -227,7 +227,7 @@ SWFDBLBitmapData newSWFDBLBitmapData_fro
SWFDBLBitmapData ret;
struct dbl_data gifdata;
diff --git a/multimedia/ming/patches/patch-src_libming.h b/multimedia/ming/patches/patch-src_libming.h
index f8953868b33..b560c1fc4c4 100644
--- a/multimedia/ming/patches/patch-src_libming.h
+++ b/multimedia/ming/patches/patch-src_libming.h
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_libming.h,v 1.1 2013/07/06 07:43:13 ryoon Exp $
+$NetBSD: patch-src_libming.h,v 1.2 2014/05/16 09:43:30 wiz Exp $
* Introduce custom PrintGifError() from util/qprintf.c of giflib 5.0.4.
@@ -20,7 +20,7 @@ $NetBSD: patch-src_libming.h,v 1.1 2013/07/06 07:43:13 ryoon Exp $
+PrintGifError(int ErrorCode)
{
- fprintf(stderr, "\nGIF-LIB error: %s.\n", GifErrorString());
-+ char *Err = GifErrorString(ErrorCode);
++ const char *Err = GifErrorString(ErrorCode);
+
+ if (Err != NULL)
+ fprintf(stderr, "\nGIF-LIB error: %s.\n", Err);
diff --git a/multimedia/ming/patches/patch-util_gif2dbl.c b/multimedia/ming/patches/patch-util_gif2dbl.c
index db8167f6315..db0ad7afc7b 100644
--- a/multimedia/ming/patches/patch-util_gif2dbl.c
+++ b/multimedia/ming/patches/patch-util_gif2dbl.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-util_gif2dbl.c,v 1.1 2013/07/06 07:43:13 ryoon Exp $
+$NetBSD: patch-util_gif2dbl.c,v 1.2 2014/05/16 09:43:30 wiz Exp $
* Fix build with giflib 5.0.4.
* Catch error with gifib 5.0 manner.
@@ -28,3 +28,12 @@ $NetBSD: patch-util_gif2dbl.c,v 1.1 2013/07/06 07:43:13 ryoon Exp $
error("Error opening file");
if(DGifSlurp(file) != GIF_OK)
+@@ -190,7 +192,7 @@ unsigned char *readGif(char *fileName, i
+ }
+
+ /* Done! */
+- DGifCloseFile(file);
++ DGifCloseFile(file, NULL);
+
+ *length = size;
+ return data;
diff --git a/multimedia/mplayer-share/distinfo b/multimedia/mplayer-share/distinfo
index 09da316b208..07db8252b01 100644
--- a/multimedia/mplayer-share/distinfo
+++ b/multimedia/mplayer-share/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.81 2013/07/06 07:07:18 ryoon Exp $
+$NetBSD: distinfo,v 1.82 2014/05/16 09:49:06 wiz Exp $
SHA1 (mplayer/MPlayer-1.1.1.tar.xz) = ba2f3bd1442d04b17b0143680850273d928689c1
RMD160 (mplayer/MPlayer-1.1.1.tar.xz) = 745b3fdf684ba7614dbec2a7143188b7c9cca3a1
@@ -7,8 +7,8 @@ SHA1 (patch-aa) = da461823d0731624de964323ab630f6e295be7b7
SHA1 (patch-ae) = 286f5ac075ea4123a1a6276f97e02a4dda9b3e67
SHA1 (patch-an) = a1d16ce7a4ff5a2071a7bac1b6836dc197b849e4
SHA1 (patch-libao2_ao_sun.c) = ce7042b394b9b8c051597c734b70290c8bf0a8d5
-SHA1 (patch-libmpdemux_demux__gif.c) = 2e760d89cd05c8249be83fc79b410d282af796db
-SHA1 (patch-libvo_vo__gif89a.c) = 7127f03a420551f82f29772de4f986f4ff10cb32
+SHA1 (patch-libmpdemux_demux__gif.c) = 4efec4ea1fe395e24760530e532d3251c64a8fb8
+SHA1 (patch-libvo_vo__gif89a.c) = 88e20df5ea5d5f294d312dddab08cb0e40fb8483
SHA1 (patch-stream_dvb_tune.c) = 46cb5fb4700d7da5ed997dd468033c1edbe9be03
SHA1 (patch-stream_dvbin.h) = ee4f74eb786100e7cc62be228d73ce29d88638d1
SHA1 (patch-sub_osd.c) = 00dceec6ddd10d5ccb6561a18663fe1ca0635be5
diff --git a/multimedia/mplayer-share/patches/patch-libmpdemux_demux__gif.c b/multimedia/mplayer-share/patches/patch-libmpdemux_demux__gif.c
index 640c196d6a3..5648ac319d3 100644
--- a/multimedia/mplayer-share/patches/patch-libmpdemux_demux__gif.c
+++ b/multimedia/mplayer-share/patches/patch-libmpdemux_demux__gif.c
@@ -1,6 +1,6 @@
-$NetBSD: patch-libmpdemux_demux__gif.c,v 1.1 2013/07/06 07:07:18 ryoon Exp $
+$NetBSD: patch-libmpdemux_demux__gif.c,v 1.2 2014/05/16 09:49:06 wiz Exp $
-* Fix build with giflib 5.0.
+* Fix build with giflib 5.1.
--- libmpdemux/demux_gif.c.orig 2010-12-12 10:37:15.000000000 +0000
+++ libmpdemux/demux_gif.c
@@ -98,11 +98,13 @@ $NetBSD: patch-libmpdemux_demux__gif.c,v 1.1 2013/07/06 07:07:18 ryoon Exp $
free(priv);
return NULL;
}
-@@ -302,7 +314,7 @@ static void demux_close_gif(demuxer_t* d
+@@ -301,8 +313,8 @@ static void demux_close_gif(demuxer_t* d
+ {
gif_priv_t *priv = demuxer->priv;
if (!priv) return;
- if (priv->gif && DGifCloseFile(priv->gif) == GIF_ERROR)
+- if (priv->gif && DGifCloseFile(priv->gif) == GIF_ERROR)
- PrintGifError();
++ if (priv->gif && DGifCloseFile(priv->gif, NULL) == GIF_ERROR)
+ PrintGifError(priv->gif->Error);
free(priv->refimg);
free(priv);
diff --git a/multimedia/mplayer-share/patches/patch-libvo_vo__gif89a.c b/multimedia/mplayer-share/patches/patch-libvo_vo__gif89a.c
index b75708d1687..c783c0f3560 100644
--- a/multimedia/mplayer-share/patches/patch-libvo_vo__gif89a.c
+++ b/multimedia/mplayer-share/patches/patch-libvo_vo__gif89a.c
@@ -1,6 +1,6 @@
-$NetBSD: patch-libvo_vo__gif89a.c,v 1.1 2013/07/06 07:07:18 ryoon Exp $
+$NetBSD: patch-libvo_vo__gif89a.c,v 1.2 2014/05/16 09:49:06 wiz Exp $
-* Fix build with giflib 5.0.
+* Fix build with giflib 5.1.
--- libvo/vo_gif89a.c.orig 2011-05-07 10:59:11.000000000 +0000
+++ libvo/vo_gif89a.c
@@ -39,7 +39,15 @@ $NetBSD: patch-libvo_vo__gif89a.c,v 1.1 2013/07/06 07:07:18 ryoon Exp $
}
static void flip_page(void)
-@@ -365,7 +366,7 @@ static void uninit(void)
+@@ -358,14 +359,14 @@ static void uninit(void)
+ MPLAYER_VERSION, VO_GIF_REVISION,
+ "joey@nicewarrior.org");
+ EGifPutComment(new_gif, temp);
+- EGifCloseFile(new_gif); // also frees gif storage space.
++ EGifCloseFile(new_gif, NULL); // also frees gif storage space.
+ }
+
+ // free our allocated ram
free(gif_filename);
free(slice_data);
free(reduce_data);
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-08 10:31:56 +0000