Index: head/multimedia/libva/Makefile
===================================================================
--- head/multimedia/libva/Makefile	(revision 369768)
+++ head/multimedia/libva/Makefile	(revision 369769)
@@ -1,64 +1,63 @@
 # $FreeBSD$
 
 PORTNAME=	libva
-PORTVERSION=	1.3.1
-PORTREVISION=	3
+PORTVERSION=	1.4.0
 CATEGORIES=	multimedia
 MASTER_SITES=	http://cgit.freedesktop.org/${PORTNAME}/snapshot/
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	VAAPI wrapper and dummy driver
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
 LIB_DEPENDS=	libdrm.so:${PORTSDIR}/graphics/libdrm
 
 USES=		autoreconf libtool pkgconfig tar:bzip2
 USE_XORG=	glproto pciaccess xext xfixes
 USE_GL=		gl
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-prefix=va
 USE_LDCONFIG=	yes
 
 CPPFLAGS+=	-isystem${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 # 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 ${ARCH} == "sparc64"
 BROKEN=		glXCreateContext fails during configure
 .endif
 
 .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
 
 post-configure:	.SILENT
 	${REINPLACE_CMD} 's/-lpthread/${PTHREAD_LIBS}/' \
 		${WRKSRC}/test/putsurface/Makefile
 
 .include <bsd.port.post.mk>
Index: head/multimedia/libva/distinfo
===================================================================
--- head/multimedia/libva/distinfo	(revision 369768)
+++ head/multimedia/libva/distinfo	(revision 369769)
@@ -1,2 +1,2 @@
-SHA256 (libva-1.3.1.tar.bz2) = c21dfe770b957769ce2a1bf833abb0727f2ad133e2609d8b5137f0fb0c5e216e
-SIZE (libva-1.3.1.tar.bz2) = 585004
+SHA256 (libva-1.4.0.tar.bz2) = bc061ab38acb89d80c1748e2cdf57bce95f05a287f7e94751fe82cf65bd824e8
+SIZE (libva-1.4.0.tar.bz2) = 590900
Index: head/multimedia/libva/files/patch-test-v4l_h264-encode-capture.cpp
===================================================================
--- head/multimedia/libva/files/patch-test-v4l_h264-encode-capture.cpp	(revision 369768)
+++ head/multimedia/libva/files/patch-test-v4l_h264-encode-capture.cpp	(nonexistent)
@@ -1,38 +0,0 @@
---- test/v4l_h264/encode/capture.cpp.orig	2012-10-04 15:30:51.000000000 +0200
-+++ test/v4l_h264/encode/capture.cpp	2012-10-11 17:57:55.361081933 +0200
-@@ -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>
-+#ifdef __FreeBSD__
-+#include <stdlib.h>
-+#else
- #include <malloc.h>
-+#endif
- #include <sys/stat.h>
- #include <sys/mman.h>
- #include <sys/ioctl.h>
-@@ -451,10 +456,15 @@
-     }
-     for (n_buffers = 0; n_buffers < 4; ++n_buffers) {
-         buffers[n_buffers].length = buffer_size;
-+#ifdef __FreeBSD__
-+	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);
-         }

Property changes on: head/multimedia/libva/files/patch-test-v4l_h264-encode-capture.cpp
___________________________________________________________________
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/files/patch-va-va.c
===================================================================
--- head/multimedia/libva/files/patch-va-va.c	(revision 369768)
+++ head/multimedia/libva/files/patch-va-va.c	(nonexistent)
@@ -1,30 +0,0 @@
---- ./va/va.c.orig	2014-05-09 12:38:02.000000000 +0800
-+++ ./va/va.c	2014-07-17 19:11:43.977174636 +0800
-@@ -227,7 +227,7 @@
-         strncat( driver_path, DRIVER_EXTENSION, strlen(DRIVER_EXTENSION) );
-         
-         va_infoMessage("Trying to open %s\n", driver_path);
--#ifndef ANDROID
-+#if !defined(ANDROID) && defined(RTLD_NODELETE)
-         handle = dlopen( driver_path, RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE );
- #else
-         handle = dlopen( driver_path, RTLD_NOW| RTLD_GLOBAL);
-@@ -515,15 +515,15 @@
-   free(old_ctx->vtable_vpp);
-   old_ctx->vtable_vpp = NULL;
- 
--  if (VA_STATUS_SUCCESS == vaStatus)
--      pDisplayContext->vaDestroy(pDisplayContext);
--
-   VA_TRACE_LOG(va_TraceTerminate, dpy);
- 
-   va_TraceEnd(dpy);
- 
-   va_FoolEnd(dpy);
- 
-+  if (VA_STATUS_SUCCESS == vaStatus)
-+      pDisplayContext->vaDestroy(pDisplayContext);
-+
-   return vaStatus;
- }
- 

Property changes on: head/multimedia/libva/files/patch-va-va.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/files/patch-va-glx-va_glx_private.h
===================================================================
--- head/multimedia/libva/files/patch-va-glx-va_glx_private.h	(revision 369768)
+++ head/multimedia/libva/files/patch-va-glx-va_glx_private.h	(nonexistent)
@@ -1,11 +0,0 @@
---- va/glx/va_glx_private.h~
-+++ va/glx/va_glx_private.h
-@@ -38,7 +38,7 @@ typedef void (*PFNGLXBINDTEXIMAGEEXTPROC
- typedef void (*PFNGLXRELEASETEXIMAGEEXTPROC)(Display *, GLXDrawable, int);
- #endif
- 
--#if GLX_GLXEXT_VERSION < 27
-+#if GLX_GLXEXT_VERSION < 21
- /* XXX: this is not exactly that version but this is the only means to
-    make sure we have the correct <GL/glx.h> with those signatures */
- typedef GLXPixmap (*PFNGLXCREATEPIXMAPPROC)(Display *, GLXFBConfig, Pixmap, const int *);

Property changes on: head/multimedia/libva/files/patch-va-glx-va_glx_private.h
___________________________________________________________________
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/files/patch-test__v4l_h264__encode__capture.cpp
===================================================================
--- head/multimedia/libva/files/patch-test__v4l_h264__encode__capture.cpp	(nonexistent)
+++ head/multimedia/libva/files/patch-test__v4l_h264__encode__capture.cpp	(revision 369769)
@@ -0,0 +1,38 @@
+--- test/v4l_h264/encode/capture.cpp.orig	2012-10-04 15:30:51.000000000 +0200
++++ test/v4l_h264/encode/capture.cpp	2012-10-11 17:57:55.361081933 +0200
+@@ -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>
++#ifdef __FreeBSD__
++#include <stdlib.h>
++#else
+ #include <malloc.h>
++#endif
+ #include <sys/stat.h>
+ #include <sys/mman.h>
+ #include <sys/ioctl.h>
+@@ -451,10 +456,15 @@
+     }
+     for (n_buffers = 0; n_buffers < 4; ++n_buffers) {
+         buffers[n_buffers].length = buffer_size;
++#ifdef __FreeBSD__
++	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);
+         }

Property changes on: head/multimedia/libva/files/patch-test__v4l_h264__encode__capture.cpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/multimedia/libva/files/patch-va__glx__va_glx_private.h
===================================================================
--- head/multimedia/libva/files/patch-va__glx__va_glx_private.h	(nonexistent)
+++ head/multimedia/libva/files/patch-va__glx__va_glx_private.h	(revision 369769)
@@ -0,0 +1,11 @@
+--- va/glx/va_glx_private.h~
++++ va/glx/va_glx_private.h
+@@ -38,7 +38,7 @@ typedef void (*PFNGLXBINDTEXIMAGEEXTPROC
+ typedef void (*PFNGLXRELEASETEXIMAGEEXTPROC)(Display *, GLXDrawable, int);
+ #endif
+ 
+-#if GLX_GLXEXT_VERSION < 27
++#if GLX_GLXEXT_VERSION < 21
+ /* XXX: this is not exactly that version but this is the only means to
+    make sure we have the correct <GL/glx.h> with those signatures */
+ typedef GLXPixmap (*PFNGLXCREATEPIXMAPPROC)(Display *, GLXFBConfig, Pixmap, const int *);

Property changes on: head/multimedia/libva/files/patch-va__glx__va_glx_private.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/multimedia/libva/files/patch-va__va.c
===================================================================
--- head/multimedia/libva/files/patch-va__va.c	(nonexistent)
+++ head/multimedia/libva/files/patch-va__va.c	(revision 369769)
@@ -0,0 +1,11 @@
+--- va/va.c.orig	2014-09-30 01:48:34 UTC
++++ va/va.c
+@@ -227,7 +227,7 @@
+         strncat( driver_path, DRIVER_EXTENSION, strlen(DRIVER_EXTENSION) );
+         
+         va_infoMessage("Trying to open %s\n", driver_path);
+-#ifndef ANDROID
++#if !defined(ANDROID) && defined(RTLD_NODELETE)
+         handle = dlopen( driver_path, RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE );
+ #else
+         handle = dlopen( driver_path, RTLD_NOW| RTLD_GLOBAL);

Property changes on: head/multimedia/libva/files/patch-va__va.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/multimedia/libva/pkg-plist
===================================================================
--- head/multimedia/libva/pkg-plist	(revision 369768)
+++ head/multimedia/libva/pkg-plist	(revision 369769)
@@ -1,49 +1,48 @@
 bin/vaavcenc
 bin/vah264encode
 bin/vainfo
 bin/valoadjpeg
 bin/vampeg2vaenc
 bin/vampeg2vldemo
 bin/vaputsurface
 include/va/va.h
 include/va/va_backend.h
 include/va/va_backend_glx.h
 include/va/va_backend_tpi.h
 include/va/va_backend_vpp.h
 include/va/va_compat.h
 include/va/va_dec_jpeg.h
 include/va/va_dec_vp8.h
 include/va/va_dri2.h
 include/va/va_dricommon.h
 include/va/va_drm.h
 include/va/va_drmcommon.h
 include/va/va_enc_h264.h
 include/va/va_enc_mpeg2.h
+include/va/va_enc_vp8.h
 include/va/va_glx.h
 include/va/va_tpi.h
 include/va/va_version.h
 include/va/va_vpp.h
 include/va/va_x11.h
 lib/libva-drm.so
 lib/libva-drm.so.1
-lib/libva-drm.so.1.3501.0
+lib/libva-drm.so.1.3600.0
 lib/libva-glx.so
 lib/libva-glx.so.1
-lib/libva-glx.so.1.3501.0
+lib/libva-glx.so.1.3600.0
 lib/libva-tpi.so
 lib/libva-tpi.so.1
-lib/libva-tpi.so.1.3501.0
+lib/libva-tpi.so.1.3600.0
 lib/libva-x11.so
 lib/libva-x11.so.1
-lib/libva-x11.so.1.3501.0
+lib/libva-x11.so.1.3600.0
 lib/libva.so
 lib/libva.so.1
-lib/libva.so.1.3501.0
+lib/libva.so.1.3600.0
 lib/va/dummy_drv_video.so
 libdata/pkgconfig/libva-drm.pc
 libdata/pkgconfig/libva-glx.pc
 libdata/pkgconfig/libva-tpi.pc
 libdata/pkgconfig/libva-x11.pc
 libdata/pkgconfig/libva.pc
-@dirrm include/va
-@dirrmtry lib/va