CVS commit: pkgsrc/multimedia/ffmpeg1

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Jun 15 10:52:02 UTC 2018

Modified Files:
        pkgsrc/multimedia/ffmpeg1: options.mk

Log Message:
ffmpeg1: Remove x264 as a supported option.

This package shares a PKG_OPTIONS variable with the other ffmpeg
packages, so a user who requests the x264 option for them will end
up with a broken package for ffmpeg1.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/multimedia/ffmpeg1/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/ffmpeg1/options.mk
diff -u pkgsrc/multimedia/ffmpeg1/options.mk:1.3 pkgsrc/multimedia/ffmpeg1/options.mk:1.4
--- pkgsrc/multimedia/ffmpeg1/options.mk:1.3    Wed May 16 11:09:57 2018
+++ pkgsrc/multimedia/ffmpeg1/options.mk        Fri Jun 15 10:52:02 2018
@@ -1,10 +1,11 @@
-# $NetBSD: options.mk,v 1.3 2018/05/16 11:09:57 jperkin Exp $
+# $NetBSD: options.mk,v 1.4 2018/06/15 10:52:02 jperkin Exp $
 
 # Global and legacy options
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.ffmpeg
-PKG_SUPPORTED_OPTIONS= faac lame ass libvpx theora vorbis x264 xvid \
+PKG_SUPPORTED_OPTIONS= faac lame ass libvpx theora vorbis xvid \
                        opencore-amr rtmp
+#PKG_SUPPORTED_OPTIONS+=x264
 PKG_SUGGESTED_OPTIONS= lame ass libvpx theora vorbis xvid
 #PKG_OPTIONS_OPTIONAL_GROUPS=  aac-decoder
 #PKG_OPTIONS_GROUP.aac-decoder=        faac