From owner-svn-ports-all@freebsd.org Tue Mar 12 16:53:46 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2A26715367BC; Tue, 12 Mar 2019 16:53:46 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 883E370E0A; Tue, 12 Mar 2019 16:53:45 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6CD1425952; Tue, 12 Mar 2019 16:53:45 +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 x2CGrjuf054459; Tue, 12 Mar 2019 16:53:45 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2CGri7q054455; Tue, 12 Mar 2019 16:53:44 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201903121653.x2CGri7q054455@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 12 Mar 2019 16:53:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r495470 - in head/multimedia: libva-intel-driver libva-intel-hybrid-driver libva-intel-media-driver X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head/multimedia: libva-intel-driver libva-intel-hybrid-driver libva-intel-media-driver X-SVN-Commit-Revision: 495470 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 883E370E0A X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.97)[-0.968,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Mar 2019 16:53:46 -0000 Author: jbeich Date: Tue Mar 12 16:53:44 2019 New Revision: 495470 URL: https://svnweb.freebsd.org/changeset/ports/495470 Log: multimedia/libva-intel*driver: allow disabling Wayland/X11 independently of libva PR: 236376 Submitted by: Dries Michiels (based on) Modified: head/multimedia/libva-intel-driver/Makefile (contents, props changed) head/multimedia/libva-intel-hybrid-driver/Makefile (contents, props changed) head/multimedia/libva-intel-media-driver/Makefile (contents, props changed) head/multimedia/libva-intel-media-driver/distinfo (contents, props changed) Modified: head/multimedia/libva-intel-driver/Makefile ============================================================================== --- head/multimedia/libva-intel-driver/Makefile Tue Mar 12 16:22:59 2019 (r495469) +++ head/multimedia/libva-intel-driver/Makefile Tue Mar 12 16:53:44 2019 (r495470) @@ -27,11 +27,18 @@ GH_ACCOUNT= intel GH_PROJECT= intel-vaapi-driver PLIST_FILES= lib/dri/i915_drv_video.so lib/dri/i965_drv_video.so -OPTIONS_DEFINE= HYBRID +OPTIONS_DEFINE= HYBRID WAYLAND X11 +OPTIONS_DEFAULT= WAYLAND X11 HYBRID_DESC= Hybrid VP8 encoding on Gen7/8 and VP9 decoding on Gen7/8/9 HYBRID_RUN_DEPENDS= ${LOCALBASE}/lib/dri/hybrid_drv_video.so:multimedia/libva-intel-hybrid-driver HYBRID_MESON_TRUE= enable_hybrid_codec + +WAYLAND_LIB_DEPENDS= libva-wayland.so:multimedia/libva +WAYLAND_MESON_YES= with_wayland + +X11_LIB_DEPENDS= libva-x11.so:multimedia/libva +X11_MESON_YES= with_x11 post-install: ${LN} -sf i965_drv_video.so ${STAGEDIR}${PREFIX}/lib/dri/i915_drv_video.so Modified: head/multimedia/libva-intel-hybrid-driver/Makefile ============================================================================== --- head/multimedia/libva-intel-hybrid-driver/Makefile Tue Mar 12 16:22:59 2019 (r495469) +++ head/multimedia/libva-intel-hybrid-driver/Makefile Tue Mar 12 16:53:44 2019 (r495470) @@ -29,6 +29,15 @@ GNU_CONFIGURE= yes INSTALL_TARGET= install-strip PLIST_FILES= lib/dri/hybrid_drv_video.so +OPTIONS_DEFINE= WAYLAND X11 +OPTIONS_DEFAULT=WAYLAND X11 + +WAYLAND_LIB_DEPENDS= libva-wayland.so:multimedia/libva +WAYLAND_CONFIGURE_ENABLE= wayland + +X11_LIB_DEPENDS= libva-x11.so:multimedia/libva +X11_CONFIGURE_ENABLE= x11 + post-patch: @${REINPLACE_CMD} -e '/__linux__/d; /LINUX/d' \ ${WRKSRC}/src/vp9hdec/Makefile.am Modified: head/multimedia/libva-intel-media-driver/Makefile ============================================================================== --- head/multimedia/libva-intel-media-driver/Makefile Tue Mar 12 16:22:59 2019 (r495469) +++ head/multimedia/libva-intel-media-driver/Makefile Tue Mar 12 16:53:44 2019 (r495470) @@ -6,6 +6,9 @@ DISTVERSION= 18.4.1 CATEGORIES= multimedia PKGNAMEPREFIX= libva-intel- +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES= 95549679029d.patch:-p1 + MAINTAINER= jbeich@FreeBSD.org COMMENT= VAAPI driver for Intel HD 5000 (Gen8) or newer @@ -32,12 +35,15 @@ CMAKE_ARGS= -DBUILD_TYPE:STRING="${CMAKE_BUILD_TYPE}" -DUFO_MARCH:STRING="${CPUTYPE}" PLIST_FILES= lib/dri/iHD_drv_video.so -OPTIONS_DEFINE= TEST +OPTIONS_DEFINE= TEST X11 +OPTIONS_DEFAULT=X11 # XXX Unbundle googletest TEST_CMAKE_BOOL= MEDIA_RUN_TEST_SUITE TEST_TEST_TARGET= RunULT +X11_LIB_DEPENDS= libva-x11.so:multimedia/libva + post-patch: @${REINPLACE_CMD} -e '/-D__linux__/d' \ ${WRKSRC}/media_driver/cmake/linux/media_compile_flags_linux.cmake @@ -48,5 +54,9 @@ post-patch: # Silence -Wmacro-redefined @${REINPLACE_CMD} -e '/__fastcall/d' \ ${WRKSRC}/media_driver/linux/common/cm/cm_mem_os.h + +post-patch-X11-off: + @${REINPLACE_CMD} -i .nox11 '/find_package.*X11/d' \ + ${WRKSRC}/media_driver/media_top_cmake.cmake .include Modified: head/multimedia/libva-intel-media-driver/distinfo ============================================================================== --- head/multimedia/libva-intel-media-driver/distinfo Tue Mar 12 16:22:59 2019 (r495469) +++ head/multimedia/libva-intel-media-driver/distinfo Tue Mar 12 16:53:44 2019 (r495470) @@ -1,3 +1,5 @@ TIMESTAMP = 1549187390 SHA256 (intel-media-driver-intel-media-18.4.1_GH0.tar.gz) = f04467e725a530c2fb80e081a45d5b7910d1b3ccbf89ff2d0b1ea7996dd93ce1 SIZE (intel-media-driver-intel-media-18.4.1_GH0.tar.gz) = 14657816 +SHA256 (95549679029d.patch) = 348ec62564031f994669da4f70c735061bbedbe7057db68185798826989cf75b +SIZE (95549679029d.patch) = 1005