From owner-svn-ports-head@freebsd.org Fri Sep 23 13:14:12 2016 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 52313BE70B2; Fri, 23 Sep 2016 13:14:12 +0000 (UTC) (envelope-from jbeich@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 2B20F8CE; Fri, 23 Sep 2016 13:14:12 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8NDEBWh064077; Fri, 23 Sep 2016 13:14:11 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8NDEBsx064074; Fri, 23 Sep 2016 13:14:11 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201609231314.u8NDEBsx064074@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 23 Sep 2016 13:14:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r422671 - in head/multimedia: libx264 x264 x264/files 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.23 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: Fri, 23 Sep 2016 13:14:12 -0000 Author: jbeich Date: Fri Sep 23 13:14:10 2016 New Revision: 422671 URL: https://svnweb.freebsd.org/changeset/ports/422671 Log: multimedia/x264: add OPENCL option, enabled by default Before OpenCL can be used for lookahead install at least one implementation: devel/freeocl, devel/pocl, lang/beignet or lang/clover. $ x264 --fullhelp | fgrep opencl --opencl Enable use of OpenCL --opencl-clbin Specify path of compiled OpenCL kernel cache --opencl-device Specify OpenCL device ordinal where the options also work in other apps e.g., $ ffmpeg -i -codec:v libx264 -x264opts opencl:opencl-device=1 $ mpv --ovc libx264 --ovcopts-add x264opts=opencl:opencl-device=1 -o Differential Revision: https://reviews.freebsd.org/D7958 Approved by: koobs (maintainer) Modified: head/multimedia/libx264/Makefile (contents, props changed) head/multimedia/x264/Makefile (contents, props changed) head/multimedia/x264/files/patch-configure (contents, props changed) Modified: head/multimedia/libx264/Makefile ============================================================================== --- head/multimedia/libx264/Makefile Fri Sep 23 13:12:07 2016 (r422670) +++ head/multimedia/libx264/Makefile Fri Sep 23 13:14:10 2016 (r422671) @@ -3,7 +3,7 @@ # # Updating notes: see multimedia/x264/Makefile. -PORTREVISION= 2 +PORTREVISION= 3 PKGNAMEPREFIX= lib COMMENT= H.264/MPEG-4 AVC Video Encoding (Library) MASTERDIR= ${.CURDIR}/../x264 @@ -13,12 +13,17 @@ LIB_DEPENDS= # USES= pathfix -OPTIONS_DEFINE= HI10P +OPTIONS_DEFINE= HI10P OPENCL +OPTIONS_DEFAULT= OPENCL OPTIONS_EXCLUDE= FFMS GPAC LAVF LSMASH SWSCALE HI10P_DESC= Enable High 10 Profile 10-bit encoding HI10P_CONFIGURE_ON= --bit-depth=10 +OPENCL_DESC= Heterogeneous computing via OpenCL +OPENCL_BUILD_DEPENDS= ${LOCALBASE}/include/CL/opencl.h:devel/opencl +OPENCL_CONFIGURE_OFF= --disable-opencl + CONFIGURE_ARGS= \ --enable-static \ --enable-shared \ Modified: head/multimedia/x264/Makefile ============================================================================== --- head/multimedia/x264/Makefile Fri Sep 23 13:12:07 2016 (r422670) +++ head/multimedia/x264/Makefile Fri Sep 23 13:14:10 2016 (r422671) @@ -103,8 +103,7 @@ SWSCALE_LIB_DEPENDS= libavutil.so:multim CONFIGURE_ARGS?= --system-libx264 CONFIGURE_ARGS+= --prefix="${PREFIX}" \ --extra-cflags="${CPPFLAGS} ${CFLAGS}" \ - --extra-ldflags="${LDFLAGS}" \ - --disable-opencl \ + --extra-ldflags="${LDFLAGS}" CFLAGS_armv6+= -mcpu=arm1136jf-s Modified: head/multimedia/x264/files/patch-configure ============================================================================== --- head/multimedia/x264/files/patch-configure Fri Sep 23 13:12:07 2016 (r422670) +++ head/multimedia/x264/files/patch-configure Fri Sep 23 13:14:10 2016 (r422671) @@ -51,3 +51,13 @@ if [ $compiler = ICC -o $compiler = ICL ] ; then if cc_check 'extras/intel_dispatcher.h' '' 'x264_intel_dispatcher_override();' ; then define HAVE_INTEL_DISPATCHER +@@ -1128,6 +1118,9 @@ if [ "$opencl" = "yes" ]; then + opencl="yes" + define HAVE_OPENCL + libdl="-ldl" ++ else ++ opencl="yes" ++ define HAVE_OPENCL + fi + LDFLAGS="$LDFLAGS $libdl" + fi