From 1f21c99f65e33c05a62d220b25d7542b6ec4a409 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Fri, 27 Dec 2019 04:06:19 +0000 Subject: [PATCH] multimedia/libva-utils: minor refactor - Convert to USES=meson like r490613 - Drop unused USES=tar:bz2 like r490614 - Drop unused DEBUG like r490615 - Drop unused dependencies - Take maintainership PR: 242903 Approved by: madpilot (maintainer) --- multimedia/libva-utils/Makefile | 34 +++++++++---------- multimedia/libva-utils/distinfo | 8 +++++ ...tch-vendor_intel_sfcsample_VDecAccelVA.cpp | 12 ------- 3 files changed, 24 insertions(+), 30 deletions(-) delete mode 100644 multimedia/libva-utils/files/patch-vendor_intel_sfcsample_VDecAccelVA.cpp diff --git a/multimedia/libva-utils/Makefile b/multimedia/libva-utils/Makefile index 5b5311a31e3f..d6b93b9e27b7 100644 --- a/multimedia/libva-utils/Makefile +++ b/multimedia/libva-utils/Makefile @@ -2,38 +2,36 @@ PORTNAME= libva-utils PORTVERSION= 2.6.0 +PORTREVISION= 1 CATEGORIES= multimedia -MAINTAINER= madpilot@FreeBSD.org +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= 4aeb5254a191.patch:-p1 # https://github.com/intel/libva-utils/pull/183 +PATCHFILES+= 520ea5582c9a.patch:-p1 # https://github.com/intel/libva-utils/pull/184 +PATCHFILES+= 24a87768547a.patch:-p1 # https://github.com/intel/libva-utils/pull/184 +PATCHFILES+= fde08663af79.patch:-p1 # https://github.com/intel/libva-utils/pull/184 + +MAINTAINER= jbeich@FreeBSD.org COMMENT= Collection of tests and utilities for VAAPI LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libva.so:multimedia/libva \ - libdrm.so:graphics/libdrm - -USES= autoreconf compiler:c++11-lang gmake libtool pkgconfig tar:bzip2 - -GNU_CONFIGURE= yes -INSTALL_TARGET= install-strip +LIB_DEPENDS= libva-drm.so:multimedia/libva +USES= meson pkgconfig USE_GITHUB= yes GH_ACCOUNT= intel -OPTIONS_DEFINE= DEBUG WAYLAND X11 +OPTIONS_DEFINE= WAYLAND X11 OPTIONS_DEFAULT=WAYLAND X11 -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_LIB_DEPENDS= libwayland-client.so:graphics/wayland +WAYLAND_MESON_TRUE= wayland -X11_CONFIGURE_ENABLE= x11 -X11_USES= xorg -X11_USE= XORG=x11,xext,xfixes +X11_USES= xorg +X11_USE= XORG=x11,xext,xfixes +X11_MESON_TRUE= x11 .include diff --git a/multimedia/libva-utils/distinfo b/multimedia/libva-utils/distinfo index 47d55046649a..32ea2e945e21 100644 --- a/multimedia/libva-utils/distinfo +++ b/multimedia/libva-utils/distinfo @@ -1,3 +1,11 @@ TIMESTAMP = 1575987973 SHA256 (intel-libva-utils-2.6.0_GH0.tar.gz) = 6ce7a534539c9ae554ace0bfa6689d871145cc172bb3f66ceb3fe2f65466fd90 SIZE (intel-libva-utils-2.6.0_GH0.tar.gz) = 1196875 +SHA256 (4aeb5254a191.patch) = 33bc96eb476fa09bcbecb1f32f5a7cb4a28eba7777e6398646df057cba5d9934 +SIZE (4aeb5254a191.patch) = 3180 +SHA256 (520ea5582c9a.patch) = 8f23240c64257a368662bb6b12e767aa98cb370760907c9c97bed3d66b90df2e +SIZE (520ea5582c9a.patch) = 1196 +SHA256 (24a87768547a.patch) = 088280b5ecd2fe279cc422493899c1ffda9056f6065ec2a67a165a0f234b9d57 +SIZE (24a87768547a.patch) = 5169 +SHA256 (fde08663af79.patch) = 64f517ec7501d5d31b12405e6241103eb3bd7acca86fed2882b554f13795c875 +SIZE (fde08663af79.patch) = 780 diff --git a/multimedia/libva-utils/files/patch-vendor_intel_sfcsample_VDecAccelVA.cpp b/multimedia/libva-utils/files/patch-vendor_intel_sfcsample_VDecAccelVA.cpp deleted file mode 100644 index dbac3f8a502f..000000000000 --- a/multimedia/libva-utils/files/patch-vendor_intel_sfcsample_VDecAccelVA.cpp +++ /dev/null @@ -1,12 +0,0 @@ ---- vendor/intel/sfcsample/VDecAccelVA.cpp.orig 2019-02-01 23:11:33 UTC -+++ vendor/intel/sfcsample/VDecAccelVA.cpp -@@ -32,7 +32,9 @@ - #include - #include - #include -+#ifdef __linux__ - #include -+#endif - #include - #include - #include