diff --git a/multimedia/Makefile b/multimedia/Makefile index c642fe192bea..f1a83247522b 100644 --- a/multimedia/Makefile +++ b/multimedia/Makefile @@ -210,6 +210,7 @@ SUBDIR += libv4l SUBDIR += libva SUBDIR += libva-intel-driver + SUBDIR += libva-utils SUBDIR += libva-vdpau-driver SUBDIR += libvdpau SUBDIR += libvpx diff --git a/multimedia/libva-intel-driver/Makefile b/multimedia/libva-intel-driver/Makefile index 1d72bb49377e..ea924fb1ea90 100644 --- a/multimedia/libva-intel-driver/Makefile +++ b/multimedia/libva-intel-driver/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= libva-intel-driver -PORTVERSION= 1.7.3 -PORTREVISION= 2 +PORTVERSION= 1.8.0 CATEGORIES= multimedia MAINTAINER= madpilot@FreeBSD.org diff --git a/multimedia/libva-intel-driver/distinfo b/multimedia/libva-intel-driver/distinfo index 90d133fcf85a..bd253b75d739 100644 --- a/multimedia/libva-intel-driver/distinfo +++ b/multimedia/libva-intel-driver/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1487846424 -SHA256 (01org-intel-vaapi-driver-1.7.3_GH0.tar.gz) = c1f02cbdf0398f096ddc91096fac6ee62267a54955f6d235d73a8ff2ea888118 -SIZE (01org-intel-vaapi-driver-1.7.3_GH0.tar.gz) = 1648659 +TIMESTAMP = 1491034980 +SHA256 (01org-intel-vaapi-driver-1.8.0_GH0.tar.gz) = 45a38641f3ddbd43d9c053bfd9cb809ecb2d5f5227f0e3c1c5a8d51dccf81b35 +SIZE (01org-intel-vaapi-driver-1.8.0_GH0.tar.gz) = 2308240 diff --git a/multimedia/libva-intel-driver/files/patch-src-i965_decoder_utils.c b/multimedia/libva-intel-driver/files/patch-src-i965_decoder_utils.c deleted file mode 100644 index ae328b331aaf..000000000000 --- a/multimedia/libva-intel-driver/files/patch-src-i965_decoder_utils.c +++ /dev/null @@ -1,14 +0,0 @@ ---- src/i965_decoder_utils.c.orig 2014-12-24 00:59:48 UTC -+++ src/i965_decoder_utils.c -@@ -23,7 +23,11 @@ - - #include "sysdeps.h" - #include -+#ifdef __FreeBSD__ -+#include -+#else - #include -+#endif - - #include "intel_batchbuffer.h" - #include "intel_media.h" diff --git a/multimedia/libva-intel-driver/pkg-descr b/multimedia/libva-intel-driver/pkg-descr index 4f327bc5372f..cd213d8e5b76 100644 --- a/multimedia/libva-intel-driver/pkg-descr +++ b/multimedia/libva-intel-driver/pkg-descr @@ -1,4 +1,4 @@ Libva driver for intel graphics cards with hardware accelerated features for video encode/decode. -WWW: http://cgit.freedesktop.org/vaapi/intel-driver +WWW: https://github.com/01org/intel-vaapi-driver diff --git a/multimedia/libva-utils/Makefile b/multimedia/libva-utils/Makefile new file mode 100644 index 000000000000..40bdf4043bf5 --- /dev/null +++ b/multimedia/libva-utils/Makefile @@ -0,0 +1,53 @@ +# $FreeBSD$ + +PORTNAME= libva-utils +PORTVERSION= 1.8.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 + +USE_GITHUB= yes +GH_ACCOUNT= 01org + +#LDFLAGS+= -lpthread +# prevent types conflict: videodev2.h vs. drm.h +#CFLAGS+= -DHAVE_LINUX_INTEGER_TYPES + +OPTIONS_DEFINE= DEBUG + +.include + +.if ${PORT_OPTIONS:MDEBUG} +CFLAGS+= -D_DEBUG +.else +CFLAGS+= -DNDEBUG +.endif + +.include + +.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 diff --git a/multimedia/libva-utils/distinfo b/multimedia/libva-utils/distinfo new file mode 100644 index 000000000000..95aa4b5b6bf4 --- /dev/null +++ b/multimedia/libva-utils/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1491052388 +SHA256 (01org-libva-utils-1.8.0_GH0.tar.gz) = 2a7590c8428d0b453b004702c4c515669403cea27f9f17b2560b38da337ec943 +SIZE (01org-libva-utils-1.8.0_GH0.tar.gz) = 1011595 diff --git a/multimedia/libva-utils/pkg-descr b/multimedia/libva-utils/pkg-descr new file mode 100644 index 000000000000..7e18f24afe83 --- /dev/null +++ b/multimedia/libva-utils/pkg-descr @@ -0,0 +1,4 @@ +libva-utils is a collection of utilities and examples to exercise +VA-API in accordance with the libva project. + +WWW: https://github.com/01org/libva-utils diff --git a/multimedia/libva-utils/pkg-plist b/multimedia/libva-utils/pkg-plist new file mode 100644 index 000000000000..a2e913dc937a --- /dev/null +++ b/multimedia/libva-utils/pkg-plist @@ -0,0 +1,8 @@ +bin/avcenc +bin/h264encode +bin/vainfo +bin/jpegenc +bin/loadjpeg +bin/mpeg2vaenc +bin/mpeg2vldemo +bin/putsurface diff --git a/multimedia/libva/Makefile b/multimedia/libva/Makefile index 8e4e63b896ef..305d62c3d0a2 100644 --- a/multimedia/libva/Makefile +++ b/multimedia/libva/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= libva -PORTVERSION= 1.7.3 +PORTVERSION= 1.8.0 CATEGORIES= multimedia MAINTAINER= madpilot@FreeBSD.org @@ -22,7 +22,6 @@ USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= 01org -GH_TAGNAME= ${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} LDFLAGS+= -lpthread # prevent types conflict: videodev2.h vs. drm.h @@ -48,8 +47,6 @@ 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 diff --git a/multimedia/libva/distinfo b/multimedia/libva/distinfo index 313ae8dd3328..a2b7e179f9b3 100644 --- a/multimedia/libva/distinfo +++ b/multimedia/libva/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1487845684 -SHA256 (01org-libva-1.7.3-libva-1.7.3_GH0.tar.gz) = f0f816a725007fbf3c7ed816ff71ba420696bec63ff49045e9b23d9b34ac73c8 -SIZE (01org-libva-1.7.3-libva-1.7.3_GH0.tar.gz) = 898775 +TIMESTAMP = 1491034642 +SHA256 (01org-libva-1.8.0_GH0.tar.gz) = 924ed467d50a24018428448071a311d6467e0d40dc94731e2164f9d5d61bac51 +SIZE (01org-libva-1.8.0_GH0.tar.gz) = 195261 diff --git a/multimedia/libva/files/patch-test__v4l_h264__encode__capture.cpp b/multimedia/libva/files/patch-test__v4l_h264__encode__capture.cpp deleted file mode 100644 index c2c6c6c62d27..000000000000 --- a/multimedia/libva/files/patch-test__v4l_h264__encode__capture.cpp +++ /dev/null @@ -1,38 +0,0 @@ ---- test/v4l_h264/encode/capture.cpp.orig 2016-06-21 01:29:25 UTC -+++ test/v4l_h264/encode/capture.cpp -@@ -30,6 +30,7 @@ - */ - - #include /* EXIT_FAILURE, EXIT_SUCCESS */ -+#include /* printf */ - #include - #include /* strerror() */ - #include -@@ -37,7 +38,11 @@ - #include /* low-level i/o */ - #include - #include -+#if defined __FreeBSD__ || defined __DragonFly__ -+#include -+#else - #include -+#endif - #include - #include - #include -@@ -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; -+#if defined __FreeBSD__ || defined __DragonFly__ -+ 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); - } diff --git a/multimedia/libva/pkg-descr b/multimedia/libva/pkg-descr index 8af205db570a..1377e3d5e27b 100644 --- a/multimedia/libva/pkg-descr +++ b/multimedia/libva/pkg-descr @@ -3,4 +3,4 @@ hardware accelerated video decode/encode at various entry-points (VLD, 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/01org/libva diff --git a/multimedia/libva/pkg-plist b/multimedia/libva/pkg-plist index 0811d92f8e65..9c52012b3f98 100644 --- a/multimedia/libva/pkg-plist +++ b/multimedia/libva/pkg-plist @@ -1,11 +1,3 @@ -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 @@ -33,19 +25,19 @@ include/va/va_vpp.h include/va/va_x11.h lib/libva-drm.so lib/libva-drm.so.1 -lib/libva-drm.so.1.3904.0 +lib/libva-drm.so.1.4000.0 lib/libva-glx.so lib/libva-glx.so.1 -lib/libva-glx.so.1.3904.0 +lib/libva-glx.so.1.4000.0 lib/libva-tpi.so lib/libva-tpi.so.1 -lib/libva-tpi.so.1.3904.0 +lib/libva-tpi.so.1.4000.0 lib/libva-x11.so lib/libva-x11.so.1 -lib/libva-x11.so.1.3904.0 +lib/libva-x11.so.1.4000.0 lib/libva.so lib/libva.so.1 -lib/libva.so.1.3904.0 +lib/libva.so.1.4000.0 lib/va/dummy_drv_video.so libdata/pkgconfig/libva-drm.pc libdata/pkgconfig/libva-glx.pc