From owner-svn-ports-head@FreeBSD.ORG  Mon Dec 31 17:32:17 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 6DD93E56;
 Mon, 31 Dec 2012 17:32:17 +0000 (UTC)
 (envelope-from gblach@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 387248FC08;
 Mon, 31 Dec 2012 17:32:17 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBVHWHJ1073245;
 Mon, 31 Dec 2012 17:32:17 GMT (envelope-from gblach@svn.freebsd.org)
Received: (from gblach@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBVHWGHv073243;
 Mon, 31 Dec 2012 17:32:16 GMT (envelope-from gblach@svn.freebsd.org)
Message-Id: <201212311732.qBVHWGHv073243@svn.freebsd.org>
From: Grzegorz Blach <gblach@FreeBSD.org>
Date: Mon, 31 Dec 2012 17:32:16 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r309768 - in head/multimedia/mplayer2: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 31 Dec 2012 17:32:17 -0000

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)