diff options
| author | Grzegorz Blach <gblach@FreeBSD.org> | 2012-12-30 18:04:18 +0000 |
|---|---|---|
| committer | Grzegorz Blach <gblach@FreeBSD.org> | 2012-12-30 18:04:18 +0000 |
| commit | d5617b8932347ec3ca13c1acb47b0e68fe4ee2af (patch) | |
| tree | 946f156aca353511885520e73b534e9fa27427bd /multimedia/mplayer2 | |
| parent | 6ee31886c911678177a10c557fb2840d9ba0b523 (diff) | |
- Fix build when both audio/portaudio and audio/portaudio2 are installed
- Remove xvmc option (was removed upstream)
Approved by: crees (mentor)
Notes
Notes:
svn path=/head/; revision=309684
Diffstat (limited to 'multimedia/mplayer2')
| -rw-r--r-- | multimedia/mplayer2/Makefile | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/multimedia/mplayer2/Makefile b/multimedia/mplayer2/Makefile index 0db7f7aaab41..1c85c7b41698 100644 --- a/multimedia/mplayer2/Makefile +++ b/multimedia/mplayer2/Makefile @@ -26,8 +26,10 @@ CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ 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 |