CVS commit: pkgsrc/multimedia

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Sep 20 08:21:17 UTC 2017

Modified Files:
        pkgsrc/multimedia/ffmpeg1: options.mk
        pkgsrc/multimedia/ffmpeg2: options.mk
        pkgsrc/multimedia/ffmpeg3: options.mk

Log Message:
ffmpeg[123]: added rtmp option


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/multimedia/ffmpeg1/options.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/multimedia/ffmpeg2/options.mk
cvs rdiff -u -r1.7 -r1.8 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/ffmpeg1/options.mk
diff -u pkgsrc/multimedia/ffmpeg1/options.mk:1.1 pkgsrc/multimedia/ffmpeg1/options.mk:1.2
--- pkgsrc/multimedia/ffmpeg1/options.mk:1.1    Mon Aug 11 23:01:50 2014
+++ pkgsrc/multimedia/ffmpeg1/options.mk        Wed Sep 20 08:21:17 2017
@@ -1,10 +1,10 @@
-# $NetBSD: options.mk,v 1.1 2014/08/11 23:01:50 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2017/09/20 08:21:17 adam Exp $
 
 # Global and legacy options
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.ffmpeg
 PKG_SUPPORTED_OPTIONS= faac lame ass libvpx theora vorbis x264 xvid \
-                       opencore-amr
+                       opencore-amr rtmp
 PKG_SUGGESTED_OPTIONS= lame ass libvpx theora vorbis x264 xvid
 #PKG_OPTIONS_OPTIONAL_GROUPS=  aac-decoder
 #PKG_OPTIONS_GROUP.aac-decoder=        faac
@@ -70,6 +70,12 @@ CONFIGURE_ARGS+=     --disable-libopencore-a
 CONFIGURE_ARGS+=       --disable-libopencore-amrwb
 .endif
 
+# RTMP support via librtmp
+.if !empty(PKG_OPTIONS:Mrtmp)
+CONFIGURE_ARGS+=       --enable-librtmp
+.include "../../net/rtmpdump/buildlink3.mk"
+.endif
+
 ###
 ### OGG Theora support
 ###

Index: pkgsrc/multimedia/ffmpeg2/options.mk
diff -u pkgsrc/multimedia/ffmpeg2/options.mk:1.12 pkgsrc/multimedia/ffmpeg2/options.mk:1.13
--- pkgsrc/multimedia/ffmpeg2/options.mk:1.12   Mon May 29 08:38:16 2017
+++ pkgsrc/multimedia/ffmpeg2/options.mk        Wed Sep 20 08:21:17 2017
@@ -1,10 +1,10 @@
-# $NetBSD: options.mk,v 1.12 2017/05/29 08:38:16 leot Exp $
+# $NetBSD: options.mk,v 1.13 2017/09/20 08:21:17 adam Exp $
 
 # Global and legacy options
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.ffmpeg2
 PKG_SUPPORTED_OPTIONS= ass doc faac fdk-aac fontconfig freetype gnutls lame \
-                       libvpx opencore-amr openssl theora vorbis x11 x264 \
+                       libvpx opencore-amr openssl rtmp theora vorbis x11 x264 \
                        x265 xcb xvid
 PKG_SUGGESTED_OPTIONS= lame ass freetype fontconfig libvpx openssl \
                        theora vorbis x11 x264 xvid
@@ -117,6 +117,12 @@ CONFIGURE_ARGS+=   --enable-openssl
 CONFIGURE_ARGS+=       --disable-openssl
 .endif
 
+# RTMP support via librtmp
+.if !empty(PKG_OPTIONS:Mrtmp)
+CONFIGURE_ARGS+=       --enable-librtmp
+.include "../../net/rtmpdump/buildlink3.mk"
+.endif
+
 # OGG Theora support
 .if !empty(PKG_OPTIONS:Mtheora)
 CONFIGURE_ARGS+=       --enable-libtheora

Index: pkgsrc/multimedia/ffmpeg3/options.mk
diff -u pkgsrc/multimedia/ffmpeg3/options.mk:1.7 pkgsrc/multimedia/ffmpeg3/options.mk:1.8
--- pkgsrc/multimedia/ffmpeg3/options.mk:1.7    Sun May 28 02:09:18 2017
+++ pkgsrc/multimedia/ffmpeg3/options.mk        Wed Sep 20 08:21:17 2017
@@ -1,10 +1,10 @@
-# $NetBSD: options.mk,v 1.7 2017/05/28 02:09:18 maya Exp $
+# $NetBSD: options.mk,v 1.8 2017/09/20 08:21:17 adam Exp $
 
 # Global and legacy options
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.ffmpeg3
-PKG_SUPPORTED_OPTIONS= ass doc fdk-aac fontconfig freetype \
-                       gnutls lame libvpx opencore-amr openssl opus theora \
+PKG_SUPPORTED_OPTIONS= ass doc fdk-aac fontconfig freetype gnutls \
+                       lame libvpx opencore-amr openssl opus rtmp theora \
                        vorbis x11 x264 x265 xcb xvid
 PKG_SUGGESTED_OPTIONS= lame ass freetype fontconfig libvpx openssl \
                        theora vorbis x11 x264 xvid
@@ -107,6 +107,12 @@ CONFIGURE_ARGS+=   --enable-openssl
 CONFIGURE_ARGS+=       --disable-openssl
 .endif
 
+# RTMP support via librtmp
+.if !empty(PKG_OPTIONS:Mrtmp)
+CONFIGURE_ARGS+=       --enable-librtmp
+.include "../../net/rtmpdump/buildlink3.mk"
+.endif
+
 # OGG Theora support
 .if !empty(PKG_OPTIONS:Mtheora)
 CONFIGURE_ARGS+=       --enable-libtheora