Index: head/multimedia/libva/Makefile =================================================================== --- head/multimedia/libva/Makefile (revision 417392) +++ head/multimedia/libva/Makefile (revision 417393) @@ -1,58 +1,58 @@ # $FreeBSD$ PORTNAME= libva -PORTVERSION= 1.7.0 +PORTVERSION= 1.7.1 CATEGORIES= multimedia MASTER_SITES= http://cgit.freedesktop.org/${PORTNAME}/snapshot/ 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 LIB_DEPENDS= libdrm.so:graphics/libdrm -USES= alias autoreconf gmake libtool pkgconfig tar:bzip2 +USES= alias autoreconf gmake libtool localbase pkgconfig tar:bzip2 USE_XORG= glproto pciaccess xext xfixes USE_GL= gl GNU_CONFIGURE= yes CONFIGURE_ARGS= --program-prefix=va USE_LDCONFIG= yes -LDFLAGS+= -L${LOCALBASE}/lib +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 .include .if ${PORT_OPTIONS:MDEBUG} CFLAGS+= -D_DEBUG .else CFLAGS+= -DNDEBUG .endif .include .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|' \ ${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/distinfo =================================================================== --- head/multimedia/libva/distinfo (revision 417392) +++ head/multimedia/libva/distinfo (revision 417393) @@ -1,2 +1,3 @@ -SHA256 (libva-1.7.0.tar.bz2) = 0931ba1fcb74680e98340ab9be18f88282247c8e6cb7bc4b53f1fe4e68c64e98 -SIZE (libva-1.7.0.tar.bz2) = 617808 +TIMESTAMP = 1466696062 +SHA256 (libva-1.7.1.tar.bz2) = d85f9c97b6002c63dd8e935b26cfd33d8bf8ef292a389cfa92f1340dc291c33f +SIZE (libva-1.7.1.tar.bz2) = 625584 Index: head/multimedia/libva/files/patch-va_va__trace.c =================================================================== --- head/multimedia/libva/files/patch-va_va__trace.c (nonexistent) +++ head/multimedia/libva/files/patch-va_va__trace.c (revision 417393) @@ -0,0 +1,72 @@ +--- va/va_trace.c.orig 2016-06-21 01:29:25 UTC ++++ va/va_trace.c +@@ -48,6 +48,9 @@ + #include + #include + #include ++#ifdef __FreeBSD__ ++#include ++#endif + #include + #include + #include +@@ -294,7 +297,11 @@ static void add_trace_config_info( + { + struct trace_config_info *pconfig_info; + int idx = 0; ++#ifdef __FreeBSD__ ++ pid_t thd_id = pthread_getthreadid_np(); ++#else + pid_t thd_id = syscall(__NR_gettid); ++#endif + + LOCK_RESOURCE(pva_trace); + +@@ -318,7 +325,11 @@ static void delete_trace_config_info( + { + struct trace_config_info *pconfig_info; + int idx = 0; ++#ifdef __FreeBSD__ ++ pid_t thd_id = pthread_getthreadid_np(); ++#else + pid_t thd_id = syscall(__NR_gettid); ++#endif + + LOCK_RESOURCE(pva_trace); + +@@ -663,7 +674,11 @@ static struct trace_log_file *start_trac + { + 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(); ++#else + pid_t thd_id = syscall(__NR_gettid); ++#endif + int i = 0; + + LOCK_RESOURCE(pva_trace); +@@ -702,7 +717,11 @@ 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(); ++#else + pid_t thd_id = syscall(__NR_gettid); ++#endif + int i = 0; + + plog_file = ptra_ctx->plog_file; +@@ -1226,7 +1245,11 @@ static void internal_TraceUpdateContext + { + struct trace_context *trace_ctx = NULL; + int i = 0, delete = 1; ++#ifdef __FreeBSD__ ++ pid_t thd_id = pthread_getthreadid_np(); ++#else + pid_t thd_id = syscall(__NR_gettid); ++#endif + + if(tra_ctx_idx >= MAX_TRACE_CTX_NUM) + return; Property changes on: head/multimedia/libva/files/patch-va_va__trace.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property 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 Index: head/multimedia/libva/pkg-plist =================================================================== --- head/multimedia/libva/pkg-plist (revision 417392) +++ head/multimedia/libva/pkg-plist (revision 417393) @@ -1,53 +1,54 @@ 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 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_enc_vp9.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.so lib/libva-drm.so.1 -lib/libva-drm.so.1.3900.0 +lib/libva-drm.so.1.3902.0 lib/libva-glx.so lib/libva-glx.so.1 -lib/libva-glx.so.1.3900.0 +lib/libva-glx.so.1.3902.0 lib/libva-tpi.so lib/libva-tpi.so.1 -lib/libva-tpi.so.1.3900.0 +lib/libva-tpi.so.1.3902.0 lib/libva-x11.so lib/libva-x11.so.1 -lib/libva-x11.so.1.3900.0 +lib/libva-x11.so.1.3902.0 lib/libva.so lib/libva.so.1 -lib/libva.so.1.3900.0 +lib/libva.so.1.3902.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