update to libraw 0.20.0

letmaik · Aug 8, 2020 · 66f0568 · 66f0568
1 parent ac7cfc5
commit 66f0568
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/.github/scripts/build-linux.sh b/.github/scripts/build-linux.sh
@@ -64,7 +64,12 @@ libraw_dir=$(pwd)/external/LibRaw
 pushd external/LibRaw-cmake
 mkdir build
 cd build
-cmake -DLIBRAW_PATH=$libraw_dir -DENABLE_EXAMPLES=OFF -DENABLE_RAWSPEED=OFF -DCMAKE_BUILD_TYPE=Release ..
+cmake .. \
+    -DLIBRAW_PATH=$libraw_dir \
+    -DCMAKE_CXX_FLAGS="-DUSE_X3FTOOLS -DUSE_6BY9RPI" \
+    -DENABLE_EXAMPLES=OFF \
+    -DENABLE_RAWSPEED=OFF \
+    -DCMAKE_BUILD_TYPE=Release
 make
 make install -j$(nproc)
 echo "/usr/local/lib" | tee /etc/ld.so.conf.d/99local.conf

diff --git a/README.md b/README.md
@@ -124,7 +124,7 @@ Or install the latest release version from the source repository:
 git clone https://github.com/LibRaw/LibRaw.git libraw
 git clone https://github.com/LibRaw/LibRaw-cmake.git libraw-cmake
 cd libraw
-git checkout 0.19.5
+git checkout 0.20.0
 cp -R ../libraw-cmake/* .
 cmake .
 sudo make install

diff --git a/external/LibRaw b/external/LibRaw
diff --git a/rawpy/_version.py b/rawpy/_version.py
@@ -1 +1 @@
-__version__ = "0.14.0"
+__version__ = "0.15.0"
diff --git a/setup.py b/setup.py
@@ -187,6 +187,7 @@ def windows_libraw_compile():
     enable_openmp_flag = 'ON' if has_openmp_dll else 'OFF'
     cmds = [cmake + ' .. -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release ' +\
                     '-DLIBRAW_PATH=' + libraw_dir.replace('\\', '/') + ' ' +\
+                    '-DCMAKE_CXX_FLAGS="-DUSE_X3FTOOLS -DUSE_6BY9RPI" ' +\
                     '-DENABLE_EXAMPLES=OFF -DENABLE_OPENMP=' + enable_openmp_flag + ' -DENABLE_RAWSPEED=OFF ' +\
                     ('-DENABLE_DEMOSAIC_PACK_GPL2=ON -DDEMOSAIC_PACK_GPL2_RPATH=../../LibRaw-demosaic-pack-GPL2 ' +\
                      '-DENABLE_DEMOSAIC_PACK_GPL3=ON -DDEMOSAIC_PACK_GPL3_RPATH=../../LibRaw-demosaic-pack-GPL3 '
@@ -235,6 +236,7 @@ def mac_libraw_compile():
     install_name_dir = os.path.join(install_dir, 'lib')
     cmds = ['cmake .. -DCMAKE_BUILD_TYPE=Release ' +\
                     '-DLIBRAW_PATH=' + libraw_dir + ' ' +\
+                    '-DCMAKE_CXX_FLAGS="-DUSE_X3FTOOLS -DUSE_6BY9RPI" ' +\
                     '-DENABLE_OPENMP=OFF ' +\
                     '-DENABLE_EXAMPLES=OFF -DENABLE_RAWSPEED=OFF ' +\
                     ('-DENABLE_DEMOSAIC_PACK_GPL2=ON -DDEMOSAIC_PACK_GPL2_RPATH=../../LibRaw-demosaic-pack-GPL2 ' +\