Mon Apr 30 09:00:46 2018 UTC ()
ffmpeg[34]: added tesseract option


(adam)
diff -r1.11 -r1.12 pkgsrc/multimedia/ffmpeg3/options.mk
diff -r1.1 -r1.2 pkgsrc/multimedia/ffmpeg4/options.mk
cvs diff -r1.11 -r1.12 pkgsrc/multimedia/ffmpeg3/options.mk (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg3/options.mk 2018/03/05 21:17:07 1.11
+++ pkgsrc/multimedia/ffmpeg3/options.mk 2018/04/30 09:00:45 1.12
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1# $NetBSD: options.mk,v 1.11 2018/03/05 21:17:07 rjs Exp $ 1# $NetBSD: options.mk,v 1.12 2018/04/30 09:00:45 adam Exp $
2 2
3# Global and legacy options 3# Global and legacy options
4 4
5PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg3 5PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg3
6PKG_SUPPORTED_OPTIONS= ass bluray doc fdk-aac fontconfig freetype gnutls \ 6PKG_SUPPORTED_OPTIONS= ass bluray doc fdk-aac fontconfig freetype gnutls \
7 lame libvpx opencore-amr openssl opus rpi \ 7 lame libvpx opencore-amr openssl opus rpi rtmp \
8 rtmp theora vorbis x11 x264 x265 xcb xvid 8 tesseract theora vorbis x11 x264 x265 xcb xvid
9PKG_SUGGESTED_OPTIONS= lame ass bluray freetype fontconfig libvpx openssl \ 9PKG_SUGGESTED_OPTIONS= lame ass bluray freetype fontconfig libvpx openssl \
10 theora vorbis x11 x264 xvid 10 theora vorbis x11 x264 xvid
11 11
12PLIST_VARS+= doc 12PLIST_VARS+= doc
13 13
14# Add VDPAU if it is available 14# Add VDPAU if it is available
15.include "../../multimedia/libvdpau/available.mk" 15.include "../../multimedia/libvdpau/available.mk"
16.if ${VDPAU_AVAILABLE} == "yes" 16.if ${VDPAU_AVAILABLE} == "yes"
17PKG_SUPPORTED_OPTIONS+= vdpau 17PKG_SUPPORTED_OPTIONS+= vdpau
18PKG_SUGGESTED_OPTIONS+= vdpau 18PKG_SUGGESTED_OPTIONS+= vdpau
19.endif 19.endif
20 20
21# Add VAAPI if it is available 21# Add VAAPI if it is available
@@ -103,26 +103,34 @@ CONFIGURE_ARGS+= --disable-libopencore-a @@ -103,26 +103,34 @@ CONFIGURE_ARGS+= --disable-libopencore-a
103CONFIGURE_ARGS+= --enable-nonfree 103CONFIGURE_ARGS+= --enable-nonfree
104CONFIGURE_ARGS+= --enable-openssl 104CONFIGURE_ARGS+= --enable-openssl
105.include "../../security/openssl/buildlink3.mk" 105.include "../../security/openssl/buildlink3.mk"
106.else 106.else
107CONFIGURE_ARGS+= --disable-openssl 107CONFIGURE_ARGS+= --disable-openssl
108.endif 108.endif
109 109
110# RTMP support via librtmp 110# RTMP support via librtmp
111.if !empty(PKG_OPTIONS:Mrtmp) 111.if !empty(PKG_OPTIONS:Mrtmp)
112CONFIGURE_ARGS+= --enable-librtmp 112CONFIGURE_ARGS+= --enable-librtmp
113.include "../../net/rtmpdump/buildlink3.mk" 113.include "../../net/rtmpdump/buildlink3.mk"
114.endif 114.endif
115 115
 116# OCR filter using Tesseract
 117.if !empty(PKG_OPTIONS:Mtesseract)
 118CONFIGURE_ARGS+= --enable-libtesseract
 119.include "../../graphics/tesseract/buildlink3.mk"
 120.else
 121CONFIGURE_ARGS+= --disable-libtesseract
 122.endif
 123
116# OGG Theora support 124# OGG Theora support
117.if !empty(PKG_OPTIONS:Mtheora) 125.if !empty(PKG_OPTIONS:Mtheora)
118CONFIGURE_ARGS+= --enable-libtheora 126CONFIGURE_ARGS+= --enable-libtheora
119.include "../../multimedia/libtheora/buildlink3.mk" 127.include "../../multimedia/libtheora/buildlink3.mk"
120.endif 128.endif
121 129
122# OGG Vorbis support 130# OGG Vorbis support
123.if !empty(PKG_OPTIONS:Mvorbis) 131.if !empty(PKG_OPTIONS:Mvorbis)
124CONFIGURE_ARGS+= --enable-libvorbis 132CONFIGURE_ARGS+= --enable-libvorbis
125.include "../../audio/libvorbis/buildlink3.mk" 133.include "../../audio/libvorbis/buildlink3.mk"
126.endif 134.endif
127 135
128# LAME MP3 encoder 136# LAME MP3 encoder
@@ -209,14 +217,13 @@ CONFIGURE_ARGS+= --enable-libxcb-shm @@ -209,14 +217,13 @@ CONFIGURE_ARGS+= --enable-libxcb-shm
209CONFIGURE_ARGS+= --enable-libxcb-xfixes 217CONFIGURE_ARGS+= --enable-libxcb-xfixes
210.include "../../x11/libxcb/buildlink3.mk" 218.include "../../x11/libxcb/buildlink3.mk"
211.else 219.else
212CONFIGURE_ARGS+= --disable-libxcb 220CONFIGURE_ARGS+= --disable-libxcb
213.endif 221.endif
214 222
215# Bluray support 223# Bluray support
216.if !empty(PKG_OPTIONS:Mbluray) 224.if !empty(PKG_OPTIONS:Mbluray)
217CONFIGURE_ARGS+= --enable-libbluray 225CONFIGURE_ARGS+= --enable-libbluray
218.include "../../multimedia/libbluray/buildlink3.mk" 226.include "../../multimedia/libbluray/buildlink3.mk"
219.else 227.else
220CONFIGURE_ARGS+= --disable-libbluray 228CONFIGURE_ARGS+= --disable-libbluray
221.endif 229.endif
222 
cvs diff -r1.1 -r1.2 pkgsrc/multimedia/ffmpeg4/options.mk (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg4/options.mk 2018/04/26 07:56:57 1.1
+++ pkgsrc/multimedia/ffmpeg4/options.mk 2018/04/30 09:00:46 1.2
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1# $NetBSD: options.mk,v 1.1 2018/04/26 07:56:57 adam Exp $ 1# $NetBSD: options.mk,v 1.2 2018/04/30 09:00:46 adam Exp $
2 2
3# Global and legacy options 3# Global and legacy options
4 4
5PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg4 5PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg4
6PKG_SUPPORTED_OPTIONS= ass bluray doc fdk-aac fontconfig freetype gnutls \ 6PKG_SUPPORTED_OPTIONS= ass bluray doc fdk-aac fontconfig freetype gnutls \
7 lame libvpx opencore-amr openssl opus rpi \ 7 lame libvpx opencore-amr openssl opus rpi rtmp \
8 rtmp theora vorbis x11 x264 x265 xcb xvid 8 tesseract theora vorbis x11 x264 x265 xcb xvid
9PKG_SUGGESTED_OPTIONS= lame ass bluray freetype fontconfig libvpx openssl \ 9PKG_SUGGESTED_OPTIONS= lame ass bluray freetype fontconfig libvpx openssl \
10 theora vorbis x11 x264 xvid 10 theora vorbis x11 x264 xvid
11 11
12PLIST_VARS+= doc 12PLIST_VARS+= doc
13 13
14# Add VDPAU if it is available 14# Add VDPAU if it is available
15.include "../../multimedia/libvdpau/available.mk" 15.include "../../multimedia/libvdpau/available.mk"
16.if ${VDPAU_AVAILABLE} == "yes" 16.if ${VDPAU_AVAILABLE} == "yes"
17PKG_SUPPORTED_OPTIONS+= vdpau 17PKG_SUPPORTED_OPTIONS+= vdpau
18PKG_SUGGESTED_OPTIONS+= vdpau 18PKG_SUGGESTED_OPTIONS+= vdpau
19.endif 19.endif
20 20
21# Add VAAPI if it is available 21# Add VAAPI if it is available
@@ -103,26 +103,34 @@ CONFIGURE_ARGS+= --disable-libopencore-a @@ -103,26 +103,34 @@ CONFIGURE_ARGS+= --disable-libopencore-a
103CONFIGURE_ARGS+= --enable-nonfree 103CONFIGURE_ARGS+= --enable-nonfree
104CONFIGURE_ARGS+= --enable-openssl 104CONFIGURE_ARGS+= --enable-openssl
105.include "../../security/openssl/buildlink3.mk" 105.include "../../security/openssl/buildlink3.mk"
106.else 106.else
107CONFIGURE_ARGS+= --disable-openssl 107CONFIGURE_ARGS+= --disable-openssl
108.endif 108.endif
109 109
110# RTMP support via librtmp 110# RTMP support via librtmp
111.if !empty(PKG_OPTIONS:Mrtmp) 111.if !empty(PKG_OPTIONS:Mrtmp)
112CONFIGURE_ARGS+= --enable-librtmp 112CONFIGURE_ARGS+= --enable-librtmp
113.include "../../net/rtmpdump/buildlink3.mk" 113.include "../../net/rtmpdump/buildlink3.mk"
114.endif 114.endif
115 115
 116# OCR filter using Tesseract
 117.if !empty(PKG_OPTIONS:Mtesseract)
 118CONFIGURE_ARGS+= --enable-libtesseract
 119.include "../../graphics/tesseract/buildlink3.mk"
 120.else
 121CONFIGURE_ARGS+= --disable-libtesseract
 122.endif
 123
116# OGG Theora support 124# OGG Theora support
117.if !empty(PKG_OPTIONS:Mtheora) 125.if !empty(PKG_OPTIONS:Mtheora)
118CONFIGURE_ARGS+= --enable-libtheora 126CONFIGURE_ARGS+= --enable-libtheora
119.include "../../multimedia/libtheora/buildlink3.mk" 127.include "../../multimedia/libtheora/buildlink3.mk"
120.endif 128.endif
121 129
122# OGG Vorbis support 130# OGG Vorbis support
123.if !empty(PKG_OPTIONS:Mvorbis) 131.if !empty(PKG_OPTIONS:Mvorbis)
124CONFIGURE_ARGS+= --enable-libvorbis 132CONFIGURE_ARGS+= --enable-libvorbis
125.include "../../audio/libvorbis/buildlink3.mk" 133.include "../../audio/libvorbis/buildlink3.mk"
126.endif 134.endif
127 135
128# LAME MP3 encoder 136# LAME MP3 encoder