Index: head/multimedia/libva/files/patch-va_va__trace.c =================================================================== --- head/multimedia/libva/files/patch-va_va__trace.c (revision 523153) +++ head/multimedia/libva/files/patch-va_va__trace.c (nonexistent) @@ -1,84 +0,0 @@ -- Implement gettid() for BSDs - ---- va/va_trace.c.orig 2019-07-05 13:14:31 UTC -+++ va/va_trace.c -@@ -48,12 +48,42 @@ - #include - #include - #include --#include - #include - #include - #include - #include - -+#if defined(__linux__) -+#include -+#elif defined(__DragonFly__) || defined(__FreeBSD__) -+#include -+#elif defined(__NetBSD__) -+#include -+#elif defined(__sun) -+#include -+#else // fallback -+#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(); -+#elif defined(__OpenBSD__) -+ return getthrid(); -+#elif defined(__sun) -+ return thr_self(); -+#else // fallback -+ 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 +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 +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 +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; -@@ -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; Property changes on: head/multimedia/libva/files/patch-va_va__trace.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/multimedia/libva/Makefile =================================================================== --- head/multimedia/libva/Makefile (revision 523153) +++ head/multimedia/libva/Makefile (revision 523154) @@ -1,48 +1,51 @@ # $FreeBSD$ PORTNAME= libva PORTVERSION= 2.6.0 CATEGORIES= multimedia PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= c2a431cc3cab.patch:-p1 5cfcd31635b1.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 LDFLAGS_FreeBSD_12.0= -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 - -post-patch: - @${REINPLACE_CMD} 's,/etc,${PREFIX}&,' ${WRKSRC}/va/va.c .include Index: head/multimedia/libva/distinfo =================================================================== --- head/multimedia/libva/distinfo (revision 523153) +++ head/multimedia/libva/distinfo (revision 523154) @@ -1,7 +1,17 @@ TIMESTAMP = 1577288899 SHA256 (intel-libva-2.6.0_GH0.tar.gz) = 5566755739503ef53beafad7fd7e155e68039e9af78e051e27f1715a420a0952 SIZE (intel-libva-2.6.0_GH0.tar.gz) = 228808 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