Attachment 201103 Details for Bug 234925 – v0

[patch] v0

libva-nox11.diff (text/plain), 3.43 KB, created by Jan Beich on 2019-01-13 18:38:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2019-01-13 18:38:50 UTC

Size: 3.43 KB

patch

obsolete

>From 5b4cfa4b81bfb218fee1f3a30fdf0c3f3f0d82e8 Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Sun, 13 Jan 2019 18:18:34 +0000
>Subject: [PATCH] multimedia/libva: allow disabling X11 support
>
>---
> multimedia/libva/Makefile  | 12 +++++++-----
> multimedia/libva/pkg-plist | 26 +++++++++++++-------------
> 2 files changed, 20 insertions(+), 18 deletions(-)
>
>diff --git a/multimedia/libva/Makefile b/multimedia/libva/Makefile
>index d65570470895..554ed0560692 100644
>--- a/multimedia/libva/Makefile
>+++ b/multimedia/libva/Makefile
>@@ -19,8 +19,6 @@ RUN_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
> LIB_DEPENDS=	libdrm.so:graphics/libdrm
> 
> USES=		autoreconf gmake libtool localbase pkgconfig tar:bzip2
>-USE_XORG=	xorgproto pciaccess x11 xext xfixes
>-USE_GL=		gl
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--program-prefix=va
> USE_LDCONFIG=	yes
>@@ -33,9 +31,8 @@ LDFLAGS+=	-lpthread
> # prevent types conflict: videodev2.h vs. drm.h
> CFLAGS+=	-DHAVE_LINUX_INTEGER_TYPES
> 
>-OPTIONS_DEFINE=	DEBUG WAYLAND
>-OPTIONS_DEFAULT=WAYLAND
>-WAYLAND_DESC=	Support wayland protocol
>+OPTIONS_DEFINE=	DEBUG WAYLAND X11
>+OPTIONS_DEFAULT=WAYLAND X11
> OPTIONS_SUB=	yes
> 
> DEBUG_CFLAGS=		-D_DEBUG
>@@ -44,8 +41,13 @@ DEBUG_CFLAGS_OFF=	-DNDEBUG
> WAYLAND_CONFIGURE_ENABLE=	wayland
> WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland
> 
>+X11_CONFIGURE_ENABLE=	x11 glx
>+X11_USES=		gl
>+X11_USE=		GL=gl XORG=x11,xorgproto,xext,xfixes
>+
> post-patch:	.SILENT
> 	${REINPLACE_CMD} -e 's|$${libdir}/$pkgconfig$|${PREFIX}/libdata/\1|' \
>+		-e 's/"$$USE_X11:$$enable_glx" != "yes:no"/"$$USE_X11" != "no"/' \
> 		${WRKSRC}/configure.ac
> 	${REINPLACE_CMD} '/^export VA_HEADER_/d' \
> 		${WRKSRC}/doc/Makefile.am
>diff --git a/multimedia/libva/pkg-plist b/multimedia/libva/pkg-plist
>index 794d53abeaff..905aa58539d2 100644
>--- a/multimedia/libva/pkg-plist
>+++ b/multimedia/libva/pkg-plist
>@@ -1,6 +1,6 @@
> include/va/va.h
> include/va/va_backend.h
>-include/va/va_backend_glx.h
>+%%X11%%include/va/va_backend_glx.h
> include/va/va_backend_vpp.h
> %%WAYLAND%%include/va/va_backend_wayland.h
> include/va/va_compat.h
>@@ -8,8 +8,8 @@ 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
>+%%X11%%include/va/va_dri2.h
>+%%X11%%include/va/va_dricommon.h
> include/va/va_drm.h
> include/va/va_drmcommon.h
> include/va/va_egl.h
>@@ -22,30 +22,30 @@ include/va/va_enc_vp9.h
> include/va/va_fei_h264.h
> include/va/va_fei_hevc.h
> include/va/va_fei.h
>-include/va/va_glx.h
>+%%X11%%include/va/va_glx.h
> include/va/va_str.h
> include/va/va_tpi.h
> include/va/va_version.h
> include/va/va_vpp.h
> %%WAYLAND%%include/va/va_wayland.h
>-include/va/va_x11.h
>+%%X11%%include/va/va_x11.h
> lib/libva-drm.so
> lib/libva-drm.so.2
> lib/libva-drm.so.2.300.0
>-lib/libva-glx.so
>-lib/libva-glx.so.2
>-lib/libva-glx.so.2.300.0
>+%%X11%%lib/libva-glx.so
>+%%X11%%lib/libva-glx.so.2
>+%%X11%%lib/libva-glx.so.2.300.0
> %%WAYLAND%%lib/libva-wayland.so
> %%WAYLAND%%lib/libva-wayland.so.2
> %%WAYLAND%%lib/libva-wayland.so.2.300.0
>-lib/libva-x11.so
>-lib/libva-x11.so.2
>-lib/libva-x11.so.2.300.0
>+%%X11%%lib/libva-x11.so
>+%%X11%%lib/libva-x11.so.2
>+%%X11%%lib/libva-x11.so.2.300.0
> lib/libva.so
> lib/libva.so.2
> lib/libva.so.2.300.0
> libdata/pkgconfig/libva-drm.pc
>-libdata/pkgconfig/libva-glx.pc
>+%%X11%%libdata/pkgconfig/libva-glx.pc
> %%WAYLAND%%libdata/pkgconfig/libva-wayland.pc
>-libdata/pkgconfig/libva-x11.pc
>+%%X11%%libdata/pkgconfig/libva-x11.pc
> libdata/pkgconfig/libva.pc

Flags:

jbeich: maintainer-approval? (madpilot)

Actions: View | Diff

Attachments on bug 234925: 201103