Attachment 198369 Details for Bug 232448 – v1

[patch] v1

wayland.expose.libepoll-shim.diff (text/plain), 2.91 KB, created by Jan Beich on 2018-10-19 15:30:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2018-10-19 15:30:01 UTC

Size: 2.91 KB

patch

obsolete

>From 7525dfd4f6353704613953b1adb732fd27739321 Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Fri, 19 Oct 2018 14:57:25 +0000
>Subject: [PATCH] graphics/wayland: expose libepoll-shim dependency for
> pkg-config
>
>PR:		232448
>Approved by:	x11 (NOT YET) or maintainer timeout (?? weeks)
>---
> devel/libepoll-shim/Makefile               |  6 ++++++
> devel/libepoll-shim/files/epoll-shim.pc.in | 11 +++++++++++
> devel/libepoll-shim/pkg-plist              |  1 +
> graphics/wayland/Makefile                  |  6 ++++++
> 4 files changed, 24 insertions(+)
> create mode 100644 devel/libepoll-shim/files/epoll-shim.pc.in
>
>diff --git a/devel/libepoll-shim/Makefile b/devel/libepoll-shim/Makefile
>index 20ef0d4a39e6..06dede470b91 100644
>--- a/devel/libepoll-shim/Makefile
>+++ b/devel/libepoll-shim/Makefile
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	libepoll-shim
> PORTVERSION=	0.0.20161220
>+PORTREVISION=	1
> CATEGORIES=	devel
> 
> MAINTAINER=	x11@FreeBSD.org
>@@ -20,6 +21,7 @@ USE_LDCONFIG=	yes
> USES=		compiler uidfix
> MAKE_ARGS=	INCSDIR=${PREFIX}/include/libepoll-shim/sys \
> 		LIBDIR=${PREFIX}/lib WITHOUT_PROFILE=yes
>+SUB_FILES=	${PORTNAME:S/^lib//}.pc
> 
> .include <bsd.port.pre.mk>
> 
>@@ -32,4 +34,8 @@ post-patch:
> pre-install:
> 	@${MKDIR} ${STAGEDIR}/${PREFIX}/include/libepoll-shim/sys
> 
>+post-install:
>+	${INSTALL_DATA} ${SUB_FILES:M*.pc:S,^,${WRKDIR}/,} \
>+		${STAGEDIR}${PREFIX}/libdata/pkgconfig/
>+
> .include <bsd.port.post.mk>
>diff --git a/devel/libepoll-shim/files/epoll-shim.pc.in b/devel/libepoll-shim/files/epoll-shim.pc.in
>new file mode 100644
>index 000000000000..955abff9f83d
>--- /dev/null
>+++ b/devel/libepoll-shim/files/epoll-shim.pc.in
>@@ -0,0 +1,11 @@
>+prefix=%%PREFIX%%
>+exec_prefix=${prefix}
>+libdir=${exec_prefix}/lib
>+includedir=${prefix}/include
>+
>+Name: epoll-shim
>+URL: https://github.com/jiixyj/epoll-shim
>+Description: epoll shim implemented using kevent
>+Version: %%PORTVERSION%%
>+Libs: -L${libdir} -lepoll-shim
>+Cflags: -I${includedir}/libepoll-shim
>diff --git a/devel/libepoll-shim/pkg-plist b/devel/libepoll-shim/pkg-plist
>index 286712623c63..13394d677185 100644
>--- a/devel/libepoll-shim/pkg-plist
>+++ b/devel/libepoll-shim/pkg-plist
>@@ -4,3 +4,4 @@ include/libepoll-shim/sys/timerfd.h
> lib/libepoll-shim.a
> lib/libepoll-shim.so
> lib/libepoll-shim.so.0
>+libdata/pkgconfig/epoll-shim.pc
>diff --git a/graphics/wayland/Makefile b/graphics/wayland/Makefile
>index febf21ea3db9..71b78535cb44 100644
>--- a/graphics/wayland/Makefile
>+++ b/graphics/wayland/Makefile
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	wayland
> PORTVERSION=	1.16.0
>+PORTREVISION=	1
> CATEGORIES=	graphics wayland
> MASTER_SITES=	https://wayland.freedesktop.org/releases/
> 
>@@ -28,4 +29,9 @@ CONFIGURE_ARGS=	--disable-documentation
> CONFIGURE_ENV=	ac_cv_func_posix_fallocate=no # EINVAL for many FS on 12.0
> INSTALL_TARGET=	install-strip
> 
>+post-patch:
>+.for _type in client server
>+	@${ECHO_CMD} 'Requires.private: epoll-shim' >>${WRKSRC}/src/wayland-${_type}.pc.in
>+.endfor
>+
> .include <bsd.port.mk>

Actions: View | Diff

Attachments on bug 232448: 198369