Skip to content
This repository has been archived by the owner on Jan 9, 2023. It is now read-only.

1192 update openjpeg to 2.3.1 #1269

Merged
merged 5 commits into from
Apr 12, 2019
Merged

1192 update openjpeg to 2.3.1 #1269

merged 5 commits into from
Apr 12, 2019

Conversation

tst-jlarocco
Copy link
Contributor

@tst-jlarocco tst-jlarocco commented Apr 11, 2019 •
edited by tst-rwildes
Loading

fixed #1192

@googlebot googlebot added the cla: yes Manual verification that all contributors have signed the CLA. label Apr 11, 2019
tst-nfarah-zz
tst-nfarah-zz reviewed Apr 11, 2019
View reviewed changes
Copy link
Collaborator

@tst-nfarah-zz tst-nfarah-zz left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did we verify that OpenJpeg patch (src/third_party/gdal/gdal-jp2-V2.3.0.patch) we apply in build to GDAL was still applied correctly after this library upgrade ?

@tst-nfarah-zz tst-nfarah-zz added this to the 5.3.0 milestone Apr 11, 2019
@tst-jlarocco
Copy link
Contributor Author

tst-jlarocco commented Apr 11, 2019 •
edited
Loading

Did we verify that OpenJpeg patch (src/third_party/gdal/gdal-jp2-V2.3.0.patch) we apply in build to GDAL was still applied correctly after this library upgrade ?

OpenGEE built okay and I was able to load and build JP2 files, but I didn't specifically check if the patch was applied. Is there a way to check if the patch was applied?

EDIT: I'm rebuilding now (I had removed the build directory), I'll check the configure script that the patch runs against.

@tst-jlarocco
Copy link
Contributor Author

Did we verify that OpenJpeg patch (src/third_party/gdal/gdal-jp2-V2.3.0.patch) we apply in build to GDAL was still applied correctly after this library upgrade ?

OpenGEE built okay and I was able to load and build JP2 files, but I didn't specifically check if the patch was applied. Is there a way to check if the patch was applied?

EDIT: I'm rebuilding now (I had removed the build directory), I'll check the configure script that the patch runs against.

Just checked GDAL's configure script and frmts/openjpeg/openjpegdataset.cpp and they both had te patch applied correctly.

@tst-nfarah-zz
Copy link
Collaborator

tst-nfarah-zz commented Apr 11, 2019 •
edited
Loading

Did we verify that OpenJpeg patch (src/third_party/gdal/gdal-jp2-V2.3.0.patch) we apply in build to GDAL was still applied correctly after this library upgrade ?

OpenGEE built okay and I was able to load and build JP2 files, but I didn't specifically check if the patch was applied. Is there a way to check if the patch was applied?
EDIT: I'm rebuilding now (I had removed the build directory), I'll check the configure script that the patch runs against.

Just checked GDAL's configure script and frmts/openjpeg/openjpegdataset.cpp and they both had te patch applied correctly.

yeah verifying configure and frmts/openjpeg/openjpegdataset.cpp would be one way to do it. Since we are modifying this let's rename that patch to be gdal-jp2-V2.3.1.patch

tst-nfarah-zz
tst-nfarah-zz suggested changes Apr 11, 2019
View reviewed changes
Copy link
Collaborator

@tst-nfarah-zz tst-nfarah-zz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When applying openJpeg patch we need to use the new name of the patch. see (earth_enterprise/src/third_party/gdal/SConscript) line 61.

tst-nfarah-zz
tst-nfarah-zz approved these changes Apr 11, 2019
View reviewed changes
Copy link
Collaborator

@tst-nfarah-zz tst-nfarah-zz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pending Travis CI passing, I approve this PR.

@tst-rwildes tst-rwildes merged commit 6214004 into google:release_5.3.0 Apr 12, 2019
@tst-jlarocco tst-jlarocco deleted the 1192-update-openjpeg-to-2.3.1 branch April 12, 2019 14:27
husf-dsheremata added a commit to husf-dsheremata/earthenterprise that referenced this pull request Jun 4, 2019
@husf-dsheremata
Merge branch 'master' of https://github.com/google/earthenterprise
9730474 
* 'master' of https://github.com/google/earthenterprise:
  1270 Fix xml parsing in common.sh (google#1271)
  1192 update openjpeg to 2.3.1 (google#1269)
  Documented required boost dependency for Ubuntu 14 (google#1264)
  [WIP] Resolve issue google#798 - investigate Qt build performance (google#1245)
  Copy uninstall scripts (google#1232)
  refresh commit
  Issue google#1255 - Limits internal version string to 3 parts to fix various errors with patch releases (google#1256)
  Move build number to release rpm (google#1252)
  fix version
  link up 5.3.1 doc folder (google#1249)
  I1246 create 5.3.1 doc folder from copy of 5.3.0 doc folder (google#1248)
  change version files over to 5.3.1 (google#1247)
  start of 5.3.1
  Fixes google#279 - Admin Console password will be preserved on GEE server upgrade (google#1243)
  google#1201 - Fix issue with setting source date when using .kip directories (google#1234)
  I1228 Add y-scroll-bar to GLC Assembly webpage (google#1230)
  google#1236 Polygons constructor can accept KML as a string (google#1239)
  I1225 Re-add GROUPNAME to install_server.sh (google#1233)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@tst-rwildes tst-rwildes tst-rwildes approved these changes

@tst-nfarah-zz tst-nfarah-zz tst-nfarah-zz approved these changes

Assignees
No one assigned
Labels
cla: yes Manual verification that all contributors have signed the CLA.
Projects
None yet
Milestone
5.3.0
Development

Successfully merging this pull request may close these issues.
4 participants
@tst-jlarocco @tst-nfarah-zz @tst-rwildes @googlebot