[Midnightbsd-cvs] mports [24818] trunk/multimedia/libva: update libva
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Jan 26 12:44:26 EST 2019
Revision: 24818
http://svnweb.midnightbsd.org/mports/?rev=24818
Author: laffer1
Date: 2019-01-26 12:44:19 -0500 (Sat, 26 Jan 2019)
Log Message:
-----------
update libva
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-va_glx_va__glx__private.h
trunk/multimedia/libva/files/patch-va_va.c
trunk/multimedia/libva/files/patch-va_va__trace.c
trunk/multimedia/libva/files/patch-va_wayland_Makefile.am
Removed 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
Modified: trunk/multimedia/libva/Makefile
===================================================================
--- trunk/multimedia/libva/Makefile 2019-01-26 17:40:09 UTC (rev 24817)
+++ trunk/multimedia/libva/Makefile 2019-01-26 17:44:19 UTC (rev 24818)
@@ -1,9 +1,9 @@
# $MidnightBSD$
PORTNAME= libva
-PORTVERSION= 1.6.0
+PORTVERSION= 2.3.0
+PORTREVISION= 1
CATEGORIES= multimedia
-MASTER_SITES= http://cgit.freedesktop.org/${PORTNAME}/snapshot/
MAINTAINER= ports at MidnightBSD.org
COMMENT= VAAPI wrapper and dummy driver
@@ -11,48 +11,41 @@
LICENSE= mit
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
-LIB_DEPENDS= libdrm.so:${PORTSDIR}/graphics/libdrm
+BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
+RUN_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
+LIB_DEPENDS= libdrm.so:graphics/libdrm
USES= autoreconf gmake libtool pkgconfig tar:bzip2
-USE_XORG= glproto pciaccess xext xfixes
+USE_XORG= xorgproto pciaccess x11 xext xfixes
USE_GL= gl
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --program-prefix=va
USE_LDCONFIG= yes
+INSTALL_TARGET= install-strip
-LDFLAGS+= -L${LOCALBASE}/lib
+USE_GITHUB= yes
+GH_ACCOUNT= intel
+
+LDFLAGS+= -lpthread
# prevent types conflict: videodev2.h vs. drm.h
-CFLAGS+= -I${LOCALBASE}/include -DHAVE_LINUX_INTEGER_TYPES
+CFLAGS+= -DHAVE_LINUX_INTEGER_TYPES
-OPTIONS_DEFINE= DEBUG
+OPTIONS_DEFINE= DEBUG WAYLAND
+OPTIONS_DEFAULT=WAYLAND
+WAYLAND_DESC= Support wayland protocol
+OPTIONS_SUB= yes
-.include <bsd.mport.options.mk>
+DEBUG_CFLAGS= -D_DEBUG
+DEBUG_CFLAGS_OFF= -DNDEBUG
-.if ${PORT_OPTIONS:MDEBUG}
-CFLAGS+= -D_DEBUG
-.else
-CFLAGS+= -DNDEBUG
-.endif
+WAYLAND_CONFIGURE_ENABLE= wayland
+WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland
-.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|' \
+ ${REINPLACE_CMD} -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
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: trunk/multimedia/libva/distinfo
===================================================================
--- trunk/multimedia/libva/distinfo 2019-01-26 17:40:09 UTC (rev 24817)
+++ trunk/multimedia/libva/distinfo 2019-01-26 17:44:19 UTC (rev 24818)
@@ -1,2 +1,3 @@
-SHA256 (libva-1.6.0.tar.bz2) = 390f801f57cc84b8221e0227aa5f22ed78409beb15526ac71c75f1c8551e380e
-SIZE (libva-1.6.0.tar.bz2) = 614982
+TIMESTAMP = 1548524545
+SHA256 (libva-2.3.0_GH0.tar.bz2) = 8d95e65c4d84d0f82097581e163d3770694c600cbb040ebd827f2d375e004f4b
+SIZE (libva-2.3.0_GH0.tar.bz2) = 222152
Deleted: trunk/multimedia/libva/files/patch-test__v4l_h264__encode__capture.cpp
===================================================================
--- trunk/multimedia/libva/files/patch-test__v4l_h264__encode__capture.cpp 2019-01-26 17:40:09 UTC (rev 24817)
+++ trunk/multimedia/libva/files/patch-test__v4l_h264__encode__capture.cpp 2019-01-26 17:44:19 UTC (rev 24818)
@@ -1,38 +0,0 @@
---- 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);
- }
Deleted: trunk/multimedia/libva/files/patch-va__glx__va_glx_private.h
===================================================================
--- trunk/multimedia/libva/files/patch-va__glx__va_glx_private.h 2019-01-26 17:40:09 UTC (rev 24817)
+++ trunk/multimedia/libva/files/patch-va__glx__va_glx_private.h 2019-01-26 17:44:19 UTC (rev 24818)
@@ -1,11 +0,0 @@
---- 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 *);
Deleted: trunk/multimedia/libva/files/patch-va__va.c
===================================================================
--- trunk/multimedia/libva/files/patch-va__va.c 2019-01-26 17:40:09 UTC (rev 24817)
+++ trunk/multimedia/libva/files/patch-va__va.c 2019-01-26 17:44:19 UTC (rev 24818)
@@ -1,11 +0,0 @@
---- 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);
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 2019-01-26 17:44:19 UTC (rev 24818)
@@ -0,0 +1,11 @@
+--- va/glx/va_glx_private.h.orig 2017-10-21 04:49:28 UTC
++++ va/glx/va_glx_private.h
+@@ -38,7 +38,7 @@ typedef void (*PFNGLXBINDTEXIMAGEEXTPROC)(Display *, G
+ 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 2019-01-26 17:44:19 UTC (rev 24818)
@@ -0,0 +1,11 @@
+--- va/va.c.orig 2017-10-21 04:49:28 UTC
++++ va/va.c
+@@ -350,7 +350,7 @@ static VAStatus va_openDriver(VADisplay dpy, char *dri
+ strncat( driver_path, DRIVER_EXTENSION, strlen(DRIVER_EXTENSION) );
+
+ va_infoMessage(dpy, "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
Added: trunk/multimedia/libva/files/patch-va_va__trace.c
===================================================================
--- trunk/multimedia/libva/files/patch-va_va__trace.c (rev 0)
+++ trunk/multimedia/libva/files/patch-va_va__trace.c 2019-01-26 17:44:19 UTC (rev 24818)
@@ -0,0 +1,68 @@
+--- va/va_trace.c.orig 2018-02-12 06:32:11 UTC
++++ va/va_trace.c
+@@ -50,6 +50,9 @@
+ #include <sys/stat.h>
+ #include <sys/syscall.h>
+ #include <pthread.h>
++#ifdef __FreeBSD__
++#include <pthread_np.h>
++#endif
+ #include <unistd.h>
+ #include <time.h>
+ #include <errno.h>
+@@ -290,7 +293,13 @@ static void add_trace_config_info(
+ {
+ struct trace_config_info *pconfig_info;
+ int idx = 0;
++#ifdef __FreeBSD__
++ pid_t thd_id = pthread_getthreadid_np();
++#elif defined __DragonFly__
++ pid_t thd_id = syscall(SYS_lwp_gettid);
++#else
+ pid_t thd_id = syscall(__NR_gettid);
++#endif
+
+ LOCK_RESOURCE(pva_trace);
+
+@@ -668,7 +677,13 @@ static struct trace_log_file *start_tracing2log_file(
+ {
+ struct trace_log_files_manager *plog_files_mgr = NULL;
+ struct trace_log_file *plog_file = NULL;
++#ifdef __FreeBSD__
++ pid_t thd_id = pthread_getthreadid_np();
++#elif defined __DragonFly__
++ pid_t thd_id = syscall(SYS_lwp_gettid);
++#else
+ pid_t thd_id = syscall(__NR_gettid);
++#endif
+ int i = 0;
+
+ LOCK_RESOURCE(pva_trace);
+@@ -707,7 +722,13 @@ static void refresh_log_file(
+ struct trace_context *ptra_ctx)
+ {
+ struct trace_log_file *plog_file = NULL;
++#ifdef __FreeBSD__
++ pid_t thd_id = pthread_getthreadid_np();
++#elif defined __DragonFly__
++ pid_t thd_id = syscall(SYS_lwp_gettid);
++#else
+ pid_t thd_id = syscall(__NR_gettid);
++#endif
+ int i = 0;
+
+ plog_file = ptra_ctx->plog_file;
+@@ -1230,7 +1251,13 @@ static void internal_TraceUpdateContext (
+ {
+ struct trace_context *trace_ctx = NULL;
+ int i = 0, delete = 1;
++#ifdef __FreeBSD__
++ pid_t thd_id = pthread_getthreadid_np();
++#elif defined __DragonFly__
++ pid_t thd_id = syscall(SYS_lwp_gettid);
++#else
+ pid_t thd_id = syscall(__NR_gettid);
++#endif
+
+ if(tra_ctx_idx >= MAX_TRACE_CTX_NUM)
+ return;
Property changes on: trunk/multimedia/libva/files/patch-va_va__trace.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
Added: trunk/multimedia/libva/files/patch-va_wayland_Makefile.am
===================================================================
--- trunk/multimedia/libva/files/patch-va_wayland_Makefile.am (rev 0)
+++ trunk/multimedia/libva/files/patch-va_wayland_Makefile.am 2019-01-26 17:44:19 UTC (rev 24818)
@@ -0,0 +1,20 @@
+BSD sed doesn't support inlining argument for i command, so embed
+newlines via C-style quoting as proposed for POSIX[1].
+
+$ echo '/* comment */' | sed -e '1i#include "sysdeps.h"'
+sed: 1: "1i#include "sysdeps.h"
+": command i expects \ followed by text
+
+[1] http://austingroupbugs.net/view.php?id=249
+
+--- va/wayland/Makefile.am.orig 2018-10-01 23:31:25 UTC
++++ va/wayland/Makefile.am
+@@ -70,7 +70,7 @@ va_wayland_drm.c: $(protocol_source_h)
+ %-client-protocol-export.c : %.xml
+ $(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@
+ %-client-protocol.c: %-client-protocol-export.c
+- $(AM_V_GEN)$(SED) -e '1i#include "sysdeps.h"' \
++ $(AM_V_GEN)$(SED) -e $$'1i\\\n#include "sysdeps.h"\n' \
+ -e 's at WL_EXPORT@DLL_HIDDEN at g' < $< > $@
+
+ EXTRA_DIST = \
Property changes on: trunk/multimedia/libva/files/patch-va_wayland_Makefile.am
___________________________________________________________________
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 2019-01-26 17:40:09 UTC (rev 24817)
+++ trunk/multimedia/libva/pkg-descr 2019-01-26 17:44:19 UTC (rev 24818)
@@ -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: https://github.com/intel/libva
Modified: trunk/multimedia/libva/pkg-plist
===================================================================
--- trunk/multimedia/libva/pkg-plist 2019-01-26 17:40:09 UTC (rev 24817)
+++ trunk/multimedia/libva/pkg-plist 2019-01-26 17:44:19 UTC (rev 24818)
@@ -1,16 +1,8 @@
-bin/vaavcenc
-bin/vah264encode
-bin/vainfo
-bin/vajpegenc
-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
+%%WAYLAND%%include/va/va_backend_wayland.h
include/va/va_compat.h
include/va/va_dec_hevc.h
include/va/va_dec_jpeg.h
@@ -20,34 +12,40 @@
include/va/va_dricommon.h
include/va/va_drm.h
include/va/va_drmcommon.h
+include/va/va_egl.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_enc_vp9.h
+include/va/va_fei_h264.h
+include/va/va_fei_hevc.h
+include/va/va_fei.h
include/va/va_glx.h
+include/va/va_str.h
include/va/va_tpi.h
include/va/va_version.h
include/va/va_vpp.h
+%%WAYLAND%%include/va/va_wayland.h
include/va/va_x11.h
lib/libva-drm.so
-lib/libva-drm.so.1
-lib/libva-drm.so.1.3800.0
+lib/libva-drm.so.2
+lib/libva-drm.so.2.300.0
lib/libva-glx.so
-lib/libva-glx.so.1
-lib/libva-glx.so.1.3800.0
-lib/libva-tpi.so
-lib/libva-tpi.so.1
-lib/libva-tpi.so.1.3800.0
+lib/libva-glx.so.2
+lib/libva-glx.so.2.300.0
+%%WAYLAND%%lib/libva-wayland.so
+%%WAYLAND%%lib/libva-wayland.so.2
+%%WAYLAND%%lib/libva-wayland.so.2.300.0
lib/libva-x11.so
-lib/libva-x11.so.1
-lib/libva-x11.so.1.3800.0
+lib/libva-x11.so.2
+lib/libva-x11.so.2.300.0
lib/libva.so
-lib/libva.so.1
-lib/libva.so.1.3800.0
-lib/va/dummy_drv_video.so
+lib/libva.so.2
+lib/libva.so.2.300.0
libdata/pkgconfig/libva-drm.pc
libdata/pkgconfig/libva-glx.pc
-libdata/pkgconfig/libva-tpi.pc
+%%WAYLAND%%libdata/pkgconfig/libva-wayland.pc
libdata/pkgconfig/libva-x11.pc
libdata/pkgconfig/libva.pc
More information about the Midnightbsd-cvs
mailing list