From 62a774daf1a94d1c5c2d2aa7dd5dbfe18dd47efb Mon Sep 17 00:00:00 2001 From: Guido Falsi Date: Sat, 14 Jul 2018 06:37:14 +0000 Subject: [PATCH] - Update libva to 2.2.0 - Update libva-intel-driver 2.2.0 - Add Missing dependency - Update libva-utils to 2.2.0 - Add missing dependencies - Add WAYLAND option - Cleanup some testing comments which slipped in by mistake --- multimedia/libva-intel-driver/Makefile | 5 +++-- multimedia/libva-intel-driver/distinfo | 6 +++--- multimedia/libva-utils/Makefile | 27 +++++++++----------------- multimedia/libva-utils/distinfo | 6 +++--- multimedia/libva-utils/pkg-plist | 1 + multimedia/libva/Makefile | 2 +- multimedia/libva/distinfo | 6 +++--- multimedia/libva/pkg-plist | 10 +++++----- 8 files changed, 28 insertions(+), 35 deletions(-) diff --git a/multimedia/libva-intel-driver/Makefile b/multimedia/libva-intel-driver/Makefile index e6c727fc63ed..e0350ba0ae76 100644 --- a/multimedia/libva-intel-driver/Makefile +++ b/multimedia/libva-intel-driver/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libva-intel-driver -PORTVERSION= 2.1.0 +PORTVERSION= 2.2.0 CATEGORIES= multimedia MAINTAINER= madpilot@FreeBSD.org @@ -11,7 +11,8 @@ COMMENT= VAAPI intel driver LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libva.so:multimedia/libva +LIB_DEPENDS= libva.so:multimedia/libva \ + libdrm.so:graphics/libdrm BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat GNU_CONFIGURE= yes diff --git a/multimedia/libva-intel-driver/distinfo b/multimedia/libva-intel-driver/distinfo index 401e87f3e37b..dbd6e1e24fa6 100644 --- a/multimedia/libva-intel-driver/distinfo +++ b/multimedia/libva-intel-driver/distinfo @@ -1,3 +1,3 @@ -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 +TIMESTAMP = 1531506010 +SHA256 (01org-intel-vaapi-driver-2.2.0_GH0.tar.gz) = 13eb518bd168106a64d8e1c0f0a72e9b9937e6fd9a4c713a10f51e52508ea9b2 +SIZE (01org-intel-vaapi-driver-2.2.0_GH0.tar.gz) = 3966600 diff --git a/multimedia/libva-utils/Makefile b/multimedia/libva-utils/Makefile index 345506599798..49aaf619154c 100644 --- a/multimedia/libva-utils/Makefile +++ b/multimedia/libva-utils/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= libva-utils -PORTVERSION= 2.1.0 +PORTVERSION= 2.2.0 CATEGORIES= multimedia MAINTAINER= madpilot@FreeBSD.org @@ -10,34 +10,25 @@ COMMENT= Collection of tests and utilities for VAAPI LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libva.so:multimedia/libva +LIB_DEPENDS= libva.so:multimedia/libva \ + libdrm.so:graphics/libdrm USES= autoreconf gmake libtool pkgconfig tar:bzip2 -#USE_XORG= glproto pciaccess xext xfixes -#USE_GL= gl +USE_XORG= x11 xext xfixes 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 +OPTIONS_DEFINE= DEBUG WAYLAND +WAYLAND_DESC= Support wayland protocol +OPTIONS_SUB= yes 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 +WAYLAND_CONFIGURE_ENABLE= wayland +WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland .include diff --git a/multimedia/libva-utils/distinfo b/multimedia/libva-utils/distinfo index 9f3d04536969..78314a525a8e 100644 --- a/multimedia/libva-utils/distinfo +++ b/multimedia/libva-utils/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1518439230 -SHA256 (01org-libva-utils-2.1.0_GH0.tar.gz) = 1000a6a2e27d23b92b7489330ab2017e5bca3e9db6872cb0bb868d8465553aa3 -SIZE (01org-libva-utils-2.1.0_GH0.tar.gz) = 1034951 +TIMESTAMP = 1531505935 +SHA256 (01org-libva-utils-2.2.0_GH0.tar.gz) = 1c45452090456f2b972d51960b1294215615b0dd925aa36b90eceac77777f3e3 +SIZE (01org-libva-utils-2.2.0_GH0.tar.gz) = 1037165 diff --git a/multimedia/libva-utils/pkg-plist b/multimedia/libva-utils/pkg-plist index 2383fa1fc50d..dc7e34461f8b 100644 --- a/multimedia/libva-utils/pkg-plist +++ b/multimedia/libva-utils/pkg-plist @@ -5,6 +5,7 @@ bin/loadjpeg bin/mpeg2vaenc bin/mpeg2vldemo bin/putsurface +%%WAYLAND%%bin/putsurface_wayland bin/vainfo bin/vavpp bin/vp9enc diff --git a/multimedia/libva/Makefile b/multimedia/libva/Makefile index b04af0ca0e0a..14dc5da47f1f 100644 --- a/multimedia/libva/Makefile +++ b/multimedia/libva/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= libva -PORTVERSION= 2.1.0 +PORTVERSION= 2.2.0 CATEGORIES= multimedia MAINTAINER= madpilot@FreeBSD.org diff --git a/multimedia/libva/distinfo b/multimedia/libva/distinfo index e8e9828db4df..de53fc9d69f8 100644 --- a/multimedia/libva/distinfo +++ b/multimedia/libva/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1518439088 -SHA256 (01org-libva-2.1.0_GH0.tar.gz) = c8e7b1095b0f9e74d94df327f350ec2cc051e381f3023c9732ab9b8b0e9ab151 -SIZE (01org-libva-2.1.0_GH0.tar.gz) = 214894 +TIMESTAMP = 1531505858 +SHA256 (01org-libva-2.2.0_GH0.tar.gz) = 327181061056b49f8f9b5c5ee08fdd9832df06f4282451b218d1d0bde26a99b7 +SIZE (01org-libva-2.2.0_GH0.tar.gz) = 218971 diff --git a/multimedia/libva/pkg-plist b/multimedia/libva/pkg-plist index cbc563b91407..a3bd2ae1f2fc 100644 --- a/multimedia/libva/pkg-plist +++ b/multimedia/libva/pkg-plist @@ -31,19 +31,19 @@ include/va/va_vpp.h include/va/va_x11.h lib/libva-drm.so lib/libva-drm.so.2 -lib/libva-drm.so.2.100.0 +lib/libva-drm.so.2.200.0 lib/libva-glx.so lib/libva-glx.so.2 -lib/libva-glx.so.2.100.0 +lib/libva-glx.so.2.200.0 %%WAYLAND%%lib/libva-wayland.so %%WAYLAND%%lib/libva-wayland.so.2 -%%WAYLAND%%lib/libva-wayland.so.2.100.0 +%%WAYLAND%%lib/libva-wayland.so.2.200.0 lib/libva-x11.so lib/libva-x11.so.2 -lib/libva-x11.so.2.100.0 +lib/libva-x11.so.2.200.0 lib/libva.so lib/libva.so.2 -lib/libva.so.2.100.0 +lib/libva.so.2.200.0 libdata/pkgconfig/libva-drm.pc libdata/pkgconfig/libva-glx.pc %%WAYLAND%%libdata/pkgconfig/libva-wayland.pc