Date: Wed, 20 May 2015 05:06:16 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r386837 - head/multimedia/mpv Message-ID: <201505200506.t4K56GfZ025646@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505200506.t4K56GfZ025646>