svn commit: r309768 - in head/multimedia/mplayer2: . files

[Grzegorz Blach]

Author: gblach
Date: Mon Dec 31 17:32:16 2012
New Revision: 309768
URL: http://svnweb.freebsd.org/changeset/ports/309768

Log:
  - Fix linking with giflib
  - Fix linking with libbluray
  
  PR:		ports/174842
  Approved by:	crees (mentor)

Added:
  head/multimedia/mplayer2/files/patch-libmpdemux-demux_gif.c   (contents, props changed)
Modified:
  head/multimedia/mplayer2/Makefile

Modified: head/multimedia/mplayer2/Makefile
==============================================================================
--- head/multimedia/mplayer2/Makefile	Mon Dec 31 17:25:28 2012	(r309767)
+++ head/multimedia/mplayer2/Makefile	Mon Dec 31 17:32:16 2012	(r309768)
@@ -166,7 +166,6 @@ CONFIGURE_ARGS+=	--disable-portaudio
 
 .if ${PORT_OPTIONS:MLIBBLURAY}
 LIB_DEPENDS+=		bluray:${PORTSDIR}/multimedia/libbluray
-CONFIGURE_ARGS+=	--enable-bluray
 .else
 CONFIGURE_ARGS+=	--disable-bluray
 .endif

Added: head/multimedia/mplayer2/files/patch-libmpdemux-demux_gif.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/mplayer2/files/patch-libmpdemux-demux_gif.c	Mon Dec 31 17:32:16 2012	(r309768)
@@ -0,0 +1,19 @@
+--- libmpdemux/demux_gif.c.orig	2012-12-31 00:26:50.000000000 +0100
++++ libmpdemux/demux_gif.c	2012-12-31 00:30:54.000000000 +0100
+@@ -44,6 +44,16 @@
+ 
+ #define GIF_SIGNATURE (('G' << 16) | ('I' << 8) | 'F')
+ 
++static void PrintGifError(void)
++{
++  char *Err = GifErrorString();
++
++  if (Err != NULL)
++    fprintf(stderr, "\nGIF-LIB error: %s.\n", Err);
++  else
++    fprintf(stderr, "\nGIF-LIB undefined error %d.\n", GifError());
++}
++
+ #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)