Received: by mail.netbsd.org (Postfix, from userid 605) id 0EC9585039; Mon, 30 Apr 2018 09:00:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id F298385035 for ; Mon, 30 Apr 2018 09:00:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id rzqo6Gg_qleZ for ; Mon, 30 Apr 2018 09:00:46 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 3EBC084CCE for ; Mon, 30 Apr 2018 09:00:46 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 32D88FBEC; Mon, 30 Apr 2018 09:00:46 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1525078846138200" MIME-Version: 1.0 Date: Mon, 30 Apr 2018 09:00:46 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/multimedia To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20180430090046.32D88FBEC@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1525078846138200 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Mon Apr 30 09:00:46 UTC 2018 Modified Files: pkgsrc/multimedia/ffmpeg3: options.mk pkgsrc/multimedia/ffmpeg4: options.mk Log Message: ffmpeg[34]: added tesseract option To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 pkgsrc/multimedia/ffmpeg3/options.mk cvs rdiff -u -r1.1 -r1.2 pkgsrc/multimedia/ffmpeg4/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1525078846138200 Content-Disposition: inline Content-Length: 2696 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/multimedia/ffmpeg3/options.mk diff -u pkgsrc/multimedia/ffmpeg3/options.mk:1.11 pkgsrc/multimedia/ffmpeg3/options.mk:1.12 --- pkgsrc/multimedia/ffmpeg3/options.mk:1.11 Mon Mar 5 21:17:07 2018 +++ pkgsrc/multimedia/ffmpeg3/options.mk Mon Apr 30 09:00:45 2018 @@ -1,11 +1,11 @@ -# $NetBSD: options.mk,v 1.11 2018/03/05 21:17:07 rjs Exp $ +# $NetBSD: options.mk,v 1.12 2018/04/30 09:00:45 adam Exp $ # Global and legacy options PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg3 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 + lame libvpx opencore-amr openssl opus rpi rtmp \ + tesseract theora vorbis x11 x264 x265 xcb xvid PKG_SUGGESTED_OPTIONS= lame ass bluray freetype fontconfig libvpx openssl \ theora vorbis x11 x264 xvid @@ -113,6 +113,14 @@ CONFIGURE_ARGS+= --enable-librtmp .include "../../net/rtmpdump/buildlink3.mk" .endif +# OCR filter using Tesseract +.if !empty(PKG_OPTIONS:Mtesseract) +CONFIGURE_ARGS+= --enable-libtesseract +.include "../../graphics/tesseract/buildlink3.mk" +.else +CONFIGURE_ARGS+= --disable-libtesseract +.endif + # OGG Theora support .if !empty(PKG_OPTIONS:Mtheora) CONFIGURE_ARGS+= --enable-libtheora @@ -219,4 +227,3 @@ CONFIGURE_ARGS+= --enable-libbluray .else CONFIGURE_ARGS+= --disable-libbluray .endif - Index: pkgsrc/multimedia/ffmpeg4/options.mk diff -u pkgsrc/multimedia/ffmpeg4/options.mk:1.1 pkgsrc/multimedia/ffmpeg4/options.mk:1.2 --- pkgsrc/multimedia/ffmpeg4/options.mk:1.1 Thu Apr 26 07:56:57 2018 +++ pkgsrc/multimedia/ffmpeg4/options.mk Mon Apr 30 09:00:46 2018 @@ -1,11 +1,11 @@ -# $NetBSD: options.mk,v 1.1 2018/04/26 07:56:57 adam Exp $ +# $NetBSD: options.mk,v 1.2 2018/04/30 09:00:46 adam Exp $ # Global and legacy options PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg4 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 + lame libvpx opencore-amr openssl opus rpi rtmp \ + tesseract theora vorbis x11 x264 x265 xcb xvid PKG_SUGGESTED_OPTIONS= lame ass bluray freetype fontconfig libvpx openssl \ theora vorbis x11 x264 xvid @@ -113,6 +113,14 @@ CONFIGURE_ARGS+= --enable-librtmp .include "../../net/rtmpdump/buildlink3.mk" .endif +# OCR filter using Tesseract +.if !empty(PKG_OPTIONS:Mtesseract) +CONFIGURE_ARGS+= --enable-libtesseract +.include "../../graphics/tesseract/buildlink3.mk" +.else +CONFIGURE_ARGS+= --disable-libtesseract +.endif + # OGG Theora support .if !empty(PKG_OPTIONS:Mtheora) CONFIGURE_ARGS+= --enable-libtheora --_----------=_1525078846138200--