diff options
| author | rjs <rjs@pkgsrc.org> | 2018-03-05 21:17:07 +0000 |
|---|---|---|
| committer | rjs <rjs@pkgsrc.org> | 2018-03-05 21:17:07 +0000 |
| commit | 93052cbe023de80900ec68363bc4a8074c74eec4 (patch) | |
| tree | 9f5be622df2fe665d6aba0cbe7ef9f40d5e5fd7d /multimedia | |
| parent | 95ff0e8eef9cdaf06477973629b3448141123ccd (diff) | |
| download | pkgsrc-93052cbe023de80900ec68363bc4a8074c74eec4.tar.gz | |
Make use of multimedia/libbluray optional.
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/ffmpeg3/Makefile.common | 4 | ||||
| -rw-r--r-- | multimedia/ffmpeg3/options.mk | 15 |
2 files changed, 13 insertions, 6 deletions
diff --git a/multimedia/ffmpeg3/Makefile.common b/multimedia/ffmpeg3/Makefile.common index 251a1005ba2..889e1ae917f 100644 --- a/multimedia/ffmpeg3/Makefile.common +++ b/multimedia/ffmpeg3/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.27 2018/02/26 07:40:28 adam Exp $ +# $NetBSD: Makefile.common,v 1.28 2018/03/05 21:17:07 rjs Exp $ # used by multimedia/ffmpeg3/Makefile # used by multimedia/ffplay3/Makefile @@ -20,7 +20,6 @@ CONFIGURE_ARGS+= --disable-debug CONFIGURE_ARGS+= --disable-optimizations CONFIGURE_ARGS+= --disable-stripping CONFIGURE_ARGS+= --enable-gpl -CONFIGURE_ARGS+= --enable-libbluray CONFIGURE_ARGS+= --enable-libxml2 CONFIGURE_ARGS+= --enable-pthreads CONFIGURE_ARGS+= --enable-shared @@ -92,7 +91,6 @@ pre-configure: .include "../../archivers/xz/buildlink3.mk" .include "../../devel/libgetopt/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" -.include "../../multimedia/libbluray/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/ffmpeg3/options.mk b/multimedia/ffmpeg3/options.mk index e5cfd375170..d11c32f34bf 100644 --- a/multimedia/ffmpeg3/options.mk +++ b/multimedia/ffmpeg3/options.mk @@ -1,12 +1,12 @@ -# $NetBSD: options.mk,v 1.10 2017/10/18 20:25:41 adam Exp $ +# $NetBSD: options.mk,v 1.11 2018/03/05 21:17:07 rjs Exp $ # Global and legacy options PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg3 -PKG_SUPPORTED_OPTIONS= ass doc fdk-aac fontconfig freetype gnutls \ +PKG_SUPPORTED_OPTIONS= ass bluray doc fdk-aac fontconfig freetype gnutls \ lame libvpx opencore-amr openssl opus rpi \ rtmp theora vorbis x11 x264 x265 xcb xvid -PKG_SUGGESTED_OPTIONS= lame ass freetype fontconfig libvpx openssl \ +PKG_SUGGESTED_OPTIONS= lame ass bluray freetype fontconfig libvpx openssl \ theora vorbis x11 x264 xvid PLIST_VARS+= doc @@ -211,3 +211,12 @@ CONFIGURE_ARGS+= --enable-libxcb-xfixes .else CONFIGURE_ARGS+= --disable-libxcb .endif + +# Bluray support +.if !empty(PKG_OPTIONS:Mbluray) +CONFIGURE_ARGS+= --enable-libbluray +.include "../../multimedia/libbluray/buildlink3.mk" +.else +CONFIGURE_ARGS+= --disable-libbluray +.endif + |