From owner-svn-ports-head@freebsd.org Sun Nov 22 07:19:56 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B5A6EA352C8; Sun, 22 Nov 2015 07:19:56 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 7E5BC1444; Sun, 22 Nov 2015 07:19:56 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAM7JtVA089809; Sun, 22 Nov 2015 07:19:55 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAM7JtSS089808; Sun, 22 Nov 2015 07:19:55 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201511220719.tAM7JtSS089808@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sun, 22 Nov 2015 07:19:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r402216 - head/multimedia/ffmpeg 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.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Nov 2015 07:19:56 -0000 Author: riggs Date: Sun Nov 22 07:19:55 2015 New Revision: 402216 URL: https://svnweb.freebsd.org/changeset/ports/402216 Log: Add non-default OPTION to support NEON instructions on arm Include new patch from jbeich: - Add NEON OPTION on arm; no changes in default OPTIONs - Port now assumes at least armv7-a if user selects NEON PR: 204345 Submitted by: gonzo@FreeBSD.org, jbeich@FreeBSD.org Modified: head/multimedia/ffmpeg/Makefile Modified: head/multimedia/ffmpeg/Makefile ============================================================================== --- head/multimedia/ffmpeg/Makefile Sun Nov 22 04:50:46 2015 (r402215) +++ head/multimedia/ffmpeg/Makefile Sun Nov 22 07:19:55 2015 (r402216) @@ -42,7 +42,8 @@ OPTIONS_GROUP= LICENSE OPTIONS_GROUP_LICENSE= GPL3 NONFREE OPTIONS_DEFINE_amd64= MMX SSE -OPTIONS_DEFINE_armv6= VFP +OPTIONS_DEFINE_armv6= VFP NEON +OPTIONS_DEFINE_armv6hf= VFP NEON OPTIONS_DEFINE_i386= MMX SSE OPTIONS_DEFAULT_amd64= MMX SSE OPTIONS_DEFAULT_i386= ${MACHINE_CPU:tu:MMMX} ${MACHINE_CPU:tu:MSSE} @@ -59,6 +60,7 @@ GPL3_DESC= Allow (L)GPL version 3 code(c ILBC_DESC= Internet Low Bit Rate codec LIBV4L_DESC= Video for Linux support LICENSE_DESC= Licensing options +NEON_DESC= Enable Media Processing Engine instructions NONFREE_DESC= Allow use of nonfree code OPENCL_DESC= Heterogeneous computing via OpenCL OPENH264_DESC= H.264 video codec support via OpenH264 @@ -312,7 +314,10 @@ VAAPI_CONFIGURE_ENABLE= vaapi VDPAU_BUILD_DEPENDS= ${LOCALBASE}/include/vdpau/vdpau.h:${PORTSDIR}/multimedia/libvdpau VDPAU_CONFIGURE_ENABLE= vdpau +# armv6 VFP_CONFIGURE_ENABLE= vfp +NEON_CONFIGURE_ENABLE= neon +NEON_CONFIGURE_ON= --cpu=armv7-a # vo-aacenc VO_AACENC_LIB_DEPENDS= libvo-aacenc.so:${PORTSDIR}/audio/vo-aacenc