Bug 259483 - multimedia/assimp: fix build on 32 bit platforms
Summary: multimedia/assimp: fix build on 32 bit platforms
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: Yuri Victorovich
URL: https://github.com/assimp/assimp/issu...
Keywords:
Depends on:
Blocks:
 
Reported: 2021-10-27 14:24 UTC by Robert Clausecker
Modified: 2021-10-27 14:53 UTC (History)
2 users (show)

See Also:
bugzilla: maintainer-feedback? (yuri)
fuz: merge-quarterly?


Attachments
multimedia/assimp: fix build on 32 bit platforms (59.69 KB, patch)
2021-10-27 14:24 UTC, Robert Clausecker
fuz: maintainer-approval? (yuri)
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Robert Clausecker 2021-10-27 14:24:28 UTC
Created attachment 229070 [details]
multimedia/assimp: fix build on 32 bit platforms

This patch applies the relevant upstream patches to multimedia/assimp to update contrib/zip to 0.1.18, thereby fixing upstream issue 2954 and making the port build on 32 bit platforms.

PPC was not tested but should be fine if it failed for the same reason.  CC'ed pkubaj@ in case he wants to test.

Tested with Poudriere on amd64 i386 FreeBSD 13, without Poudriere on armv7 arm64 FreeBSD 13.

Please MFH if possible.
Comment 1 Piotr Kubaj freebsd_committer 2021-10-27 14:39:02 UTC
Thanks, I'm testing it.

However, the description of the patch is wrong:
+Update contrib/zip to 0.1.18 to fix a build failure on 32 bit platforms.
+This patch is a combination of two upstream patches [1][2] slightly
+edited to fit FreeBSD conventions and to skip files not shipped in the
+distribution.  See upstream issue 2954 [3] for details.
+
+[1]: https://github.com/assimp/assimp/commit/f78446b14aff46db2ef27d062a275b6a01fd68b1.diff
+[2]: https://github.com/assimp/assimp/commit/f78446b14aff46db2ef27d062a275b6a01fd68b1.diff
+[3]: https://github.com/assimp/assimp/issues/2954

[1] and [2] are the same URLs.
Comment 2 Robert Clausecker 2021-10-27 14:43:17 UTC
(In reply to Piotr Kubaj from comment #1)

Oh how unfortunate.  That was a copy/paste error from merging the two patches and their descriptions.  The URL for [2] should have been

https://github.com/assimp/assimp/commit/bb3db0ebaffc6b76de256e597ec1d1e4d2a6663f.diff

of course.
Comment 3 Yuri Victorovich freebsd_committer 2021-10-27 14:49:44 UTC
Committed, thanks!
Comment 4 commit-hook freebsd_committer 2021-10-27 14:49:58 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=c1f6d03bf9305cd02ab733359989fd33c6675231

commit c1f6d03bf9305cd02ab733359989fd33c6675231
Author:     Robert Clausecker <fuz@fuz.su>
AuthorDate: 2021-10-27 14:42:01 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2021-10-27 14:47:40 +0000

    multimedia/assimp: Fix build on 32 bit platforms

    PR:             259483

 multimedia/assimp/Makefile                      |    4 +-
 multimedia/assimp/files/patch-contrib-zip (new) | 1729 +++++++++++++++++++++++
 2 files changed, 1730 insertions(+), 3 deletions(-)
Comment 5 commit-hook freebsd_committer 2021-10-27 14:50:59 UTC
A commit in branch 2021Q4 references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=6a25fe1ffc96b5ea79c1fef1bc0bee6ff8453069

commit 6a25fe1ffc96b5ea79c1fef1bc0bee6ff8453069
Author:     Robert Clausecker <fuz@fuz.su>
AuthorDate: 2021-10-27 14:42:01 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2021-10-27 14:48:35 +0000

    multimedia/assimp: Fix build on 32 bit platforms

    PR:             259483
    (cherry picked from commit c1f6d03bf9305cd02ab733359989fd33c6675231)

 multimedia/assimp/Makefile                      |    4 +-
 multimedia/assimp/files/patch-contrib-zip (new) | 1729 +++++++++++++++++++++++
 2 files changed, 1730 insertions(+), 3 deletions(-)
Comment 6 Piotr Kubaj freebsd_committer 2021-10-27 14:53:15 UTC
Builds fine on powerpc.