svn commit: r362158 - in head/multimedia/libva: . files

[Guido Falsi]

Author: madpilot
Date: Thu Jul 17 16:06:31 2014
New Revision: 362158
URL: http://svnweb.freebsd.org/changeset/ports/362158
QAT: https://qat.redports.org/buildarchive/r362158/

Log:
  - Import bugfix from upstream [1]
  - While here, remove check for unsupported release
  
  PR:		191921 [1]
  Submitted by:	jiashiun at gmail.com
  MFH:		2014Q3

Deleted:
  head/multimedia/libva/files/extra-patch-va-va_trace.c
Modified:
  head/multimedia/libva/Makefile
  head/multimedia/libva/files/patch-va-va.c

Modified: head/multimedia/libva/Makefile
==============================================================================
--- head/multimedia/libva/Makefile	Thu Jul 17 16:01:21 2014	(r362157)
+++ head/multimedia/libva/Makefile	Thu Jul 17 16:06:31 2014	(r362158)
@@ -2,6 +2,7 @@
 
 PORTNAME=	libva
 PORTVERSION=	1.3.1
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://cgit.freedesktop.org/${PORTNAME}/snapshot/
 
@@ -40,11 +41,6 @@ CFLAGS+=	-DNDEBUG
 
 .include <bsd.port.pre.mk>
 
-# add strnlen(3) from head/lib/libc/string/strnlen.c
-.if ${OSVERSION} < 800067
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-va-va_trace.c
-.endif
-
 .if ${ARCH} == "sparc64"
 BROKEN=		glXCreateContext fails during configure
 .endif

Modified: head/multimedia/libva/files/patch-va-va.c
==============================================================================
--- head/multimedia/libva/files/patch-va-va.c	Thu Jul 17 16:01:21 2014	(r362157)
+++ head/multimedia/libva/files/patch-va-va.c	Thu Jul 17 16:06:31 2014	(r362158)
@@ -1,6 +1,6 @@
---- va/va.c~
-+++ va/va.c
-@@ -199,7 +199,7 @@ static VAStatus va_openDriver(VADisplay 
+--- ./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);
@@ -9,3 +9,22 @@
          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;
+ }
+