diff options
| author | mrg <mrg@pkgsrc.org> | 2011-08-12 06:14:27 +0000 |
|---|---|---|
| committer | mrg <mrg@pkgsrc.org> | 2011-08-12 06:14:27 +0000 |
| commit | d98e7e1f8683e47ca5b7da7dc6718085447caac1 (patch) | |
| tree | 14286d0431161f71ec92edfac13d6c10b1e91c27 /multimedia/ffmpeg | |
| parent | 15c17aadd2acdf297556b1d02257b2dbfe9cc061 (diff) | |
| download | pkgsrc-d98e7e1f8683e47ca5b7da7dc6718085447caac1.tar.gz | |
ffmpeg seems to have dropped the faad support, so remove the option.
(enabling the option causes build failures.)
Diffstat (limited to 'multimedia/ffmpeg')
| -rw-r--r-- | multimedia/ffmpeg/buildlink3.mk | 6 | ||||
| -rw-r--r-- | multimedia/ffmpeg/options.mk | 14 |
2 files changed, 4 insertions, 16 deletions
diff --git a/multimedia/ffmpeg/buildlink3.mk b/multimedia/ffmpeg/buildlink3.mk index e1ff23eee49..687d034799d 100644 --- a/multimedia/ffmpeg/buildlink3.mk +++ b/multimedia/ffmpeg/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.15 2011/01/24 19:07:16 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2011/08/12 06:14:27 mrg Exp $ BUILDLINK_TREE+= ffmpeg @@ -26,10 +26,6 @@ pkgbase := ffmpeg . include "../../multimedia/x264-devel/buildlink3.mk" .endif -.if !empty(PKG_BUILD_OPTIONS.ffmpeg:Mfaad) -. include "../../audio/faad2/buildlink3.mk" -.endif - .if !empty(PKG_BUILD_OPTIONS.ffmpeg:Mfaac) . include "../../audio/faac/buildlink3.mk" .endif diff --git a/multimedia/ffmpeg/options.mk b/multimedia/ffmpeg/options.mk index a159da62e8c..a8a1245c019 100644 --- a/multimedia/ffmpeg/options.mk +++ b/multimedia/ffmpeg/options.mk @@ -1,12 +1,12 @@ -# $NetBSD: options.mk,v 1.21 2011/08/04 23:43:48 wiz Exp $ +# $NetBSD: options.mk,v 1.22 2011/08/12 06:14:27 mrg Exp $ # Global and legacy options PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg -PKG_SUPPORTED_OPTIONS= theora vorbis xvid faad faac x264 opencore-amr libvpx +PKG_SUPPORTED_OPTIONS= theora vorbis xvid faac x264 opencore-amr libvpx PKG_SUGGESTED_OPTIONS= theora vorbis xvid x264 libvpx #PKG_OPTIONS_OPTIONAL_GROUPS= aac-decoder -#PKG_OPTIONS_GROUP.aac-decoder= faad faac +#PKG_OPTIONS_GROUP.aac-decoder= faac ### Add vdpau if it is available .include "../../multimedia/libvdpau/available.mk" @@ -18,14 +18,6 @@ PKG_SUGGESTED_OPTIONS+= vdpau .include "../../mk/bsd.options.mk" ### -### faad option -### -.if !empty(PKG_OPTIONS:Mfaad) -CONFIGURE_ARGS+= --enable-libfaad -.include "../../audio/faad2/buildlink3.mk" -.endif - -### ### faac option ### .if !empty(PKG_OPTIONS:Mfaac) |