svn commit: r410128 - head/multimedia/mplayer

[Alexey Dokuchaev]

Author: danfe
Date: Fri Mar  4 15:39:39 2016
New Revision: 410128
URL: https://svnweb.freebsd.org/changeset/ports/410128

Log:
  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)

Modified:
  head/multimedia/mplayer/Makefile
  head/multimedia/mplayer/Makefile.common
  head/multimedia/mplayer/Makefile.optvars

Modified: head/multimedia/mplayer/Makefile
==============================================================================
--- head/multimedia/mplayer/Makefile	Fri Mar  4 15:13:16 2016	(r410127)
+++ head/multimedia/mplayer/Makefile	Fri Mar  4 15:39:39 2016	(r410128)
@@ -10,14 +10,14 @@ COMMENT=	High performance media player s
 
 .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

Modified: head/multimedia/mplayer/Makefile.common
==============================================================================
--- head/multimedia/mplayer/Makefile.common	Fri Mar  4 15:13:16 2016	(r410127)
+++ head/multimedia/mplayer/Makefile.common	Fri Mar  4 15:39:39 2016	(r410128)
@@ -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

Modified: head/multimedia/mplayer/Makefile.optvars
==============================================================================
--- head/multimedia/mplayer/Makefile.optvars	Fri Mar  4 15:13:16 2016	(r410127)
+++ head/multimedia/mplayer/Makefile.optvars	Fri Mar  4 15:39:39 2016	(r410128)
@@ -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