From owner-svn-ports-head@FreeBSD.ORG  Wed May 20 05:06:16 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id DB2DB107;
 Wed, 20 May 2015 05:06:16 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C9CA21C9D;
 Wed, 20 May 2015 05:06:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4K56Gj7025647;
 Wed, 20 May 2015 05:06:16 GMT (envelope-from pi@FreeBSD.org)
Received: (from pi@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4K56GfZ025646;
 Wed, 20 May 2015 05:06:16 GMT (envelope-from pi@FreeBSD.org)
Message-Id: <201505200506.t4K56GfZ025646@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: pi set sender to pi@FreeBSD.org
 using -f
From: Kurt Jaeger <pi@FreeBSD.org>
Date: Wed, 20 May 2015 05:06:16 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r386837 - head/multimedia/mpv
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.20
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: Wed, 20 May 2015 05:06:17 -0000

Author: pi
Date: Wed May 20 05:06:16 2015
New Revision: 386837
URL: https://svnweb.freebsd.org/changeset/ports/386837

Log:
  multimedia/mpv: fix conflict between ffmpeg and ffmpeg26
  
  PR:		198758
  Submitted by:	Carlos J Puga Medina <cpm@fbsd.es> (maintainer)

Modified:
  head/multimedia/mpv/Makefile

Modified: head/multimedia/mpv/Makefile
==============================================================================
--- head/multimedia/mpv/Makefile	Wed May 20 03:57:44 2015	(r386836)
+++ head/multimedia/mpv/Makefile	Wed May 20 05:06:16 2015	(r386837)
@@ -4,7 +4,7 @@
 PORTNAME=	mpv
 PORTVERSION=	0.9.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://ftp.waf.io/pub/release/:1 \
@@ -33,7 +33,7 @@ USE_XORG=	x11 xv xxf86vm
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 
-CPPFLAGS+=	-I.. -I${LOCALBASE}/include
+CPPFLAGS+=	-I.. -I${LOCALBASE}/include/ffmpeg26 -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
@@ -45,8 +45,6 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--disable-alsa \
 		--disable-pdf
 
-CONFLICTS_BUILD=	ffmpeg
-
 OPTIONS_DEFINE=		BS2B DOCS ENCA LADSPA LCMS2 LIBGUESS LUAJIT ZSH
 OPTIONS_GROUP=		IN VO AO
 OPTIONS_GROUP_IN=	CDIO LIBBLURAY V4L YTDL SMB