diff options
| author | Alexey Dokuchaev <danfe@FreeBSD.org> | 2016-03-04 15:39:39 +0000 |
|---|---|---|
| committer | Alexey Dokuchaev <danfe@FreeBSD.org> | 2016-03-04 15:39:39 +0000 |
| commit | 17246114ea21c0fcf31026074315925736797550 (patch) | |
| tree | 78e985516cf28e1f5d2305e9e1f8d2a2e9962eea /multimedia/mplayer | |
| parent | math/yacas: unbreak on 9. w/ gcc (diff) | |
Make dependency on `multimedia/libdvdnav' optional: riggs@ vaguely recalls
that there were build problems when disabling dvdnav some years ago, but I
had been building and running MPlayer without it for quite a while with no
issues. It remains enabled by default anyways.
While here use our standard OPTIMIZED_CFLAGS_DESC for OCFLAGS_DESC and fix
minor indentation bug.
Approved by: riggs (maintainer)
Notes
Notes:
svn path=/head/; revision=410128
Diffstat (limited to 'multimedia/mplayer')
| -rw-r--r-- | multimedia/mplayer/Makefile | 7 | ||||
| -rw-r--r-- | multimedia/mplayer/Makefile.common | 3 | ||||
| -rw-r--r-- | multimedia/mplayer/Makefile.optvars | 5 |
3 files changed, 9 insertions, 6 deletions
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile index 5337eadfc21c..7de466a9daff 100644 --- a/multimedia/mplayer/Makefile +++ b/multimedia/mplayer/Makefile @@ -10,14 +10,14 @@ COMMENT= High performance media player supporting many formats .include "${.CURDIR}/../../multimedia/mplayer/Makefile.common" -OPTIONS_DEFINE= AALIB AMR_NB AMR_WB BLURAY CACA CDIO DEBUG DV \ +OPTIONS_DEFINE= AALIB AMR_NB AMR_WB BLURAY CACA CDIO DEBUG DV DVDNAV \ ENCA FONTCONFIG FRIBIDI GIF GNUTLS GSM GUI IPV6 JACK \ LADSPA LIBMNG LIRC LZO NAS OCFLAGS OPENAL OPENGL \ OPENJPEG OPUS PULSEAUDIO REAL RTC RTMP \ SCHROEDINGER SDL SKINS SMB SVGALIB V4L VDPAU VPX \ X11 X11DGA X11VM XINERAMA XVIDEO XVMC -OPTIONS_DEFAULT=FONTCONFIG FRIBIDI GNUTLS IPV6 OCFLAGS OPENGL \ +OPTIONS_DEFAULT=DVDNAV FONTCONFIG FRIBIDI GNUTLS IPV6 OCFLAGS OPENGL \ SKINS X11 X11DGA X11VM XINERAMA XVIDEO OPTIONS_DEFINE_i386= RTCPU @@ -28,10 +28,11 @@ OPTIONS_DEFAULT_i386= RTCPU VDPAU OPTIONS_DEFAULT_amd64= RTCPU VDPAU OPTIONS_DEFAULT_powerpc=RTCPU +DVDNAV_DESC?= DVD navigation features support BLURAY_DESC?= BluRay support ENCA_DESC?= Charset conversion via enca LZO_DESC?= External liblzo support -OCFLAGS_DESC?= Use optimized compiler flags +OCFLAGS_DESC?= ${OPTIMIZED_CFLAGS_DESC} REAL_DESC?= Enable realplayer plugin RTC_DESC?= Add support for kernel real time clock RTCPU_DESC?= Use runtime CPU detection diff --git a/multimedia/mplayer/Makefile.common b/multimedia/mplayer/Makefile.common index 43d77945076a..ed325ff6ca36 100644 --- a/multimedia/mplayer/Makefile.common +++ b/multimedia/mplayer/Makefile.common @@ -13,8 +13,7 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ - libfreetype.so:${PORTSDIR}/print/freetype2 \ - libdvdnav.so:${PORTSDIR}/multimedia/libdvdnav + libfreetype.so:${PORTSDIR}/print/freetype2 USES= compiler:c11 gmake iconv ncurses tar:xz GNU_CONFIGURE= yes diff --git a/multimedia/mplayer/Makefile.optvars b/multimedia/mplayer/Makefile.optvars index 81489e520265..902da2b6684c 100644 --- a/multimedia/mplayer/Makefile.optvars +++ b/multimedia/mplayer/Makefile.optvars @@ -25,8 +25,11 @@ CDIO_CONFIGURE_OFF= --disable-libcdio DV_LIB_DEPENDS= libdv.so:${PORTSDIR}/multimedia/libdv DV_CONFIGURE_OFF= --disable-libdv +DVDNAV_LIB_DEPENDS= libdvdnav.so:${PORTSDIR}/multimedia/libdvdnav +DVDNAV_CONFIGURE_OFF= --disable-dvdnav + ENCA_LIB_DEPENDS= libenca.so:${PORTSDIR}/converters/enca -ENCA_CONFIGURE_OFF= --disable-enca +ENCA_CONFIGURE_OFF= --disable-enca FAAC_LIB_DEPENDS= libfaac.so:${PORTSDIR}/audio/faac FAAC_CONFIGURE_OFF= --disable-faac |