CVS commit: pkgsrc/x11/pixman

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Jan  4 11:33:38 UTC 2024

Modified Files:
        pkgsrc/x11/pixman: Makefile PLIST distinfo hacks.mk
Removed Files:
        pkgsrc/x11/pixman/patches: patch-Makefile.in patch-pixman_pixman-vmx.c

Log Message:
pixman: update to 0.43.0.

        Benjamin Gilbert (3):
              meson: don't dllexport when built as static library
              mmx: use xmmintrin.h if building with SSE2
              meson: avoid linking with -pthread if we don't have pthreads

        Claude Heiland-Allen (2):
              implement r8g8b8 sRGB (without alpha)
              add r8g8b8 sRGB to test suite

        Dylan Baker (2):
              autotools: remove autotools
              delete win32 make files

        Emanuel Schmidt (3):
              Separate meson build options for demos and tests
              Changed name of the config-header to "pixman-config.h"
              Fixed missing dependency in libdemo

        Gauthier Östervall (1):
              Update build instructions to meson and ninja

        Havard Eidnes (2):
              vmx: Simplify scaled_nearest_scanline_vmx_8888_8888_OVER
              vmx: Reimplement create_mask_32_128 and use it in vmx_fill

        Heiko Lewin (2):
              Fix signed-unsigned semantics in reduce_32
              pixman-arma64: Adjustments to build with llvm integrated assembler

        Matt Turner (9):
              Post-release version bump to 0.42.3
              test: Revert to including pixman-private.h
              Remove generic build system information
              Use more Markdown-friendly syntax
              meson: Fix syntax
              pixman-sse2: Remove unused functions
              pixman-mmx: Don't redefine _MM_SHUFFLE
              pixman-access: Mark __dummy__ variables with MAYBE_UNUSED
              test: Use fabsl on float128

        Pavel Labath (1):
              Fix alignment problem in pixman-fast-path.c

        Sam James (1):
              pixman-bits-image: fix -Walloc-size

        Simon Ser (5):
              Add pixman_region{,32}_empty()
              Constify pixman_image_set_clip_region()
              Fix const warnings in pixman_image_set_clip_region()
              ci: upgrade to Fedora 39
              Pre-release version bump to 0.43.0


To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 pkgsrc/x11/pixman/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/pixman/PLIST
cvs rdiff -u -r1.75 -r1.76 pkgsrc/x11/pixman/distinfo
cvs rdiff -u -r1.15 -r1.16 pkgsrc/x11/pixman/hacks.mk
cvs rdiff -u -r1.4 -r0 pkgsrc/x11/pixman/patches/patch-Makefile.in
cvs rdiff -u -r1.5 -r0 pkgsrc/x11/pixman/patches/patch-pixman_pixman-vmx.c

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

Modified files:

Index: pkgsrc/x11/pixman/Makefile
diff -u pkgsrc/x11/pixman/Makefile:1.89 pkgsrc/x11/pixman/Makefile:1.90
--- pkgsrc/x11/pixman/Makefile:1.89     Fri Sep 29 09:27:07 2023
+++ pkgsrc/x11/pixman/Makefile  Thu Jan  4 11:33:38 2024
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.89 2023/09/29 09:27:07 adam Exp $
+# $NetBSD: Makefile,v 1.90 2024/01/04 11:33:38 wiz Exp $
 
-DISTNAME=      pixman-0.42.2
+DISTNAME=      pixman-0.43.0
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_XORG:=lib/}
 EXTRACT_SUFX=  .tar.xz
@@ -10,28 +10,22 @@ HOMEPAGE=   https://xorg.freedesktop.org/
 COMMENT=       Library of low-level pixel manipulation routines
 LICENSE=       mit
 
-CHECK_PORTABILITY_SKIP+=       Makefile.am # already patched in Makefile.in
-
-GNU_CONFIGURE= yes
-USE_LIBTOOL=   yes
-USE_TOOLS+=    perl
-
 .include "../../mk/bsd.prefs.mk"
 
 .if ${MACHINE_ARCH} == i386
-CONFIGURE_ARGS+=       --disable-sse2
+MESON_ARGS+=           -Dsse2=disabled
 .endif
 
 .if ${PKGSRC_COMPILER:Mclang} && ${MACHINE_ARCH} == "aarch64"
 # NEON macros depend on GNU as, but Xcode ships llvm-as
-CONFIGURE_ARGS+=       --disable-arm-a64-neon
+MESON_ARGS+=   -Da64-neon=disabled
 .endif
 
-PKGCONFIG_OVERRIDE+=   pixman-1.pc.in
-PKGCONFIG_OVERRIDE+=   pixman-1-uninstalled.pc.in
+PKGCONFIG_OVERRIDE+=   output/meson-private/pixman-1.pc
 
-TEST_TARGET=   check
+PKGCONFIG_OVERRIDE_STAGE=      post-configure
 
 X11_LIB_NAME?=         pixman
 .include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
+.include "../../devel/meson/build.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/x11/pixman/PLIST
diff -u pkgsrc/x11/pixman/PLIST:1.4 pkgsrc/x11/pixman/PLIST:1.5
--- pkgsrc/x11/pixman/PLIST:1.4 Sat Jun 16 03:15:31 2012
+++ pkgsrc/x11/pixman/PLIST     Thu Jan  4 11:33:38 2024
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST,v 1.4 2012/06/16 03:15:31 dholland Exp $
+@comment $NetBSD: PLIST,v 1.5 2024/01/04 11:33:38 wiz Exp $
 include/pixman-1/pixman-version.h
 include/pixman-1/pixman.h
-lib/libpixman-1.la
+lib/libpixman-1.so
+lib/libpixman-1.so.0
+lib/libpixman-1.so.${PKGVERSION}
 lib/pkgconfig/pixman-1.pc

Index: pkgsrc/x11/pixman/distinfo
diff -u pkgsrc/x11/pixman/distinfo:1.75 pkgsrc/x11/pixman/distinfo:1.76
--- pkgsrc/x11/pixman/distinfo:1.75     Thu Nov  3 08:51:25 2022
+++ pkgsrc/x11/pixman/distinfo  Thu Jan  4 11:33:38 2024
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.75 2022/11/03 08:51:25 wiz Exp $
+$NetBSD: distinfo,v 1.76 2024/01/04 11:33:38 wiz Exp $
 
-BLAKE2s (pixman-0.42.2.tar.xz) = 787db2f251f18541df50cc8681dfdb4da97def41dac52233b79575a0b83836fa
-SHA512 (pixman-0.42.2.tar.xz) = 3476e2676e66756b1af61b1e532cd80c985c191fb7956eb01702b419726cce99e79163b7f287f74f66414680e7396d13c3fee525cd663f12b6ac4877070ff4e8
-Size (pixman-0.42.2.tar.xz) = 652984 bytes
-SHA1 (patch-Makefile.in) = 49a0aa317a84390c1966687312f8466bc8d17ca3
-SHA1 (patch-pixman_pixman-vmx.c) = 8ca3649a5dd0527ce078af1b91fb01611dde9b45
+BLAKE2s (pixman-0.43.0.tar.xz) = 961a9b2e94acaa0adff6e809a8a3f4c7f592aaee569e356aea23f2b0460fca58
+SHA512 (pixman-0.43.0.tar.xz) = a90399b8c6aec218abb2f419fb5d6894acf9f4c7acb4fd3893b0b7c805ba47c82ee7efb363be59bb1a15b6997b2dddb7dba062a165503b035e1124fff1b271c9
+Size (pixman-0.43.0.tar.xz) = 638236 bytes

Index: pkgsrc/x11/pixman/hacks.mk
diff -u pkgsrc/x11/pixman/hacks.mk:1.15 pkgsrc/x11/pixman/hacks.mk:1.16
--- pkgsrc/x11/pixman/hacks.mk:1.15     Fri Sep 29 09:27:07 2023
+++ pkgsrc/x11/pixman/hacks.mk  Thu Jan  4 11:33:38 2024
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.15 2023/09/29 09:27:07 adam Exp $
+# $NetBSD: hacks.mk,v 1.16 2024/01/04 11:33:38 wiz Exp $
 #
 .if !defined(PIXMAN_HACKS_MK)
 PIXMAN_HACKS_MK=       # empty
@@ -11,17 +11,13 @@ PIXMAN_HACKS_MK=    # empty
 .  if !${CC_VERSION:Mgcc-4.[2-9]*} && \
     !${CC_VERSION:Mgcc-[5-9].*} && \
     !${CC_VERSION:Mgcc-[1-9][0-9]*}
-CONFIGURE_ARGS+=       --disable-sse2 --disable-ssse3
+MESON_ARGS+=   -Dsse2=disabled
+MESON_ARGS+=   -Dssse3=disabled
 .  endif
 .endif
 
 .if !empty(PKGSRC_COMPILER:Msunpro)
-CONFIGURE_ARGS+=       --disable-sse2 --disable-mmx --disable-ssse3
-.endif
-
-CONFIGURE_ARGS.MirBSD+=        PTHREAD_LIBS=-pthread
-
-.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 060000
-CONFIGURE_ENV+=                ac_cv_tls=none
-CFLAGS+=               -DPIXMAN_NO_TLS
+MESON_ARGS+=   -Dmmx=disabled
+MESON_ARGS+=   -Dsse2=disabled
+MESON_ARGS+=   -Dssse3=disabled
 .endif