mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-02 01:20:54 +00:00
Code Issues Releases Activity

multimedia/zoneminder: fix build on armv7 (again)

Browse Source 
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: 78a10b6095

PR:	264550
Approved by:	bsd@abinet.ru (maintainer)
This commit is contained in:
Robert Clausecker 2022-06-08 18:38:35 +02:00 committed by Piotr Kubaj
parent 0888562d7e
commit 83e849f1f6
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
multimedia/zoneminder/distinfo
View File

@ -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

16
multimedia/zoneminder/files/patch-src_zm__utils.cpp Normal file
View File

@ -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");