[Midnightbsd-cvs] mports [20800] trunk/multimedia/libva/pkg-plist: libva 1.6.0
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Thu Nov 12 22:05:26 EST 2015
Revision: 20800
http://svnweb.midnightbsd.org/mports/?rev=20800
Author: laffer1
Date: 2015-11-12 22:05:26 -0500 (Thu, 12 Nov 2015)
Log Message:
-----------
libva 1.6.0
Modified Paths:
--------------
trunk/multimedia/libva/Makefile
trunk/multimedia/libva/distinfo
trunk/multimedia/libva/pkg-descr
trunk/multimedia/libva/pkg-plist
Added Paths:
-----------
trunk/multimedia/libva/files/patch-test__v4l_h264__encode__capture.cpp
trunk/multimedia/libva/files/patch-va__glx__va_glx_private.h
trunk/multimedia/libva/files/patch-va__va.c
Removed Paths:
-------------
trunk/multimedia/libva/files/extra-patch-va-va_trace.c
trunk/multimedia/libva/files/patch-test-v4l_h264-encode-capture.cpp
trunk/multimedia/libva/files/patch-va-glx-va_glx_private.h
trunk/multimedia/libva/files/patch-va-va.c
Property Changed:
----------------
trunk/multimedia/libva/pkg-descr
Modified: trunk/multimedia/libva/Makefile
===================================================================
--- trunk/multimedia/libva/Makefile 2015-11-13 03:00:33 UTC (rev 20799)
+++ trunk/multimedia/libva/Makefile 2015-11-13 03:05:26 UTC (rev 20800)
@@ -1,7 +1,7 @@
# $MidnightBSD$
PORTNAME= libva
-PORTVERSION= 1.2.1
+PORTVERSION= 1.6.0
CATEGORIES= multimedia
MASTER_SITES= http://cgit.freedesktop.org/${PORTNAME}/snapshot/
@@ -9,23 +9,21 @@
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= tar:bzip2
-USE_XORG= glproto pciaccess xext xfixes
+USES= alias autoreconf gmake libtool pkgconfig tar:bzip2
+USE_XORG= glproto pciaccess xext xfixes
USE_GL= gl
-USE_AUTOTOOLS= aclocal autoheader automake autoconf libtoolize
-ACLOCAL_ARGS= -I.
-AUTOMAKE_ARGS= --add-missing
+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
+CFLAGS+= -I${LOCALBASE}/include -DHAVE_LINUX_INTEGER_TYPES
OPTIONS_DEFINE= DEBUG
@@ -39,11 +37,6 @@
.include <bsd.port.pre.mk>
-# add strnlen(3) from head/lib/libc/string/strnlen.c
-.if ${OSVERSION} < 4000
-EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-va-va_trace.c
-.endif
-
.if ${ARCH} == "sparc64"
BROKEN= glXCreateContext fails during configure
.endif
@@ -54,10 +47,7 @@
post-patch: .SILENT
${REINPLACE_CMD} -e 's|\($$libdir\)/dri|\1/va|' \
- -e 's|$${libdir}/\(pkgconfig\)|$${prefix}/libdata/\1|' \
- -e 's/\(LIBVA_LT_CURRENT\)=libva_lt_current/\1=1/' \
- -e 's/\(LIBVA_LT_REV\)=libva_lt_revision/\1=3301/' \
- -e 's/\(LIBVA_LT_AGE\)=libva_lt_age/\1=0/' \
+ -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
@@ -65,13 +55,4 @@
${WRKSRC}/doc/Makefile.am
${REINPLACE_CMD} 's/-ldl//' ${WRKSRC}/va/Makefile.am
-# XXX: work around an issue with automake-1.13 erroring out on a
-# non-existent m4 directory before libtoolize creates it
-pre-configure::
- @${MKDIR} ${WRKSRC}/m4
-
-post-configure: .SILENT
- ${REINPLACE_CMD} 's/-lpthread/${PTHREAD_LIBS}/' \
- ${WRKSRC}/test/putsurface/Makefile
-
.include <bsd.port.post.mk>
Modified: trunk/multimedia/libva/distinfo
===================================================================
--- trunk/multimedia/libva/distinfo 2015-11-13 03:00:33 UTC (rev 20799)
+++ trunk/multimedia/libva/distinfo 2015-11-13 03:05:26 UTC (rev 20800)
@@ -1,2 +1,2 @@
-SHA256 (libva-1.2.1.tar.bz2) = 0e2109fee2bd89952d99b9fa9d7d0ec2d8ceb6c6354144a8dec1bc9c765ab760
-SIZE (libva-1.2.1.tar.bz2) = 581091
+SHA256 (libva-1.6.0.tar.bz2) = 390f801f57cc84b8221e0227aa5f22ed78409beb15526ac71c75f1c8551e380e
+SIZE (libva-1.6.0.tar.bz2) = 614982
Deleted: trunk/multimedia/libva/files/extra-patch-va-va_trace.c
===================================================================
--- trunk/multimedia/libva/files/extra-patch-va-va_trace.c 2015-11-13 03:00:33 UTC (rev 20799)
+++ trunk/multimedia/libva/files/extra-patch-va-va_trace.c 2015-11-13 03:05:26 UTC (rev 20800)
@@ -1,21 +0,0 @@
---- va/va_trace.c.orig 2012-10-04 15:30:51.000000000 +0200
-+++ va/va_trace.c 2012-10-09 23:12:35.888197737 +0200
-@@ -137,6 +137,18 @@
- VASurfaceID surface
- );
-
-+static size_t
-+strnlen(const char *s, size_t maxlen)
-+{
-+ size_t len;
-+
-+ for (len = 0; len < maxlen; len++, s++) {
-+ if (!*s)
-+ break;
-+ }
-+ return (len);
-+}
-+
- #define FILE_NAME_SUFFIX(env_value) \
- do { \
- int tmp = strnlen(env_value, sizeof(env_value)); \
Deleted: trunk/multimedia/libva/files/patch-test-v4l_h264-encode-capture.cpp
===================================================================
--- trunk/multimedia/libva/files/patch-test-v4l_h264-encode-capture.cpp 2015-11-13 03:00:33 UTC (rev 20799)
+++ trunk/multimedia/libva/files/patch-test-v4l_h264-encode-capture.cpp 2015-11-13 03:05:26 UTC (rev 20800)
@@ -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);
- }
Added: trunk/multimedia/libva/files/patch-test__v4l_h264__encode__capture.cpp
===================================================================
--- trunk/multimedia/libva/files/patch-test__v4l_h264__encode__capture.cpp (rev 0)
+++ trunk/multimedia/libva/files/patch-test__v4l_h264__encode__capture.cpp 2015-11-13 03:05:26 UTC (rev 20800)
@@ -0,0 +1,38 @@
+--- test/v4l_h264/encode/capture.cpp.orig 2015-07-01 07:54:24 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>
++#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 @@ static void init_userp (unsigned int buf
+ }
+ 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: trunk/multimedia/libva/files/patch-test__v4l_h264__encode__capture.cpp
___________________________________________________________________
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
Deleted: trunk/multimedia/libva/files/patch-va-glx-va_glx_private.h
===================================================================
--- trunk/multimedia/libva/files/patch-va-glx-va_glx_private.h 2015-11-13 03:00:33 UTC (rev 20799)
+++ trunk/multimedia/libva/files/patch-va-glx-va_glx_private.h 2015-11-13 03:05:26 UTC (rev 20800)
@@ -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 *);
Deleted: trunk/multimedia/libva/files/patch-va-va.c
===================================================================
--- trunk/multimedia/libva/files/patch-va-va.c 2015-11-13 03:00:33 UTC (rev 20799)
+++ trunk/multimedia/libva/files/patch-va-va.c 2015-11-13 03:05:26 UTC (rev 20800)
@@ -1,11 +0,0 @@
---- va/va.c~
-+++ va/va.c
-@@ -199,7 +199,7 @@ static VAStatus va_openDriver(VADisplay
- 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);
Added: trunk/multimedia/libva/files/patch-va__glx__va_glx_private.h
===================================================================
--- trunk/multimedia/libva/files/patch-va__glx__va_glx_private.h (rev 0)
+++ trunk/multimedia/libva/files/patch-va__glx__va_glx_private.h 2015-11-13 03:05:26 UTC (rev 20800)
@@ -0,0 +1,11 @@
+--- va/glx/va_glx_private.h.orig 2015-07-01 07:54:24 UTC
++++ 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: trunk/multimedia/libva/files/patch-va__glx__va_glx_private.h
___________________________________________________________________
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
Added: trunk/multimedia/libva/files/patch-va__va.c
===================================================================
--- trunk/multimedia/libva/files/patch-va__va.c (rev 0)
+++ trunk/multimedia/libva/files/patch-va__va.c 2015-11-13 03:05:26 UTC (rev 20800)
@@ -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: trunk/multimedia/libva/files/patch-va__va.c
___________________________________________________________________
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
Modified: trunk/multimedia/libva/pkg-descr
===================================================================
--- trunk/multimedia/libva/pkg-descr 2015-11-13 03:00:33 UTC (rev 20799)
+++ trunk/multimedia/libva/pkg-descr 2015-11-13 03:05:26 UTC (rev 20800)
@@ -3,4 +3,4 @@
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: http://freedesktop.org/wiki/Software/vaapi
Property changes on: trunk/multimedia/libva/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/multimedia/libva/pkg-plist
===================================================================
--- trunk/multimedia/libva/pkg-plist 2015-11-13 03:00:33 UTC (rev 20799)
+++ trunk/multimedia/libva/pkg-plist 2015-11-13 03:05:26 UTC (rev 20800)
@@ -1,6 +1,7 @@
bin/vaavcenc
bin/vah264encode
bin/vainfo
+bin/vajpegenc
bin/valoadjpeg
bin/vampeg2vaenc
bin/vampeg2vldemo
@@ -11,34 +12,39 @@
include/va/va_backend_tpi.h
include/va/va_backend_vpp.h
include/va/va_compat.h
+include/va/va_dec_hevc.h
include/va/va_dec_jpeg.h
+include/va/va_dec_vp8.h
+include/va/va_dec_vp9.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_hevc.h
+include/va/va_enc_jpeg.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.la
lib/libva-drm.so
lib/libva-drm.so.1
-lib/libva-glx.la
+lib/libva-drm.so.1.3800.0
lib/libva-glx.so
lib/libva-glx.so.1
-lib/libva-tpi.la
+lib/libva-glx.so.1.3800.0
lib/libva-tpi.so
lib/libva-tpi.so.1
-lib/libva-x11.la
+lib/libva-tpi.so.1.3800.0
lib/libva-x11.so
lib/libva-x11.so.1
-lib/libva.la
+lib/libva-x11.so.1.3800.0
lib/libva.so
lib/libva.so.1
-lib/va/dummy_drv_video.la
+lib/libva.so.1.3800.0
lib/va/dummy_drv_video.so
libdata/pkgconfig/libva-drm.pc
libdata/pkgconfig/libva-glx.pc
@@ -45,5 +51,3 @@
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 Midnightbsd-cvs
mailing list