Mon Jul 12 14:10:10 2021 UTC ()
alacritty: add link to tech-x11 thread


(tnn)
diff -r1.7 -r1.8 pkgsrc/x11/alacritty/Makefile
cvs diff -r1.7 -r1.8 pkgsrc/x11/alacritty/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/alacritty/Makefile 2021/06/20 10:09:35 1.7
+++ pkgsrc/x11/alacritty/Makefile 2021/07/12 14:10:10 1.8
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.7 2021/06/20 10:09:35 tnn Exp $ 1# $NetBSD: Makefile,v 1.8 2021/07/12 14:10:10 tnn Exp $
2 2
3DISTNAME= alacritty-0.8.0 3DISTNAME= alacritty-0.8.0
4PKGREVISION= 2 4PKGREVISION= 2
5CATEGORIES= x11 5CATEGORIES= x11
6MASTER_SITES= ${MASTER_SITE_GITHUB:=alacritty/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=alacritty/}
7GITHUB_TAG= v${PKGVERSION_NOREV} 7GITHUB_TAG= v${PKGVERSION_NOREV}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://github.com/alacritty/alacritty 10HOMEPAGE= https://github.com/alacritty/alacritty
11COMMENT= Cross-platform, GPU-accelerated terminal emulator 11COMMENT= Cross-platform, GPU-accelerated terminal emulator
12LICENSE= apache-2.0 12LICENSE= apache-2.0
13 13
14BUILD_DEPENDS+= cmake-[0-9]*:../../devel/cmake 14BUILD_DEPENDS+= cmake-[0-9]*:../../devel/cmake
@@ -19,26 +19,27 @@ BUILD_DEPENDS+= ${PYPKGPREFIX}-expat-[0 @@ -19,26 +19,27 @@ BUILD_DEPENDS+= ${PYPKGPREFIX}-expat-[0
19USE_LANGUAGES+= c c++ 19USE_LANGUAGES+= c c++
20USE_TOOLS+= gmake pkg-config # for fontconfig-sys 20USE_TOOLS+= gmake pkg-config # for fontconfig-sys
21 21
22MAKE_ENV+= OPENSSL_DIR=${BUILDLINK_PREFIX.openssl:Q} 22MAKE_ENV+= OPENSSL_DIR=${BUILDLINK_PREFIX.openssl:Q}
23MAKE_ENV+= RUSTFLAGS=${RUSTFLAGS:Q} 23MAKE_ENV+= RUSTFLAGS=${RUSTFLAGS:Q}
24RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libxcb}/lib 24RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libxcb}/lib
25RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.fontconfig}/lib 25RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.fontconfig}/lib
26RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.freetype2}/lib 26RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.freetype2}/lib
27 27
28.include "../../mk/bsd.prefs.mk" 28.include "../../mk/bsd.prefs.mk"
29 29
30.if ${OPSYS} == "NetBSD" && ${X11_TYPE} == "native" 30.if ${OPSYS} == "NetBSD" && ${X11_TYPE} == "native"
31# This works around XIM errors when RTLD local-binding libX11. 31# This works around XIM errors when RTLD local-binding libX11.
 32# See: https://mail-index.netbsd.org/tech-x11/2021/07/12/msg002222.html
32# But it might also break GPU accelerated mode. 33# But it might also break GPU accelerated mode.
33SUBST_CLASSES+= rtld 34SUBST_CLASSES+= rtld
34SUBST_MESSAGE.rtld= amend RTLD_GLOBAL 35SUBST_MESSAGE.rtld= amend RTLD_GLOBAL
35SUBST_STAGE.rtld= pre-configure 36SUBST_STAGE.rtld= pre-configure
36SUBST_FILES.rtld= ../vendor/x11-dl-2.18.5/src/link.rs 37SUBST_FILES.rtld= ../vendor/x11-dl-2.18.5/src/link.rs
37SUBST_SED.rtld= -e 's,libc::RTLD_LAZY,& | libc::RTLD_GLOBAL,g' 38SUBST_SED.rtld= -e 's,libc::RTLD_LAZY,& | libc::RTLD_GLOBAL,g'
38.endif 39.endif
39 40
40# The xcb crate depends on any version of python 3. 41# The xcb crate depends on any version of python 3.
41PYTHON_VERSIONS_INCOMPATIBLE= 27 42PYTHON_VERSIONS_INCOMPATIBLE= 27
42PYTHON_FOR_BUILD_ONLY= tool 43PYTHON_FOR_BUILD_ONLY= tool
43 44
44INSTALLATION_DIRS= bin share/examples/alacritty 45INSTALLATION_DIRS= bin share/examples/alacritty