From owner-svn-ports-head@FreeBSD.ORG  Mon Oct 20 06:16:59 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id CEFAF85E;
 Mon, 20 Oct 2014 06:16:59 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id BB3B5EF6;
 Mon, 20 Oct 2014 06:16:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9K6GxEh027431;
 Mon, 20 Oct 2014 06:16:59 GMT (envelope-from riggs@FreeBSD.org)
Received: (from riggs@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9K6GxaH027430;
 Mon, 20 Oct 2014 06:16:59 GMT (envelope-from riggs@FreeBSD.org)
Message-Id: <201410200616.s9K6GxaH027430@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: riggs set sender to
 riggs@FreeBSD.org using -f
From: Thomas Zander <riggs@FreeBSD.org>
Date: Mon, 20 Oct 2014 06:16:59 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r371232 - head/multimedia/ffmpeg24
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Oct 2014 06:16:59 -0000

Author: riggs
Date: Mon Oct 20 06:16:58 2014
New Revision: 371232
URL: https://svnweb.freebsd.org/changeset/ports/371232
QAT: https://qat.redports.org/buildarchive/r371232/

Log:
  - Merge OPTION to enable x265 from multimedia/ffmpeg
  
  Reported by: nox

Modified:
  head/multimedia/ffmpeg24/Makefile   (contents, props changed)

Modified: head/multimedia/ffmpeg24/Makefile
==============================================================================
--- head/multimedia/ffmpeg24/Makefile	Mon Oct 20 06:14:32 2014	(r371231)
+++ head/multimedia/ffmpeg24/Makefile	Mon Oct 20 06:16:58 2014	(r371232)
@@ -37,7 +37,7 @@ OPTIONS_DEFINE=	AACPLUS ALSA AMR_NB AMR_
 		JACK LAME LIBBLURAY LIBV4L MODPLUG OPENAL OPENCV OPENJPEG OPENSSL \
 		OPTIMIZED_CFLAGS OPUS PULSEAUDIO RTMP SCHROEDINGER SDL SPEEX \
 		THEORA VAAPI VDPAU VO_AACENC VO_AMRWBENC VORBIS VPX \
-		X11GRAB X264 XVID
+		X11GRAB X264 X265 XVID
 
 OPTIONS_DEFAULT=	FFSERVER FONTCONFIG FREETYPE FREI0R GNUTLS ICONV \
 			OPENCV SCHROEDINGER THEORA VORBIS VPX X264 XVID
@@ -204,6 +204,10 @@ VPX_CONFIGURE_ENABLE=	libvpx
 X264_LIB_DEPENDS=	libx264.so:${PORTSDIR}/multimedia/x264
 X264_CONFIGURE_ENABLE=	libx264
 
+# x265
+X265_LIB_DEPENDS=	libx265.so:${PORTSDIR}/multimedia/x265
+X265_CONFIGURE_ENABLE=	libx265
+
 # xvid
 XVID_LIB_DEPENDS=	libxvidcore.so:${PORTSDIR}/multimedia/xvid
 XVID_CONFIGURE_ENABLE=	libxvid