CVS commit: pkgsrc/multimedia/ffmpeg3

["Robert Swindells" <rjs%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rjs
Date:           Mon Mar  5 21:17:08 UTC 2018

Modified Files:
        pkgsrc/multimedia/ffmpeg3: Makefile.common options.mk

Log Message:
Make use of multimedia/libbluray optional.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/multimedia/ffmpeg3/Makefile.common
cvs rdiff -u -r1.10 -r1.11 pkgsrc/multimedia/ffmpeg3/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/ffmpeg3/Makefile.common
diff -u pkgsrc/multimedia/ffmpeg3/Makefile.common:1.27 pkgsrc/multimedia/ffmpeg3/Makefile.common:1.28
--- pkgsrc/multimedia/ffmpeg3/Makefile.common:1.27      Mon Feb 26 07:40:28 2018
+++ pkgsrc/multimedia/ffmpeg3/Makefile.common   Mon Mar  5 21:17:07 2018
@@ -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"

Index: pkgsrc/multimedia/ffmpeg3/options.mk
diff -u pkgsrc/multimedia/ffmpeg3/options.mk:1.10 pkgsrc/multimedia/ffmpeg3/options.mk:1.11
--- pkgsrc/multimedia/ffmpeg3/options.mk:1.10   Wed Oct 18 20:25:41 2017
+++ pkgsrc/multimedia/ffmpeg3/options.mk        Mon Mar  5 21:17:07 2018
@@ -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
+