From nobody Sat Jun 25 14:01:49 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id A06A28628C8; Sat, 25 Jun 2022 14:01:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LVbJY47yqz4VS0; Sat, 25 Jun 2022 14:01:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656165709; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pMYbsgIEAU576Z5UX1QeVa8DoEqOsiBZvB9IMteIwZc=; b=wLHDKYc9Lq2LxjwXwYIny/PfqcKc7UKXTnyt+sWgo+TbQYxkD7fLGb1BFRp9iT4QBo5d4y wiHO3dYOBy9ks+sLn5mZm8HCObFnwDDJFRudL+MF4Eh0ElN32mAFSxH6MgZfCwhPxSan4h aiGcvY1k1G9LuGQByK/J5xPOs1pSfWAdgXDfJaYGEy1XlM1C0RNBTPxeGAF3aaTDgR1MGi 6lyi+BxEzo7TWefWmO4UiMmYn8YmBLKhKUKysRw6SMTc7u/stJlNI12DlUDn68wfLa+Qy1 /87uzh4cJ9h1v7D2uTemFq2l+v37mjOSgkuNpbuVcQhJV+wqoBhAkNeEAtjP4g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 63FF025AD6; Sat, 25 Jun 2022 14:01:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25PE1nU1094686; Sat, 25 Jun 2022 14:01:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25PE1naF094685; Sat, 25 Jun 2022 14:01:49 GMT (envelope-from git) Date: Sat, 25 Jun 2022 14:01:49 GMT Message-Id: <202206251401.25PE1naF094685@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: 69dc4935e664 - main - x11/babl: fix packaging on arm/aarch64 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 69dc4935e66470d3dd7fccfdbbe855b60644c1a4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656165709; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pMYbsgIEAU576Z5UX1QeVa8DoEqOsiBZvB9IMteIwZc=; b=BewCs++3m+rdkYgl+O+ORZ+RUoIAwF56i7huoJ3nG6EvNYbbZ+kB3X1wckVHr74Eb/nvNw p/vOX4k18dxoY/vDSJylmGvxp7YkL1cTb8Ra/Xm23pc1A9RdHbPS98pXwuHBF8MzZq/VXL VZKwzdIWQcC8UADl07p5jI3b3hbxE1fec4IzRVd1IjWWhQK4QincTZoYdjKQNvFsvZ8fFo l4J8qMjv8MUg7rSsxeqX677EOGq6sfdbLxMquoIbXgeQOX+ra8ElvOFztFNXmwjIcZyA3l IkIGQXzMftA8zVoTUGAZzfIJDF6xDZ6S2bM/cZOkC34nztYyNVOT2qKvankbsw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656165709; a=rsa-sha256; cv=none; b=xDKVYdLgy4r9MQ/md2OpnZVoxlto12P01F+SlcuWmetKS9T4KwaGQqZR5lUN45MQxZVOzw QY0ih2Ez1I8VuIGDo6xNAvmC+t0MMSoJmXtNESHh+peuBuBWDknhYqAYNk7X3WFL3Wu/3U d/NIwlmycJbmR8zVNiilLzfiABGj27qZRrjhoCAVnp7gLSkc1Rplbckh1+y3zDkpmnxkVq P5alEWogU6Ts/TEG+liN0izTzpqWVK6XDZyOiYu6J/cNJmtClybCN7vdN7nJmOqGvtVmzY WtxaabK/4FtuNXID3pA7N7Xka1vq/mt5S+uWfW5wz1JL088aJOKamNeETM/YQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=69dc4935e66470d3dd7fccfdbbe855b60644c1a4 commit 69dc4935e66470d3dd7fccfdbbe855b60644c1a4 Author: Dima Panov AuthorDate: 2022-06-25 14:00:21 +0000 Commit: Dima Panov CommitDate: 2022-06-25 14:00:21 +0000 x11/babl: fix packaging on arm/aarch64 PR: 264875 --- x11/babl/Makefile | 8 ++++---- x11/babl/pkg-plist | 24 ++++++++++++------------ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/x11/babl/Makefile b/x11/babl/Makefile index f8331189dd18..2a26c16c8b36 100644 --- a/x11/babl/Makefile +++ b/x11/babl/Makefile @@ -33,11 +33,11 @@ PLIST_SUB+= BABL_SHLIB=${BABL_SHLIB} BABL_VER=${BABL_VER} .include .if ${ARCH} == "amd64" -PLIST_SUB+= AMD64="" AARCH64="@comment " -.elif ${ARCH} == "aarch64" -PLIST_SUB+= AMD64="@comment " AARCH64="" +PLIST_SUB+= AMD64="" ARM="@comment " +.elif ${ARCH} == "armv6" || ${ARCH} == "armv7" +PLIST_SUB+= AMD64="@comment " ARM="" .else -PLIST_SUB+= AMD64="@comment " AARCH64="@comment " +PLIST_SUB+= AMD64="@comment " ARM="@comment " .endif .include diff --git a/x11/babl/pkg-plist b/x11/babl/pkg-plist index 695f67c93a1c..5fec613055d9 100644 --- a/x11/babl/pkg-plist +++ b/x11/babl/pkg-plist @@ -7,18 +7,18 @@ lib/babl-%%BABL_VER%%/CIE.so lib/babl-%%BABL_VER%%/HCY.so lib/babl-%%BABL_VER%%/HSL.so lib/babl-%%BABL_VER%%/HSV.so -%%AARCH64%%lib/babl-%%BABL_VER%%/arm-neon-CIE.so -%%AARCH64%%lib/babl-%%BABL_VER%%/arm-neon-cairo.so -%%AARCH64%%lib/babl-%%BABL_VER%%/arm-neon-double.so -%%AARCH64%%lib/babl-%%BABL_VER%%/arm-neon-float.so -%%AARCH64%%lib/babl-%%BABL_VER%%/arm-neon-gegl-fixups.so -%%AARCH64%%lib/babl-%%BABL_VER%%/arm-neon-gggl-lies.so -%%AARCH64%%lib/babl-%%BABL_VER%%/arm-neon-gggl.so -%%AARCH64%%lib/babl-%%BABL_VER%%/arm-neon-grey.so -%%AARCH64%%lib/babl-%%BABL_VER%%/arm-neon-simple.so -%%AARCH64%%lib/babl-%%BABL_VER%%/arm-neon-u16.so -%%AARCH64%%lib/babl-%%BABL_VER%%/arm-neon-u32.so -%%AARCH64%%lib/babl-%%BABL_VER%%/arm-neon-ycbcr.so +%%ARM%%lib/babl-%%BABL_VER%%/arm-neon-CIE.so +%%ARM%%lib/babl-%%BABL_VER%%/arm-neon-cairo.so +%%ARM%%lib/babl-%%BABL_VER%%/arm-neon-double.so +%%ARM%%lib/babl-%%BABL_VER%%/arm-neon-float.so +%%ARM%%lib/babl-%%BABL_VER%%/arm-neon-gegl-fixups.so +%%ARM%%lib/babl-%%BABL_VER%%/arm-neon-gggl-lies.so +%%ARM%%lib/babl-%%BABL_VER%%/arm-neon-gggl.so +%%ARM%%lib/babl-%%BABL_VER%%/arm-neon-grey.so +%%ARM%%lib/babl-%%BABL_VER%%/arm-neon-simple.so +%%ARM%%lib/babl-%%BABL_VER%%/arm-neon-u16.so +%%ARM%%lib/babl-%%BABL_VER%%/arm-neon-u32.so +%%ARM%%lib/babl-%%BABL_VER%%/arm-neon-ycbcr.so lib/babl-%%BABL_VER%%/avx2-int8.so lib/babl-%%BABL_VER%%/cairo.so lib/babl-%%BABL_VER%%/double.so