Attachment #203822 for bug #237411

View | Details | Raw Unified | Return to bug 237411
Collapse All | Expand All




BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:devel/libpthread-stubs
LIB_DEPENDS=	libpciaccess.so:devel/libpciaccess

USES=		meson pkgconfig tar:bzip2
GNU_CONFIGURE=	yes
USE_LDCONFIG=	yes
INSTALL_TARGET=	install-strip

OPTIONS_DEFINE=	MANPAGES TESTS
OPTIONS_SUB=	yes

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_MESON_TRUE=	install-test-programs

# avoid circular dependency in case cairo supports OpenGL (cairo->mesa-libs->libdrm->cairo)
CONFIGURE_ARGS+=	-Dcairo-tests=false

.include <bsd.port.options.mk>


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>




- 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"))));''',

Return to bug 237411

Lines 15-24 LICENSE= MIT Link Here

(-)b/graphics/libdrm/Makefile (-11 / +4 lines)
15	BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:devel/libpthread-stubs	15	BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:devel/libpthread-stubs
16	LIB_DEPENDS= libpciaccess.so:devel/libpciaccess	16	LIB_DEPENDS= libpciaccess.so:devel/libpciaccess
17		17
18	USES= libtool pkgconfig tar:bzip2	18	USES= meson pkgconfig tar:bzip2
19	GNU_CONFIGURE= yes
20	USE_LDCONFIG= yes	19	USE_LDCONFIG= yes
21	INSTALL_TARGET= install-strip
22		20
23	OPTIONS_DEFINE= MANPAGES TESTS	21	OPTIONS_DEFINE= MANPAGES TESTS
24	OPTIONS_SUB= yes	22	OPTIONS_SUB= yes
Lines 29-42 TESTS_DESC= Install test programs (which are always built) Link Here
29	OPTIONS_DEFAULT+= MANPAGES	27	OPTIONS_DEFAULT+= MANPAGES
30	.endif	28	.endif
31		29
32	MANPAGES_CONFIGURE_ENABLE= manpages
33	MANPAGES_BUILD_DEPENDS= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl	30	MANPAGES_BUILD_DEPENDS= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl
34	MANPAGES_USE= GNOME=libxslt:build	31	MANPAGES_USE= GNOME=libxslt:build
		32	MANPAGES_MESON_TRUE= man-pages
35		33
36	TESTS_CONFIGURE_ENABLE= install-test-programs	34	TESTS_MESON_TRUE= install-test-programs
37		35
38	# avoid circular dependency in case cairo supports OpenGL (cairo->mesa-libs->libdrm->cairo)	36	# avoid circular dependency in case cairo supports OpenGL (cairo->mesa-libs->libdrm->cairo)
39	CONFIGURE_ARGS+= --disable-cairo-tests	37	CONFIGURE_ARGS+= -Dcairo-tests=false
40		38
41	.include <bsd.port.options.mk>	39	.include <bsd.port.options.mk>
42		40
Lines 68-76 PLIST_SUB+= RADEON_DRIVERS="@comment " Link Here
68	EXTRA_PATCHES+= ${FILESDIR}/extra-xf86drm.c	66	EXTRA_PATCHES+= ${FILESDIR}/extra-xf86drm.c
69	.endif	67	.endif
70		68
71	pre-patch:
72	@${REINPLACE_CMD} 's\|{libdir}/pkgconfig\|{prefix}/libdata/pkgconfig\|g; \
73	s,i?86\|x86_64),i?86\|amd64\|x86_64),g' \
74	${WRKSRC}/configure
75
76	.include <bsd.port.mk>	69	.include <bsd.port.mk>

Added Link Here

(-)b/graphics/libdrm/files/patch-meson.build (+23 lines)
1	- sys/sysctl.h isn't self-sufficient
2	- tests don't use Bash features
3
4	--- meson.build.orig 2019-04-19 15:52:29 UTC
5	+++ meson.build
6	@@ -181,7 +181,7 @@ endif
7	dep_m = cc.find_library('m', required : false)
8	foreach header : ['sys/sysctl.h', 'sys/select.h', 'alloca.h']
9	config.set('HAVE_' + header.underscorify().to_upper(),
10	- cc.compiles('#include <@0@>'.format(header), name : '@0@ works'.format(header)))
11	+ cc.compiles('#include <sys/types.h>\n#include <@0@>'.format(header), name : '@0@ works'.format(header)))
12	endforeach
13	if cc.has_header_symbol('sys/sysmacros.h', 'major')
14	config.set10('MAJOR_IN_SYSMACROS', true)
15	@@ -249,7 +249,7 @@ endif
16	with_man_pages = with_man_pages != 'false' and prog_xslt.found() and prog_sed.found()
17
18	# Used for tets
19	-prog_bash = find_program('bash')
20	+prog_bash = find_program('sh')
21
22	config.set10('HAVE_VISIBILITY',
23	cc.compiles('''int foo_hidden(void) __attribute__((visibility(("hidden"))));''',