Attachment 203822 Details for Bug 237411 – v1

[patch] v1

libdrm.meson.diff (text/plain), 3.05 KB, created by Jan Beich on 2019-04-20 11:16:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2019-04-20 11:16:34 UTC

Size: 3.05 KB

patch

obsolete

>From 362a9a7fc6b596e8ff658a576bbe256fbf34dc06 Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Sat, 20 Apr 2019 10:50:10 +0000
>Subject: [PATCH] graphics/libdrm: convert to USES=meson
>
>PR:		237411
>Approved by:	x11 (???)
>---
> graphics/libdrm/Makefile                | 15 ++++-----------
> graphics/libdrm/files/patch-meson.build | 23 +++++++++++++++++++++++
> 2 files changed, 27 insertions(+), 11 deletions(-)
> create mode 100644 graphics/libdrm/files/patch-meson.build
>
>diff --git a/graphics/libdrm/Makefile b/graphics/libdrm/Makefile
>index 8b77252250ea..5ea0ff219482 100644
>--- a/graphics/libdrm/Makefile
>+++ b/graphics/libdrm/Makefile
>@@ -15,10 +15,8 @@ LICENSE=	MIT
> BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:devel/libpthread-stubs
> LIB_DEPENDS=	libpciaccess.so:devel/libpciaccess
> 
>-USES=		libtool pkgconfig tar:bzip2
>-GNU_CONFIGURE=	yes
>+USES=		meson pkgconfig tar:bzip2
> USE_LDCONFIG=	yes
>-INSTALL_TARGET=	install-strip
> 
> OPTIONS_DEFINE=	MANPAGES TESTS
> OPTIONS_SUB=	yes
>@@ -29,14 +27,14 @@ TESTS_DESC=	Install test programs (which are always built)
> OPTIONS_DEFAULT+=	MANPAGES
> .endif
> 
>-MANPAGES_CONFIGURE_ENABLE=	manpages
> MANPAGES_BUILD_DEPENDS=	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl
> MANPAGES_USE=		GNOME=libxslt:build
>+MANPAGES_MESON_TRUE=	man-pages
> 
>-TESTS_CONFIGURE_ENABLE=	install-test-programs
>+TESTS_MESON_TRUE=	install-test-programs
> 
> # avoid circular dependency in case cairo supports OpenGL (cairo->mesa-libs->libdrm->cairo)
>-CONFIGURE_ARGS+=	--disable-cairo-tests
>+CONFIGURE_ARGS+=	-Dcairo-tests=false
> 
> .include <bsd.port.options.mk>
> 
>@@ -68,9 +66,4 @@ PLIST_SUB+=	RADEON_DRIVERS="@comment "
> EXTRA_PATCHES+=	${FILESDIR}/extra-xf86drm.c
> .endif
> 
>-pre-patch:
>-	@${REINPLACE_CMD} 's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|g; \
>-			   s,i?86|x86_64),i?86|amd64|x86_64),g' \
>-		${WRKSRC}/configure
>-
> .include <bsd.port.mk>
>diff --git a/graphics/libdrm/files/patch-meson.build b/graphics/libdrm/files/patch-meson.build
>new file mode 100644
>index 000000000000..d0c96d73d18b
>--- /dev/null
>+++ b/graphics/libdrm/files/patch-meson.build
>@@ -0,0 +1,23 @@
>+- sys/sysctl.h isn't self-sufficient
>+- tests don't use Bash features
>+
>+--- meson.build.orig	2019-04-19 15:52:29 UTC
>++++ meson.build
>+@@ -181,7 +181,7 @@ endif
>+ dep_m = cc.find_library('m', required : false)
>+ foreach header : ['sys/sysctl.h', 'sys/select.h', 'alloca.h']
>+   config.set('HAVE_' + header.underscorify().to_upper(),
>+-    cc.compiles('#include <@0@>'.format(header), name : '@0@ works'.format(header)))
>++    cc.compiles('#include <sys/types.h>\n#include <@0@>'.format(header), name : '@0@ works'.format(header)))
>+ endforeach
>+ if cc.has_header_symbol('sys/sysmacros.h', 'major')
>+   config.set10('MAJOR_IN_SYSMACROS', true)
>+@@ -249,7 +249,7 @@ endif
>+ with_man_pages = with_man_pages != 'false' and prog_xslt.found() and prog_sed.found()
>+ 
>+ # Used for tets
>+-prog_bash = find_program('bash')
>++prog_bash = find_program('sh')
>+ 
>+ config.set10('HAVE_VISIBILITY',
>+   cc.compiles('''int foo_hidden(void) __attribute__((visibility(("hidden"))));''',

Actions: View | Diff

Attachments on bug 237411: 203822