3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-30 20:59:12 +08:00
Code Issues Projects Releases Wiki Activity

Update to version 1.15.8.

Browse Source 
Revert "Merge pull request #1277 from AlexanderTaeschner/CairoInitMutex".

This reverts commit 2aa83904eac9d11b69f09e9f0af85350fea472d9, reversing
changes made to 748e8b6e7495f06253eb21236bf3abf38b897b63.
This commit is contained in:
Alexander Täschner 2017-09-04 10:04:55 +02:00
parent 35a9d223bc
commit 3eb193938a
3 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/cairo/CONTROL
View File

@ -1,4 +1,4 @@
Source: cairo
Version: 1.15.6
Version: 1.15.8
Description: Cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets include the X Window System (via both Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and SVG file output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.
Build-Depends: zlib, libpng, pixman, glib, freetype, fontconfig

16
ports/cairo/Initialize-mutexes-for-static-builds-for-win32.patch
View File

@ -1,16 +0,0 @@
src/win32/cairo-win32-device.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/win32/cairo-win32-device.c b/src/win32/cairo-win32-device.c
index 741e49e..c60c494 100644
--- a/src/win32/cairo-win32-device.c
+++ b/src/win32/cairo-win32-device.c
@@ -131,6 +131,8 @@ _cairo_win32_device_get (void)
{
cairo_win32_device_t *device;
+ CAIRO_MUTEX_INITIALIZE ();
+
if (__cairo_win32_device)
return cairo_device_reference (__cairo_win32_device);

7
ports/cairo/portfile.cmake
View File

@ -7,19 +7,18 @@
#
include(vcpkg_common_functions)
set(CAIRO_VERSION 1.15.6)
set(CAIRO_VERSION 1.15.8)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/cairo-${CAIRO_VERSION})
vcpkg_download_distfile(ARCHIVE
URLS "http://cairographics.org/snapshots/cairo-${CAIRO_VERSION}.tar.xz"
FILENAME "cairo-${CAIRO_VERSION}.tar.xz"
SHA512 e4eccba745a03545001ebd6f1a7b87bee4b932f80a2d877a764500ad5c18011a5bac585f31eec6d0b65ccaa818de0df2b3b99f0792111363bd3554cfa7f688b6
SHA512 5af1eebf432201dae0efaa5b6766b151d8273ea00dae48e104d56477005b4d423d64b5d11c512736a4cb076632fb2a572ec35becd922825a68d933bb5ff96ca1
)
vcpkg_extract_source_archive(${ARCHIVE})
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES "${CMAKE_CURRENT_LIST_DIR}/Initialize-mutexes-for-static-builds-for-win32.patch"
"${CMAKE_CURRENT_LIST_DIR}/export-only-in-shared-build.patch"
PATCHES "${CMAKE_CURRENT_LIST_DIR}/export-only-in-shared-build.patch"
)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}/src)