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 (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,154 +1,154 @@ @@ -1,154 +1,154 @@
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"
22PKG_SUPPORTED_OPTIONS+= vaapi 22PKG_SUPPORTED_OPTIONS+= vaapi
23PKG_SUGGESTED_OPTIONS+= vaapi 23PKG_SUGGESTED_OPTIONS+= vaapi
24.endif 24.endif
25 25
26### 26###
27.include "../../mk/bsd.options.mk" 27.include "../../mk/bsd.options.mk"
28 28
29### 29###
30### ass option 30### ass option
31### 31###
32.if !empty(PKG_OPTIONS:Mass) 32.if !empty(PKG_OPTIONS:Mass)
33USE_TOOLS+= pkg-config 33USE_TOOLS+= pkg-config
34CONFIGURE_ARGS+= --enable-libass 34CONFIGURE_ARGS+= --enable-libass
35.include "../../multimedia/libass/buildlink3.mk" 35.include "../../multimedia/libass/buildlink3.mk"
36.else 36.else
37CONFIGURE_ARGS+= --disable-libass 37CONFIGURE_ARGS+= --disable-libass
38.endif 38.endif
39 39
40### 40###
41### faac option 41### faac option
42### 42###
43.if !empty(PKG_OPTIONS:Mfaac) 43.if !empty(PKG_OPTIONS:Mfaac)
44RESTRICTED= This software may require the payment of patent royalties 44RESTRICTED= This software may require the payment of patent royalties
45NO_BIN_ON_CDROM= ${RESTRICTED} 45NO_BIN_ON_CDROM= ${RESTRICTED}
46NO_BIN_ON_FTP= ${RESTRICTED} 46NO_BIN_ON_FTP= ${RESTRICTED}
47CONFIGURE_ARGS+= --enable-libfaac 47CONFIGURE_ARGS+= --enable-libfaac
48CONFIGURE_ARGS+= --enable-nonfree 48CONFIGURE_ARGS+= --enable-nonfree
49.include "../../audio/faac/buildlink3.mk" 49.include "../../audio/faac/buildlink3.mk"
50.endif 50.endif
51 51
52### 52###
53### opencore-amr option 53### opencore-amr option
54### 54###
55.if !empty(PKG_OPTIONS:Mopencore-amr) 55.if !empty(PKG_OPTIONS:Mopencore-amr)
56CONFIGURE_ARGS+= --enable-libopencore-amrnb 56CONFIGURE_ARGS+= --enable-libopencore-amrnb
57CONFIGURE_ARGS+= --enable-libopencore-amrwb 57CONFIGURE_ARGS+= --enable-libopencore-amrwb
58 58
59# "The OpenCORE external libraries are under the Apache License 59# "The OpenCORE external libraries are under the Apache License
60# 2.0. That license is incompatible with the LGPL v2.1 and the GPL 60# 2.0. That license is incompatible with the LGPL v2.1 and the GPL
61# v2, but not with version 3 of those licenses. So to combine the 61# v2, but not with version 3 of those licenses. So to combine the
62# OpenCORE libraries with FFmpeg, the license version needs to be 62# OpenCORE libraries with FFmpeg, the license version needs to be
63# upgraded by passing --enable-version3 to configure." 63# upgraded by passing --enable-version3 to configure."
64CONFIGURE_ARGS+= --enable-version3 64CONFIGURE_ARGS+= --enable-version3
65# TODO: LICENSE 65# TODO: LICENSE
66 66
67.include "../../audio/opencore-amr/buildlink3.mk" 67.include "../../audio/opencore-amr/buildlink3.mk"
68.else 68.else
69CONFIGURE_ARGS+= --disable-libopencore-amrnb 69CONFIGURE_ARGS+= --disable-libopencore-amrnb
70CONFIGURE_ARGS+= --disable-libopencore-amrwb 70CONFIGURE_ARGS+= --disable-libopencore-amrwb
71.endif 71.endif
72 72
73# RTMP support via librtmp 73# RTMP support via librtmp
74.if !empty(PKG_OPTIONS:Mrtmp) 74.if !empty(PKG_OPTIONS:Mrtmp)
75CONFIGURE_ARGS+= --enable-librtmp 75CONFIGURE_ARGS+= --enable-librtmp
76.include "../../net/rtmpdump/buildlink3.mk" 76.include "../../net/rtmpdump/buildlink3.mk"
77.endif 77.endif
78 78
79### 79###
80### OGG Theora support 80### OGG Theora support
81### 81###
82.if !empty(PKG_OPTIONS:Mtheora) 82.if !empty(PKG_OPTIONS:Mtheora)
83CONFIGURE_ARGS+= --enable-libtheora 83CONFIGURE_ARGS+= --enable-libtheora
84.include "../../multimedia/libtheora/buildlink3.mk" 84.include "../../multimedia/libtheora/buildlink3.mk"
85.endif 85.endif
86 86
87### 87###
88### OGG Vorbis support 88### OGG Vorbis support
89### 89###
90.if !empty(PKG_OPTIONS:Mvorbis) 90.if !empty(PKG_OPTIONS:Mvorbis)
91CONFIGURE_ARGS+= --enable-libvorbis 91CONFIGURE_ARGS+= --enable-libvorbis
92.include "../../audio/libvorbis/buildlink3.mk" 92.include "../../audio/libvorbis/buildlink3.mk"
93.endif 93.endif
94 94
95### 95###
96### LAME MP3 encoder 96### LAME MP3 encoder
97### 97###
98.if !empty(PKG_OPTIONS:Mlame) 98.if !empty(PKG_OPTIONS:Mlame)
99# "lame-3.98" isn't compatible with "ffmpeg" which breaks audio encoding. 99# "lame-3.98" isn't compatible with "ffmpeg" which breaks audio encoding.
100BUILDLINK_ABI_DEPENDS.lame+= lame>=3.98.2nb1 100BUILDLINK_ABI_DEPENDS.lame+= lame>=3.98.2nb1
101CONFIGURE_ARGS+= --enable-libmp3lame 101CONFIGURE_ARGS+= --enable-libmp3lame
102.include "../../audio/lame/buildlink3.mk" 102.include "../../audio/lame/buildlink3.mk"
103.endif 103.endif
104 104
105### 105###
106### XviD support 106### XviD support
107### 107###
108.if !empty(PKG_OPTIONS:Mxvid) 108.if !empty(PKG_OPTIONS:Mxvid)
109CONFIGURE_ARGS+= --enable-libxvid 109CONFIGURE_ARGS+= --enable-libxvid
110.include "../../multimedia/xvidcore/buildlink3.mk" 110.include "../../multimedia/xvidcore/buildlink3.mk"
111.endif 111.endif
112 112
113### 113###
114### x264 support 114### x264 support
115### 115###
116.if !empty(PKG_OPTIONS:Mx264) 116.if !empty(PKG_OPTIONS:Mx264)
117# ABI change between 20090326 and 20100201 117# ABI change between 20090326 and 20100201
118BUILDLINK_API_DEPENDS.x264-devel+= x264-devel>=20111207 118BUILDLINK_API_DEPENDS.x264-devel+= x264-devel>=20111207
119#BUILDLINK_API_DEPENDS.x264-devel+= x264-devel<20110102 119#BUILDLINK_API_DEPENDS.x264-devel+= x264-devel<20110102
120CONFIGURE_ARGS+= --enable-libx264 120CONFIGURE_ARGS+= --enable-libx264
121.include "../../multimedia/x264-devel/buildlink3.mk" 121.include "../../multimedia/x264-devel/buildlink3.mk"
122.else 122.else
123CONFIGURE_ARGS+= --disable-libx264 123CONFIGURE_ARGS+= --disable-libx264
124.endif 124.endif
125 125
126### 126###
127### VDPAU support 127### VDPAU support
128### 128###
129.if !empty(PKG_OPTIONS:Mvdpau) 129.if !empty(PKG_OPTIONS:Mvdpau)
130CONFIGURE_ARGS+= --enable-vdpau 130CONFIGURE_ARGS+= --enable-vdpau
131.include "../../multimedia/libvdpau/buildlink3.mk" 131.include "../../multimedia/libvdpau/buildlink3.mk"
132.else 132.else
133CONFIGURE_ARGS+= --disable-vdpau 133CONFIGURE_ARGS+= --disable-vdpau
134.endif 134.endif
135 135
136### 136###
137### VAAPI support 137### VAAPI support
138### 138###
139.if !empty(PKG_OPTIONS:Mvaapi) 139.if !empty(PKG_OPTIONS:Mvaapi)
140CONFIGURE_ARGS+= --enable-vaapi 140CONFIGURE_ARGS+= --enable-vaapi
141.include "../../multimedia/libva/buildlink3.mk" 141.include "../../multimedia/libva/buildlink3.mk"
142.else 142.else
143CONFIGURE_ARGS+= --disable-vaapi 143CONFIGURE_ARGS+= --disable-vaapi
144.endif 144.endif
145 145
146### 146###
147### VPX support 147### VPX support
148### 148###
149.if !empty(PKG_OPTIONS:Mlibvpx) 149.if !empty(PKG_OPTIONS:Mlibvpx)
150CONFIGURE_ARGS+= --enable-libvpx 150CONFIGURE_ARGS+= --enable-libvpx
151.include "../../multimedia/libvpx/buildlink3.mk" 151.include "../../multimedia/libvpx/buildlink3.mk"
152.else 152.else
153CONFIGURE_ARGS+= --disable-libvpx 153CONFIGURE_ARGS+= --disable-libvpx
154.endif 154.endif