[lib] update exiv2 to v0.28.1

LeoHsiao1 · Jan 13, 2024 · 2377b9f · 2377b9f
1 parent 99a88b9
commit 2377b9f
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 19 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,7 +16,7 @@ jobs:
       matrix:
         os: [ubuntu-22.04]
         python_version: [3.7, 3.8, 3.9, '3.10', '3.11', '3.12']
-        exiv2_version: [0.27.7]
+        exiv2_version: [0.28.1]
     runs-on: ${{matrix.os}}
     env:
       PLATFORM_NAME: linux
@@ -88,7 +88,7 @@ jobs:
       matrix:
         os: [macos-12]
         python_version: [3.6, 3.7, 3.8, 3.9, '3.10', '3.11', '3.12']
-        exiv2_version: [0.27.7]
+        exiv2_version: [0.28.1]
     runs-on: ${{matrix.os}}
     env:
       PLATFORM_NAME: darwin
@@ -160,7 +160,7 @@ jobs:
       matrix:
         os: [windows-2019]
         python_version: [3.6, 3.7, 3.8, 3.9, '3.10', '3.11', '3.12']
-        exiv2_version: [0.27.7]
+        exiv2_version: [0.28.1]
     runs-on: ${{matrix.os}}
     env:
       PLATFORM_NAME: win

diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule ".github/exiv2"]
 	path = .github/exiv2
 	url = https://github.com/Exiv2/exiv2.git
-  branch = v0.27.7
+  branch = v0.28.1
diff --git a/docs/Tutorial-cn.md b/docs/Tutorial-cn.md
@@ -300,7 +300,7 @@ __exiv2_version__ = '...'
 
 ## convert
 
-- Exiv2 支持将某些 EXIF 或 IPTC 标签，转换成 XMP 标签，也支持反向转换。参考：<https://github.com/Exiv2/exiv2/blob/v0.27.7/src/convert.cpp#L313>
+- Exiv2 支持将某些 EXIF 或 IPTC 标签，转换成 XMP 标签，也支持反向转换。参考：<https://github.com/Exiv2/exiv2/blob/v0.28.1/src/convert.cpp#L313>
 - 示例：
     ```py
     >>> pyexiv2.convert_exif_to_xmp({'Exif.Image.Artist': 'test-中文-', 'Exif.Image.Rating': '4'})

diff --git a/docs/Tutorial.md b/docs/Tutorial.md
@@ -300,7 +300,7 @@ __exiv2_version__ = '...'
 
 ## convert
 
-- Exiv2 supports converting some EXIF or IPTC tags to XMP tags, and also supports reverse conversion. Reference: <https://github.com/Exiv2/exiv2/blob/v0.27.7/src/convert.cpp#L313>
+- Exiv2 supports converting some EXIF or IPTC tags to XMP tags, and also supports reverse conversion. Reference: <https://github.com/Exiv2/exiv2/blob/v0.28.1/src/convert.cpp#L313>
 - For example:
     ```py
     >>> pyexiv2.convert_exif_to_xmp({'Exif.Image.Artist': 'test-中文-', 'Exif.Image.Rating': '4'})

diff --git a/pyexiv2/lib/README.md b/pyexiv2/lib/README.md
@@ -27,16 +27,16 @@
 
 1. Download [the release of Exiv2](https://www.exiv2.org/archive.html) :
     ```sh
-    curl -O https://github.com/Exiv2/exiv2/releases/download/v0.27.7/exiv2-0.27.7-Linux64.tar.gz
-    tar -zxvf exiv2-0.27.7-Linux64.tar.gz
+    curl -O https://github.com/Exiv2/exiv2/releases/download/v0.28.1/exiv2-0.28.1-Linux64.tar.gz
+    tar -zxvf exiv2-0.28.1-Linux64.tar.gz
     ```
 
 2. Prepare environment variables according to your download path:
     ```sh
-    EXIV2_DIR=??/exiv2-0.27.7-Linux64
+    EXIV2_DIR=??/exiv2-0.28.1-Linux64
     LIB_DIR=??/pyexiv2/lib/
-    cp $EXIV2_DIR/lib/libexiv2.so.0.27.7  $EXIV2_DIR/lib/libexiv2.so
-    cp $EXIV2_DIR/lib/libexiv2.so.0.27.7  $LIB_DIR/libexiv2.so
+    cp $EXIV2_DIR/lib/libexiv2.so.0.28.1  $EXIV2_DIR/lib/libexiv2.so
+    cp $EXIV2_DIR/lib/libexiv2.so.0.28.1  $LIB_DIR/libexiv2.so
     ```
 
 3. Prepare the python interpreter:
@@ -65,15 +65,15 @@
 
 1. Download [the release of Exiv2](https://www.exiv2.org/archive.html) :
     ```sh
-    curl -O https://github.com/Exiv2/exiv2/releases/download/v0.27.7/exiv2-0.27.7-Darwin.tar.gz
-    tar -zxvf exiv2-0.27.7-Darwin.tar.gz
+    curl -O https://github.com/Exiv2/exiv2/releases/download/v0.28.1/exiv2-0.28.1-Darwin.tar.gz
+    tar -zxvf exiv2-0.28.1-Darwin.tar.gz
     ```
 
 2. Prepare environment variables according to your download path:
     ```sh
-    EXIV2_DIR=??/exiv2-0.27.7-Darwin
+    EXIV2_DIR=??/exiv2-0.28.1-Darwin
     LIB_DIR=??/pyexiv2/lib
-    cp ${EXIV2_DIR}/lib/libexiv2.0.27.7.dylib ${LIB_DIR}/libexiv2.dylib
+    cp ${EXIV2_DIR}/lib/libexiv2.0.28.1.dylib ${LIB_DIR}/libexiv2.dylib
     ```
 
 3. Prepare the python interpreter:
@@ -102,16 +102,16 @@
 
 1. Download [the release of Exiv2](https://www.exiv2.org/archive.html) :
     ```sh
-    curl -O https://github.com/Exiv2/exiv2/releases/download/v0.27.7/exiv2-0.27.7-2019msvc64.zip
-    python -m zipfile -e exiv2-0.27.7-2019msvc64.zip .
+    curl -O https://github.com/Exiv2/exiv2/releases/download/v0.28.1/exiv2-0.28.1-2019msvc64.zip
+    python -m zipfile -e exiv2-0.28.1-2019msvc64.zip .
     ```
 
 2. Install `Visual Studio 2019` (must use the same version of Visual Studio as the Exiv2 build) , and set the environment variables it needs.
 
 3. Prepare environment variables according to your download path:
     ```batch
     "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
-    set  EXIV2_DIR=??\exiv2-0.27.7-2019msvc64
+    set  EXIV2_DIR=??\exiv2-0.28.1-2019msvc64
     set  LIB_DIR=??\pyexiv2\lib
     copy %EXIV2_DIR%\bin\exiv2.dll  %LIB_DIR%
     ```

diff --git a/pyexiv2/tests/test_func.py b/pyexiv2/tests/test_func.py
@@ -5,7 +5,7 @@
 def test_version():
     try:
         from .base import __exiv2_version__
-        assert __exiv2_version__ == '0.27.7'
+        assert __exiv2_version__ == '0.28.1'
     except:
         ENV.skip_test = True
         raise