multimedia/libva: switch to upstream patches

3 files changed, 17 insertions, 88 deletions

diff --git a/multimedia/libva/Makefile b/multimedia/libva/Makefile
index d1410ba7bea3..86c18a75cc2f 100644
--- a/multimedia/libva/Makefile
+++ b/multimedia/libva/Makefile
@@ -5,7 +5,13 @@ 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
@@ -42,7 +48,4 @@ 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 <bsd.port.mk>
diff --git a/multimedia/libva/distinfo b/multimedia/libva/distinfo
index c1bb32d7dafd..1dd9fc443f49 100644
--- a/multimedia/libva/distinfo
+++ b/multimedia/libva/distinfo
@@ -5,3 +5,13 @@ SHA256 (c2a431cc3cab.patch) = d749a839b168529d2c424ffa78bd8859eebd831a5dfd50e8cd
 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/files/patch-va_va__trace.c b/multimedia/libva/files/patch-va_va__trace.c
deleted file mode 100644
index 44530c28d8b6..000000000000
--- a/multimedia/libva/files/patch-va_va__trace.c
+++ /dev/null
@@ -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 <unistd.h>
- #include <sys/types.h>
- #include <sys/stat.h>
--#include <sys/syscall.h>
- #include <pthread.h>
- #include <unistd.h>
- #include <sys/time.h>
- #include <errno.h>
- 
-+#if defined(__linux__)
-+#include <sys/syscall.h>
-+#elif defined(__DragonFly__) || defined(__FreeBSD__)
-+#include <pthread_np.h>
-+#elif defined(__NetBSD__)
-+#include <lwp.h>
-+#elif defined(__sun)
-+#include <thread.h>
-+#else // fallback
-+#include <stdint.h>
-+#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;