From nobody Fri Jul 01 10:38:18 2022 X-Original-To: dev-commits-ports-all@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 0B2D28A96E0; Fri, 1 Jul 2022 10:38:19 +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 4LZBVy6xlXz3Qbc; Fri, 1 Jul 2022 10:38:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656671899; 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=IBixWqUmefBjFVQFnbHBTGqLc/qu4AooD8n7RmST13Q=; b=K0EqMCczYMlYD8q60laOHK4IUWmRLchrTK7Ky98ny6XBO2FxEC85Bpzucex6OwyYRPza9b ALosXm9TGbd/16bk3I78wDUTPP/sa678cGX57SQ0ZdgJMelFiXIycCcpm836ZKuDuAsozB uNBbEiPO7acQe4IktSnxrboq74pw7J4oUnMb9sf7Bucgmhgn6aOw2ZETSa3aU3zfViSbjc jvR+QJ5Enu4tig8LkEWBaMrKdSSg+o7ftVHMQWv9rielhhevmkwvr857Sts/OtlYRvRCpL YWn0s3xUnngyIy8+J0h2PqbcIgOp6PSB5Tw8F6n555z+Zdzyq8NBsMeIILhnHw== 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 C396019E88; Fri, 1 Jul 2022 10:38:18 +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 261AcIow005442; Fri, 1 Jul 2022 10:38:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 261AcIoh005441; Fri, 1 Jul 2022 10:38:18 GMT (envelope-from git) Date: Fri, 1 Jul 2022 10:38:18 GMT Message-Id: <202207011038.261AcIoh005441@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: 09da9cfa444f - main - graphics/gegl: Fix packaging on aarch64 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 09da9cfa444f688ca70ab0a1b17f6ff11e23b1fc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656671899; 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=IBixWqUmefBjFVQFnbHBTGqLc/qu4AooD8n7RmST13Q=; b=GU0LaxpUTCZ3f7MjTBnOZ2dxw/7JC7EOwSO8gwWfi4dr3KSkaiKi5oRwF90JKd+dno9uF2 1I31MRVOU/TX/0wJwhGZQkirlQRDaokhmimdt0xebvUpL9m6hF4dz2XGSTStPVVkkHsr3p 4k0bZD2F6s2AbdxGqGPxJ4FHrVR7Dt7NhPr1UHxv84xYUvthnM5qwH3VBVAx+phPV6bGA0 gEiIbwZoV1vPB9OMp5iHsK9tBPQSi//V/gSVfMG8Mog5o/d5p95E6RzoExMmIbKO4br3FS AGnnaEw1qTS/PeqOkX/ILt9NKWbPRmlnLGpJkuaWs6gJxGlEG0kYK3tTjSZoBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656671899; a=rsa-sha256; cv=none; b=vFPcZ9agrSUEeGRhQngOOs+YNSh7BnosJPCoVgBSKjnHXXCwL8Fa+j29c688f6lQ5eXi6m e6uaNTRJ3Ew58sI/ICaFAPlAV0gAPHbdmTfwvDsnhWQ2rjIBD0dFLYRz7dEbxytUXdx00U IHK8lJH9q2E2lmSSGh5KEwlwc6I0zQmqbeBxQlQF4Yv9BIo2Q2RzdrgFwXOBwteHrdwoPX ZCvmiJJpDKMvbnkGLkym0a0Z8uqtcEix+8GtYxMN5VXJKeqkYIgE/PqUd5lWFmECKby2TQ FclIPiRxxmnnMVOEJlr4YTZwNU0QSiyvTe+8hE/6Dt3WVvjna1+pWrulS6fSfA== 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=09da9cfa444f688ca70ab0a1b17f6ff11e23b1fc commit 09da9cfa444f688ca70ab0a1b17f6ff11e23b1fc Author: Dima Panov AuthorDate: 2022-07-01 10:36:59 +0000 Commit: Dima Panov CommitDate: 2022-07-01 10:38:06 +0000 graphics/gegl: Fix packaging on aarch64 PR: 264972 --- graphics/gegl/Makefile | 8 ++++---- graphics/gegl/pkg-plist | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/graphics/gegl/Makefile b/graphics/gegl/Makefile index e678b899ab72..d5165a494cf0 100644 --- a/graphics/gegl/Makefile +++ b/graphics/gegl/Makefile @@ -132,11 +132,11 @@ LDFLAGS+= -lexecinfo .endif .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 post-patch: diff --git a/graphics/gegl/pkg-plist b/graphics/gegl/pkg-plist index 816b3bf3b88e..ec0a267f75ac 100644 --- a/graphics/gegl/pkg-plist +++ b/graphics/gegl/pkg-plist @@ -89,23 +89,23 @@ include/gegl-%%GEGL_VER%%/sc/sc-sample.h %%FFMPEG%%lib/gegl-%%GEGL_VER%%/ff-save.so lib/gegl-%%GEGL_VER%%/dropshadow2.json lib/gegl-%%GEGL_VER%%/gegl-common-cxx.so -%%AARCH64%%lib/gegl-%%GEGL_VER%%/gegl-common-cxx-arm-neon.so +%%ARM%%lib/gegl-%%GEGL_VER%%/gegl-common-cxx-arm-neon.so %%AMD64%%lib/gegl-%%GEGL_VER%%/gegl-common-cxx-x86_64-v2.so %%AMD64%%lib/gegl-%%GEGL_VER%%/gegl-common-cxx-x86_64-v3.so lib/gegl-%%GEGL_VER%%/gegl-common-gpl3.so -%%AARCH64%%lib/gegl-%%GEGL_VER%%/gegl-common-gpl3-arm-neon.so +%%ARM%%lib/gegl-%%GEGL_VER%%/gegl-common-gpl3-arm-neon.so %%AMD64%%lib/gegl-%%GEGL_VER%%/gegl-common-gpl3-x86_64-v2.so %%AMD64%%lib/gegl-%%GEGL_VER%%/gegl-common-gpl3-x86_64-v3.so lib/gegl-%%GEGL_VER%%/gegl-common.so -%%AARCH64%%lib/gegl-%%GEGL_VER%%/gegl-common-arm-neon.so +%%ARM%%lib/gegl-%%GEGL_VER%%/gegl-common-arm-neon.so %%AMD64%%lib/gegl-%%GEGL_VER%%/gegl-common-x86_64-v2.so %%AMD64%%lib/gegl-%%GEGL_VER%%/gegl-common-x86_64-v3.so lib/gegl-%%GEGL_VER%%/gegl-core.so lib/gegl-%%GEGL_VER%%/gegl-generated.so -%%AARCH64%%lib/gegl-%%GEGL_VER%%/gegl-generated-arm-neon.so +%%ARM%%lib/gegl-%%GEGL_VER%%/gegl-generated-arm-neon.so %%AMD64%%lib/gegl-%%GEGL_VER%%/gegl-generated-x86_64-v2.so %%AMD64%%lib/gegl-%%GEGL_VER%%/gegl-generated-x86_64-v3.so -%%AARCH64%%lib/gegl-%%GEGL_VER%%/gegl-transformops-arm-neon.so +%%ARM%%lib/gegl-%%GEGL_VER%%/gegl-transformops-arm-neon.so %%AMD64%%lib/gegl-%%GEGL_VER%%/gegl-transformops-x86_64-v2.so %%AMD64%%lib/gegl-%%GEGL_VER%%/gegl-transformops-x86_64-v3.so lib/gegl-%%GEGL_VER%%/gif-load.so