diff --git a/multimedia/libva-intel-media-driver/Makefile b/multimedia/libva-intel-media-driver/Makefile index fcb0d6fff06f..1a2bf098ba48 100644 --- a/multimedia/libva-intel-media-driver/Makefile +++ b/multimedia/libva-intel-media-driver/Makefile @@ -1,63 +1,63 @@ # $FreeBSD$ PORTNAME= media-driver DISTVERSIONPREFIX= intel-media- DISTVERSION= 20.1.0r CATEGORIES= multimedia PKGNAMEPREFIX= libva-intel- PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= f337957afed6.patch:-p1 # https://github.com/intel/media-driver/pull/819 PATCHFILES+= 1c790ebf5006.patch:-p1 # https://github.com/intel/media-driver/pull/819 PATCHFILES+= 63d607335723.patch:-p1 # https://github.com/intel/media-driver/pull/819 PATCHFILES+= ad51a4ed50d1.patch:-p1 # https://github.com/intel/media-driver/pull/819 PATCHFILES+= ffc5e189592b.patch:-p1 # https://github.com/intel/media-driver/pull/819 PATCHFILES+= 783fb8d1c8a9.patch:-p1 # https://github.com/intel/media-driver/pull/819 PATCHFILES+= a5e441477420.patch:-p1 # https://github.com/intel/media-driver/pull/819 PATCHFILES+= 199db8d44462.patch:-p1 # https://github.com/intel/media-driver/pull/819 PATCHFILES+= 718ae1db9724.patch:-p1 # https://github.com/intel/media-driver/pull/819 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>=19.3.1:multimedia/gmmlib \ - libva>=2.6.1_1:multimedia/libva + libva>=2.7.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 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} 's/$${GIT_COMMIT}/${DISTVERSIONFULL}/' \ ${WRKSRC}/media_driver/cmake/linux/media_compile_flags_linux.cmake post-patch-X11-off: @${REINPLACE_CMD} -i .nox11 '/find_package.*X11/d' \ ${WRKSRC}/media_driver/media_top_cmake.cmake .include diff --git a/multimedia/libva/Makefile b/multimedia/libva/Makefile index 5636fe5db91a..c2145d378f5f 100644 --- a/multimedia/libva/Makefile +++ b/multimedia/libva/Makefile @@ -1,53 +1,50 @@ # $FreeBSD$ PORTNAME= libva -PORTVERSION= 2.6.1 -PORTREVISION= 1 +PORTVERSION= 2.7.0 CATEGORIES= multimedia PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= 04acc7860feb.patch:-p1 -PATCHFILES+= 48f446b32a4f.patch:-p1 PATCHFILES+= c2a431cc3cab.patch:-p1 # https://github.com/intel/libva/pull/292 PATCHFILES+= 5cfcd31635b1.patch:-p1 # https://github.com/intel/libva/pull/292 PATCHFILES+= f601fc614d8d.patch:-p1 # https://github.com/intel/libva/pull/363 PATCHFILES+= 853c679c628a.patch:-p1 # https://github.com/intel/libva/pull/363 PATCHFILES+= 810d1974a54c.patch:-p1 # https://github.com/intel/libva/pull/363 PATCHFILES+= 12525d4cd7c3.patch:-p1 # https://github.com/intel/libva/pull/363 PATCHFILES+= 36f53f358a9c.patch:-p1 # https://github.com/intel/libva/pull/363 MAINTAINER= jbeich@FreeBSD.org COMMENT?= VAAPI wrapper and dummy driver LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS+= libdrm.so:graphics/libdrm USES= meson pkgconfig USE_GITHUB= yes USE_LDCONFIG= yes GH_ACCOUNT= intel # -lpthread is not necessary if pthread_getthreadid_np is a libc stub LDFLAGS+= ${LDFLAGS_${OPSYS}_${OSREL}} LDFLAGS_FreeBSD_11.3= -lpthread OPTIONS_DEFINE= GLX WAYLAND X11 OPTIONS_DEFAULT=GLX WAYLAND X11 OPTIONS_EXCLUDE?=GLX # enslaved until subpackaging OPTIONS_SUB= yes GLX_LIB_DEPENDS= libva-x11.so:multimedia/libva GLX_USES= gl GLX_USE= GL=gl GLX_MESON_YES= with_glx GLX_IMPLIES= X11 WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland WAYLAND_MESON_YES= with_wayland X11_USES= xorg X11_USE= XORG=x11,xorgproto,xext,xfixes X11_MESON_YES= with_x11 .include diff --git a/multimedia/libva/distinfo b/multimedia/libva/distinfo index 684ea22a1673..d84ad79fc2da 100644 --- a/multimedia/libva/distinfo +++ b/multimedia/libva/distinfo @@ -1,23 +1,17 @@ -TIMESTAMP = 1579259667 -SHA256 (intel-libva-2.6.1_GH0.tar.gz) = 965f581e096508ece26ea9bef8bd769e93f9d1fe6840e309cc925cfef35ad13f -SIZE (intel-libva-2.6.1_GH0.tar.gz) = 228850 -SHA256 (7eec6f8ffb39.patch) = 588258fbdcd26d12094eaf1d797535b9beeeac3f3e7c621d0f4d63af3e46c3e0 -SIZE (7eec6f8ffb39.patch) = 2760 -SHA256 (04acc7860feb.patch) = 8dd3a11b2ff799c6bbd8d0d3f551afa1c6eecedd8ad053d2a7ec0743ed93ed2b -SIZE (04acc7860feb.patch) = 911 -SHA256 (48f446b32a4f.patch) = 4c87a23a78ec0a07e046aa7cd8b7906ef00ee60a7e1dfb0f74cff913f9dda276 -SIZE (48f446b32a4f.patch) = 1456 +TIMESTAMP = 1585323940 +SHA256 (intel-libva-2.7.0_GH0.tar.gz) = 0952ee21069c560f48ebafcba91e1ffb72e5a8736dbab3559af959221b51598f +SIZE (intel-libva-2.7.0_GH0.tar.gz) = 236349 SHA256 (c2a431cc3cab.patch) = d749a839b168529d2c424ffa78bd8859eebd831a5dfd50e8cdd1fc760907a232 SIZE (c2a431cc3cab.patch) = 835 SHA256 (5cfcd31635b1.patch) = 16344b56bf7e4bbc8a572183adbfd346d92d54d70a87dc6f30bae2ee946ccc84 SIZE (5cfcd31635b1.patch) = 1091 SHA256 (f601fc614d8d.patch) = 9e762c22913dc53696fa52701bf4bc9d1c10febfa85a52a6e390da65966a7175 SIZE (f601fc614d8d.patch) = 3148 SHA256 (853c679c628a.patch) = 79cb66ea3f8a9cfe5a2566129dc820bd8f227e1c26d772723e3d7aaa34415703 SIZE (853c679c628a.patch) = 1070 SHA256 (810d1974a54c.patch) = ea6c6d6621e6cee6bf88357fcc6492420ee39d3fc7ffdda2f442e77b13dfa423 SIZE (810d1974a54c.patch) = 2636 SHA256 (12525d4cd7c3.patch) = 3a41122d08c894bca75d70e7b633ef99a7afdb5e95a53aa1aff86afe52fba33e SIZE (12525d4cd7c3.patch) = 2518 SHA256 (36f53f358a9c.patch) = b472d4a43a16f6df979c052bfc6a8f43252b7c2282f1fd3bc8422a83d0504324 SIZE (36f53f358a9c.patch) = 988 diff --git a/multimedia/libva/pkg-plist b/multimedia/libva/pkg-plist index 91b7550ef101..54b8734c6bc5 100644 --- a/multimedia/libva/pkg-plist +++ b/multimedia/libva/pkg-plist @@ -1,51 +1,52 @@ include/va/va.h include/va/va_backend.h %%GLX%%include/va/va_backend_glx.h include/va/va_backend_vpp.h %%WAYLAND%%include/va/va_backend_wayland.h include/va/va_compat.h +include/va/va_dec_av1.h include/va/va_dec_hevc.h include/va/va_dec_jpeg.h include/va/va_dec_vp8.h include/va/va_dec_vp9.h %%X11%%include/va/va_dri2.h %%X11%%include/va/va_dricommon.h include/va/va_drm.h include/va/va_drmcommon.h include/va/va_egl.h include/va/va_enc_h264.h include/va/va_enc_hevc.h include/va/va_enc_jpeg.h include/va/va_enc_mpeg2.h include/va/va_enc_vp8.h include/va/va_enc_vp9.h include/va/va_fei_h264.h include/va/va_fei_hevc.h include/va/va_fei.h %%GLX%%include/va/va_glx.h include/va/va_str.h include/va/va_tpi.h include/va/va_version.h include/va/va_vpp.h %%WAYLAND%%include/va/va_wayland.h %%X11%%include/va/va_x11.h lib/libva-drm.so lib/libva-drm.so.2 -lib/libva-drm.so.2.600.0 +lib/libva-drm.so.2.700.0 %%GLX%%lib/libva-glx.so %%GLX%%lib/libva-glx.so.2 -%%GLX%%lib/libva-glx.so.2.600.0 +%%GLX%%lib/libva-glx.so.2.700.0 %%WAYLAND%%lib/libva-wayland.so %%WAYLAND%%lib/libva-wayland.so.2 -%%WAYLAND%%lib/libva-wayland.so.2.600.0 +%%WAYLAND%%lib/libva-wayland.so.2.700.0 %%X11%%lib/libva-x11.so %%X11%%lib/libva-x11.so.2 -%%X11%%lib/libva-x11.so.2.600.0 +%%X11%%lib/libva-x11.so.2.700.0 lib/libva.so lib/libva.so.2 -lib/libva.so.2.600.0 +lib/libva.so.2.700.0 libdata/pkgconfig/libva-drm.pc %%GLX%%libdata/pkgconfig/libva-glx.pc %%WAYLAND%%libdata/pkgconfig/libva-wayland.pc %%X11%%libdata/pkgconfig/libva-x11.pc libdata/pkgconfig/libva.pc