From nobody Mon Jun 13 20:37:45 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 D0725831F03; Mon, 13 Jun 2022 20:37:45 +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 4LMNfx5WYlz4YDM; Mon, 13 Jun 2022 20:37:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655152665; 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=AWaKbfejN3XeoNyV/8ssmOhfHG4eTKJ52X17UfW15Js=; b=x9AG6OwFVjrRnvLhOk1nxkptYvb8r/WJpfddfXcBRK5ywQMI+UxlSL+bFOckJgt+wlHvzo 90y3cXzm8XwItVKsbC7Y27sPjBPIzi2AwclMCNmQjZykGk7l3pnN4uIurfOVIKti57Wsts O3dX7/aR5YH76tSpnocYAapPHFcmF8+m7TdZqe/oUW+082Rzr8HYPk5GdI4v9GcSEEtYHR 0TccTGsqseqZespT2oD2go6b98IOPpW/frNyLCTjaU/Gr2niC8iReYq24ErXC60GflhkjW pCw0IEi5/MLBwJuDQoFhXTLZOmh9v+/fd0MEkk9G1vpfT8LQcjlOS9o19HJiwQ== 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 99DFF1CA5E; Mon, 13 Jun 2022 20:37:45 +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 25DKbjJP005561; Mon, 13 Jun 2022 20:37:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25DKbjLq005560; Mon, 13 Jun 2022 20:37:45 GMT (envelope-from git) Date: Mon, 13 Jun 2022 20:37:45 GMT Message-Id: <202206132037.25DKbjLq005560@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 83e849f1f6da - main - multimedia/zoneminder: fix build on armv7 (again) 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: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 83e849f1f6dadadd5bb6beca5cf8662271b4a4ff Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655152665; 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=AWaKbfejN3XeoNyV/8ssmOhfHG4eTKJ52X17UfW15Js=; b=Pw6b39Vx31evOELO69ptYB5fCsXO6RLGhMuQ05UMwQJi3CJDrBtk6S+iuVnfCXCSudm6Wa WgxhzwChiVXgWyFxjr6ZttGckCNILIbiEHh5iUq0SkJxg+sJCo+1+rDnGkIYYTdj8Kf6uF VxYe1UTCJ/PWq89xHp92M/54FikVCXTMHcmrTLZ2PdmIdzTE9NQ+jCFS2CzLUtrXn5+qdQ hdSmRFAQP41vjIMnq/Tn8ATR5ins6QGeJvmr3Ais5sSuv2D1rQ1OX+kS+mltDn2julSXpJ ehqmiU46kl3IayNrSrv/sMPXjUYxxE7TgYzJ/xQksrYzB6khssuo4NGhIx0vnA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655152665; a=rsa-sha256; cv=none; b=INDgWGn8p8JP1otlbph+LtYUzSuYa6zi4jjxVoHO0BHtDspKjuhOfYoXK3RPix5yq3LUl/ 62T+noe8Z5tQpycYSIb3153FspvW85PCih7591GIlTqBlLDK1s7gIbBKK23ZhChUzsvJdX VszSlc6p1RIaumqhHl91drEGbFplIBixz5yeWUNHuWP8WcyN72E7UI7HQE9uTnLTLtqn9y Orvz125Oze3pgdioM0Ls4G+VsWwP1XjjBcI9cm+nhk76vIXpVXhSxI03rue6cP4kIRL5pN 3fVdScNzd9hY2WcY3Cb5PBaAsZd3Dw254lAr0Rj44KOBug9unUzCSIKA/unZ/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=83e849f1f6dadadd5bb6beca5cf8662271b4a4ff commit 83e849f1f6dadadd5bb6beca5cf8662271b4a4ff Author: Robert Clausecker AuthorDate: 2022-06-08 16:38:35 +0000 Commit: Piotr Kubaj CommitDate: 2022-06-13 20:37:40 +0000 multimedia/zoneminder: fix build on armv7 (again) After pkubaj@ fixed armv7 support in ports commit 5094662, the fix was upstreamed. Unfortunately upstream made a mistake in processing the patch, leading to broken code on armv7. This was subsequently fixed in the linked commit, but has not made its way into the ports tree yet. Fix the build once again by importing the patch from the commit above. See also: https://cgit.freebsd.org/ports/commit/?id=50946628c31aff06f6ff06504d5164466d34428c See also: https://github.com/ZoneMinder/zoneminder/commit/78a10b6095b3759d341a1a336ac2b73a880871b4 PR: 264550 Approved by: bsd@abinet.ru (maintainer) --- multimedia/zoneminder/distinfo | 2 +- multimedia/zoneminder/files/patch-src_zm__utils.cpp | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/multimedia/zoneminder/distinfo b/multimedia/zoneminder/distinfo index 3bde15a93e04..820a8dd29abf 100644 --- a/multimedia/zoneminder/distinfo +++ b/multimedia/zoneminder/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1641049619 +TIMESTAMP = 1654708449 SHA256 (zoneminder-zoneminder-1.36.12_GH0.tar.gz) = 8f2772c9aa891e3e3de6b73e4ce95189af4d5faa886ac13d7ce20972d11c31dd SIZE (zoneminder-zoneminder-1.36.12_GH0.tar.gz) = 11350267 SHA256 (FriendsOfCake-crud-1429237_GH0.tar.gz) = 4dc57f344623d3c0e735b53ed583e5382aa9e43012215f641cbd8ebad381aadc diff --git a/multimedia/zoneminder/files/patch-src_zm__utils.cpp b/multimedia/zoneminder/files/patch-src_zm__utils.cpp new file mode 100644 index 000000000000..aa450dd74cfe --- /dev/null +++ b/multimedia/zoneminder/files/patch-src_zm__utils.cpp @@ -0,0 +1,16 @@ +Partial application of upstream commit 78a10b6 to fix +armv7 support fix. + +https://github.com/ZoneMinder/zoneminder/commit/78a10b6095b3759d341a1a336ac2b73a880871b4 + +--- src/zm_utils.cpp.orig 2021-12-10 22:36:30 UTC ++++ src/zm_utils.cpp +@@ -231,6 +231,8 @@ void HwCapsDetect() { + unsigned long auxval = 0; + elf_aux_info(AT_HWCAP, &auxval, sizeof(auxval)); + if (auxval & HWCAP_NEON) { ++ #else ++ { + #error Unsupported OS. + #endif + Debug(1,"Detected ARM (AArch32) processor with Neon");