diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 69b00fdc..e814137e 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -23,7 +23,7 @@ jobs: - name: Build run: | - meson . build -Dlog=true -Dloaders="svg, tvg_beta, png, jpg" -Dsavers="tvg_beta" + meson . build -Dlog=true -Dloaders="svg, tvg, png, jpg" -Dsavers="tvg" cd build sudo ninja -C . install @@ -46,7 +46,7 @@ jobs: - name: Build run: | - meson . build -Dexamples=true -Dloaders="svg, tvg_beta, png, jpg" -Dsavers="tvg_beta" + meson . build -Dexamples=true -Dloaders="svg, tvg, png, jpg" -Dsavers="tvg" cd build sudo ninja -C . install @@ -67,7 +67,7 @@ jobs: - name: Install-ThorVG run: | - meson . build -Dloaders="svg, tvg_beta, png, jpg" -Dsavers="tvg_beta" -Dbindings="capi" + meson . build -Dloaders="svg, tvg, png, jpg" -Dsavers="tvg" -Dbindings="capi" cd build sudo ninja -C . install cd .. @@ -75,7 +75,7 @@ jobs: - name: Build run: | - meson . build -Dtests=true -Dloaders="svg, tvg_beta, png, jpg" -Dsavers="tvg_beta" -Dbindings="capi" --errorlogs + meson . build -Dtests=true -Dloaders="svg, tvg, png, jpg" -Dsavers="tvg" -Dbindings="capi" --errorlogs cd build sudo ninja -C . install test diff --git a/meson.build b/meson.build index ce2ee11b..09e527e3 100644 --- a/meson.build +++ b/meson.build @@ -24,7 +24,7 @@ if get_option('loaders').contains('svg') == true config_h.set10('THORVG_SVG_LOADER_SUPPORT', true) endif -if get_option('loaders').contains('tvg_beta') == true +if get_option('loaders').contains('tvg') == true config_h.set10('THORVG_TVG_LOADER_SUPPORT', true) endif @@ -36,7 +36,7 @@ if get_option('loaders').contains('jpg') == true config_h.set10('THORVG_JPG_LOADER_SUPPORT', true) endif -if get_option('savers').contains('tvg_beta') == true +if get_option('savers').contains('tvg') == true config_h.set10('THORVG_TVG_SAVER_SUPPORT', true) endif @@ -102,11 +102,11 @@ Summary: simd_type, get_option('engines').contains('sw'), get_option('engines').contains('gl'), - get_option('loaders').contains('tvg_beta'), + get_option('loaders').contains('tvg'), get_option('loaders').contains('svg'), get_option('loaders').contains('png'), get_option('loaders').contains('jpg'), - get_option('savers').contains('tvg_beta'), + get_option('savers').contains('tvg'), get_option('bindings').contains('capi'), get_option('log'), get_option('tests'), diff --git a/meson_options.txt b/meson_options.txt index b24578eb..643b12a8 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -6,13 +6,13 @@ option('engines', option('loaders', type: 'array', - choices: ['', 'svg', 'png', 'jpg', 'tvg_beta'], - value: ['svg'], + choices: ['', 'tvg', 'svg', 'png', 'jpg'], + value: ['svg', 'tvg'], description: 'Enable File Loaders in thorvg') option('savers', type: 'array', - choices: ['', 'tvg_beta'], + choices: ['', 'tvg'], value: [''], description: 'Enable File Savers in thorvg') diff --git a/src/loaders/meson.build b/src/loaders/meson.build index 6a4433b2..24b65448 100644 --- a/src/loaders/meson.build +++ b/src/loaders/meson.build @@ -8,7 +8,7 @@ if get_option('loaders').contains('png') == true subdir('png') endif -if get_option('loaders').contains('tvg_beta') == true +if get_option('loaders').contains('tvg') == true subdir('tvg') endif diff --git a/src/savers/meson.build b/src/savers/meson.build index 0d8694cc..2b35e381 100644 --- a/src/savers/meson.build +++ b/src/savers/meson.build @@ -1,6 +1,6 @@ subsaver_dep = [] -if get_option('savers').contains('tvg_beta') == true +if get_option('savers').contains('tvg') == true subdir('tvg') endif