Index: head/multimedia/libva/Makefile =================================================================== --- head/multimedia/libva/Makefile (revision 505898) +++ head/multimedia/libva/Makefile (revision 505899) @@ -1,44 +1,41 @@ # $FreeBSD$ PORTNAME= libva -PORTVERSION= 2.4.1 -PORTREVISION= 1 +PORTVERSION= 2.5.0 CATEGORIES= multimedia PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= c2a431cc3cab.patch:-p1 5cfcd31635b1.patch:-p1 -PATCHFILES+= 394b1eb4ce5f.patch:-p1 -PATCHFILES+= 93c52a17b8d2.patch:-p1 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 LDFLAGS+= -lpthread # for pthread_getthreadid_np 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_USE= XORG=x11,xorgproto,xext,xfixes X11_MESON_YES= with_x11 .include Index: head/multimedia/libva/distinfo =================================================================== --- head/multimedia/libva/distinfo (revision 505898) +++ head/multimedia/libva/distinfo (revision 505899) @@ -1,11 +1,7 @@ -TIMESTAMP = 1555495659 -SHA256 (intel-libva-2.4.1_GH0.tar.gz) = 68ca8d071dcb84ac82e3c6d7f02a55937d9f690fcb215853f4aa1de8d459812f -SIZE (intel-libva-2.4.1_GH0.tar.gz) = 223649 +TIMESTAMP = 1562332471 +SHA256 (intel-libva-2.5.0_GH0.tar.gz) = 9b6264dade6b6d3edb59c6c4f3c9217d1d5a195635fc07da875d565f58624418 +SIZE (intel-libva-2.5.0_GH0.tar.gz) = 226226 SHA256 (c2a431cc3cab.patch) = d749a839b168529d2c424ffa78bd8859eebd831a5dfd50e8cdd1fc760907a232 SIZE (c2a431cc3cab.patch) = 835 SHA256 (5cfcd31635b1.patch) = 16344b56bf7e4bbc8a572183adbfd346d92d54d70a87dc6f30bae2ee946ccc84 SIZE (5cfcd31635b1.patch) = 1091 -SHA256 (394b1eb4ce5f.patch) = 78bb4d0ae07df1b1efffaec4998a4c1fe99b04a772acc299ce67e3c6fc0b49e0 -SIZE (394b1eb4ce5f.patch) = 1599 -SHA256 (93c52a17b8d2.patch) = 82eaa9e089282a17cb1453df65e2f7e4a9abdf8a1a08f6e8a739060ef1f45146 -SIZE (93c52a17b8d2.patch) = 607 Index: head/multimedia/libva/files/patch-va_va__trace.c =================================================================== --- head/multimedia/libva/files/patch-va_va__trace.c (revision 505898) +++ head/multimedia/libva/files/patch-va_va__trace.c (revision 505899) @@ -1,78 +1,78 @@ - Implement gettid() for BSDs ---- va/va_trace.c.orig 2018-02-12 06:32:11 UTC +--- va/va_trace.c.orig 2019-07-05 13:14:31 UTC +++ va/va_trace.c @@ -48,12 +48,36 @@ #include #include #include -#include #include #include - #include + #include #include +#if defined(__linux__) +#include +#elif defined(__DragonFly__) || defined(__FreeBSD__) +#include +#elif defined(__NetBSD__) +#include +#else // OpenBSD, Solaris +#include +#endif + +#if !defined(__BIONIC__) +static pid_t gettid() +{ +#if defined(__linux__) + return syscall(__NR_gettid); +#elif defined(__DragonFly__) || defined(__FreeBSD__) + return pthread_getthreadid_np(); +#elif defined(__NetBSD__) + return _lwp_self(); +#else // OpenBSD, Solaris + return (intptr_t) pthread_self(); +#endif +} +#endif + /* * Env. to debug some issue, e.g. the decode/encode issue in a video conference scenerio: * .LIBVA_TRACE=log_file: general VA parameters saved into log_file -@@ -290,7 +318,7 @@ static void add_trace_config_info( +@@ -290,7 +314,7 @@ static void add_trace_config_info( { struct trace_config_info *pconfig_info; int idx = 0; - pid_t thd_id = syscall(__NR_gettid); + pid_t thd_id = gettid(); LOCK_RESOURCE(pva_trace); -@@ -668,7 +696,7 @@ static struct trace_log_file *start_tracing2log_file( +@@ -668,7 +692,7 @@ static struct trace_log_file *start_tracing2log_file( { struct trace_log_files_manager *plog_files_mgr = NULL; struct trace_log_file *plog_file = NULL; - pid_t thd_id = syscall(__NR_gettid); + pid_t thd_id = gettid(); int i = 0; LOCK_RESOURCE(pva_trace); -@@ -707,7 +735,7 @@ static void refresh_log_file( +@@ -707,7 +731,7 @@ static void refresh_log_file( struct trace_context *ptra_ctx) { struct trace_log_file *plog_file = NULL; - pid_t thd_id = syscall(__NR_gettid); + pid_t thd_id = gettid(); int i = 0; plog_file = ptra_ctx->plog_file; -@@ -1230,7 +1258,7 @@ static void internal_TraceUpdateContext ( +@@ -1238,7 +1262,7 @@ static void internal_TraceUpdateContext ( { struct trace_context *trace_ctx = NULL; int i = 0, delete = 1; - pid_t thd_id = syscall(__NR_gettid); + pid_t thd_id = gettid(); if(tra_ctx_idx >= MAX_TRACE_CTX_NUM) return; Index: head/multimedia/libva/pkg-plist =================================================================== --- head/multimedia/libva/pkg-plist (revision 505898) +++ head/multimedia/libva/pkg-plist (revision 505899) @@ -1,51 +1,51 @@ 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_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.401.0 +lib/libva-drm.so.2.500.0 %%GLX%%lib/libva-glx.so %%GLX%%lib/libva-glx.so.2 -%%GLX%%lib/libva-glx.so.2.401.0 +%%GLX%%lib/libva-glx.so.2.500.0 %%WAYLAND%%lib/libva-wayland.so %%WAYLAND%%lib/libva-wayland.so.2 -%%WAYLAND%%lib/libva-wayland.so.2.401.0 +%%WAYLAND%%lib/libva-wayland.so.2.500.0 %%X11%%lib/libva-x11.so %%X11%%lib/libva-x11.so.2 -%%X11%%lib/libva-x11.so.2.401.0 +%%X11%%lib/libva-x11.so.2.500.0 lib/libva.so lib/libva.so.2 -lib/libva.so.2.401.0 +lib/libva.so.2.500.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