Update ABI/API compatibility reports after commit 98a4c5c3709e0cc43b0a1c151ed5bd85a2d...

diff --git a/abi-check/changelog/openjpeg/current/log.html b/abi-check/changelog/openjpeg/current/log.html
index 91c939db1102a9825ad62fa0144085883d188bb7..0277bee261084d2463c4fdf13cd1d3ed4fefba91 100644 (file)
--- a/abi-check/changelog/openjpeg/current/log.html
+++ b/abi-check/changelog/openjpeg/current/log.html
@@ -20,7 +20,23 @@
 <br/>
 <h1>Changelog from Git</h1><br/><br/>
 <div class='changelog'>
-<pre class='wrap'>commit 5d0a8b08dcd3bcdf532c54702b5a88ec61b17918
+<pre class='wrap'>commit 98a4c5c3709e0cc43b0a1c151ed5bd85a2d607fa
+Merge: 5d0a8b0 6558637
+Author: Even Rouault &lt;even.rouault@spatialys.com&gt;
+Date:   2020-12-10 15:55:41 +0100
+
+    Merge pull request #1306 from matthew-sharp/master
+    
+    Use INC_DIR for OPENJPEG_INCLUDE_DIRS (fixes uclouvain#1174)
+
+commit 65586374d639cfc0104419992f9022174b412594
+Author: Matthew Sharp &lt;sharpshopter@gmail.com&gt;
+Date:   2020-12-10 10:17:46 +1100
+
+    Use INC_DIR for OPENJPEG_INCLUDE_DIRS (fixes uclouvain#1174)
+    This fixes the case where the cmake file is accessed via a symlink.
+
+commit 5d0a8b08dcd3bcdf532c54702b5a88ec61b17918
 Merge: 43dd9ee 8f5aff1
 Author: Even Rouault &lt;even.rouault@spatialys.com&gt;
 Date:   2020-12-05 11:39:23 +0100
@@ -877,18 +893,6 @@ Date:   2019-04-25 15:32:22 +0200
     
     compression: emit POC marker when only one single POC is requested (f…
 
-commit a94cfbd5334922ca5b63cfac9d2e5e0ec98155be
-Author: Even Rouault &lt;even.rouault@spatialys.com&gt;
-Date:   2019-04-25 14:07:46 +0200
-
-    Change opj_j2k_check_poc_val() to take into account tile number
-
-commit bdec5ae2723369be5abba7aaae398aa4ae3225cc
-Author: Even Rouault &lt;even.rouault@spatialys.com&gt;
-Date:   2019-04-25 01:29:38 +0200
-
-    Add test for previous commit
-
 ...</pre></div>
 
 </body>

diff --git a/abi-check/db/openjpeg/Tracker.data b/abi-check/db/openjpeg/Tracker.data
index e0deb0df45eaa0ff0784f98c1668407a6d5c887a..6a086ed9595e6a5988d4541d0be65049202b53b7 100644 (file)
--- a/abi-check/db/openjpeg/Tracker.data
+++ b/abi-check/db/openjpeg/Tracker.data
@@ -705,7 +705,7 @@ $VAR1 = {
                       '2.2.0' => '2017-08-10 00:31',
                       '2.3.0' => '2017-10-04 22:23',
                       '2.3.1' => '2019-04-02 10:08',
-                      'current' => '2020-12-05 11:39:23'
+                      'current' => '2020-12-10 15:55:41'
                     },
           'HeadersDiff' => {
                              '1.1' => {
@@ -813,7 +813,7 @@ $VAR1 = {
           'Maintainer' => 'OpenJPEG team',
           'MaintainerUrl' => 'http://www.openjpeg.org/',
           'PackageDiff' => {},
-          'ScmUpdateTime' => '1607166363',
+          'ScmUpdateTime' => '1607622901',
           'Soname' => {
                         '1.1' => {
                                    'lib/libopenjpeg.so' => 'libopenjpeg.so'

diff --git a/abi-check/installed/openjpeg/2.3.1/lib/libopenjp2.a b/abi-check/installed/openjpeg/2.3.1/lib/libopenjp2.a
index dd55b4e08602625047346a45309bec47557bb00e..61655e51f3da261a12715e0f46215bfe38010e48 100644 (file)
Binary files a/abi-check/installed/openjpeg/2.3.1/lib/libopenjp2.a and b/abi-check/installed/openjpeg/2.3.1/lib/libopenjp2.a differ

diff --git a/abi-check/installed/openjpeg/2.3.1/lib/libopenjp2.so.2.3.1 b/abi-check/installed/openjpeg/2.3.1/lib/libopenjp2.so.2.3.1
index 2e37b70415affd52dd259236cb993479f73dd783..89129b0ae99ef77c1a77b0ad113322136c3b31c1 100644 (file)
Binary files a/abi-check/installed/openjpeg/2.3.1/lib/libopenjp2.so.2.3.1 and b/abi-check/installed/openjpeg/2.3.1/lib/libopenjp2.so.2.3.1 differ

diff --git a/abi-check/installed/openjpeg/current/lib/libopenjp2.a b/abi-check/installed/openjpeg/current/lib/libopenjp2.a
index 2b568df468696d9a2c9edebce0b35525ebee2d20..d2162439495c8a12505d74556ffb454bf91d2cc1 100644 (file)
Binary files a/abi-check/installed/openjpeg/current/lib/libopenjp2.a and b/abi-check/installed/openjpeg/current/lib/libopenjp2.a differ

diff --git a/abi-check/installed/openjpeg/current/lib/libopenjp2.so.2.3.1 b/abi-check/installed/openjpeg/current/lib/libopenjp2.so.2.3.1
index 780c9124163dce9ca0568c18cad041986cbbaf86..12ebf59c9db0df18dfaa99a1f2df3cfa8f3f9669 100644 (file)
Binary files a/abi-check/installed/openjpeg/current/lib/libopenjp2.so.2.3.1 and b/abi-check/installed/openjpeg/current/lib/libopenjp2.so.2.3.1 differ

diff --git a/abi-check/installed/openjpeg/current/lib/openjpeg-2.3/OpenJPEGConfig.cmake b/abi-check/installed/openjpeg/current/lib/openjpeg-2.3/OpenJPEGConfig.cmake
index ca5b6b48e611018ea55473b79cf2529bd5d59a7a..c1c92ecff61f6c438600df096ff6ec94dea57c59 100644 (file)
--- a/abi-check/installed/openjpeg/current/lib/openjpeg-2.3/OpenJPEGConfig.cmake
+++ b/abi-check/installed/openjpeg/current/lib/openjpeg-2.3/OpenJPEGConfig.cmake
@@ -27,12 +27,8 @@ if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake)
   # This is an install tree
   include(${SELF_DIR}/OpenJPEGTargets.cmake)
 
-  # We find a relative path from the PKG directory to header files.
-  set(PKG_DIR "/home/travis/abi-check/work/abi-check/installed/openjpeg/current/lib/openjpeg-2.3")
   set(INC_DIR "/home/travis/abi-check/work/abi-check/installed/openjpeg/current/include/openjpeg-2.3")
-  file(RELATIVE_PATH PKG_TO_INC_RPATH "${PKG_DIR}" "${INC_DIR}")
-
-  get_filename_component(OPENJPEG_INCLUDE_DIRS "${SELF_DIR}/${PKG_TO_INC_RPATH}" ABSOLUTE)
+  get_filename_component(OPENJPEG_INCLUDE_DIRS "${INC_DIR}" ABSOLUTE)
 
 else()
   if(EXISTS ${SELF_DIR}/OpenJPEGExports.cmake)

diff --git a/abi-check/timeline/openjpeg/index.html b/abi-check/timeline/openjpeg/index.html
index d835bbc5ca0e3e4d5df38718802be331f7a443f9..d4cc70ec7c0727aa8e79f8fa1e4c6666e3f03f38 100644 (file)
--- a/abi-check/timeline/openjpeg/index.html
+++ b/abi-check/timeline/openjpeg/index.html
@@ -30,7 +30,7 @@
 <th>Headers<br/>Diff</th>
 </tr>
 <tr id='current'><td>current</td>
-<td>2020-12-05<br/>11:39</td>
+<td>2020-12-10<br/>15:55</td>
 <td>7</td>
 <td><a href='../../changelog/openjpeg/current/log.html'>changelog</a></td>
 <td class='ok'><a href='../../objects_report/openjpeg/2.3.1/current/report.html'>100%</a></td>
@@ -179,7 +179,7 @@
 <td>N/A</td>
 <td>N/A</td>
 </tr>
-</table><br/>Maintained by <a href='http://www.openjpeg.org/'>OpenJPEG team</a>. Last updated on Sat Dec  5 11:06:38 2020.<br/>
+</table><br/>Maintained by <a href='http://www.openjpeg.org/'>OpenJPEG team</a>. Last updated on Thu Dec 10 17:55:40 2020.<br/>
 <br/>
 <hr/>
 <div align='right'><a class='home' title="Andrey Ponomarenko's ABI laboratory" href='http://abi-laboratory.pro/'>abi-laboratory.pro</a></div>