svn commit: r309684 - head/multimedia/mplayer2

[Grzegorz Blach]

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