Received: by mail.netbsd.org (Postfix, from userid 605) id 8133E84D8A; Thu, 23 Apr 2020 15:25:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 0B6F084D79 for ; Thu, 23 Apr 2020 15:25:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id HaP6HDnbGaA2 for ; Thu, 23 Apr 2020 15:25:43 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 5F48C84CDB for ; Thu, 23 Apr 2020 15:25:43 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 5AD33FB27; Thu, 23 Apr 2020 15:25:43 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_158765554310280" MIME-Version: 1.0 Date: Thu, 23 Apr 2020 15:25:43 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/mbone/vic-devel To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20200423152543.5AD33FB27@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_158765554310280 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Thu Apr 23 15:25:43 UTC 2020 Modified Files: pkgsrc/mbone/vic-devel: options.mk Log Message: vic-devel: remove unsupported options that references old ffmpeg version To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 pkgsrc/mbone/vic-devel/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_158765554310280 Content-Disposition: inline Content-Length: 1325 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/mbone/vic-devel/options.mk diff -u pkgsrc/mbone/vic-devel/options.mk:1.4 pkgsrc/mbone/vic-devel/options.mk:1.5 --- pkgsrc/mbone/vic-devel/options.mk:1.4 Mon Aug 11 23:09:44 2014 +++ pkgsrc/mbone/vic-devel/options.mk Thu Apr 23 15:25:43 2020 @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.4 2014/08/11 23:09:44 wiz Exp $ +# $NetBSD: options.mk,v 1.5 2020/04/23 15:25:43 nia Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.vic -PKG_SUPPORTED_OPTIONS= inet6 # vic-gpl -PKG_SUGGESTED_OPTIONS= inet6 # vic-gpl +PKG_SUPPORTED_OPTIONS= inet6 +PKG_SUGGESTED_OPTIONS= inet6 .include "../../mk/bsd.options.mk" @@ -10,18 +10,3 @@ PKG_SUGGESTED_OPTIONS= inet6 # vic-gpl .if !empty(PKG_OPTIONS:Minet6) CONFIGURE_ARGS+= --enable-ipv6 .endif - -## mpeg4+x264 support (ffmpeg) - -.if !empty(PKG_OPTIONS:Mvic-gpl) -CONFIGURE_ARGS+= --enable-gpl -CONFIGURE_ARGS+= --disable-ffmpeg-co -CONFIGURE_ARGS+= --disable-x264-co -CONFIGURE_ARGS+= --with-ffmpeginc=${BUILDLINK_PREFIX.ffmpeg}/include -CONFIGURE_ARGS+= --with-ffmpeglib=${BUILDLINK_PREFIX.ffmpeg}/lib -.include "../../multimedia/ffmpeg1/buildlink3.mk" - -CONFIGURE_ARGS+= --with-x264inc=${BUILDLINK_PREFIX.x264-devel}/include -CONFIGURE_ARGS+= --with-x264lib=${BUILDLINK_PREFIX.x264-devel}/lib -.include "../../multimedia/x264-devel/buildlink3.mk" -.endif --_----------=_158765554310280--