[pkgsrc/trunk]: pkgsrc/multimedia/ffmpeg3 Make use of multimedia/libbluray op...

[rjs <rjs%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a8af4ce681c6
branches:  trunk
changeset: 376659:a8af4ce681c6
user:      rjs <rjs%pkgsrc.org@localhost>
date:      Mon Mar 05 21:17:07 2018 +0000

description:
Make use of multimedia/libbluray optional.

diffstat:

 multimedia/ffmpeg3/Makefile.common |   4 +---
 multimedia/ffmpeg3/options.mk      |  15 ++++++++++++---
 2 files changed, 13 insertions(+), 6 deletions(-)

diffs (57 lines):

diff -r 70549219bbfa -r a8af4ce681c6 multimedia/ffmpeg3/Makefile.common
--- a/multimedia/ffmpeg3/Makefile.common        Mon Mar 05 16:57:43 2018 +0000
+++ b/multimedia/ffmpeg3/Makefile.common        Mon Mar 05 21:17:07 2018 +0000
@@ -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-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 @@
 .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 -r 70549219bbfa -r a8af4ce681c6 multimedia/ffmpeg3/options.mk
--- a/multimedia/ffmpeg3/options.mk     Mon Mar 05 16:57:43 2018 +0000
+++ b/multimedia/ffmpeg3/options.mk     Mon Mar 05 21:17:07 2018 +0000
@@ -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 @@
 .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
+