Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1573637304156480"
MIME-Version: 1.0
Date: Wed, 13 Nov 2019 09:28:24 +0000
From: "Tobias Nygren" <tnn@netbsd.org>
Subject: CVS commit: pkgsrc/graphics/gegl
To: pkgsrc-changes@NetBSD.org
Reply-To: tnn@netbsd.org
Message-Id: <20191113092824.4DC20FA95@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1573637304156480
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	tnn
Date:		Wed Nov 13 09:28:24 UTC 2019

Modified Files:
	pkgsrc/graphics/gegl: distinfo
Added Files:
	pkgsrc/graphics/gegl/patches: patch-meson.build

Log Message:
gegl: fix broken cpu detection

from upstream


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/graphics/gegl/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/gegl/patches/patch-meson.build

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


--_----------=_1573637304156480
Content-Disposition: inline
Content-Length: 2297
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/graphics/gegl/distinfo
diff -u pkgsrc/graphics/gegl/distinfo:1.25 pkgsrc/graphics/gegl/distinfo:1.26
--- pkgsrc/graphics/gegl/distinfo:1.25	Sat Nov  2 14:05:46 2019
+++ pkgsrc/graphics/gegl/distinfo	Wed Nov 13 09:28:24 2019
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.25 2019/11/02 14:05:46 nia Exp $
+$NetBSD: distinfo,v 1.26 2019/11/13 09:28:24 tnn Exp $
 
 SHA1 (gegl-0.4.18.tar.xz) = fbb7415f8f9df63cd738f7ef51ef0f0ff65ecfbb
 RMD160 (gegl-0.4.18.tar.xz) = c33c56c7b839b508f9f89a1bf4ae51ccd6758ca2
 SHA512 (gegl-0.4.18.tar.xz) = e79874cd50e9f0c27c7dc9d9b952545c31d0a48e2b158aa54b92c3e933267877222f86ede7256f2528f18985dc85d6eadbcd809f7a3563efc4449ec7634f15fd
 Size (gegl-0.4.18.tar.xz) = 4812756 bytes
 SHA1 (patch-gegl_gegl-config.c) = a8e1f5f5394a33be2bcdcb05ec7654d06f7ad4bc
+SHA1 (patch-meson.build) = 10c564848e9821be63ea6aa82f27339d4e2bc421

Added files:

Index: pkgsrc/graphics/gegl/patches/patch-meson.build
diff -u /dev/null pkgsrc/graphics/gegl/patches/patch-meson.build:1.1
--- /dev/null	Wed Nov 13 09:28:24 2019
+++ pkgsrc/graphics/gegl/patches/patch-meson.build	Wed Nov 13 09:28:24 2019
@@ -0,0 +1,35 @@
+$NetBSD: patch-meson.build,v 1.1 2019/11/13 09:28:24 tnn Exp $
+
+https://gitlab.gnome.org/GNOME/gegl/commit/6bcf95fd0f32cf5e8b1ddbe17b14d9ad049bded8
+
+--- meson.build.orig	2019-10-26 23:01:07.000000000 +0000
++++ meson.build
+@@ -73,23 +73,21 @@ if os_osx and cc.get_id() != 'clang'
+ endif
+ 
+ 
+-host_cpu = host_machine.cpu()
+-if   host_cpu.startswith('i') and host_cpu.endswith('86')
++host_cpu_family = host_machine.cpu_family()
++if   host_cpu_family == 'x86'
+   have_x86 = true
+   config.set10('ARCH_X86',    true)
+-elif host_cpu == 'x86_64'
++elif host_cpu_family == 'x86_64'
+   have_x86 = true
+   config.set10('ARCH_X86',    true)
+   config.set10('ARCH_X86_64', true)
+-elif host_cpu == 'ppc' or host_cpu == 'powerpc'
++elif host_cpu_family == 'ppc'
+   have_ppc = true
+   config.set10('ARCH_PPC',    true)
+-elif host_cpu == 'ppc64' or host_cpu == 'powerpc64'
++elif host_cpu_family == 'ppc64'
+   have_ppc = true
+   config.set10('ARCH_PPC',    true)
+   config.set10('ARCH_PPC64',  true)
+-else
+-  error('Unknown host architecture')
+ endif
+ 
+ ################################################################################


--_----------=_1573637304156480--