- Update multimedia/libva to 1.8.0

- Update multimedia/libva-intel-driver to 1.8.0
- Utility programs have been split out of libva distribution to
  another repository, so create a new libva-utils port, copied
  from libva, with these bits
- While here, update home pages in pkg-descr files

multimedia/Makefile

@@ -210,6 +210,7 @@
     SUBDIR += libv4l
     SUBDIR += libva
     SUBDIR += libva-intel-driver
+    SUBDIR += libva-utils
     SUBDIR += libva-vdpau-driver
     SUBDIR += libvdpau
     SUBDIR += libvpx

multimedia/libva-intel-driver/Makefile

@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libva-intel-driver
-PORTVERSION=	1.7.3
+PORTVERSION=	1.8.0
-PORTREVISION=	2
 CATEGORIES=	multimedia
 
 MAINTAINER=	madpilot@FreeBSD.org

multimedia/libva-intel-driver/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1487846424
+TIMESTAMP = 1491034980
-SHA256 (01org-intel-vaapi-driver-1.7.3_GH0.tar.gz) = c1f02cbdf0398f096ddc91096fac6ee62267a54955f6d235d73a8ff2ea888118
+SHA256 (01org-intel-vaapi-driver-1.8.0_GH0.tar.gz) = 45a38641f3ddbd43d9c053bfd9cb809ecb2d5f5227f0e3c1c5a8d51dccf81b35
-SIZE (01org-intel-vaapi-driver-1.7.3_GH0.tar.gz) = 1648659
+SIZE (01org-intel-vaapi-driver-1.8.0_GH0.tar.gz) = 2308240

multimedia/libva-intel-driver/files/patch-src-i965_decoder_utils.c

@@ -1,14 +0,0 @@
---- src/i965_decoder_utils.c.orig	2014-12-24 00:59:48 UTC
-+++ src/i965_decoder_utils.c
-@@ -23,7 +23,11 @@
- 
- #include "sysdeps.h"
- #include <limits.h>
-+#ifdef __FreeBSD__
-+#include <stdlib.h>
-+#else
- #include <alloca.h>
-+#endif
- 
- #include "intel_batchbuffer.h"
- #include "intel_media.h"

multimedia/libva-intel-driver/pkg-descr

@@ -1,4 +1,4 @@
 Libva driver for intel graphics cards with hardware accelerated
 features for video encode/decode.
 
-WWW: http://cgit.freedesktop.org/vaapi/intel-driver
+WWW: https://github.com/01org/intel-vaapi-driver

multimedia/libva-utils/Makefile

@@ -0,0 +1,53 @@
+# $FreeBSD$
+
+PORTNAME=	libva-utils
+PORTVERSION=	1.8.0
+CATEGORIES=	multimedia
+
+MAINTAINER=	madpilot@FreeBSD.org
+COMMENT=	Collection of tests and utilities for VAAPI
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+LIB_DEPENDS=	libva.so:multimedia/libva
+
+USES=		autoreconf gmake libtool pkgconfig tar:bzip2
+#USE_XORG=	glproto pciaccess xext xfixes
+#USE_GL=	gl
+GNU_CONFIGURE=	yes
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	01org
+
+#LDFLAGS+=	-lpthread
+# prevent types conflict: videodev2.h vs. drm.h
+#CFLAGS+=	-DHAVE_LINUX_INTEGER_TYPES
+
+OPTIONS_DEFINE=	DEBUG
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDEBUG}
+CFLAGS+=	-D_DEBUG
+.else
+CFLAGS+=	-DNDEBUG
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if defined(STRIP) && ${STRIP} != ""
+INSTALL_TARGET=	install-strip
+.endif
+
+#post-patch:	.SILENT
+#	${REINPLACE_CMD} -e 's|\($$libdir\)/dri|\1/va|' \
+#		-e 's|$${libdir}/\(pkgconfig\)|${PREFIX}/libdata/\1|' \
+#		${WRKSRC}/configure.ac
+#	${REINPLACE_CMD} -e 's/va\(info\)/\1/g' -e 's/info\.c/vainfo\.c/' \
+#		${WRKSRC}/test/vainfo/Makefile.am
+#	${REINPLACE_CMD} '/^export VA_HEADER_/d' \
+#		${WRKSRC}/doc/Makefile.am
+#	${REINPLACE_CMD} 's/-ldl//' ${WRKSRC}/va/Makefile.am
+
+.include <bsd.port.post.mk>

multimedia/libva-utils/distinfo

@@ -0,0 +1,3 @@
+TIMESTAMP = 1491052388
+SHA256 (01org-libva-utils-1.8.0_GH0.tar.gz) = 2a7590c8428d0b453b004702c4c515669403cea27f9f17b2560b38da337ec943
+SIZE (01org-libva-utils-1.8.0_GH0.tar.gz) = 1011595

multimedia/libva-utils/pkg-descr

@@ -0,0 +1,4 @@
+libva-utils is a collection of utilities and examples to exercise
+VA-API in accordance with the libva project.
+
+WWW: https://github.com/01org/libva-utils

multimedia/libva-utils/pkg-plist

@@ -0,0 +1,8 @@
+bin/avcenc
+bin/h264encode
+bin/vainfo
+bin/jpegenc
+bin/loadjpeg
+bin/mpeg2vaenc
+bin/mpeg2vldemo
+bin/putsurface

multimedia/libva/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	libva
-PORTVERSION=	1.7.3
+PORTVERSION=	1.8.0
 CATEGORIES=	multimedia
 
 MAINTAINER=	madpilot@FreeBSD.org
@@ -22,7 +22,6 @@ USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	01org
-GH_TAGNAME=	${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
 
 LDFLAGS+=	-lpthread
 # prevent types conflict: videodev2.h vs. drm.h
@@ -48,8 +47,6 @@ post-patch:	.SILENT
 	${REINPLACE_CMD} -e 's|\($$libdir\)/dri|\1/va|' \
 		-e 's|$${libdir}/\(pkgconfig\)|${PREFIX}/libdata/\1|' \
 		${WRKSRC}/configure.ac
-	${REINPLACE_CMD} -e 's/va\(info\)/\1/g' -e 's/info\.c/vainfo\.c/' \
-		${WRKSRC}/test/vainfo/Makefile.am
 	${REINPLACE_CMD} '/^export VA_HEADER_/d' \
 		${WRKSRC}/doc/Makefile.am
 	${REINPLACE_CMD} 's/-ldl//' ${WRKSRC}/va/Makefile.am

multimedia/libva/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1487845684
+TIMESTAMP = 1491034642
-SHA256 (01org-libva-1.7.3-libva-1.7.3_GH0.tar.gz) = f0f816a725007fbf3c7ed816ff71ba420696bec63ff49045e9b23d9b34ac73c8
+SHA256 (01org-libva-1.8.0_GH0.tar.gz) = 924ed467d50a24018428448071a311d6467e0d40dc94731e2164f9d5d61bac51
-SIZE (01org-libva-1.7.3-libva-1.7.3_GH0.tar.gz) = 898775
+SIZE (01org-libva-1.8.0_GH0.tar.gz) = 195261

multimedia/libva/files/patch-test__v4l_h264__encode__capture.cpp

@@ -1,38 +0,0 @@
---- test/v4l_h264/encode/capture.cpp.orig	2016-06-21 01:29:25 UTC
-+++ test/v4l_h264/encode/capture.cpp
-@@ -30,6 +30,7 @@
- */
- 
- #include <cstdlib> /* EXIT_FAILURE, EXIT_SUCCESS */
-+#include <cstdio> /* printf */
- #include <string>
- #include <cstring> /* strerror() */
- #include <cassert>
-@@ -37,7 +38,11 @@
- #include <fcntl.h> /* low-level i/o */
- #include <errno.h>
- #include <unistd.h>
-+#if defined __FreeBSD__ || defined __DragonFly__
-+#include <stdlib.h>
-+#else
- #include <malloc.h>
-+#endif
- #include <sys/stat.h>
- #include <sys/mman.h>
- #include <sys/ioctl.h>
-@@ -451,10 +456,15 @@ static void init_userp (unsigned int buf
-     }
-     for (n_buffers = 0; n_buffers < 4; ++n_buffers) {
-         buffers[n_buffers].length = buffer_size;
-+#if defined __FreeBSD__ || defined __DragonFly__
-+	if(posix_memalign(&buffers[n_buffers].start, page_size, buffer_size))
-+	{
-+#else
-         buffers[n_buffers].start = memalign (/* boundary */ page_size,
-             buffer_size);
- 
-         if (!buffers[n_buffers].start) {
-+#endif
-             std::cerr << "Out of memory\n";
-             exit (EXIT_FAILURE);
-         }

multimedia/libva/pkg-descr

@@ -3,4 +3,4 @@ hardware accelerated video decode/encode at various entry-points (VLD,
 IDCT, Motion Compensation etc.) for the prevailing coding standards
 today (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3).
 
-WWW: http://freedesktop.org/wiki/Software/vaapi
+WWW: https://github.com/01org/libva

multimedia/libva/pkg-plist

@@ -1,11 +1,3 @@
-bin/vaavcenc
-bin/vah264encode
-bin/vainfo
-bin/vajpegenc
-bin/valoadjpeg
-bin/vampeg2vaenc
-bin/vampeg2vldemo
-bin/vaputsurface
 include/va/va.h
 include/va/va_backend.h
 include/va/va_backend_glx.h
@@ -33,19 +25,19 @@ include/va/va_vpp.h
 include/va/va_x11.h
 lib/libva-drm.so
 lib/libva-drm.so.1
-lib/libva-drm.so.1.3904.0
+lib/libva-drm.so.1.4000.0
 lib/libva-glx.so
 lib/libva-glx.so.1
-lib/libva-glx.so.1.3904.0
+lib/libva-glx.so.1.4000.0
 lib/libva-tpi.so
 lib/libva-tpi.so.1
-lib/libva-tpi.so.1.3904.0
+lib/libva-tpi.so.1.4000.0
 lib/libva-x11.so
 lib/libva-x11.so.1
-lib/libva-x11.so.1.3904.0
+lib/libva-x11.so.1.4000.0
 lib/libva.so
 lib/libva.so.1
-lib/libva.so.1.3904.0
+lib/libva.so.1.4000.0
 lib/va/dummy_drv_video.so
 libdata/pkgconfig/libva-drm.pc
 libdata/pkgconfig/libva-glx.pc