Wed May 16 11:09:57 2018 UTC ()
ffmpeg1: Remove x264 from PKG_SUGGESTED_OPTIONS.

The current x264 version in pkgsrc has changed the API and ffmpeg1 no longer
builds against it.


(jperkin)
diff -r1.2 -r1.3 pkgsrc/multimedia/ffmpeg1/options.mk
cvs diff -r1.2 -r1.3 pkgsrc/multimedia/ffmpeg1/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg1/Attic/options.mk 2017/09/20 08:21:17 1.2
+++ pkgsrc/multimedia/ffmpeg1/Attic/options.mk 2018/05/16 11:09:57 1.3
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1# $NetBSD: options.mk,v 1.2 2017/09/20 08:21:17 adam Exp $ 1# $NetBSD: options.mk,v 1.3 2018/05/16 11:09:57 jperkin Exp $
2 2
3# Global and legacy options 3# Global and legacy options
4 4
5PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg 5PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg
6PKG_SUPPORTED_OPTIONS= faac lame ass libvpx theora vorbis x264 xvid \ 6PKG_SUPPORTED_OPTIONS= faac lame ass libvpx theora vorbis x264 xvid \
7 opencore-amr rtmp 7 opencore-amr rtmp
8PKG_SUGGESTED_OPTIONS= lame ass libvpx theora vorbis x264 xvid 8PKG_SUGGESTED_OPTIONS= lame ass libvpx theora vorbis xvid
9#PKG_OPTIONS_OPTIONAL_GROUPS= aac-decoder 9#PKG_OPTIONS_OPTIONAL_GROUPS= aac-decoder
10#PKG_OPTIONS_GROUP.aac-decoder= faac 10#PKG_OPTIONS_GROUP.aac-decoder= faac
11 11
12### Add VDPAU if it is available 12### Add VDPAU if it is available
13.include "../../multimedia/libvdpau/available.mk" 13.include "../../multimedia/libvdpau/available.mk"
14.if ${VDPAU_AVAILABLE} == "yes" 14.if ${VDPAU_AVAILABLE} == "yes"
15PKG_SUPPORTED_OPTIONS+= vdpau 15PKG_SUPPORTED_OPTIONS+= vdpau
16PKG_SUGGESTED_OPTIONS+= vdpau 16PKG_SUGGESTED_OPTIONS+= vdpau
17.endif 17.endif
18 18
19### Add VAAPI if it is available 19### Add VAAPI if it is available
20.include "../../multimedia/libva/available.mk" 20.include "../../multimedia/libva/available.mk"
21.if ${VAAPI_AVAILABLE} == "yes" 21.if ${VAAPI_AVAILABLE} == "yes"