Attachment 247622 Details for Bug 276296 – v1 (apply via "git am")

[patch] v1 (apply via "git am")

bug276296.diff (text/plain), 4.66 KB, created by Jan Beich on 2024-01-13 12:52:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2024-01-13 12:52:05 UTC

Size: 4.66 KB

patch

obsolete

>From 759a91721bd188d30f584fd036e27324d2a01256 Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Sat, 13 Jan 2024 13:29:57 +0100
>Subject: [PATCH 1/3] x11/pixman: drop unused lang/perl5* dependency after
> 92ea0d614b10
>
>https://gitlab.freedesktop.org/pixman/pixman/-/commit/8ccda2be30ad
>
>PR:		276296
>---
> x11/pixman/Makefile | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
>diff --git a/x11/pixman/Makefile b/x11/pixman/Makefile
>index 226db1a7a695..64440390ef28 100644
>--- a/x11/pixman/Makefile
>+++ b/x11/pixman/Makefile
>@@ -11,8 +11,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> 
> PORTSCOUT=	limitw:1,even
> 
>-USES=		compiler:c11 cpe perl5 tar:xz xorg-cat:lib
>-USE_PERL5=	build
>+USES=		compiler:c11 cpe tar:xz xorg-cat:lib
> CONFIGURE_ARGS=	--disable-gtk
> INSTALL_TARGET=	install-strip
> 
>
>From 07b2f3cd6b25f779f85f4cb6e2d3117495672b75 Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Sat, 13 Jan 2024 13:24:41 +0100
>Subject: [PATCH 2/3] x11/pixman: convert to USES=meson
>
>https://gitlab.freedesktop.org/pixman/pixman/-/commit/55eb680a1fcb
>
>PR:		276296
>---
> x11/pixman/Makefile  | 19 ++++++++-----------
> x11/pixman/pkg-plist |  1 -
> 2 files changed, 8 insertions(+), 12 deletions(-)
>
>diff --git a/x11/pixman/Makefile b/x11/pixman/Makefile
>index 64440390ef28..7aeff17f6bc1 100644
>--- a/x11/pixman/Makefile
>+++ b/x11/pixman/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=	pixman
> PORTVERSION=	0.42.2
>+PORTREVISION=	1
> CATEGORIES=	x11
> 
> MAINTAINER=	x11@FreeBSD.org
>@@ -11,25 +12,21 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> 
> PORTSCOUT=	limitw:1,even
> 
>-USES=		compiler:c11 cpe tar:xz xorg-cat:lib
>-CONFIGURE_ARGS=	--disable-gtk
>-INSTALL_TARGET=	install-strip
>-
>-# Build the library exclusively, thus disabling the demos and the tests (which
>-# do not get installed anyway).  This is to workaround a problem in powerpc64
>-# where the build of the tests crashes ld; see PR bin/202284.
>-MAKE_ARGS=	SUBDIRS=pixman
>+USES=		compiler:c11 cpe tar:xz xorg-cat:lib,meson
>+MESON_ARGS=	--auto-features=auto \
>+		-Dgtk=disabled \
>+		-Dtests=disabled
> 
> .include <bsd.port.pre.mk>
> 
> .if ${ARCH} == "armv6" || ${ARCH} == "armv7"
> BUILD_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
>-CONFIGURE_ENV+=	CCASFLAGS="${CFLAGS} -B${LOCALBASE}/bin -no-integrated-as"
>+CFLAGS+=	-B${LOCALBASE}/bin -no-integrated-as
> LLD_UNSAFE=	yes
> .elif ${ARCH} == "aarch64"
>-CONFIGURE_ARGS+=	--disable-arm-a64-neon
>+MESON_ARGS+=	-Da64-neon=disabled
> .elif (defined(MACHINE_CPU) && !${MACHINE_CPU:Maltivec}) || (${ARCH} == powerpc && !defined(MACHINE_CPU))
>-CONFIGURE_ARGS+=	--disable-vmx
>+MESON_ARGS+=	-Dvmx=disabled
> .endif
> 
> .include <bsd.port.post.mk>
>diff --git a/x11/pixman/pkg-plist b/x11/pixman/pkg-plist
>index 89d6b50037a8..10164af3b799 100644
>--- a/x11/pixman/pkg-plist
>+++ b/x11/pixman/pkg-plist
>@@ -1,6 +1,5 @@
> include/pixman-1/pixman-version.h
> include/pixman-1/pixman.h
>-lib/libpixman-1.a
> lib/libpixman-1.so
> lib/libpixman-1.so.0
> lib/libpixman-1.so.0.42.2
>
>From 9bf75279ef0fcded3f471e84cc374e411c8687f3 Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Thu, 4 Jan 2024 11:01:05 +0100
>Subject: [PATCH 3/3] x11/pixman: update to 0.43.0
>
>Changes:	https://lists.x.org/archives/xorg-announce/2024-January/003439.html
>PR:		276296
>---
> x11/pixman/Makefile  | 5 +----
> x11/pixman/distinfo  | 6 +++---
> x11/pixman/pkg-plist | 2 +-
> 3 files changed, 5 insertions(+), 8 deletions(-)
>
>diff --git a/x11/pixman/Makefile b/x11/pixman/Makefile
>index 7aeff17f6bc1..f126bfc96c98 100644
>--- a/x11/pixman/Makefile
>+++ b/x11/pixman/Makefile
>@@ -1,6 +1,5 @@
> PORTNAME=	pixman
>-PORTVERSION=	0.42.2
>-PORTREVISION=	1
>+PORTVERSION=	0.43.0
> CATEGORIES=	x11
> 
> MAINTAINER=	x11@FreeBSD.org
>@@ -10,8 +9,6 @@ WWW=		http://pixman.org
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-PORTSCOUT=	limitw:1,even
>-
> USES=		compiler:c11 cpe tar:xz xorg-cat:lib,meson
> MESON_ARGS=	--auto-features=auto \
> 		-Dgtk=disabled \
>diff --git a/x11/pixman/distinfo b/x11/pixman/distinfo
>index fba0281fc19c..626c1df9c638 100644
>--- a/x11/pixman/distinfo
>+++ b/x11/pixman/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1667505454
>-SHA256 (xorg/lib/pixman-0.42.2.tar.xz) = 5747d2ec498ad0f1594878cc897ef5eb6c29e91c53b899f7f71b506785fc1376
>-SIZE (xorg/lib/pixman-0.42.2.tar.xz) = 652984
>+TIMESTAMP = 1704362465
>+SHA256 (xorg/lib/pixman-0.43.0.tar.xz) = 5ba00c2879932c32d2ef878b6e802e3f898dda14c07e881dcfcc6a8f670e0cdc
>+SIZE (xorg/lib/pixman-0.43.0.tar.xz) = 638236
>diff --git a/x11/pixman/pkg-plist b/x11/pixman/pkg-plist
>index 10164af3b799..0bdaa602271e 100644
>--- a/x11/pixman/pkg-plist
>+++ b/x11/pixman/pkg-plist
>@@ -2,5 +2,5 @@ include/pixman-1/pixman-version.h
> include/pixman-1/pixman.h
> lib/libpixman-1.so
> lib/libpixman-1.so.0
>-lib/libpixman-1.so.0.42.2
>+lib/libpixman-1.so.0.43.0
> libdata/pkgconfig/pixman-1.pc

Actions: View | Diff

Attachments on bug 276296: 247622