Index: head/multimedia/libva-intel-driver/Makefile =================================================================== --- head/multimedia/libva-intel-driver/Makefile (revision 495469) +++ head/multimedia/libva-intel-driver/Makefile (revision 495470) @@ -1,39 +1,46 @@ # $FreeBSD$ PORTNAME= libva-intel-driver PORTVERSION= 2.3.0 PORTREVISION= 3 CATEGORIES= multimedia PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= f139dafa5917.patch:-p1 # for mesa-libs 18.3+ MAINTAINER= jbeich@FreeBSD.org COMMENT= VAAPI legacy driver for Intel GMA 4500 (Gen4) or newer LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS_REASON= Only Intel GPUs on x86 are supported BUILD_DEPENDS= libva>=2.4.0:multimedia/libva LIB_DEPENDS= libdrm_intel.so:graphics/libdrm \ libva.so:multimedia/libva USES= compiler:c11 meson pkgconfig USE_GITHUB= yes 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 .include Index: head/multimedia/libva-intel-hybrid-driver/Makefile =================================================================== --- head/multimedia/libva-intel-hybrid-driver/Makefile (revision 495469) +++ head/multimedia/libva-intel-hybrid-driver/Makefile (revision 495470) @@ -1,36 +1,45 @@ # $FreeBSD$ PORTNAME= intel-hybrid-driver DISTVERSION= 1.0.2 PORTREVISION= 1 CATEGORIES= multimedia PKGNAMEPREFIX= libva- PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES= dfa9c8eba295.patch:-p1 b3b4d9a3a08d.patch:-p1 MAINTAINER= jbeich@FreeBSD.org COMMENT= Hybrid VP8 encoder and VP9 decoder for Intel GPUs LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS_REASON= Only Intel GPUs on x86 are supported LIB_DEPENDS= libdrm_intel.so:graphics/libdrm \ libcmrt.so:multimedia/cmrt \ libva.so:multimedia/libva USES= autoreconf compiler:c11 gmake libtool pkgconfig USE_GITHUB= yes GH_ACCOUNT= 01org 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 .include Index: head/multimedia/libva-intel-media-driver/Makefile =================================================================== --- head/multimedia/libva-intel-media-driver/Makefile (revision 495469) +++ head/multimedia/libva-intel-media-driver/Makefile (revision 495470) @@ -1,52 +1,62 @@ # $FreeBSD$ PORTNAME= media-driver DISTVERSIONPREFIX= intel-media- 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 LICENSE= MIT BSD3CLAUSE LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/LICENSE.md ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS_REASON= Only Intel GPUs on x86 are supported BUILD_DEPENDS= gmmlib>=${PORTVERSION:C/([^.]*\.[^.]).*/\1/}:multimedia/gmmlib \ libva>=2.4.0:multimedia/libva LIB_DEPENDS= libpciaccess.so:devel/libpciaccess \ libigdgmm.so:multimedia/gmmlib \ libva.so:multimedia/libva USES= cmake compiler:c++11-lib localbase pkgconfig USE_GITHUB= yes GH_ACCOUNT= intel ARCH_SUFX= ${ARCH:S/i386/32/:S/amd//:S/x86_//} CMAKE_OFF= MEDIA_BUILD_FATAL_WARNINGS BUILD_CMRTLIB CMAKE_ARGS= -DBUILD_TYPE:STRING="${CMAKE_BUILD_TYPE}" \ -DARCH:STRING="${ARCH_SUFX}" \ -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 @if [ ${CHOSEN_COMPILER_TYPE} != gcc ]; then \ ${REINPLACE_CMD} -i .gcc.bak '/-fno-tree-pre/d' \ ${WRKSRC}/media_driver/cmake/linux/media_compile_flags_linux.cmake; \ fi # 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 Index: head/multimedia/libva-intel-media-driver/distinfo =================================================================== --- head/multimedia/libva-intel-media-driver/distinfo (revision 495469) +++ head/multimedia/libva-intel-media-driver/distinfo (revision 495470) @@ -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