Thu May 4 09:43:56 2023 UTC ()
libXi: update to 1.8.1.

Alan Coopersmith (6):                                                                                                                                                                   Build xz tarballs instead of bzip2
      Fix spelling/wording issues
      gitlab CI: enable commit & merge request checks
      gitlab CI: enable gitlab's builtin static analysis
      XInput_find_display: Don't dereference NULL dpyinfo
      configure: Use LT_INIT from libtool 2 instead of deprecated AC_PROG_LIBTOOL

Peter Hutterer (2):
      Initialize a few stack vars to zero
      libXi 1.8.1


(wiz)
diff -r1.40 -r1.41 pkgsrc/x11/libXi/Makefile
diff -r1.10 -r1.11 pkgsrc/x11/libXi/buildlink3.mk
diff -r1.2 -r1.3 pkgsrc/x11/libXi/builtin.mk
diff -r1.32 -r1.33 pkgsrc/x11/libXi/distinfo
cvs diff -r1.40 -r1.41 pkgsrc/x11/libXi/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/libXi/Makefile 2022/11/09 13:14:21 1.40
+++ pkgsrc/x11/libXi/Makefile 2023/05/04 09:43:56 1.41
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.40 2022/11/09 13:14:21 joerg Exp $ 1# $NetBSD: Makefile,v 1.41 2023/05/04 09:43:56 wiz Exp $
2 2
3DISTNAME= libXi-1.8 3DISTNAME= libXi-1.8.1
4CATEGORIES= x11 devel 4CATEGORIES= x11 devel
5MASTER_SITES= ${MASTER_SITE_XORG:=lib/} 5MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
6EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.xz
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://xorg.freedesktop.org/ 9HOMEPAGE= https://xorg.freedesktop.org/
10COMMENT= X Input extension library 10COMMENT= X Input extension library
11LICENSE= mit 11LICENSE= mit
12 12
13USE_LIBTOOL= yes 13USE_LIBTOOL= yes
14GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
15USE_TOOLS+= pkg-config 15USE_TOOLS+= pkg-config
16 16
17CONFIGURE_ENV+= LIB_MAN_SUFFIX=3 ac_cv_path_ASCIIDOC= ac_cv_path_XMLTO= 17CONFIGURE_ENV+= LIB_MAN_SUFFIX=3 ac_cv_path_ASCIIDOC= ac_cv_path_XMLTO=
18PKGCONFIG_OVERRIDE+= xi.pc.in 18PKGCONFIG_OVERRIDE+= xi.pc.in
19 19
cvs diff -r1.10 -r1.11 pkgsrc/x11/libXi/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/x11/libXi/buildlink3.mk 2018/03/07 11:57:36 1.10
+++ pkgsrc/x11/libXi/buildlink3.mk 2023/05/04 09:43:56 1.11
@@ -1,36 +1,36 @@ @@ -1,36 +1,36 @@
1# $NetBSD: buildlink3.mk,v 1.10 2018/03/07 11:57:36 wiz Exp $ 1# $NetBSD: buildlink3.mk,v 1.11 2023/05/04 09:43:56 wiz Exp $
2 2
3.include "../../mk/bsd.fast.prefs.mk" 3.include "../../mk/bsd.fast.prefs.mk"
4 4
5.if ${X11_TYPE} != "modular" && \ 5.if ${X11_TYPE} != "modular" && \
6 !defined(BUILDLINK_API_DEPENDS.libXi) 6 !defined(BUILDLINK_API_DEPENDS.libXi)
7.include "../../mk/x11.buildlink3.mk" 7.include "../../mk/x11.buildlink3.mk"
8.else 8.else
9 9
10BUILDLINK_TREE+= libXi 10BUILDLINK_TREE+= libXi
11 11
12. if !defined(LIBXI_BUILDLINK3_MK) 12. if !defined(LIBXI_BUILDLINK3_MK)
13LIBXI_BUILDLINK3_MK:= 13LIBXI_BUILDLINK3_MK:=
14 14
15. if !defined(USE_BUILTIN.libXi) 15. if !defined(USE_BUILTIN.libXi)
16CHECK_BUILTIN.libXi:= yes 16CHECK_BUILTIN.libXi:= yes
17. include "../../x11/libXi/builtin.mk" 17. include "../../x11/libXi/builtin.mk"
18CHECK_BUILTIN.libXi:= no 18CHECK_BUILTIN.libXi:= no
19. endif 19. endif
20 20
21BUILDLINK_API_DEPENDS.libXi+= libXi>=1.0.0 21BUILDLINK_API_DEPENDS.libXi+= libXi>=1.0.0
22BUILDLINK_PKGSRCDIR.libXi?= ../../x11/libXi 22BUILDLINK_PKGSRCDIR.libXi?= ../../x11/libXi
23 23
24. if !empty(USE_BUILTIN.libXi:M[Nn][Oo]) 24. if ${USE_BUILTIN.libXi:tl} == no
25BUILDLINK_API_DEPENDS.libX11+= libX11>=1.5 25BUILDLINK_API_DEPENDS.libX11+= libX11>=1.5
26BUILDLINK_API_DEPENDS.libXext+= libXext>=1.1 26BUILDLINK_API_DEPENDS.libXext+= libXext>=1.1
27. endif 27. endif
28.include "../../x11/libX11/buildlink3.mk" 28.include "../../x11/libX11/buildlink3.mk"
29.include "../../x11/libXext/buildlink3.mk" 29.include "../../x11/libXext/buildlink3.mk"
30.include "../../x11/libXfixes/buildlink3.mk" 30.include "../../x11/libXfixes/buildlink3.mk"
31.include "../../x11/xorgproto/buildlink3.mk" 31.include "../../x11/xorgproto/buildlink3.mk"
32. endif # LIBXI_BUILDLINK3_MK 32. endif # LIBXI_BUILDLINK3_MK
33 33
34BUILDLINK_TREE+= -libXi 34BUILDLINK_TREE+= -libXi
35 35
36.endif 36.endif
cvs diff -r1.2 -r1.3 pkgsrc/x11/libXi/builtin.mk (expand / switch to unified diff)

--- pkgsrc/x11/libXi/builtin.mk 2019/11/03 09:14:11 1.2
+++ pkgsrc/x11/libXi/builtin.mk 2023/05/04 09:43:56 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: builtin.mk,v 1.2 2019/11/03 09:14:11 rillig Exp $ 1# $NetBSD: builtin.mk,v 1.3 2023/05/04 09:43:56 wiz Exp $
2 2
3BUILTIN_PKG:= libXi 3BUILTIN_PKG:= libXi
4PKGCONFIG_FILE.libXi= ${X11BASE}/lib/pkgconfig/xi.pc 4PKGCONFIG_FILE.libXi= ${X11BASE}/lib/pkgconfig/xi.pc
5PKGCONFIG_FILE.libXi+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xi.pc 5PKGCONFIG_FILE.libXi+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xi.pc
6 6
7BUILTIN_FIND_FILES_VAR:= H_XINPUT 7BUILTIN_FIND_FILES_VAR:= H_XINPUT
8BUILTIN_FIND_FILES.H_XINPUT= ${X11BASE}/include/X11/extensions/XInput.h 8BUILTIN_FIND_FILES.H_XINPUT= ${X11BASE}/include/X11/extensions/XInput.h
9 9
10.include "../../mk/buildlink3/bsd.builtin.mk" 10.include "../../mk/buildlink3/bsd.builtin.mk"
11 11
12### 12###
13### Determine if there is a built-in implementation of the package and 13### Determine if there is a built-in implementation of the package and
14### set IS_BUILTIN.<pkg> appropriately ("yes" or "no"). 14### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
@@ -23,22 +23,22 @@ IS_BUILTIN.libXi= yes @@ -23,22 +23,22 @@ IS_BUILTIN.libXi= yes
23.endif 23.endif
24MAKEVARS+= IS_BUILTIN.libXi 24MAKEVARS+= IS_BUILTIN.libXi
25 25
26### 26###
27### Determine whether we should use the built-in implementation if it 27### Determine whether we should use the built-in implementation if it
28### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no"). 28### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no").
29### 29###
30.if !defined(USE_BUILTIN.libXi) && !defined(BUILDLINK_API_DEPENDS.libXi) 30.if !defined(USE_BUILTIN.libXi) && !defined(BUILDLINK_API_DEPENDS.libXi)
31. if ${PREFER.libXi} == "pkgsrc" 31. if ${PREFER.libXi} == "pkgsrc"
32USE_BUILTIN.libXi= no 32USE_BUILTIN.libXi= no
33. else 33. else
34USE_BUILTIN.libXi= ${IS_BUILTIN.libXi} 34USE_BUILTIN.libXi= ${IS_BUILTIN.libXi}
35. if defined(BUILTIN_PKG.libXi) && \ 35. if defined(BUILTIN_PKG.libXi) && \
36 !empty(IS_BUILTIN.libXi:M[yY][eE][sS]) 36 ${IS_BUILTIN.libXi:tl} == yes
37USE_BUILTIN.libXi= yes 37USE_BUILTIN.libXi= yes
38. endif 38. endif
39. endif # PREFER.libXi 39. endif # PREFER.libXi
40.endif 40.endif
41MAKEVARS+= USE_BUILTIN.libXi 41MAKEVARS+= USE_BUILTIN.libXi
42 42
43.include "../../mk/buildlink3/pkgconfig-builtin.mk" 43.include "../../mk/buildlink3/pkgconfig-builtin.mk"
44.include "../../mk/x11.builtin.mk" 44.include "../../mk/x11.builtin.mk"
cvs diff -r1.32 -r1.33 pkgsrc/x11/libXi/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/libXi/distinfo 2021/10/26 11:34:06 1.32
+++ pkgsrc/x11/libXi/distinfo 2023/05/04 09:43:56 1.33
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1$NetBSD: distinfo,v 1.32 2021/10/26 11:34:06 nia Exp $ 1$NetBSD: distinfo,v 1.33 2023/05/04 09:43:56 wiz Exp $
2 2
3BLAKE2s (libXi-1.8.tar.bz2) = b6f3552f121ff262b17bacecce1aa5788500ec96d5e0f1334d5171ad1e22ebe7 3BLAKE2s (libXi-1.8.1.tar.xz) = 667e58b8de067f64e571766348d4e7552d64fb19f7cca34c83f874cbf8bc860d
4SHA512 (libXi-1.8.tar.bz2) = 4b2c667a8466eb389f253d77285c3f506c4a2b6c75054c722974a864565d565cc0c5701f8ea773eb929ceb94adfeb737ecd7a0bfc2c240157416a5f343c07aba 4SHA512 (libXi-1.8.1.tar.xz) = a30b1a07e6d710f5196e7477415d68074736f89d954e8f2d5ccc9b5f349e7d1d440c90fb512508176b5db5ecad55608cfb540872936b731963fd83343db3a0b9
5Size (libXi-1.8.tar.bz2) = 494579 bytes 5Size (libXi-1.8.1.tar.xz) = 404252 bytes