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

Guido Falsi madpilot at FreeBSD.org
Wed Oct 1 21:49:27 UTC 2014 

Author: madpilot
Date: Wed Oct  1 21:49:25 2014
New Revision: 369769
URL: https://svnweb.freebsd.org/changeset/ports/369769
QAT: https://qat.redports.org/buildarchive/r369769/

Log:
  - Update to 1.4.0
  - Rename patch files
  - Remove dirrm

Added:
  head/multimedia/libva/files/patch-test__v4l_h264__encode__capture.cpp
     - copied unchanged from r369768, head/multimedia/libva/files/patch-test-v4l_h264-encode-capture.cpp
  head/multimedia/libva/files/patch-va__glx__va_glx_private.h
     - copied unchanged from r369698, head/multimedia/libva/files/patch-va-glx-va_glx_private.h
  head/multimedia/libva/files/patch-va__va.c
     - copied, changed from r369698, head/multimedia/libva/files/patch-va-va.c
Deleted:
  head/multimedia/libva/files/patch-test-v4l_h264-encode-capture.cpp
  head/multimedia/libva/files/patch-va-glx-va_glx_private.h
  head/multimedia/libva/files/patch-va-va.c
Modified:
  head/multimedia/libva/Makefile
  head/multimedia/libva/distinfo
  head/multimedia/libva/pkg-plist

Modified: head/multimedia/libva/Makefile
==============================================================================
--- head/multimedia/libva/Makefile	Wed Oct  1 21:46:50 2014	(r369768)
+++ head/multimedia/libva/Makefile	Wed Oct  1 21:49:25 2014	(r369769)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	libva
-PORTVERSION=	1.3.1
-PORTREVISION=	3
+PORTVERSION=	1.4.0
 CATEGORIES=	multimedia
 MASTER_SITES=	http://cgit.freedesktop.org/${PORTNAME}/snapshot/
 

Modified: head/multimedia/libva/distinfo
==============================================================================
--- head/multimedia/libva/distinfo	Wed Oct  1 21:46:50 2014	(r369768)
+++ head/multimedia/libva/distinfo	Wed Oct  1 21:49:25 2014	(r369769)
@@ -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

Copied: head/multimedia/libva/files/patch-test__v4l_h264__encode__capture.cpp (from r369768, head/multimedia/libva/files/patch-test-v4l_h264-encode-capture.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/libva/files/patch-test__v4l_h264__encode__capture.cpp	Wed Oct  1 21:49:25 2014	(r369769, copy of r369768, head/multimedia/libva/files/patch-test-v4l_h264-encode-capture.cpp)
@@ -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);
+         }

Copied: head/multimedia/libva/files/patch-va__glx__va_glx_private.h (from r369698, head/multimedia/libva/files/patch-va-glx-va_glx_private.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/libva/files/patch-va__glx__va_glx_private.h	Wed Oct  1 21:49:25 2014	(r369769, copy of r369698, head/multimedia/libva/files/patch-va-glx-va_glx_private.h)
@@ -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 *);

Copied and modified: head/multimedia/libva/files/patch-va__va.c (from r369698, head/multimedia/libva/files/patch-va-va.c)
==============================================================================
--- head/multimedia/libva/files/patch-va-va.c	Wed Oct  1 07:45:42 2014	(r369698, copy source)
+++ head/multimedia/libva/files/patch-va__va.c	Wed Oct  1 21:49:25 2014	(r369769)
@@ -1,5 +1,5 @@
---- ./va/va.c.orig	2014-05-09 12:38:02.000000000 +0800
-+++ ./va/va.c	2014-07-17 19:11:43.977174636 +0800
+--- 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) );
          
@@ -9,22 +9,3 @@
          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;
- }
- 

Modified: head/multimedia/libva/pkg-plist
==============================================================================
--- head/multimedia/libva/pkg-plist	Wed Oct  1 21:46:50 2014	(r369768)
+++ head/multimedia/libva/pkg-plist	Wed Oct  1 21:49:25 2014	(r369769)
@@ -19,6 +19,7 @@ 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
@@ -26,24 +27,22 @@ 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
- at dirrm include/va
- at dirrmtry lib/va

More information about the svn-ports-head mailing list