From owner-svn-ports-all@FreeBSD.ORG  Sun Dec 30 18:04:19 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 02C0F537;
 Sun, 30 Dec 2012 18:04:19 +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 C2AA28FC08;
 Sun, 30 Dec 2012 18:04:18 +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 qBUI4IAK052367;
 Sun, 30 Dec 2012 18:04:18 GMT (envelope-from gblach@svn.freebsd.org)
Received: (from gblach@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBUI4Ipu052366;
 Sun, 30 Dec 2012 18:04:18 GMT (envelope-from gblach@svn.freebsd.org)
Message-Id: <201212301804.qBUI4Ipu052366@svn.freebsd.org>
From: Grzegorz Blach <gblach@FreeBSD.org>
Date: Sun, 30 Dec 2012 18:04:18 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r309684 - head/multimedia/mplayer2
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 30 Dec 2012 18:04:19 -0000

Author: gblach
Date: Sun Dec 30 18:04:18 2012
New Revision: 309684
URL: http://svnweb.freebsd.org/changeset/ports/309684

Log:
  - Fix build when both audio/portaudio and audio/portaudio2 are installed
  - Remove xvmc option (was removed upstream)
  
  Approved by:	crees (mentor)

Modified:
  head/multimedia/mplayer2/Makefile

Modified: head/multimedia/mplayer2/Makefile
==============================================================================
--- head/multimedia/mplayer2/Makefile	Sun Dec 30 17:57:04 2012	(r309683)
+++ head/multimedia/mplayer2/Makefile	Sun Dec 30 18:04:18 2012	(r309684)
@@ -26,8 +26,10 @@ CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		TMPDIR="${WRKSRC}"
 CONFIGURE_ARGS=	--cc=${CC} \
-		--extra-cflags=-I${LOCALBASE}/include/ffmpeg1 \
-		--extra-ldflags=-L${LOCALBASE}/lib/ffmpeg1 \
+		--extra-cflags='-I${LOCALBASE}/include/ffmpeg1 \
+		-I${LOCALBASE}/include/portaudio2' \
+		--extra-ldflags='-L${LOCALBASE}/lib/ffmpeg1 \
+		-L${LOCALBASE}/lib/portaudio2' \
 		--mandir=${PREFIX}/man \
 		--disable-alsa \
 		--disable-liba52 \
@@ -48,7 +50,7 @@ MAKE_JOBS_SAFE=	yes
 
 OPTIONS_DEFINE=	DEBUG RTC IPV6 SMB JOYSTICK \
 		DVDREAD LIBBLURAY V4L DV THEORA \
-		X11 XVMC XINERAMA OPENGL SDL VDPAU GIF CACA \
+		X11 XINERAMA OPENGL SDL VDPAU GIF CACA \
 		MAD SPEEX LIBCDIO LADSPA REALPLAYER \
 		JACK PULSE PORTAUDIO ASS LIRC
 OPTIONS_DEFAULT=DVDREAD X11 ASS
@@ -244,10 +246,6 @@ USE_XORG+=		xinerama xineramaproto
 .else
 CONFIGURE_ARGS+=	--disable-xinerama
 .endif
-.if ${PORT_OPTIONS:MXVMC}
-USE_XORG+=		xvmc
-CONFIGURE_ARGS+=	--enable-xvmc --with-xvmclib=XvMCW
-.endif
 .else			#WITHOUT_X11
 CONFIGURE_ARGS+=	--disable-x11 --disable-fontconfig
 .endif