Update libva, libva-intel-driver and libva-utils to 2.1.0

8 files changed, 23 insertions, 38 deletions

diff --git a/multimedia/libva-intel-driver/Makefile b/multimedia/libva-intel-driver/Makefile
index 35bdfdbe15b5..e6c727fc63ed 100644
--- a/multimedia/libva-intel-driver/Makefile
+++ b/multimedia/libva-intel-driver/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libva-intel-driver
-PORTVERSION=	2.0.0
-PORTREVISION=	1
+PORTVERSION=	2.1.0
 CATEGORIES=	multimedia
 
 MAINTAINER=	madpilot@FreeBSD.org
diff --git a/multimedia/libva-intel-driver/distinfo b/multimedia/libva-intel-driver/distinfo
index 509e5f19e37d..401e87f3e37b 100644
--- a/multimedia/libva-intel-driver/distinfo
+++ b/multimedia/libva-intel-driver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1508576498
-SHA256 (01org-intel-vaapi-driver-2.0.0_GH0.tar.gz) = 19acdace87fb0e167202cecd593028ccf0b90900f48319c3241403abde9fda12
-SIZE (01org-intel-vaapi-driver-2.0.0_GH0.tar.gz) = 2831508
+TIMESTAMP = 1518439257
+SHA256 (01org-intel-vaapi-driver-2.1.0_GH0.tar.gz) = 8958113f645c6ec9a3a8f7ca80b4c308027ee2b8334531c66d1b69f002346fc6
+SIZE (01org-intel-vaapi-driver-2.1.0_GH0.tar.gz) = 3954965
diff --git a/multimedia/libva-utils/Makefile b/multimedia/libva-utils/Makefile
index a9ddbd133cef..345506599798 100644
--- a/multimedia/libva-utils/Makefile
+++ b/multimedia/libva-utils/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	libva-utils
-PORTVERSION=	2.0.0
+PORTVERSION=	2.1.0
 CATEGORIES=	multimedia
 
 MAINTAINER=	madpilot@FreeBSD.org
diff --git a/multimedia/libva-utils/distinfo b/multimedia/libva-utils/distinfo
index 388141ac750f..9f3d04536969 100644
--- a/multimedia/libva-utils/distinfo
+++ b/multimedia/libva-utils/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1508576446
-SHA256 (01org-libva-utils-2.0.0_GH0.tar.gz) = 9488ebbcd44decace43696c5e00b37c858ca6376dcccbaf0f255e77d6fefd858
-SIZE (01org-libva-utils-2.0.0_GH0.tar.gz) = 1033292
+TIMESTAMP = 1518439230
+SHA256 (01org-libva-utils-2.1.0_GH0.tar.gz) = 1000a6a2e27d23b92b7489330ab2017e5bca3e9db6872cb0bb868d8465553aa3
+SIZE (01org-libva-utils-2.1.0_GH0.tar.gz) = 1034951
diff --git a/multimedia/libva/Makefile b/multimedia/libva/Makefile
index ebc7bd0042be..b04af0ca0e0a 100644
--- a/multimedia/libva/Makefile
+++ b/multimedia/libva/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	libva
-PORTVERSION=	2.0.0
-PORTREVISION=	1
+PORTVERSION=	2.1.0
 CATEGORIES=	multimedia
 
 MAINTAINER=	madpilot@FreeBSD.org
diff --git a/multimedia/libva/distinfo b/multimedia/libva/distinfo
index ab6bde028748..e8e9828db4df 100644
--- a/multimedia/libva/distinfo
+++ b/multimedia/libva/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1508575075
-SHA256 (01org-libva-2.0.0_GH0.tar.gz) = dce5e21ffe6083a230814493e806f9e622d11570d633d48ca2f6bd103f6afe3e
-SIZE (01org-libva-2.0.0_GH0.tar.gz) = 191311
+TIMESTAMP = 1518439088
+SHA256 (01org-libva-2.1.0_GH0.tar.gz) = c8e7b1095b0f9e74d94df327f350ec2cc051e381f3023c9732ab9b8b0e9ab151
+SIZE (01org-libva-2.1.0_GH0.tar.gz) = 214894
diff --git a/multimedia/libva/files/patch-va_va__trace.c b/multimedia/libva/files/patch-va_va__trace.c
index cfaf5867b9d2..a2c68629524b 100644
--- a/multimedia/libva/files/patch-va_va__trace.c
+++ b/multimedia/libva/files/patch-va_va__trace.c
@@ -1,4 +1,4 @@
---- va/va_trace.c.orig	2017-10-21 04:49:28 UTC
+--- va/va_trace.c.orig	2018-02-12 06:32:11 UTC
 +++ va/va_trace.c
 @@ -50,6 +50,9 @@
  #include <sys/stat.h>
@@ -10,7 +10,7 @@
  #include <unistd.h>
  #include <time.h>
  #include <errno.h>
-@@ -291,7 +294,13 @@ static void add_trace_config_info(
+@@ -290,7 +293,13 @@ static void add_trace_config_info(
  {
      struct trace_config_info *pconfig_info;
      int idx = 0;
@@ -24,21 +24,7 @@
  
      LOCK_RESOURCE(pva_trace);
  
-@@ -315,7 +324,13 @@ static void delete_trace_config_info(
- {
-     struct trace_config_info *pconfig_info;
-     int idx = 0;
-+#ifdef __FreeBSD__
-+    pid_t thd_id = pthread_getthreadid_np();
-+#elif defined __DragonFly__
-+    pid_t thd_id = syscall(SYS_lwp_gettid);
-+#else
-     pid_t thd_id = syscall(__NR_gettid);
-+#endif
- 
-     LOCK_RESOURCE(pva_trace);
- 
-@@ -662,7 +677,13 @@ static struct trace_log_file *start_tracing2log_file(
+@@ -668,7 +677,13 @@ static struct trace_log_file *start_tracing2log_file(
  {
      struct trace_log_files_manager *plog_files_mgr = NULL;
      struct trace_log_file *plog_file = NULL;
@@ -52,7 +38,7 @@
      int i = 0;
  
      LOCK_RESOURCE(pva_trace);
-@@ -701,7 +722,13 @@ static void refresh_log_file(
+@@ -707,7 +722,13 @@ static void refresh_log_file(
      struct trace_context *ptra_ctx)
  {
      struct trace_log_file *plog_file = NULL;
@@ -66,7 +52,7 @@
      int i = 0;
  
      plog_file = ptra_ctx->plog_file;
-@@ -1224,7 +1251,13 @@ static void internal_TraceUpdateContext (
+@@ -1230,7 +1251,13 @@ static void internal_TraceUpdateContext (
  {
      struct trace_context *trace_ctx = NULL;
      int i = 0, delete = 1;
diff --git a/multimedia/libva/pkg-plist b/multimedia/libva/pkg-plist
index ba5b19fb65af..cbc563b91407 100644
--- a/multimedia/libva/pkg-plist
+++ b/multimedia/libva/pkg-plist
@@ -20,6 +20,7 @@ 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
 include/va/va_glx.h
 include/va/va_str.h
@@ -30,19 +31,19 @@ include/va/va_vpp.h
 include/va/va_x11.h
 lib/libva-drm.so
 lib/libva-drm.so.2
-lib/libva-drm.so.2.0.0
+lib/libva-drm.so.2.100.0
 lib/libva-glx.so
 lib/libva-glx.so.2
-lib/libva-glx.so.2.0.0
+lib/libva-glx.so.2.100.0
 %%WAYLAND%%lib/libva-wayland.so
 %%WAYLAND%%lib/libva-wayland.so.2
-%%WAYLAND%%lib/libva-wayland.so.2.0.0
+%%WAYLAND%%lib/libva-wayland.so.2.100.0
 lib/libva-x11.so
 lib/libva-x11.so.2
-lib/libva-x11.so.2.0.0
+lib/libva-x11.so.2.100.0
 lib/libva.so
 lib/libva.so.2
-lib/libva.so.2.0.0
+lib/libva.so.2.100.0
 libdata/pkgconfig/libva-drm.pc
 libdata/pkgconfig/libva-glx.pc
 %%WAYLAND%%libdata/pkgconfig/libva-wayland.pc