Update to 2.6.0

Changelog:
2.6.0
enable the mutiple driver selection logic and enable it for DRM.
drm: Add iHD to driver_name_map
Add missed slice parameter 'slice_data_num_emu_prevn_bytes'
ensure that all meson files are part of the release tarball
configure: use correct comparison operator
trace: support VAConfigAttribMultipleFrame in trace
remove incorrect field of VAConfigAttribValDecJPEG
va/va_trace: Dump VP9 parameters for profile 1~3
add multiple frame capability report
add variable to indicate layer infromation
trace: fix memory leak on closing the trace
add prediction direction caps report
Add comments for colour primaries and transfer characteristics in VAProcColorProperties

2.5.0
Correct the comment of color_range.
Add VA_FOURCC_A2B10G10R10 for format a2b10g10r10.
Adjust VAEncMiscParameterQuantization structure to be align with VAEncMiscParameterBuffer(possible to impact BC)
Add attribute for max frame size
Add va_footer.html into distribution build
va_trace: hevc profiles added
Add new definition for input/output surface flag
va/va_trace: add trace support for VAEncMiscParameterTypeSkipFrame structure.
va/va_trace: add MPEG2 trace support for MiscParam and SequenceParam
va_openDriver: check strdup return value
Mark some duplicated field as deprecated
Add return value into logs
va/va_trace: add trace support for VAEncMiscParameterEncQuality structure.
Add newformat foucc defination
va_backend: remove unneeded linux/videodev2.h include
va_trace: add missing <sys/time.h> include
configure: don't build glx if VA/X11 isn't built
va/va_trace: unbreak with C89 after b369467
[common] Add A2RGB10 fourcc definition
build: meson: enables va messaging and visibility
va/va_trace: add trace support for RIR(rolling intra refresh).
va/va_trace: add trace support for ROI(region of interest).

2.4.0
va_TraceSurface support for VA_FOURCC_P010
Add pointer to struct wl_interface for driver to use
(integrate) va: fix new line symbol in error message
av: avoid driver path truncation
Fix compilation warning (uninit and wrong variable types) for Android O MR1
Allow import of the DRM PRIME 2 memory type
android: ignore unimportant compile warnnings
compile: fix sign/unsign compare in va_trace.c
android: replace utils/Log.h with log/log.h
High Dynamic Range Tone Mapping: Add a new filter for input metadata and some comments.
Remove restrictions on vaSetDriverName()

4 files changed, 17 insertions, 36 deletions

diff --git a/multimedia/libva/Makefile b/multimedia/libva/Makefile
index 2f76214e70b..e148b488ac4 100644
--- a/multimedia/libva/Makefile
+++ b/multimedia/libva/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.20 2019/04/28 11:55:45 rillig Exp $
+# $NetBSD: Makefile,v 1.21 2019/12/29 01:31:42 ryoon Exp $
 
-DISTNAME=	libva-2.3.0
+DISTNAME=	libva-2.6.0
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_GITHUB:=01org/}
-EXTRACT_SUFX=	.tar.bz2
-GITHUB_RELEASE=	${PKGVERSION_NOREV}
+EXTRACT_SUFX=	.tar.gz
+GITHUB_TAG=	2.6.0
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://github.com/01org/libva
diff --git a/multimedia/libva/distinfo b/multimedia/libva/distinfo
index a16b2ce77d0..3e11c612f26 100644
--- a/multimedia/libva/distinfo
+++ b/multimedia/libva/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.12 2018/11/23 08:05:04 ryoon Exp $
+$NetBSD: distinfo,v 1.13 2019/12/29 01:31:42 ryoon Exp $
 
-SHA1 (libva-2.3.0.tar.bz2) = e1138529355cce78fa2edc7c5b1c5aeb40dd0ce5
-RMD160 (libva-2.3.0.tar.bz2) = e2e1b68d59006cf2d0d2b3761b8181e2021f2691
-SHA512 (libva-2.3.0.tar.bz2) = e6e8b5e5c3dcfc4ad11560828c849ff522e3cd8db6763fe8d2fcec41c05461b3f354aaba82c7c78b8623f3d1c842851209fbbd046d027a0b88c6d9861e2ecfd3
-Size (libva-2.3.0.tar.bz2) = 509537 bytes
-SHA1 (patch-aa) = 3e4966037c46fada25cc869b672a7e78dda5b04b
+SHA1 (libva-2.6.0.tar.gz) = 1696b06b0ddd73365059b1533139367cf2298a14
+RMD160 (libva-2.6.0.tar.gz) = f72d718239ab92a043776978f86fc89322bd155a
+SHA512 (libva-2.6.0.tar.gz) = 190fd9875d8ec91e94d42c41b770bb51ef9f430534f99d22fa394d6e4cf8dd308ffac61a37171855e4b499982c3cc59925d238b131dd2261a3beaae03e4937d0
+Size (libva-2.6.0.tar.gz) = 228808 bytes
 SHA1 (patch-va_Makefile.am) = af963e8279aacf706b6442372ce7cb1436395c74
 SHA1 (patch-va_glx_va__glx__private.h) = daf6552189295a86f1f073ef107b7449e4098251
-SHA1 (patch-va_va__trace.c) = 3947615333d00cf2b84c255ac85cbc97eda6652d
+SHA1 (patch-va_va__trace.c) = 478f23fb0c5e7cf6a8adc421921af715a62231ef
diff --git a/multimedia/libva/patches/patch-aa b/multimedia/libva/patches/patch-aa
deleted file mode 100644
index 0abeb935b17..00000000000
--- a/multimedia/libva/patches/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2013/04/14 00:30:02 cheusov Exp $
-
-Fix v4l2 header path on NetBSD.
-
---- va/va_backend.h.orig	2012-09-28 14:04:28.000000000 +0000
-+++ va/va_backend.h
-@@ -30,7 +30,11 @@
- #define _VA_BACKEND_H_
- 
- #include <va/va.h>
-+#if defined(__linux__)
- #include <linux/videodev2.h>
-+#elif defined(__NetBSD__)
-+#include <sys/videoio.h>
-+#endif
- 
- typedef struct VADriverContext *VADriverContextP;
- typedef struct VADisplayContext *VADisplayContextP;
diff --git a/multimedia/libva/patches/patch-va_va__trace.c b/multimedia/libva/patches/patch-va_va__trace.c
index 139a3a69995..8621b10926c 100644
--- a/multimedia/libva/patches/patch-va_va__trace.c
+++ b/multimedia/libva/patches/patch-va_va__trace.c
@@ -1,9 +1,9 @@
-$NetBSD: patch-va_va__trace.c,v 1.3 2018/11/23 08:05:04 ryoon Exp $
+$NetBSD: patch-va_va__trace.c,v 1.4 2019/12/29 01:31:42 ryoon Exp $
 
 attempt to provide syscall(__NR_gettid) for most
 systems. inspired by lldb Host.cpp
 
---- va/va_trace.c.orig	2018-10-23 13:50:59.000000000 +0000
+--- va/va_trace.c.orig	2019-09-12 01:35:27.000000000 +0000
 +++ va/va_trace.c
 @@ -50,10 +50,31 @@
  #include <sys/stat.h>
@@ -16,7 +16,7 @@ systems. inspired by lldb Host.cpp
 +#include <lwp.h>
 +#endif
  #include <unistd.h>
- #include <time.h>
+ #include <sys/time.h>
  #include <errno.h>
  
 +pid_t get_tid() {
@@ -37,7 +37,7 @@ systems. inspired by lldb Host.cpp
  /*
   * 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 +311,7 @@ static void add_trace_config_info(
+@@ -288,7 +309,7 @@ static void add_trace_config_info(
  {
      struct trace_config_info *pconfig_info;
      int idx = 0;
@@ -46,7 +46,7 @@ systems. inspired by lldb Host.cpp
  
      LOCK_RESOURCE(pva_trace);
  
-@@ -668,7 +689,7 @@ static struct trace_log_file *start_trac
+@@ -666,7 +687,7 @@ static struct trace_log_file *start_trac
  {
      struct trace_log_files_manager *plog_files_mgr = NULL;
      struct trace_log_file *plog_file = NULL;
@@ -55,7 +55,7 @@ systems. inspired by lldb Host.cpp
      int i = 0;
  
      LOCK_RESOURCE(pva_trace);
-@@ -707,7 +728,7 @@ static void refresh_log_file(
+@@ -705,7 +726,7 @@ static void refresh_log_file(
      struct trace_context *ptra_ctx)
  {
      struct trace_log_file *plog_file = NULL;
@@ -64,7 +64,7 @@ systems. inspired by lldb Host.cpp
      int i = 0;
  
      plog_file = ptra_ctx->plog_file;
-@@ -1230,7 +1251,7 @@ static void internal_TraceUpdateContext 
+@@ -1231,7 +1252,7 @@ static void internal_TraceUpdateContext 
  {
      struct trace_context *trace_ctx = NULL;
      int i = 0, delete = 1;