Bug 264550 - multimedia/zoneminder: fix build on armv7 (again)
Summary: multimedia/zoneminder: fix build on armv7 (again)
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Piotr Kubaj
URL: https://github.com/ZoneMinder/zonemin...
Keywords:
Depends on:
Blocks:
 
Reported: 2022-06-08 17:28 UTC by Robert Clausecker
Modified: 2022-06-13 20:38 UTC (History)
2 users (show)

See Also:
bsd: maintainer-feedback+
fuz: merge-quarterly?


Attachments
multimedia/zoneminder: fix build on armv7 again (2.30 KB, patch)
2022-06-12 13:28 UTC, Robert Clausecker
fuz: maintainer-approval? (bsd)
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Robert Clausecker freebsd_committer freebsd_triage 2022-06-08 17:28:48 UTC
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

Tested with Poudriere on i386 amd64 armv7 FreeBSD 13.
Please MFH if possible.
Comment 1 Ivan 2022-06-12 08:28:41 UTC
Hello, the first patch is already applied, I see exactly the same rows patch suggests in our zm_utils.cpp
Comment 2 Robert Clausecker freebsd_committer freebsd_triage 2022-06-12 13:28:35 UTC
Created attachment 234640 [details]
multimedia/zoneminder: fix build on armv7 again

Sorry, I forgot to actually attach the patch.

The problem is that the patch has been wrongly applied.  Please see the attached patch for what the problem is.
Comment 3 commit-hook freebsd_committer freebsd_triage 2022-06-13 20:38:25 UTC
A commit in branch main references this bug:

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 +-
 .../zoneminder/files/patch-src_zm__utils.cpp (new)       | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)