Date: Mon, 13 Jun 2022 20:37:45 GMT From: Piotr Kubaj <pkubaj@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 83e849f1f6da - main - multimedia/zoneminder: fix build on armv7 (again) Message-ID: <202206132037.25DKbjLq005560@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=83e849f1f6dadadd5bb6beca5cf8662271b4a4ff commit 83e849f1f6dadadd5bb6beca5cf8662271b4a4ff Author: Robert Clausecker <fuz@fuz.su> AuthorDate: 2022-06-08 16:38:35 +0000 Commit: Piotr Kubaj <pkubaj@FreeBSD.org> 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");
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202206132037.25DKbjLq005560>