From owner-svn-ports-head@freebsd.org Fri Mar 4 15:39:41 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F0BAF9DBCE3; Fri, 4 Mar 2016 15:39:40 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CB3093DF; Fri, 4 Mar 2016 15:39:40 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u24Fddx4024027; Fri, 4 Mar 2016 15:39:39 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u24FddEC024024; Fri, 4 Mar 2016 15:39:39 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201603041539.u24FddEC024024@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Fri, 4 Mar 2016 15:39:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r410128 - head/multimedia/mplayer X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Mar 2016 15:39:41 -0000 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