From patchwork Fri Sep 20 06:18:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Devoogdt X-Patchwork-Id: 1987658 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4X92Jy3FKTz1xrD for ; Fri, 20 Sep 2024 16:18:56 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 2A63540591; Fri, 20 Sep 2024 06:18:53 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id HZv_QAgcmIPe; Fri, 20 Sep 2024 06:18:51 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org A9610405D9 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id A9610405D9; Fri, 20 Sep 2024 06:18:51 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 7178A1BF3A7 for ; Fri, 20 Sep 2024 06:18:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 607F084C30 for ; Fri, 20 Sep 2024 06:18:50 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id XfTj_BXkUlby for ; Fri, 20 Sep 2024 06:18:49 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=209.85.128.48; helo=mail-wm1-f48.google.com; envelope-from=thomas.devoogdt@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org BDA7D84C2B DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org BDA7D84C2B Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by smtp1.osuosl.org (Postfix) with ESMTPS id BDA7D84C2B for ; Fri, 20 Sep 2024 06:18:48 +0000 (UTC) Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-42cb0f28bfbso13842355e9.1 for ; Thu, 19 Sep 2024 23:18:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726813126; x=1727417926; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=qCu7xMd9bCQCuZbvUCWEc9qQHPOC0nCrIV7Q2oIgI2Y=; b=RL+V+Sx0QNcEi/VXKlkVfF1EOb4AZYJI5Nl8TE3fjPhwLWsitWxsWYYVqp4Z9RFpFO m0xeP+hEhLLvb9KVXVVsUSiXLz2H0nUgrA3u5i1YRefEgokzrFrknVywL4k4C9CZY8JE WZeaTCpCO24pS76i4AoPxBIMPIaZhN4OLJJspbxXgzVoK5JH0mINMPuPt51C8rZMr8pd PvfX2P0C3aMaCXKB+6JmQxjdhEMu0dDR8LOQMMaL1/N9LnZ1fP/ASi77OQKdtHgTDAxo Q797wnpg+ThTM/jlC78g6ZMduPb9OcL4zRjA3aCKgBYqbeYSdjBW5DlShfjJDEiS+pZT imZQ== X-Gm-Message-State: AOJu0Ywk6Z1Zbe4LRZsg1GbPSx6Ga13pNrv9GOmRsKRZOSwKvApmKdsS fkBMloRyodHuFY5nWy68ajxvMUtSbTYumRTBqKuKUpDfWpSXqlmrSAXPAUqn X-Google-Smtp-Source: AGHT+IFF1LYALyJgLCsW+AxRr7hTo0BTI8f0Q8uy4zQE4IhrDnAVV8bIMUl8SpXfRFa/+D9jgB3BsA== X-Received: by 2002:a05:600c:3c87:b0:42c:bbd5:af70 with SMTP id 5b1f17b1804b1-42e7ad9dc04mr9859285e9.30.1726813125340; Thu, 19 Sep 2024 23:18:45 -0700 (PDT) Received: from thomas-Precision-7670.home ([2a02:a03f:eb68:2f00:6d30:16c1:8b58:4271]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42e7af898fasm13116225e9.15.2024.09.19.23.18.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Sep 2024 23:18:44 -0700 (PDT) From: Thomas Devoogdt To: buildroot@buildroot.org Date: Fri, 20 Sep 2024 08:18:33 +0200 Message-ID: <20240920061833.132700-1-thomas@devoogdt.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dmarc=none (p=none dis=none) header.from=devoogdt.com Subject: [Buildroot] [PATCH v1] package/cairo: bump to 1.18.2 X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine , Thomas Devoogdt Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" From: Thomas Devoogdt News: - https://www.cairographics.org/news/cairo-1.18.2/ Upstream patches have been dropped in this commit. Signed-off-by: Thomas Devoogdt Reviewed-by: Adrian Perez de Castro --- ...p-IPC_RMID_DEFERRED_RELEASE-check-wh.patch | 41 ------------------- ...3-meson-only-require-cpp-for-windows.patch | 38 ----------------- package/cairo/cairo.hash | 4 +- package/cairo/cairo.mk | 2 +- 4 files changed, 3 insertions(+), 82 deletions(-) delete mode 100644 package/cairo/0002-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch delete mode 100644 package/cairo/0003-meson-only-require-cpp-for-windows.patch diff --git a/package/cairo/0002-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch b/package/cairo/0002-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch deleted file mode 100644 index 5a5c438a97..0000000000 --- a/package/cairo/0002-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 8d5037ed642b02cdb018e49866aa286f30a7b59a Mon Sep 17 00:00:00 2001 -From: Thomas Devoogdt -Date: Mon, 5 Feb 2024 17:47:07 +0100 -Subject: [PATCH] meson: always skip IPC_RMID_DEFERRED_RELEASE check when - cross-compiling - -../../br-test-pkg/bootlin-armv5-uclibc/build/cairo-1.17.4/meson.build:279:13: -ERROR: Can not run test applications in this cross environment. - -Commit 1bec56ea8a931e1ae1c74cc740134497ec365267 added support to define -ipc_rmid_deferred_release in a cross-compile config, but still kept -the default to auto, which anyhow results in an error when cross-compiling. - -There is only one usage of the ipc_rmid_deferred_release compile declarative -which was originally added in this commit: 5041b462d084de8552336275914d30c23bf5dd35. - -If ipc_rmid_deferred_release is set to FALSE, an additional XSync is performed. -This doesn't sound very harmful, so that is why this commit defaults to FALSE -and thus avoids any cross-compile errors. - -Upstream: https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/534 -Signed-off-by: Thomas Devoogdt ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 9efe91978..6a670bf94 100644 ---- a/meson.build -+++ b/meson.build -@@ -369,7 +369,7 @@ if x11_dep.found() and xext_dep.found() - - # Can skip the run check by providing the result in a cross file or - # native file as bool property value. -- prop = meson.get_external_property('ipc_rmid_deferred_release', 'auto') -+ prop = meson.get_external_property('ipc_rmid_deferred_release', meson.is_cross_build() ? 'false' : 'auto') - # We don't know the type of prop (bool, string) but need to differentiate - # between a set value (bool) or the fallback value (string), so convert to - # a string and check the string value. --- -2.34.1 diff --git a/package/cairo/0003-meson-only-require-cpp-for-windows.patch b/package/cairo/0003-meson-only-require-cpp-for-windows.patch deleted file mode 100644 index 3ce396f66f..0000000000 --- a/package/cairo/0003-meson-only-require-cpp-for-windows.patch +++ /dev/null @@ -1,38 +0,0 @@ -From e93ef3feb69994e3aa4e0ab66ccd66139b097e49 Mon Sep 17 00:00:00 2001 -From: Thomas Devoogdt -Date: Thu, 18 Jul 2024 12:16:51 +0200 -Subject: [PATCH] meson: only require cpp for windows - -Allow to compile cairo without c++ toolchain. - -Fixes: - - http://autobuild.buildroot.net/results/98b62ab7ed3092f9f9085f723baf7d6267451e5c/ - -Upstream: https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/573 -Signed-off-by: Thomas Devoogdt ---- - meson.build | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 9100152ee..297482b03 100644 ---- a/meson.build -+++ b/meson.build -@@ -1,4 +1,4 @@ --project('cairo', 'c', 'cpp', -+project('cairo', 'c', - meson_version: '>= 0.59.0', - version: run_command(find_program('version.py'), check: true).stdout().strip(), - default_options: ['warning_level=2'], -@@ -489,6 +489,8 @@ if host_machine.system() == 'darwin' and not get_option('quartz').disabled() - endif - - if host_machine.system() == 'windows' -+ add_languages('cpp') -+ - add_project_arguments('-DWIN32_LEAN_AND_MEAN', '-DNOMINMAX', language: ['c', 'cpp']) - - win32_extra_deps = [ --- -2.45.2 - diff --git a/package/cairo/cairo.hash b/package/cairo/cairo.hash index df9c693bad..b2d384d01a 100644 --- a/package/cairo/cairo.hash +++ b/package/cairo/cairo.hash @@ -1,5 +1,5 @@ -# From https://www.cairographics.org/releases/cairo-1.18.0.tar.xz.sha256sum -sha256 243a0736b978a33dee29f9cca7521733b78a65b5418206fef7bd1c3d4cf10b64 cairo-1.18.0.tar.xz +# From https://www.cairographics.org/releases/cairo-1.18.2.tar.xz.sha256sum +sha256 a62b9bb42425e844cc3d6ddde043ff39dbabedd1542eba57a2eb79f85889d45a cairo-1.18.2.tar.xz # Hash for license files: sha256 67228a9f7c5f9b67c58f556f1be178f62da4d9e2e6285318d8c74d567255abdf COPYING diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk index ba25620f8d..c741c97853 100644 --- a/package/cairo/cairo.mk +++ b/package/cairo/cairo.mk @@ -4,7 +4,7 @@ # ################################################################################ -CAIRO_VERSION = 1.18.0 +CAIRO_VERSION = 1.18.2 CAIRO_SOURCE = cairo-$(CAIRO_VERSION).tar.xz CAIRO_LICENSE = LGPL-2.1 or MPL-1.1 (library) CAIRO_LICENSE_FILES = COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1