Skip to content

Commit

Permalink
multimedia/zoneminder: fix build on armv7 (again)
Browse files Browse the repository at this point in the history
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: ZoneMinder/zoneminder@78a10b6

PR:	264550
Approved by:	bsd@abinet.ru (maintainer)
  • Loading branch information
clausecker authored and pkubaj committed Jun 13, 2022
1 parent 0888562 commit 83e849f
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 1 deletion.
2 changes: 1 addition & 1 deletion 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
Expand Down
16 changes: 16 additions & 0 deletions 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");

0 comments on commit 83e849f

Please sign in to comment.