Index: head/multimedia/libva/Makefile =================================================================== --- head/multimedia/libva/Makefile (revision 461667) +++ head/multimedia/libva/Makefile (revision 461668) @@ -1,55 +1,54 @@ # $FreeBSD$ PORTNAME= libva -PORTVERSION= 2.0.0 -PORTREVISION= 1 +PORTVERSION= 2.1.0 CATEGORIES= multimedia MAINTAINER= madpilot@FreeBSD.org COMMENT= VAAPI wrapper and dummy driver LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING 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 localbase pkgconfig tar:bzip2 USE_XORG= glproto pciaccess x11 xext xfixes USE_GL= gl GNU_CONFIGURE= yes CONFIGURE_ARGS= --program-prefix=va USE_LDCONFIG= yes INSTALL_TARGET= install-strip USE_GITHUB= yes GH_ACCOUNT= 01org LDFLAGS+= -lpthread # prevent types conflict: videodev2.h vs. drm.h CFLAGS+= -DHAVE_LINUX_INTEGER_TYPES OPTIONS_DEFINE= DEBUG WAYLAND WAYLAND_DESC= Support wayland protocol OPTIONS_SUB= yes DEBUG_CFLAGS= -D_DEBUG DEBUG_CFLAGS_OFF= -DNDEBUG WAYLAND_CONFIGURE_ENABLE= wayland WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland WAYLAND_BUILD_DEPENDS= gsed:textproc/gsed post-patch: .SILENT ${REINPLACE_CMD} -e 's|$${libdir}/\(pkgconfig\)|${PREFIX}/libdata/\1|' \ ${WRKSRC}/configure.ac ${REINPLACE_CMD} '/^export VA_HEADER_/d' \ ${WRKSRC}/doc/Makefile.am ${REINPLACE_CMD} 's/-ldl//' ${WRKSRC}/va/Makefile.am post-configure-WAYLAND-on: .SILENT ${REINPLACE_CMD} -e 's|\(SED = \).*|\1${LOCALBASE}/bin/gsed|' \ ${WRKSRC}/va/wayland/Makefile .include Index: head/multimedia/libva/distinfo =================================================================== --- head/multimedia/libva/distinfo (revision 461667) +++ head/multimedia/libva/distinfo (revision 461668) @@ -1,3 +1,3 @@ -TIMESTAMP = 1508575075 -SHA256 (01org-libva-2.0.0_GH0.tar.gz) = dce5e21ffe6083a230814493e806f9e622d11570d633d48ca2f6bd103f6afe3e -SIZE (01org-libva-2.0.0_GH0.tar.gz) = 191311 +TIMESTAMP = 1518439088 +SHA256 (01org-libva-2.1.0_GH0.tar.gz) = c8e7b1095b0f9e74d94df327f350ec2cc051e381f3023c9732ab9b8b0e9ab151 +SIZE (01org-libva-2.1.0_GH0.tar.gz) = 214894 Index: head/multimedia/libva/files/patch-va_va__trace.c =================================================================== --- head/multimedia/libva/files/patch-va_va__trace.c (revision 461667) +++ head/multimedia/libva/files/patch-va_va__trace.c (revision 461668) @@ -1,82 +1,68 @@ ---- va/va_trace.c.orig 2017-10-21 04:49:28 UTC +--- va/va_trace.c.orig 2018-02-12 06:32:11 UTC +++ va/va_trace.c @@ -50,6 +50,9 @@ #include #include #include +#ifdef __FreeBSD__ +#include +#endif #include #include #include -@@ -291,7 +294,13 @@ static void add_trace_config_info( +@@ -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); -@@ -315,7 +324,13 @@ static void delete_trace_config_info( +@@ -668,7 +677,13 @@ static struct trace_log_file *start_tracing2log_file( { - 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); - -@@ -662,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); -@@ -701,7 +722,13 @@ static void refresh_log_file( +@@ -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; -@@ -1224,7 +1251,13 @@ static void internal_TraceUpdateContext ( +@@ -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; Index: head/multimedia/libva/pkg-plist =================================================================== --- head/multimedia/libva/pkg-plist (revision 461667) +++ head/multimedia/libva/pkg-plist (revision 461668) @@ -1,50 +1,51 @@ include/va/va.h include/va/va_backend.h include/va/va_backend_glx.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 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_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.2 -lib/libva-drm.so.2.0.0 +lib/libva-drm.so.2.100.0 lib/libva-glx.so lib/libva-glx.so.2 -lib/libva-glx.so.2.0.0 +lib/libva-glx.so.2.100.0 %%WAYLAND%%lib/libva-wayland.so %%WAYLAND%%lib/libva-wayland.so.2 -%%WAYLAND%%lib/libva-wayland.so.2.0.0 +%%WAYLAND%%lib/libva-wayland.so.2.100.0 lib/libva-x11.so lib/libva-x11.so.2 -lib/libva-x11.so.2.0.0 +lib/libva-x11.so.2.100.0 lib/libva.so lib/libva.so.2 -lib/libva.so.2.0.0 +lib/libva.so.2.100.0 libdata/pkgconfig/libva-drm.pc libdata/pkgconfig/libva-glx.pc %%WAYLAND%%libdata/pkgconfig/libva-wayland.pc libdata/pkgconfig/libva-x11.pc libdata/pkgconfig/libva.pc Index: head/multimedia/libva-intel-driver/Makefile =================================================================== --- head/multimedia/libva-intel-driver/Makefile (revision 461667) +++ head/multimedia/libva-intel-driver/Makefile (revision 461668) @@ -1,42 +1,41 @@ # Created by: Manuel Creach # $FreeBSD$ PORTNAME= libva-intel-driver -PORTVERSION= 2.0.0 -PORTREVISION= 1 +PORTVERSION= 2.1.0 CATEGORIES= multimedia MAINTAINER= madpilot@FreeBSD.org COMMENT= VAAPI intel driver LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libva.so:multimedia/libva BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat GNU_CONFIGURE= yes USES= alias autoreconf compiler:c11 gmake libtool localbase \ pkgconfig tar:bzip2 USE_GL= gl USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= 01org GH_PROJECT= intel-vaapi-driver PLIST_FILES= lib/dri/i915_drv_video.so lib/dri/i965_drv_video.so ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS_REASON= Driver for hardware present only on intel i386 and amd64 CPUs post-patch: .SILENT ${REINPLACE_CMD} -e 's/-ldl//' \ ${WRKSRC}/src/Makefile.am ${REINPLACE_CMD} -e 's|driverdir|& --define-variable prefix=${PREFIX}|' \ ${WRKSRC}/configure.ac post-install: ${LN} -sf i965_drv_video.so ${STAGEDIR}${PREFIX}/lib/dri/i915_drv_video.so .include Index: head/multimedia/libva-intel-driver/distinfo =================================================================== --- head/multimedia/libva-intel-driver/distinfo (revision 461667) +++ head/multimedia/libva-intel-driver/distinfo (revision 461668) @@ -1,3 +1,3 @@ -TIMESTAMP = 1508576498 -SHA256 (01org-intel-vaapi-driver-2.0.0_GH0.tar.gz) = 19acdace87fb0e167202cecd593028ccf0b90900f48319c3241403abde9fda12 -SIZE (01org-intel-vaapi-driver-2.0.0_GH0.tar.gz) = 2831508 +TIMESTAMP = 1518439257 +SHA256 (01org-intel-vaapi-driver-2.1.0_GH0.tar.gz) = 8958113f645c6ec9a3a8f7ca80b4c308027ee2b8334531c66d1b69f002346fc6 +SIZE (01org-intel-vaapi-driver-2.1.0_GH0.tar.gz) = 3954965 Index: head/multimedia/libva-utils/Makefile =================================================================== --- head/multimedia/libva-utils/Makefile (revision 461667) +++ head/multimedia/libva-utils/Makefile (revision 461668) @@ -1,43 +1,43 @@ # $FreeBSD$ PORTNAME= libva-utils -PORTVERSION= 2.0.0 +PORTVERSION= 2.1.0 CATEGORIES= multimedia MAINTAINER= madpilot@FreeBSD.org COMMENT= Collection of tests and utilities for VAAPI LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libva.so:multimedia/libva USES= autoreconf gmake libtool pkgconfig tar:bzip2 #USE_XORG= glproto pciaccess xext xfixes #USE_GL= gl GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USE_GITHUB= yes GH_ACCOUNT= 01org #LDFLAGS+= -lpthread # prevent types conflict: videodev2.h vs. drm.h #CFLAGS+= -DHAVE_LINUX_INTEGER_TYPES OPTIONS_DEFINE= DEBUG DEBUG_CFLAGS= -D_DEBUG DEBUG_CFLAGS_OFF= -DNDEBUG #post-patch: .SILENT # ${REINPLACE_CMD} -e 's|\($$libdir\)/dri|\1/va|' \ # -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 Index: head/multimedia/libva-utils/distinfo =================================================================== --- head/multimedia/libva-utils/distinfo (revision 461667) +++ head/multimedia/libva-utils/distinfo (revision 461668) @@ -1,3 +1,3 @@ -TIMESTAMP = 1508576446 -SHA256 (01org-libva-utils-2.0.0_GH0.tar.gz) = 9488ebbcd44decace43696c5e00b37c858ca6376dcccbaf0f255e77d6fefd858 -SIZE (01org-libva-utils-2.0.0_GH0.tar.gz) = 1033292 +TIMESTAMP = 1518439230 +SHA256 (01org-libva-utils-2.1.0_GH0.tar.gz) = 1000a6a2e27d23b92b7489330ab2017e5bca3e9db6872cb0bb868d8465553aa3 +SIZE (01org-libva-utils-2.1.0_GH0.tar.gz) = 1034951