diff options
| author | atkawa7 <atkawa7@yahoo.com> | 2017-06-15 19:52:03 -0700 |
|---|---|---|
| committer | atkawa7 <atkawa7@yahoo.com> | 2017-06-15 19:52:03 -0700 |
| commit | e46dd1fd551a17a2900e09f52b8abd02a3758f4f (patch) | |
| tree | 9c2671ad8a715eca875c1f4f02882a0811e3d54a /ports/cairo | |
| parent | ce5ad1ffe1ed0c6351a09b01bc92a2ad258b8f19 (diff) | |
| parent | c966c3709e65b53580e66fe9d0cab1d4414b0472 (diff) | |
| download | vcpkg-e46dd1fd551a17a2900e09f52b8abd02a3758f4f.tar.gz vcpkg-e46dd1fd551a17a2900e09f52b8abd02a3758f4f.zip | |
Merge https://github.com/Microsoft/vcpkg
Diffstat (limited to 'ports/cairo')
| -rw-r--r-- | ports/cairo/CONTROL | 2 | ||||
| -rw-r--r-- | ports/cairo/Initialize-mutexes-for-static-builds-for-win32.patch | 16 | ||||
| -rw-r--r-- | ports/cairo/portfile.cmake | 5 |
3 files changed, 22 insertions, 1 deletions
diff --git a/ports/cairo/CONTROL b/ports/cairo/CONTROL index 0cad79902..b03290e9e 100644 --- a/ports/cairo/CONTROL +++ b/ports/cairo/CONTROL @@ -1,4 +1,4 @@ Source: cairo -Version: 1.15.4-2 +Version: 1.15.4-3 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 diff --git a/ports/cairo/Initialize-mutexes-for-static-builds-for-win32.patch b/ports/cairo/Initialize-mutexes-for-static-builds-for-win32.patch new file mode 100644 index 000000000..420d91e28 --- /dev/null +++ b/ports/cairo/Initialize-mutexes-for-static-builds-for-win32.patch @@ -0,0 +1,16 @@ + 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); + diff --git a/ports/cairo/portfile.cmake b/ports/cairo/portfile.cmake index a15649627..7e6e02155 100644 --- a/ports/cairo/portfile.cmake +++ b/ports/cairo/portfile.cmake @@ -15,6 +15,11 @@ vcpkg_download_distfile(ARCHIVE ) 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" +) + file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_cairo.txt DESTINATION ${SOURCE_PATH}/src) file(RENAME ${SOURCE_PATH}/src/CMakeLists_cairo.txt ${SOURCE_PATH}/src/CMakeLists.txt) |