diff options
| author | Thad House <thadhouse1@gmail.com> | 2019-05-31 13:49:13 -0700 |
|---|---|---|
| committer | Thad House <thadhouse1@gmail.com> | 2019-05-31 13:49:13 -0700 |
| commit | 788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b (patch) | |
| tree | 173ade0e6960917458afe9dd9fb0c3c2b7f32051 /ports/guetzli | |
| parent | f483ae4c7fd04eed671a1de595374f84175311e9 (diff) | |
| parent | 26a9338c5055193915290527eacb37f2ac7fdcb8 (diff) | |
| download | vcpkg-788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b.tar.gz vcpkg-788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b.zip | |
Merge master
Diffstat (limited to 'ports/guetzli')
| -rw-r--r-- | ports/guetzli/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | ports/guetzli/CONTROL | 8 | ||||
| -rw-r--r-- | ports/guetzli/butteraugli.patch | 13 | ||||
| -rw-r--r-- | ports/guetzli/portfile.cmake | 3 |
4 files changed, 20 insertions, 8 deletions
diff --git a/ports/guetzli/CMakeLists.txt b/ports/guetzli/CMakeLists.txt index 5d594aabd..d24b2326d 100644 --- a/ports/guetzli/CMakeLists.txt +++ b/ports/guetzli/CMakeLists.txt @@ -5,10 +5,6 @@ if(MSVC) add_compile_options(/W3 /wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS -DNOMINMAX) endif() -if(BUILD_SHARED_LIBS) - set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) -endif() - find_path(butteraugli_include butteraugli/butteraugli.h) find_library(butteraugli_library NAMES butteraugli_lib) find_package(PNG REQUIRED) diff --git a/ports/guetzli/CONTROL b/ports/guetzli/CONTROL index 1bbfbe444..dd8e76575 100644 --- a/ports/guetzli/CONTROL +++ b/ports/guetzli/CONTROL @@ -1,4 +1,4 @@ -Source: guetzli -Version: 2018-07-30 -Description: Perceptual JPEG encoder -Build-Depends: libpng, butteraugli +Source: guetzli
+Version: 2018-07-30-2
+Description: Perceptual JPEG encoder
+Build-Depends: libpng, butteraugli
diff --git a/ports/guetzli/butteraugli.patch b/ports/guetzli/butteraugli.patch new file mode 100644 index 000000000..ac124ca54 --- /dev/null +++ b/ports/guetzli/butteraugli.patch @@ -0,0 +1,13 @@ +diff --git a/guetzli/butteraugli_comparator.cc b/guetzli/butteraugli_comparator.cc
+index 142c203..f4e710d 100644
+--- a/guetzli/butteraugli_comparator.cc
++++ b/guetzli/butteraugli_comparator.cc
+@@ -56,7 +56,7 @@ ButteraugliComparator::ButteraugliComparator(const int width, const int height,
+ height_(height),
+ target_distance_(target_distance),
+ rgb_orig_(*rgb),
+- comparator_(LinearRgb(width_, height_, *rgb)),
++ comparator_(LinearRgb(width_, height_, *rgb), 1.0f),
+ distance_(0.0),
+ stats_(stats) {}
+
diff --git a/ports/guetzli/portfile.cmake b/ports/guetzli/portfile.cmake index cb5a44687..5e1041461 100644 --- a/ports/guetzli/portfile.cmake +++ b/ports/guetzli/portfile.cmake @@ -1,11 +1,14 @@ include(vcpkg_common_functions) +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/guetzli REF 0b78c7cc8b1b6cbaaf3d08b1facb599bcec1d101 SHA512 54c5198c4c066858dd1377a32e765f46a589f3444bea303b54326453d0e8e71f959d3aaf2c72f4714fd27891f4d93288e7fa96baf1fd10f127929c1fcfa5ae1c HEAD_REF master + PATCHES butteraugli.patch ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) |