Date: Tue, 12 Mar 2019 16:53:44 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> 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 Message-ID: <201903121653.x2CGri7q054455@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <bsd.port.mk> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903121653.x2CGri7q054455>