Page MenuHomeFreeBSD

graphics/osgearth: Update to 2.7
ClosedPublic

Authored by woodsb02 on May 13 2016, 8:06 AM.

Details

Summary

graphics/osgearth:

  • Update to 2.7 (this new version also allows osgearth to build against osg-3.4.0)
  • Rename and update patch of src/osgEarth/ThreadingUtils.cpp (pet portlint)
  • Add patch to removed unnecessary FirstPersonManipulator include from osgearth_skyview [1]

Changes this release:
http://docs.osgearth.org/en/latest/releasenotes.html#version-2-7-july-2015

[1] https://github.com/gwaldron/osgearth/commit/bd36290687f6884c17c622ca57442e60c1ec50b8#diff-091cce4318b0ef98b4ce05f80e3d0762

PR: 209236
Approved by: lbartoletti@tuxfamily.org (maintainer), xxx (mentor)

Test Plan

poudriere testport graphics/osgearth

Diff Detail

Repository
rP FreeBSD ports repository
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

woodsb02 updated this revision to Diff 16277.May 13 2016, 8:06 AM
woodsb02 retitled this revision from to graphics/osgearth: Update to 2.7.
woodsb02 updated this object.
woodsb02 edited the test plan for this revision. (Show Details)
woodsb02 added reviewers: adamw, mat, koobs.
mat added inline comments.May 13 2016, 8:27 AM
graphics/osgearth/Makefile
13 ↗(On Diff #16277)

This should be minizip:archivers/minizip.

graphics/osgearth/distinfo
1–2 ↗(On Diff #16277)

Please update your ports tree and run make makesum again.

woodsb02 updated this revision to Diff 16279.May 13 2016, 9:11 AM

As per comments from mat:

  • fix BUILD_DEPENDS for minizip
  • redo makepatch
woodsb02 marked 2 inline comments as done.May 13 2016, 9:12 AM
mat added inline comments.May 13 2016, 9:13 AM
graphics/osgearth/Makefile
5 ↗(On Diff #16279)

You should keep the DISTVERSIONPREFIX line, the 2.7 bit is a branch name, and not a tag, so it's going to move, and by doing so, breaking this port.

woodsb02 updated this revision to Diff 16296.May 13 2016, 4:17 PM

As per comments from mat:

  • keep DISTVERSIONPREFIX=${PORTNAME}- to prevent the port breaking in the future

Also:

  • Remove skyview patch as it is not needed with DISTVERSIONPREFIX
  • Adjust pkg-plist to suit port with DISTVERSIONPREFIX
  • Fix COMMENT (pet portlint)
woodsb02 marked an inline comment as done.May 13 2016, 4:26 PM
woodsb02 added inline comments.May 13 2016, 5:05 PM
graphics/osgearth/Makefile
5 ↗(On Diff #16279)

TIL. In fact, I have put it back in, but not sure I fully understand. I tried to read up about the GitHub download URL format, and whilst there was quite a lengthy discussion about old vs new APIs, there was not much mention of branches. So, can I please ask for an explanation of why we want the filename to be gwaldron-osgearth-osgearth-2.7_GH0.tar.gz, and what that means for branches vs tag names?

adamw added inline comments.May 14 2016, 3:42 AM
graphics/osgearth/Makefile
5 ↗(On Diff #16279)

The branch name is "2.7". When upstream commits to that branch, the branch names stays the same but the tarball changes, making checksum fail after every commit.

The tag name is "osgearth-2.7". As long as the tag isn't slipped (which is very bad behaviour), the tarball is fixed.

GitHub's API is really flexible. If you give it a branch name, a tag name, or a commit hash, it'll send you a tarball of that thing. There's no way to tell it which one of those you wanted (which is okay, because those names can't overlap anyway). The tarballs names look strange but that was an intentional choice to ensure that distfiles could never conflict.

Does that answer the question?

woodsb02 marked 2 inline comments as done.May 14 2016, 8:00 AM
woodsb02 added inline comments.
graphics/osgearth/Makefile
5 ↗(On Diff #16279)

Ah yes, I follow now. Sorry, it took a little while to click, but I now see that the tags/releases on the osgearth GitHub page are not labelled "2.7" but instead "osgearth-2.7", and therefore without the DISTVERSIONPREFIX it was not actually downloading the release, but the latest commit of the 2.7 branch! Thanks.

Its all done, and this should be ready to commit.

adamw accepted this revision.May 14 2016, 3:17 PM
adamw edited edge metadata.
This revision is now accepted and ready to land.May 14 2016, 3:17 PM
This revision was automatically updated to reflect the committed changes.
woodsb02 marked an inline comment as done.