CVS commit: pkgsrc/graphics/simp

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Fri Mar 27 22:38:33 UTC 2026

Modified Files:
        pkgsrc/graphics/simp: Makefile distinfo
Added Files:
        pkgsrc/graphics/simp/patches:
            patch-.._vendor_x11rb-0.13.2_src_xcb__ffi_raw__ffi_ffi.rs

Log Message:
simp: undo vendor create hardcoding of libxcb.so path for NetBSD

patch copied from x11/alacritty.
While here adjust nasm dependency.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/graphics/simp/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/graphics/simp/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/simp/patches/patch-.._vendor_x11rb-0.13.2_src_xcb__ffi_raw__ffi_ffi.rs

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/simp/Makefile
diff -u pkgsrc/graphics/simp/Makefile:1.41 pkgsrc/graphics/simp/Makefile:1.42
--- pkgsrc/graphics/simp/Makefile:1.41  Mon Feb 16 14:46:07 2026
+++ pkgsrc/graphics/simp/Makefile       Fri Mar 27 22:38:33 2026
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2026/02/16 14:46:07 pin Exp $
+# $NetBSD: Makefile,v 1.42 2026/03/27 22:38:33 tnn Exp $
 
 DISTNAME=      simp-3.10.3
+PKGREVISION=   1
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=Kl4rry/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -11,7 +12,6 @@ COMMENT=      Fast and simple GPU-accelerated
 LICENSE=       apache-2.0
 
 TOOL_DEPENDS+= git-base-[0-9]*:../../devel/git-base
-TOOL_DEPENDS+= nasm-[0-9]*:../../devel/nasm
 TOOL_DEPENDS+= cargo-about-[0-9]*:../../devel/cargo-about
 
 .include "cargo-depends.mk"
@@ -28,6 +28,12 @@ RUSTFLAGS+=  -C link-arg=-L${BUILDLINK_PR
 CARGO_NO_DEFAULT_FEATURES=     YES
 CARGO_FEATURES+=               gtk3
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+TOOL_DEPENDS+= nasm-[0-9]*:../../devel/nasm
+.endif
+
 .include "../../lang/rust/cargo.mk"
 .include "../../x11/gtk3/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"

Index: pkgsrc/graphics/simp/distinfo
diff -u pkgsrc/graphics/simp/distinfo:1.20 pkgsrc/graphics/simp/distinfo:1.21
--- pkgsrc/graphics/simp/distinfo:1.20  Mon Feb 16 14:46:07 2026
+++ pkgsrc/graphics/simp/distinfo       Fri Mar 27 22:38:33 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2026/02/16 14:46:07 pin Exp $
+$NetBSD: distinfo,v 1.21 2026/03/27 22:38:33 tnn Exp $
 
 BLAKE2s (ab_glyph-0.2.32.crate) = a1bd2a114f0cae7af4e1dc5f86421476ddc0abc68c8cc8f85baffa7375db8c88
 SHA512 (ab_glyph-0.2.32.crate) = aa28fc87201abc6cd14bfb2371420be102e82f9317d952db5e0f576e867dcee61e3a54d65e39489459e3dd238baef77b46418ff20a2a9c9cf9e4a6ddf1277fb0
@@ -1632,3 +1632,4 @@ Size (zune-jpeg-0.4.21.crate) = 68268 by
 BLAKE2s (zune-jpeg-0.5.12.crate) = a2a2e4e65ae004d3469ab6907a6512026552c9521eca679fb0adecfdff4edbd7
 SHA512 (zune-jpeg-0.5.12.crate) = 6c956a8df09e5c89a7ad7cbc673567b142a2945b67ef9e60881564689ea03cb9cac83a13bc2e5997a3abdd63bb65ae208e45f27a6157fd54f60d7d0a0f8f927c
 Size (zune-jpeg-0.5.12.crate) = 86116 bytes
+SHA1 (patch-.._vendor_x11rb-0.13.2_src_xcb__ffi_raw__ffi_ffi.rs) = b80ac1ecb6b77a77c6510c8421c78a0984a28073

Added files:

Index: pkgsrc/graphics/simp/patches/patch-.._vendor_x11rb-0.13.2_src_xcb__ffi_raw__ffi_ffi.rs
diff -u /dev/null pkgsrc/graphics/simp/patches/patch-.._vendor_x11rb-0.13.2_src_xcb__ffi_raw__ffi_ffi.rs:1.1
--- /dev/null   Fri Mar 27 22:38:33 2026
+++ pkgsrc/graphics/simp/patches/patch-.._vendor_x11rb-0.13.2_src_xcb__ffi_raw__ffi_ffi.rs      Fri Mar 27 22:38:33 2026
@@ -0,0 +1,27 @@
+$NetBSD: patch-.._vendor_x11rb-0.13.2_src_xcb__ffi_raw__ffi_ffi.rs,v 1.1 2026/03/27 22:38:33 tnn Exp $
+
+Remove hard-coded libxcb.so paths. pkgsrc links with the correct rpath.
+Needed for X11_TYPE=modular.
+
+--- ../vendor/x11rb-0.13.2/src/xcb_ffi/raw_ffi/ffi.rs.orig     2025-10-18 15:36:27.746267128 +0000
++++ ../vendor/x11rb-0.13.2/src/xcb_ffi/raw_ffi/ffi.rs
+@@ -35,18 +35,7 @@ pub(crate) mod libxcb_library {
+             #[cfg(not(unix))]
+             compile_error!("dl-libxcb feature is not supported on non-unix");
+ 
+-            #[cfg(all(unix, target_os = "linux"))]
+-            const LIB_NAME: &str = "libxcb.so.1";
+-
+-            // libtool turns -version-info differently into SONAMES on NetBSD.
+-            // Also, the library is apparently not in the default search path, hence use a full path.
+-            #[cfg(all(unix, target_os = "netbsd"))]
+-            const LIB_NAME: &str = "/usr/X11R7/lib/libxcb.so.2";
+-
+-            // If we do not know anything, just assume libxcb.so and hope for the best.
+-            // This is actually the right thing to do on OpenBSD since the dynamic linker then does
+-            // some magic to find the right SONAME.
+-            #[cfg(all(unix, not(any(target_os = "linux", target_os = "netbsd"))))]
++            #[cfg(unix)]
+             const LIB_NAME: &str = "libxcb.so";
+ 
+             let library = libloading::Library::new(LIB_NAME)