Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 785797A1FE for ; Sun, 28 May 2017 02:09:19 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 261B184DD5; Sun, 28 May 2017 02:09:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id AAD1784DD0 for ; Sun, 28 May 2017 02:09:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id Eakd_sjvQyWE for ; Sun, 28 May 2017 02:09:18 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 3BD3184CD8 for ; Sun, 28 May 2017 02:09:18 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 36B48FBE4; Sun, 28 May 2017 02:09:18 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1495937358108120" MIME-Version: 1.0 Date: Sun, 28 May 2017 02:09:18 +0000 From: "Maya Rashish" Subject: CVS commit: pkgsrc/multimedia/ffmpeg3 To: pkgsrc-changes@NetBSD.org Reply-To: maya@netbsd.org X-Mailer: log_accum Message-Id: <20170528020918.36B48FBE4@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. --_----------=_1495937358108120 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: maya Date: Sun May 28 02:09:18 UTC 2017 Modified Files: pkgsrc/multimedia/ffmpeg3: options.mk Log Message: ffmpeg3: introduce x11 option (default on) and wrap vaapi/vdpau options with it- makes it easier for non-x11 users to disable those. may want to make vdpau/vaapi just an option again, limited (if any) benefit. but this fixes the immediate problem of pulling in Xorg unnecessarily. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 pkgsrc/multimedia/ffmpeg3/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1495937358108120 Content-Disposition: inline Content-Length: 1361 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/multimedia/ffmpeg3/options.mk diff -u pkgsrc/multimedia/ffmpeg3/options.mk:1.6 pkgsrc/multimedia/ffmpeg3/options.mk:1.7 --- pkgsrc/multimedia/ffmpeg3/options.mk:1.6 Sat Apr 15 09:26:47 2017 +++ pkgsrc/multimedia/ffmpeg3/options.mk Sun May 28 02:09:18 2017 @@ -1,13 +1,13 @@ -# $NetBSD: options.mk,v 1.6 2017/04/15 09:26:47 adam Exp $ +# $NetBSD: options.mk,v 1.7 2017/05/28 02:09:18 maya Exp $ # Global and legacy options PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg3 PKG_SUPPORTED_OPTIONS= ass doc fdk-aac fontconfig freetype \ gnutls lame libvpx opencore-amr openssl opus theora \ - vorbis x264 x265 xcb xvid + vorbis x11 x264 x265 xcb xvid PKG_SUGGESTED_OPTIONS= lame ass freetype fontconfig libvpx openssl \ - theora vorbis x264 xvid + theora vorbis x11 x264 xvid PLIST_VARS+= doc @@ -158,7 +158,7 @@ CONFIGURE_ARGS+= --disable-libx265 .endif # VDPAU support -.if !empty(PKG_OPTIONS:Mvdpau) +.if !empty(PKG_OPTIONS:Mvdpau) && !empty(PKG_OPTIONS:Mx11) CONFIGURE_ARGS+= --enable-vdpau .include "../../multimedia/libvdpau/buildlink3.mk" .else @@ -166,7 +166,7 @@ CONFIGURE_ARGS+= --disable-vdpau .endif # VAAPI support -.if !empty(PKG_OPTIONS:Mvaapi) +.if !empty(PKG_OPTIONS:Mvaapi) && !empty(PKG_OPTIONS:Mx11) CONFIGURE_ARGS+= --enable-vaapi .include "../../multimedia/libva/buildlink3.mk" .else --_----------=_1495937358108120--