Skip to content

Commit

Permalink
[Thorvg] Update to v0.11.0 (#34202)
Browse files Browse the repository at this point in the history
  • Loading branch information
rinechran committed Oct 4, 2023
1 parent 4d879ca commit bba06b7
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 17 deletions.
15 changes: 7 additions & 8 deletions ports/thorvg/install-tools.patch
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
diff --git a/src/bin/svg2png/meson.build b/src/bin/svg2png/meson.build
index c9fe63b6..92bfdda4 100644
--- a/src/bin/svg2png/meson.build
+++ b/src/bin/svg2png/meson.build
diff --git a/src/tools/svg2png/meson.build b/src/tools/svg2png/meson.build
index c9fe63b6..010c6ac4 100644
--- a/src/tools/svg2png/meson.build
+++ b/src/tools/svg2png/meson.build
@@ -5,4 +5,4 @@ executable('svg2png',
include_directories : headers,
cpp_args : compiler_flags,
install : true,
- link_with : thorvg_lib)
+ link_with : thorvg_lib , install_dir : get_option('bindir'))
\ No newline at end of file
diff --git a/src/bin/svg2tvg/meson.build b/src/bin/svg2tvg/meson.build
diff --git a/src/tools/svg2tvg/meson.build b/src/tools/svg2tvg/meson.build
index 158376b5..8d960aec 100644
--- a/src/bin/svg2tvg/meson.build
+++ b/src/bin/svg2tvg/meson.build
--- a/src/tools/svg2tvg/meson.build
+++ b/src/tools/svg2tvg/meson.build
@@ -5,4 +5,4 @@ executable('svg2tvg',
include_directories : headers,
cpp_args : compiler_flags,
Expand Down
6 changes: 3 additions & 3 deletions ports/thorvg/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO thorvg/thorvg
REF v0.10.1
SHA512 8a105f4d854829995799016bb2837ec3c80da1cca0bc1833069a04928d6104677568d1e80fac02a4aa86d1b79b837586366fa28e2d21d43211f31bbb0e79399c
REF v0.11.0
SHA512 abca41b95152d30fc20fd51383447958347e19b123c798b321bcc3ab6850c4f70edd1cd89dc60fdce866afa3f8ffe50a913cdfb4ffbf2d3c1384937cf80183d8
HEAD_REF master
PATCHES
install-tools.patch
Expand Down Expand Up @@ -46,4 +46,4 @@ endif()

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")

file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
3 changes: 1 addition & 2 deletions ports/thorvg/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "thorvg",
"version": "0.10.1",
"port-version": 1,
"version": "0.11.0",
"description": "ThorVG is a platform-independent portable library for drawing vector-based scenes and animations",
"homepage": "https://www.thorvg.org",
"license": "MIT",
Expand Down
4 changes: 2 additions & 2 deletions ports/thorvg/windows-build-option.patch
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
diff --git a/meson.build b/meson.build
index dff33edb..f8339a3a 100644
index 65e6ab51..87e2ed38 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
project('thorvg',
'cpp',
- default_options : ['buildtype=debugoptimized', 'b_sanitize=none', 'werror=false', 'optimization=s', 'cpp_std=c++14', 'strip=true'],
+ default_options : ['buildtype=debugoptimized', 'b_sanitize=none', 'werror=false', 'optimization=s', 'cpp_std=c++14'],
version : '0.10.1',
version : '0.11.0',
license : 'MIT')

4 changes: 2 additions & 2 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -8197,8 +8197,8 @@
"port-version": 0
},
"thorvg": {
"baseline": "0.10.1",
"port-version": 1
"baseline": "0.11.0",
"port-version": 0
},
"threadpool": {
"baseline": "0.2.5",
Expand Down
5 changes: 5 additions & 0 deletions versions/t-/thorvg.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "f54024173375727d79da6658e23e99337a55a8a6",
"version": "0.11.0",
"port-version": 0
},
{
"git-tree": "11178391a67b24a7bbbe7950359aaad9e51cfce6",
"version": "0.10.1",
Expand Down

0 comments on commit bba06b7

Please sign in to comment.