Page MenuHomeFreeBSD

graphics/cloudcompare: Update 2.12.4 => 2.13.2, take maintainership
ClosedPublic

Authored by alven on Sun, Feb 22, 8:46 AM.
Tags
None
Referenced Files
F146168532: D55434.id.diff
Sat, Feb 28, 10:06 AM
F146129357: D55434.id172481.diff
Sat, Feb 28, 1:50 AM
Unknown Object (File)
Fri, Feb 27, 7:49 AM
Unknown Object (File)
Fri, Feb 27, 3:11 AM
Unknown Object (File)
Fri, Feb 27, 3:02 AM
Unknown Object (File)
Thu, Feb 26, 9:42 PM
Unknown Object (File)
Thu, Feb 26, 2:40 PM
Unknown Object (File)
Thu, Feb 26, 8:16 AM
Subscribers

Details

Summary
  • Add WWW for source code repository.
  • Static tarball is available, but not used, as GH_TUPLE is needed for bundled external libraries and 3-rd party plugins.
  • GL is needed for the main application, not for the plugins only.
  • Build PLUGIN_IO_QPDAL unconditionally, just like other plugins.
  • Supply *.desktop with *.png files from the previous version, as upstream doesn't ship them anymore. Fix post-install accordingly.
  • Fix plugin path detection actually enabling plugins autoloading.
  • Improve COMMENT and pkg-descr
Test Plan

For every {150amd64, 143amd64}:

  • Successful poudriere testport
  • Successful run-testing

Diff Detail

Repository
R11 FreeBSD ports repository
Lint
No Lint Coverage
Unit
No Test Coverage
Build Status
Buildable 70877
Build 67760: arc lint + arc unit

Event Timeline

alven requested review of this revision.Sun, Feb 22, 8:46 AM
alven created this revision.

Fix missing end of line symbol

alven edited the summary of this revision. (Show Details)
graphics/cloudcompare/Makefile
92

You can install and replace in one go with ${SED} ... > ${STAGEDIR}...

graphics/cloudcompare/files/cloudcompare.desktop
9

Doesn't Icon=cloudcompare work? If yes, this should be preferred, because advanced DE themes will be able to override the original icon with a themed one.

graphics/cloudcompare/files/cloudcompare.png
1

Not really sure about committing png images into the repo. In textproc/obsidian I just put it into DISTFILES so that the icon gets downloaded during make fetch. I feel like it is a better approach.

graphics/cloudcompare/pkg-descr
9

I don't think we need a history lesson in pkg-descr.

alven marked 2 inline comments as done.

Fix some of the issues mentioned on review.

alven added inline comments.
graphics/cloudcompare/Makefile
92

Please, more on this: how (if) could I do it for both (or many) files in one command? I like the idea just can't get it...
${SED} | cat > ${STAGEDIR} seems to not preserve file names...
Or, I may even not need this as I don't need absolute paths to the binaries at all?

graphics/cloudcompare/files/cloudcompare.desktop
9

Yes, it does, thanks!

graphics/cloudcompare/files/cloudcompare.png
1

I would possibly follow your advice if I could. As I have to use GH_TUPLE for bundled external libraries and plugins, I can't use MASTER_SITES at the same time. May be, I just don't know how to do it (properly, and at all).

graphics/cloudcompare/pkg-descr
9

I tried to reword the sentences to your advice.

alven marked 2 inline comments as done.

Enable OpenMPI detection as it seems not broken now.

graphics/cloudcompare/Makefile
92

You'll need a make or a shell loop to do this for multiple files, so feel free to leave it as is if you don't like loops.

graphics/cloudcompare/files/cloudcompare.png
1

MASTER_SITES with a non-default category should work even in presence of USE_GITHUB:

MASTER_SITES= https://../:icon
DISTFILES= cloudcompare.png:icon
EXTRACT_ONLY=
alven marked an inline comment as done and an inline comment as not done.Sun, Feb 22, 3:17 PM
alven added inline comments.
graphics/cloudcompare/files/cloudcompare.png
1

Sorry, but I really can't make it work following your advice: the other DISTFILES - plugins from GH_TUPLE - are failing to unpack properly.
Seems like this port is really different from textproc/obsidian as it has GH_TUPLE which complicates things a lot (at least for me).

graphics/cloudcompare/files/cloudcompare.png
1

Could you, please, allow me to just commit these 2 PNGs to the tree?

graphics/cloudcompare/files/cloudcompare.png
1

I'm not in a position to allow or deny you anything. I just tried to provide some useful input, but if it isn't really applicable to your case - then of course do it your way.

alven signed these changes with MFA.Sun, Feb 22, 3:38 PM
alven accepted this revision.
alven marked 3 inline comments as done.
alven added inline comments.
graphics/cloudcompare/files/cloudcompare.png
1

Thank you! :)
You've already helped me to learn a lot and make this port better :)

This revision is now accepted and ready to land.Sun, Feb 22, 3:38 PM
This revision was automatically updated to reflect the committed changes.
alven marked an inline comment as done.

It is not recommended to put binaries into the ports repository.
Can you show direct links to *.png files?
I'll try to fix this.

graphics/cloudcompare/Makefile
88

Use ${DESKTOPDIR} instead of ${PREFIX}/share/applications.

In D55434#1268047, @vvd wrote:

Can you show direct links to *.png files?
I'll try to fix this.

Sure, I can:
https://github.com/CloudCompare/CloudCompare/tree/v2.12.4/snap/gui
https://github.com/CloudCompare/CloudCompare/blob/v2.12.4/snap/gui/ccViewer.png
https://github.com/CloudCompare/CloudCompare/blob/v2.12.4/snap/gui/cloudcompare.png
Hope you could do it, so I could learn from you. Even if not, I'll be glad you tried to help me :)

alven added inline comments.
graphics/cloudcompare/Makefile
88

Thanks! Done. :)

Try this:

MASTER_SITES=   https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/refs/tags/v2.12.4/snap/gui/:icons
DISTFILES=      ccViewer.png:icons cloudcompare.png:icons
DIST_SUBDIR=    ${PORTNAME}-${DISTVERSION}
EXTRACT_ONLY=   ${_DISTFILES:N*.png}

Don't forget make makesum.

This revision was not accepted when it landed; it landed in state Needs Review.Mon, Feb 23, 4:50 AM
This revision was automatically updated to reflect the committed changes.
alven signed these changes with MFA.Mon, Feb 23, 4:50 AM

Thank you! This work wonderful, like a real magic! :)