svn commit: r389645 - head/multimedia/ffmpeg26

[Thomas Zander]

Author: riggs
Date: Sun Jun 14 17:17:34 2015
New Revision: 389645
URL: https://svnweb.freebsd.org/changeset/ports/389645

Log:
  - Re-enable OPENCV default OPTION. Since r389642 is built without SIMD
    by default on non-supporting architectures.
  - Bump PORTREVISION

Modified:
  head/multimedia/ffmpeg26/Makefile

Modified: head/multimedia/ffmpeg26/Makefile
==============================================================================
--- head/multimedia/ffmpeg26/Makefile	Sun Jun 14 15:40:33 2015	(r389644)
+++ head/multimedia/ffmpeg26/Makefile	Sun Jun 14 17:17:34 2015	(r389645)
@@ -3,6 +3,7 @@
 
 PORTNAME=	ffmpeg
 PORTVERSION=	2.6.3
+PORTREVISION=	1
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://ffmpeg.org/releases/
 PKGNAMESUFFIX=	26
@@ -37,10 +38,8 @@ OPTIONS_DEFINE=	AACPLUS ALSA AMR_NB AMR_
 		THEORA VAAPI VDPAU VO_AACENC VO_AMRWBENC VORBIS VPX \
 		X11GRAB X264 X265 XVID
 
-# Temporary remove OPENCV from OPTIONS_DEFAULT due to
-# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=199715
 OPTIONS_DEFAULT=	FFSERVER FONTCONFIG FREETYPE FREI0R GNUTLS ICONV \
-			SCHROEDINGER THEORA VORBIS VPX X264 XVID
+			OPENCV SCHROEDINGER THEORA VORBIS VPX X264 XVID
 
 OPTIONS_SINGLE=		SSL
 OPTIONS_SINGLE_SSL=	GNUTLS OPENSSL