diff options
author | ryoon <ryoon@pkgsrc.org> | 2013-07-06 07:07:18 +0000 |
---|---|---|
committer | ryoon <ryoon@pkgsrc.org> | 2013-07-06 07:07:18 +0000 |
commit | 5e2e8c802fb30cd44c0d62c41b7cd32286c55c54 (patch) | |
tree | 9e5f6838922fff812d5c151da919dd8a787b5588 /multimedia/mplayer-share | |
parent | 2a8bc1f24b4950f3c17e424e92993b510f552e85 (diff) | |
download | pkgsrc-5e2e8c802fb30cd44c0d62c41b7cd32286c55c54.tar.gz |
Update to 1.1.1
* Fix build with giflib 5.0.4.
Changelog:
* Security update.
I cannot find detail.
Diffstat (limited to 'multimedia/mplayer-share')
-rw-r--r-- | multimedia/mplayer-share/Makefile | 3 | ||||
-rw-r--r-- | multimedia/mplayer-share/Makefile.common | 5 | ||||
-rw-r--r-- | multimedia/mplayer-share/distinfo | 10 | ||||
-rw-r--r-- | multimedia/mplayer-share/patches/patch-libmpdemux_demux__gif.c | 109 | ||||
-rw-r--r-- | multimedia/mplayer-share/patches/patch-libvo_vo__gif89a.c | 50 |
5 files changed, 169 insertions, 8 deletions
diff --git a/multimedia/mplayer-share/Makefile b/multimedia/mplayer-share/Makefile index 8764666080f..55f7747a868 100644 --- a/multimedia/mplayer-share/Makefile +++ b/multimedia/mplayer-share/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.36 2013/06/04 22:16:49 tron Exp $ +# $NetBSD: Makefile,v 1.37 2013/07/06 07:07:18 ryoon Exp $ .include "Makefile.common" PKGNAME= mplayer-share-${MPLAYER_VERSION} -PKGREVISION= 7 COMMENT= Documentation used by mplayer and gmplayer DEPENDS+= mplayer-fonts-[0-9]*:../../fonts/mplayer-fonts diff --git a/multimedia/mplayer-share/Makefile.common b/multimedia/mplayer-share/Makefile.common index bbf34f29856..5e7f14281ae 100644 --- a/multimedia/mplayer-share/Makefile.common +++ b/multimedia/mplayer-share/Makefile.common @@ -1,15 +1,16 @@ -# $NetBSD: Makefile.common,v 1.52 2013/01/10 23:30:53 jmcneill Exp $ +# $NetBSD: Makefile.common,v 1.53 2013/07/06 07:07:18 ryoon Exp $ # used by multimedia/gmplayer/Makefile # used by multimedia/mencoder/Makefile # used by multimedia/mplayer/Makefile -MPLAYER_VERSION= 1.1 +MPLAYER_VERSION= 1.1.1 DISTNAME= MPlayer-${MPLAYER_VERSION} CATEGORIES?= multimedia MASTER_SITES= http://www.mplayerhq.hu/MPlayer/releases/ +EXTRACT_SUFX= .tar.xz DIST_SUBDIR= mplayer diff --git a/multimedia/mplayer-share/distinfo b/multimedia/mplayer-share/distinfo index 2a5e6b9548b..09da316b208 100644 --- a/multimedia/mplayer-share/distinfo +++ b/multimedia/mplayer-share/distinfo @@ -1,12 +1,14 @@ -$NetBSD: distinfo,v 1.80 2013/01/12 11:55:35 jmcneill Exp $ +$NetBSD: distinfo,v 1.81 2013/07/06 07:07:18 ryoon Exp $ -SHA1 (mplayer/MPlayer-1.1.tar.gz) = e46e3294bc96daabe604e4e195721e4f2d1e5b48 -RMD160 (mplayer/MPlayer-1.1.tar.gz) = 0369e57677c0c30f3b05f80ee1c4d8d7d1217e63 -Size (mplayer/MPlayer-1.1.tar.gz) = 17018391 bytes +SHA1 (mplayer/MPlayer-1.1.1.tar.xz) = ba2f3bd1442d04b17b0143680850273d928689c1 +RMD160 (mplayer/MPlayer-1.1.1.tar.xz) = 745b3fdf684ba7614dbec2a7143188b7c9cca3a1 +Size (mplayer/MPlayer-1.1.1.tar.xz) = 11202492 bytes 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-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 new file mode 100644 index 00000000000..640c196d6a3 --- /dev/null +++ b/multimedia/mplayer-share/patches/patch-libmpdemux_demux__gif.c @@ -0,0 +1,109 @@ +$NetBSD: patch-libmpdemux_demux__gif.c,v 1.1 2013/07/06 07:07:18 ryoon Exp $ + +* Fix build with giflib 5.0. + +--- libmpdemux/demux_gif.c.orig 2010-12-12 10:37:15.000000000 +0000 ++++ libmpdemux/demux_gif.c +@@ -45,6 +45,18 @@ typedef struct { + + #define GIF_SIGNATURE (('G' << 16) | ('I' << 8) | 'F') + ++/* from util/qprintf.c of giflib 5.0.4 */ ++void ++PrintGifError(int ErrorCode) ++{ ++ char *Err = GifErrorString(ErrorCode); ++ ++ if (Err != NULL) ++ fprintf(stderr, "GIF-LIB error: %s.\n", Err); ++ else ++ fprintf(stderr, "GIF-LIB undefined error %d.\n", ErrorCode); ++} ++ + #ifndef CONFIG_GIF_TVT_HACK + // not supported by certain versions of the library + static int my_read_gif(GifFileType *gif, uint8_t *buf, int len) +@@ -94,14 +106,14 @@ static int demux_gif_fill_buffer(demuxer + + while (type != IMAGE_DESC_RECORD_TYPE) { + if (DGifGetRecordType(gif, &type) == GIF_ERROR) { +- PrintGifError(); ++ PrintGifError(gif->Error); + return 0; // oops + } + if (type == TERMINATE_RECORD_TYPE) + return 0; // eof + if (type == SCREEN_DESC_RECORD_TYPE) { + if (DGifGetScreenDesc(gif) == GIF_ERROR) { +- PrintGifError(); ++ PrintGifError(gif->Error); + return 0; // oops + } + } +@@ -109,7 +121,7 @@ static int demux_gif_fill_buffer(demuxer + int code; + unsigned char *p = NULL; + if (DGifGetExtension(gif, &code, &p) == GIF_ERROR) { +- PrintGifError(); ++ PrintGifError(gif->Error); + return 0; // oops + } + if (code == 0xF9) { +@@ -138,7 +150,7 @@ static int demux_gif_fill_buffer(demuxer + comments[length] = 0; + printf("%s", comments); + if (DGifGetExtensionNext(gif, &p) == GIF_ERROR) { +- PrintGifError(); ++ PrintGifError(gif->Error); + return 0; // oops + } + } +@@ -146,7 +158,7 @@ static int demux_gif_fill_buffer(demuxer + } + while (p != NULL) { + if (DGifGetExtensionNext(gif, &p) == GIF_ERROR) { +- PrintGifError(); ++ PrintGifError(gif->Error); + return 0; // oops + } + } +@@ -154,7 +166,7 @@ static int demux_gif_fill_buffer(demuxer + } + + if (DGifGetImageDesc(gif) == GIF_ERROR) { +- PrintGifError(); ++ PrintGifError(gif->Error); + return 0; // oops + } + +@@ -167,7 +179,7 @@ static int demux_gif_fill_buffer(demuxer + memset(dp->buffer, gif->SBackGroundColor, priv->w * priv->h); + + if (DGifGetLine(gif, buf, len) == GIF_ERROR) { +- PrintGifError(); ++ PrintGifError(gif->Error); + free(buf); + return 0; // oops + } +@@ -257,10 +269,10 @@ static demuxer_t* demux_open_gif(demuxer + lseek(demuxer->stream->fd, 0, SEEK_SET); + gif = DGifOpenFileHandle(demuxer->stream->fd); + #else +- gif = DGifOpen(demuxer->stream, my_read_gif); ++ gif = DGifOpen(demuxer->stream, my_read_gif, NULL); + #endif + if (!gif) { +- PrintGifError(); ++ PrintGifError(gif->Error); + free(priv); + return NULL; + } +@@ -302,7 +314,7 @@ 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) +- PrintGifError(); ++ 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 new file mode 100644 index 00000000000..b75708d1687 --- /dev/null +++ b/multimedia/mplayer-share/patches/patch-libvo_vo__gif89a.c @@ -0,0 +1,50 @@ +$NetBSD: patch-libvo_vo__gif89a.c,v 1.1 2013/07/06 07:07:18 ryoon Exp $ + +* Fix build with giflib 5.0. + +--- libvo/vo_gif89a.c.orig 2011-05-07 10:59:11.000000000 +0000 ++++ libvo/vo_gif89a.c +@@ -44,6 +44,7 @@ + * entire argument being interpretted as the filename. + */ + ++#include <stddef.h> + #include <gif_lib.h> + + #include <stdio.h> +@@ -196,7 +197,7 @@ static int config(uint32_t s_width, uint + mp_msg(MSGT_VO, MSGL_ERR, "GIF89a: Some functionality has been disabled.\n"); + #endif + +- new_gif = EGifOpenFileName(gif_filename, 0); ++ new_gif = EGifOpenFileName(gif_filename, 0, NULL); + if (new_gif == NULL) { + mp_msg(MSGT_VO, MSGL_ERR, "GIF89a: error opening file \"%s\" for output.\n", gif_filename); + return 1; +@@ -215,7 +216,7 @@ static int config(uint32_t s_width, uint + return 1; + } + +- reduce_cmap = MakeMapObject(256, NULL); ++ reduce_cmap = GifMakeMapObject(256, NULL); + if (reduce_cmap == NULL) { + free(slice_data); slice_data = NULL; + free(reduce_data); reduce_data = NULL; +@@ -267,7 +268,7 @@ static int gif_reduce(int width, int hei + } + + R = Ra; G = Ga; B = Ba; +- return QuantizeBuffer(width, height, &size, R, G, B, dst, colors); ++ return GifQuantizeBuffer(width, height, &size, R, G, B, dst, colors); + } + + static void flip_page(void) +@@ -365,7 +366,7 @@ static void uninit(void) + free(gif_filename); + free(slice_data); + free(reduce_data); +- if (reduce_cmap != NULL) FreeMapObject(reduce_cmap); ++ if (reduce_cmap != NULL) GifFreeMapObject(reduce_cmap); + + // set the pointers back to null. + new_gif = NULL; |