multimedia/ffmpeg3

[Robert Swindells <rjs%fdy2.co.uk@localhost>]

Would anyone object to making use of libbluray by ffmpeg3 optional ?

Also, do I need to bump the package version if it defaults to including
it as it does now ?

Robert Swindells

Index: Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/ffmpeg3/Makefile.common,v
retrieving revision 1.26
diff -u -r1.26 Makefile.common
--- Makefile.common	21 Feb 2018 13:48:39 -0000	1.26
+++ Makefile.common	3 Mar 2018 17:49:02 -0000
@@ -19,7 +19,6 @@
 CONFIGURE_ARGS+=	--disable-debug
 CONFIGURE_ARGS+=	--disable-optimizations
 CONFIGURE_ARGS+=	--disable-stripping
-CONFIGURE_ARGS+=	--enable-libbluray
 CONFIGURE_ARGS+=	--enable-libxml2
 CONFIGURE_ARGS+=	--enable-gpl
 CONFIGURE_ARGS+=	--enable-pthreads
@@ -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"
Index: options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/ffmpeg3/options.mk,v
retrieving revision 1.10
diff -u -r1.10 options.mk
--- options.mk	18 Oct 2017 20:25:41 -0000	1.10
+++ options.mk	3 Mar 2018 17:49:02 -0000
@@ -3,10 +3,10 @@
 # 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
+