From 81e1b5a41cf4282fa9725ebc00a56080bb692399 Mon Sep 17 00:00:00 2001 From: David Capello Date: Tue, 4 Dec 2018 11:43:59 -0300 Subject: [PATCH] Update pixman and disable DEBUG checks in region code --- third_party/pixman | 2 +- third_party/pixman-cmake/CMakeLists.txt | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/third_party/pixman b/third_party/pixman index 65f35270e..eb0dfaa0c 160000 --- a/third_party/pixman +++ b/third_party/pixman @@ -1 +1 @@ -Subproject commit 65f35270e4531621bd2e1ee5cdb31c56c3051c43 +Subproject commit eb0dfaa0c6eb54ca9f8a6d8bf63d346c0fc4f2b9 diff --git a/third_party/pixman-cmake/CMakeLists.txt b/third_party/pixman-cmake/CMakeLists.txt index bb84c95c7..ffe544f7c 100644 --- a/third_party/pixman-cmake/CMakeLists.txt +++ b/third_party/pixman-cmake/CMakeLists.txt @@ -6,9 +6,10 @@ if(UNIX OR APPLE) add_definitions(-DHAVE_PTHREADS) endif() +# Minor and micro versions must be even numbers (to avoid defining DEBUG) set(PIXMAN_VERSION_MAJOR 0) -set(PIXMAN_VERSION_MINOR 33) -set(PIXMAN_VERSION_MICRO 6) +set(PIXMAN_VERSION_MINOR 34) +set(PIXMAN_VERSION_MICRO 0) configure_file( "${CMAKE_CURRENT_SOURCE_DIR}/../pixman/pixman/pixman-version.h.in"