Attachment #210248 for bug #242903





PORTNAME=	libva-utils
PORTVERSION=	2.6.0
PORTREVISION=	1
CATEGORIES=	multimedia

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-drm.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

USES=		meson pkgconfig
USE_GITHUB=	yes
GH_ACCOUNT=	intel

OPTIONS_DEFINE=	WAYLAND X11
OPTIONS_DEFAULT=WAYLAND X11
WAYLAND_DESC=	Support wayland protocol
OPTIONS_SUB=	yes

WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland
WAYLAND_MESON_TRUE=	wayland

WAYLAND_CONFIGURE_ENABLE=	wayland
WAYLAND_LIB_DEPENDS=		libwayland-client.so:graphics/wayland

X11_USES=		xorg
X11_USE=		XORG=x11,xext,xfixes
X11_MESON_TRUE=		x11

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/multimedia/libva-utils/distinfo (+8 lines)
1	TIMESTAMP = 1575987973	1	TIMESTAMP = 1575987973
2	SHA256 (intel-libva-utils-2.6.0_GH0.tar.gz) = 6ce7a534539c9ae554ace0bfa6689d871145cc172bb3f66ceb3fe2f65466fd90	2	SHA256 (intel-libva-utils-2.6.0_GH0.tar.gz) = 6ce7a534539c9ae554ace0bfa6689d871145cc172bb3f66ceb3fe2f65466fd90
3	SIZE (intel-libva-utils-2.6.0_GH0.tar.gz) = 1196875	3	SIZE (intel-libva-utils-2.6.0_GH0.tar.gz) = 1196875
		4	SHA256 (4aeb5254a191.patch) = 33bc96eb476fa09bcbecb1f32f5a7cb4a28eba7777e6398646df057cba5d9934
		5	SIZE (4aeb5254a191.patch) = 3180
		6	SHA256 (520ea5582c9a.patch) = 8f23240c64257a368662bb6b12e767aa98cb370760907c9c97bed3d66b90df2e
		7	SIZE (520ea5582c9a.patch) = 1196
		8	SHA256 (24a87768547a.patch) = 088280b5ecd2fe279cc422493899c1ffda9056f6065ec2a67a165a0f234b9d57
		9	SIZE (24a87768547a.patch) = 5169
		10	SHA256 (fde08663af79.patch) = 64f517ec7501d5d31b12405e6241103eb3bd7acca86fed2882b554f13795c875
		11	SIZE (fde08663af79.patch) = 780




--- vendor/intel/sfcsample/VDecAccelVA.cpp.orig	2019-02-01 23:11:33 UTC
+++ vendor/intel/sfcsample/VDecAccelVA.cpp
@@ -32,7 +32,9 @@
 #include <fcntl.h>
 #include <sys/mman.h>
 #include <sys/ioctl.h>
+#ifdef __linux__
 #include <linux/fb.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <iostream>

Return to bug 242903

Lines 2-39 Link Here

(-)b/multimedia/libva-utils/Makefile (-18 / +16 lines)
2		2
3	PORTNAME= libva-utils	3	PORTNAME= libva-utils
4	PORTVERSION= 2.6.0	4	PORTVERSION= 2.6.0
		5	PORTREVISION= 1
5	CATEGORIES= multimedia	6	CATEGORIES= multimedia
6		7
7	MAINTAINER= madpilot@FreeBSD.org	8	PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
		9	PATCHFILES+= 4aeb5254a191.patch:-p1 # https://github.com/intel/libva-utils/pull/183
		10	PATCHFILES+= 520ea5582c9a.patch:-p1 # https://github.com/intel/libva-utils/pull/184
		11	PATCHFILES+= 24a87768547a.patch:-p1 # https://github.com/intel/libva-utils/pull/184
		12	PATCHFILES+= fde08663af79.patch:-p1 # https://github.com/intel/libva-utils/pull/184
		13
		14	MAINTAINER= jbeich@FreeBSD.org
8	COMMENT= Collection of tests and utilities for VAAPI	15	COMMENT= Collection of tests and utilities for VAAPI
9		16
10	LICENSE= MIT	17	LICENSE= MIT
11	LICENSE_FILE= ${WRKSRC}/COPYING	18	LICENSE_FILE= ${WRKSRC}/COPYING
12		19
13	LIB_DEPENDS= libva.so:multimedia/libva \	20	LIB_DEPENDS= libva-drm.so:multimedia/libva
14	libdrm.so:graphics/libdrm
15
16	USES= autoreconf compiler:c++11-lang gmake libtool pkgconfig tar:bzip2
17
18	GNU_CONFIGURE= yes
19	INSTALL_TARGET= install-strip
20		21
		22	USES= meson pkgconfig
21	USE_GITHUB= yes	23	USE_GITHUB= yes
22	GH_ACCOUNT= intel	24	GH_ACCOUNT= intel
23		25
24	OPTIONS_DEFINE= DEBUG WAYLAND X11	26	OPTIONS_DEFINE= WAYLAND X11
25	OPTIONS_DEFAULT=WAYLAND X11	27	OPTIONS_DEFAULT=WAYLAND X11
26	WAYLAND_DESC= Support wayland protocol
27	OPTIONS_SUB= yes	28	OPTIONS_SUB= yes
28		29
29	DEBUG_CFLAGS= -D_DEBUG	30	WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland
30	DEBUG_CFLAGS_OFF= -DNDEBUG	31	WAYLAND_MESON_TRUE= wayland
31
32	WAYLAND_CONFIGURE_ENABLE= wayland
33	WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland
34		32
35	X11_CONFIGURE_ENABLE= x11	33	X11_USES= xorg
36	X11_USES= xorg	34	X11_USE= XORG=x11,xext,xfixes
37	X11_USE= XORG=x11,xext,xfixes	35	X11_MESON_TRUE= x11
38		36
39	.include <bsd.port.mk>	37	.include <bsd.port.mk>

Removed Link Here

(-)a/multimedia/libva-utils/files/patch-vendor_intel_sfcsample_VDecAccelVA.cpp (-12 lines)
1	--- vendor/intel/sfcsample/VDecAccelVA.cpp.orig 2019-02-01 23:11:33 UTC
2	+++ vendor/intel/sfcsample/VDecAccelVA.cpp
3	@@ -32,7 +32,9 @@
4	#include <fcntl.h>
5	#include <sys/mman.h>
6	#include <sys/ioctl.h>
7	+#ifdef __linux__
8	#include <linux/fb.h>
9	+#endif
10	#include <stdio.h>
11	#include <stdlib.h>
12	#include <iostream>