diff --git a/.github/scripts/build-linux.sh b/.github/scripts/build-linux.sh index c9e7319..4c9bd18 100755 --- a/.github/scripts/build-linux.sh +++ b/.github/scripts/build-linux.sh @@ -72,6 +72,7 @@ pushd external/LibRaw-cmake mkdir build cd build cmake .. \ + -DCMAKE_INSTALL_PREFIX=/usr \ -DLIBRAW_PATH=$libraw_dir \ -DENABLE_X3FTOOLS=ON \ -DENABLE_6BY9RPI=ON \ @@ -80,8 +81,6 @@ cmake .. \ -DCMAKE_BUILD_TYPE=Release make make install -j$(nproc) -echo "/usr/local/lib" | tee /etc/ld.so.conf.d/99local.conf -ldconfig popd # Install matplotlib (a scikit-image dependency) dependencies diff --git a/external/LibRaw b/external/LibRaw index 0209b6a..cccb976 160000 --- a/external/LibRaw +++ b/external/LibRaw @@ -1 +1 @@ -Subproject commit 0209b6a2caec189e6d1a9b21c10e9e49f46e5a92 +Subproject commit cccb97647fcee56801fa68231fa8a38aa8b52ef7 diff --git a/external/LibRaw-cmake b/external/LibRaw-cmake index 2c65229..6e26c9e 160000 --- a/external/LibRaw-cmake +++ b/external/LibRaw-cmake @@ -1 +1 @@ -Subproject commit 2c65229a9b4b1a8f61ae6aba490a99b0f9a65869 +Subproject commit 6e26c9e73677dc04f9eb236a97c6a4dc225ba7e8 diff --git a/rawpy/_version.py b/rawpy/_version.py index b62e28e..1317d75 100644 --- a/rawpy/_version.py +++ b/rawpy/_version.py @@ -1 +1 @@ -__version__ = "0.17.3" +__version__ = "0.18.0"