Date: Thu, 2 Oct 2014 16:35:27 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r369838 - in branches/2014Q4/multimedia/libva: . files Message-ID: <201410021635.s92GZR6A072563@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Thu Oct 2 16:35:26 2014 New Revision: 369838 URL: https://svnweb.freebsd.org/changeset/ports/369838 QAT: https://qat.redports.org/buildarchive/r369838/ Log: MFH: r369769 - Update to 1.4.0 - Rename patch files - Remove dirrm Fixes fetch. Approved by: portmgr (bapt) Added: branches/2014Q4/multimedia/libva/files/patch-test__v4l_h264__encode__capture.cpp - copied unchanged from r369769, head/multimedia/libva/files/patch-test__v4l_h264__encode__capture.cpp branches/2014Q4/multimedia/libva/files/patch-va__glx__va_glx_private.h - copied unchanged from r369769, head/multimedia/libva/files/patch-va__glx__va_glx_private.h branches/2014Q4/multimedia/libva/files/patch-va__va.c - copied unchanged from r369769, head/multimedia/libva/files/patch-va__va.c Deleted: branches/2014Q4/multimedia/libva/files/patch-test-v4l_h264-encode-capture.cpp branches/2014Q4/multimedia/libva/files/patch-va-glx-va_glx_private.h branches/2014Q4/multimedia/libva/files/patch-va-va.c Modified: branches/2014Q4/multimedia/libva/Makefile branches/2014Q4/multimedia/libva/distinfo branches/2014Q4/multimedia/libva/pkg-plist Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/multimedia/libva/Makefile ============================================================================== --- branches/2014Q4/multimedia/libva/Makefile Thu Oct 2 16:23:31 2014 (r369837) +++ branches/2014Q4/multimedia/libva/Makefile Thu Oct 2 16:35:26 2014 (r369838) @@ -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: branches/2014Q4/multimedia/libva/distinfo ============================================================================== --- branches/2014Q4/multimedia/libva/distinfo Thu Oct 2 16:23:31 2014 (r369837) +++ branches/2014Q4/multimedia/libva/distinfo Thu Oct 2 16:35:26 2014 (r369838) @@ -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: branches/2014Q4/multimedia/libva/files/patch-test__v4l_h264__encode__capture.cpp (from r369769, head/multimedia/libva/files/patch-test__v4l_h264__encode__capture.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/multimedia/libva/files/patch-test__v4l_h264__encode__capture.cpp Thu Oct 2 16:35:26 2014 (r369838, copy of r369769, 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: branches/2014Q4/multimedia/libva/files/patch-va__glx__va_glx_private.h (from r369769, head/multimedia/libva/files/patch-va__glx__va_glx_private.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/multimedia/libva/files/patch-va__glx__va_glx_private.h Thu Oct 2 16:35:26 2014 (r369838, copy of r369769, 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: branches/2014Q4/multimedia/libva/files/patch-va__va.c (from r369769, head/multimedia/libva/files/patch-va__va.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/multimedia/libva/files/patch-va__va.c Thu Oct 2 16:35:26 2014 (r369838, copy of r369769, head/multimedia/libva/files/patch-va__va.c) @@ -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); Modified: branches/2014Q4/multimedia/libva/pkg-plist ============================================================================== --- branches/2014Q4/multimedia/libva/pkg-plist Thu Oct 2 16:23:31 2014 (r369837) +++ branches/2014Q4/multimedia/libva/pkg-plist Thu Oct 2 16:35:26 2014 (r369838) @@ -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 -@dirrm include/va -@dirrmtry lib/va
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410021635.s92GZR6A072563>