package/mplayer/0006-Support-newer-GIFLIB-versions-part2.patch

   1 Support newer GIFLIB versions - Part 2
   2
   3 Adding another patch to fix the problem with new versions of libgif.
   4 This patch has been sent upstream:
   5
   6   https://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2015-February/072848.html
   7
   8 Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
   9
  10 Support newer GIFLIB versions - Part 2
  11
  12 This patch is necessary because the previous upstream patch is
  13 incomplete. Without this one, MPlayer will fail to compile displaying
  14 an error message like this one:
  15
  16 libvo/vo_gif89a.c: In function 'uninit':
  17 libvo/vo_gif89a.c:374:3: error: too few arguments to function 'EGifCloseFile'
  18    EGifCloseFile(new_gif); // also frees gif storage space.
  19
  20 Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
  21 ---
  22
  23 diff -rup a/libmpdemux/demux_gif.c b/libmpdemux/demux_gif.c
  24 --- a/libmpdemux/demux_gif.c    2015-02-13 15:39:56.582310414 +0000
  25 +++ b/libmpdemux/demux_gif.c    2015-02-13 15:48:06.396837922 +0000
  26 @@ -48,6 +48,7 @@ typedef struct {
  27  #if defined GIFLIB_MAJOR && GIFLIB_MAJOR >= 5
  28  #define DGifOpen(a, b) DGifOpen(a, b, NULL)
  29  #define DGifOpenFileHandle(a) DGifOpenFileHandle(a, NULL)
  30 +#define DGifCloseFile(a) DGifCloseFile(a, NULL)
  31  #define GifError() (gif ? gif->Error : 0)
  32  #define GifErrorString() GifErrorString(gif->Error)
  33  #endif
  34 diff -rup a/libvo/vo_gif89a.c b/libvo/vo_gif89a.c
  35 --- a/libvo/vo_gif89a.c 2015-02-13 15:39:56.631311186 +0000
  36 +++ b/libvo/vo_gif89a.c 2015-02-13 15:45:25.392168294 +0000
  37 @@ -71,6 +71,7 @@ const LIBVO_EXTERN(gif89a)
  38
  39  #if defined GIFLIB_MAJOR && GIFLIB_MAJOR >= 5
  40  #define EGifOpenFileName(a, b) EGifOpenFileName(a, b, NULL)
  41 +#define EGifCloseFile(a) EGifCloseFile(a, NULL)
  42  #define MakeMapObject GifMakeMapObject
  43  #define FreeMapObject GifFreeMapObject
  44  #define QuantizeBuffer GifQuantizeBuffer