Update ABI/API compatibility reports after commit 0bda7188b7b545232a341f1d978b1e4feda...

diff --git a/abi-check/changelog/openjpeg/current/log.html b/abi-check/changelog/openjpeg/current/log.html
index 5decd061a5a2d7b079310564128a256b9d250649..e9baa737c4b3d4e082a4e1eba5c4fc597ccabffa 100644 (file)
--- a/abi-check/changelog/openjpeg/current/log.html
+++ b/abi-check/changelog/openjpeg/current/log.html
@@ -20,7 +20,37 @@
 <br/>
 <h1>Changelog from Git</h1><br/><br/>
 <div class='changelog'>
-<pre class='wrap'>commit 0782cd075d7e9678bf1cb448c1f3d048fabe4489
+<pre class='wrap'>commit 0bda7188b7b545232a341f1d978b1e4feda46fc2
+Merge: 0782cd0 4d0b49e
+Author: Even Rouault &lt;even.rouault@spatialys.com&gt;
+Date:   2021-01-10 23:58:37 +0100
+
+    Merge pull request #1321 from ffontaine/master
+    
+    Fix cmake file with DESTDIR
+
+commit 4d0b49edad7fb31ebbf03c60a45b72aaa7b7412b
+Author: Fabrice Fontaine &lt;fontaine.fabrice@gmail.com&gt;
+Date:   2021-01-07 14:11:26 +0100
+
+    cmake/OpenJPEGConfig.cmake: replace ABSOLUTE by REALPATH
+    
+    Fix #1174 by replacing ABSOLUTE by REALPATH which will resolve symlinks:
+    https://cmake.org/cmake/help/latest/command/get_filename_component.html
+    
+    Signed-off-by: Fabrice Fontaine &lt;fontaine.fabrice@gmail.com&gt;
+
+commit 14f4c27e7c91f745a1dda9991b5deea3cbef2072
+Author: Fabrice Fontaine &lt;fontaine.fabrice@gmail.com&gt;
+Date:   2021-01-07 14:09:50 +0100
+
+    Revert "Use INC_DIR for OPENJPEG_INCLUDE_DIRS (fixes uclouvain#1174)"
+    
+    This reverts commit 65586374d639cfc0104419992f9022174b412594 which
+    breaks cross-compilation of poppler under buildroot (because of
+    DESTDIR usage).
+
+commit 0782cd075d7e9678bf1cb448c1f3d048fabe4489
 Merge: 07a4543 b6f0e41
 Author: Even Rouault &lt;even.rouault@spatialys.com&gt;
 Date:   2021-01-04 19:42:30 +0100
@@ -669,12 +699,6 @@ Date:   2020-05-18 20:15:07 +0200
 
     Encoder: use floating-point operations for irreversible transformation
 
-commit 99107d5e468beef3cf2f7db24633ba8b40732405
-Author: Even Rouault &lt;even.rouault@spatialys.com&gt;
-Date:   2020-05-18 18:09:10 +0200
-
-    dwt.c: change sign of constants to match standard and compensate (no functional change)
-
 commit 1d358f25c8eabbc7c274bcc148f4f5d594ec13fe
 Merge: 64689d0 4edb8c8
 Author: Even Rouault &lt;even.rouault@spatialys.com&gt;
@@ -842,28 +866,6 @@ Date:   2020-02-10 11:20:20 +0100
     
     tests: add alternate checksums for libtiff 4.1
 
-commit b5cb419faff300fdbc0b4e98dab5c9010db6f39d
-Author: Even Rouault &lt;even.rouault@spatialys.com&gt;
-Date:   2020-02-07 21:53:10 +0100
-
-    tests: add alternate checksums for libtiff 4.1
-    
-    Fixes #1233
-    
-    libtiff 4.1 slightly modifies the way it generates files. So
-    add the new expected md5sum.
-    
-    Not super elegant solution admitedly.
-
-commit 647f9b118d12819c63635eea65909b0e49e0f201
-Merge: b63a433 05f9b91
-Author: Even Rouault &lt;even.rouault@spatialys.com&gt;
-Date:   2020-01-30 13:07:31 +0100
-
-    Merge pull request #1232 from rouault/fix_1231
-    
-    opj_tcd_init_tile(): avoid integer overflow
-
 ...</pre></div>
 
 </body>

diff --git a/abi-check/db/openjpeg/Tracker.data b/abi-check/db/openjpeg/Tracker.data
index 2be80fb8ae0165400d5c6ca63b29c5aeb633dd82..a31778712c6a37354fb98509d422e8704dbb2237 100644 (file)
--- a/abi-check/db/openjpeg/Tracker.data
+++ b/abi-check/db/openjpeg/Tracker.data
@@ -768,7 +768,7 @@ $VAR1 = {
                       '2.3.0' => '2017-10-04 22:23',
                       '2.3.1' => '2019-04-02 10:08',
                       '2.4.0' => '2020-12-28 20:59',
-                      'current' => '2021-01-04 19:42:30'
+                      'current' => '2021-01-10 23:58:37'
                     },
           'HeadersDiff' => {
                              '1.1' => {
@@ -886,7 +886,7 @@ $VAR1 = {
           'Maintainer' => 'OpenJPEG team',
           'MaintainerUrl' => 'http://www.openjpeg.org/',
           'PackageDiff' => {},
-          'ScmUpdateTime' => '1609792132',
+          'ScmUpdateTime' => '1610320237',
           'Soname' => {
                         '1.1' => {
                                    'lib/libopenjpeg.so' => 'libopenjpeg.so'

diff --git a/abi-check/installed/openjpeg/2.4.0/lib/libopenjp2.a b/abi-check/installed/openjpeg/2.4.0/lib/libopenjp2.a
index 40158054f101af79ca2671cff025f3829d82a46a..0cb645176842aa4cbadef48d9b5f7af64a7b1c90 100644 (file)
Binary files a/abi-check/installed/openjpeg/2.4.0/lib/libopenjp2.a and b/abi-check/installed/openjpeg/2.4.0/lib/libopenjp2.a differ

diff --git a/abi-check/installed/openjpeg/2.4.0/lib/libopenjp2.so.2.4.0 b/abi-check/installed/openjpeg/2.4.0/lib/libopenjp2.so.2.4.0
index 305f5beeb6b70a371a3b7bb1fc446d4ec5614b54..1b68fa46605e104023c7da9f8f6a5ea1c882a5b2 100644 (file)
Binary files a/abi-check/installed/openjpeg/2.4.0/lib/libopenjp2.so.2.4.0 and b/abi-check/installed/openjpeg/2.4.0/lib/libopenjp2.so.2.4.0 differ

diff --git a/abi-check/installed/openjpeg/current/lib/libopenjp2.a b/abi-check/installed/openjpeg/current/lib/libopenjp2.a
index d8552bdfa0e9e583c78ef325239c2510403e1fc8..38cf935b3ee1b504eeae62e98ffd53e2805685ff 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.4.0 b/abi-check/installed/openjpeg/current/lib/libopenjp2.so.2.4.0
index 470bf2a07e05a509cc32fca47069a18b5524e924..e95bbb24c9202daeb220930432a343d5d2f5818c 100644 (file)
Binary files a/abi-check/installed/openjpeg/current/lib/libopenjp2.so.2.4.0 and b/abi-check/installed/openjpeg/current/lib/libopenjp2.so.2.4.0 differ

diff --git a/abi-check/installed/openjpeg/current/lib/openjpeg-2.4/OpenJPEGConfig.cmake b/abi-check/installed/openjpeg/current/lib/openjpeg-2.4/OpenJPEGConfig.cmake
index f93b7cde54c2e386ccc857fd3e73611690d63977..aaa4dce58d3b0862b55fb80702b5db88e5eea68c 100644 (file)
--- a/abi-check/installed/openjpeg/current/lib/openjpeg-2.4/OpenJPEGConfig.cmake
+++ b/abi-check/installed/openjpeg/current/lib/openjpeg-2.4/OpenJPEGConfig.cmake
@@ -27,8 +27,12 @@ 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.4")
   set(INC_DIR "/home/travis/abi-check/work/abi-check/installed/openjpeg/current/include/openjpeg-2.4")
-  get_filename_component(OPENJPEG_INCLUDE_DIRS "${INC_DIR}" ABSOLUTE)
+  file(RELATIVE_PATH PKG_TO_INC_RPATH "${PKG_DIR}" "${INC_DIR}")
+
+  get_filename_component(OPENJPEG_INCLUDE_DIRS "${SELF_DIR}/${PKG_TO_INC_RPATH}" REALPATH)
 
 else()
   if(EXISTS ${SELF_DIR}/OpenJPEGExports.cmake)

diff --git a/abi-check/timeline/openjpeg/index.html b/abi-check/timeline/openjpeg/index.html
index f34d0618ccb6fd6b1144f4f5cf005587a47660a6..876cd57523a7b1838758175ecdcdabb6c01e9dd2 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>2021-01-04<br/>19:42</td>
+<td>2021-01-10<br/>23:58</td>
 <td>7</td>
 <td><a href='../../changelog/openjpeg/current/log.html'>changelog</a></td>
 <td class='ok'><a href='../../objects_report/openjpeg/2.4.0/current/report.html'>100%</a></td>
@@ -188,7 +188,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 Mon Jan  4 20:29:28 2021.<br/>
+</table><br/>Maintained by <a href='http://www.openjpeg.org/'>OpenJPEG team</a>. Last updated on Sun Jan 10 23:11:12 2021.<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>