prepare to release tvg format feature.

Change-Id: Ie0a9f66a1415dd8d4395e4b537f5b7c39821acb9

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index 29fe266..1460758 100644 (file)
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -23,7 +23,7 @@ jobs:
 
     - name: Build
       run: |
 
     - 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
 
         cd build
         sudo ninja -C . install
 


@@ -45,7 +45,7 @@ jobs:
 
     - name: Build
       run: |
 
     - 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
 
         cd build
         sudo ninja -C . install
 


@@ -66,7 +66,7 @@ jobs:
 
     - name: Install-ThorVG
       run: |
 
     - 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 ..
         cd build
         sudo ninja -C . install
         cd ..


@@ -74,7 +74,7 @@ jobs:
 
     - name: Build
       run: |
 
     - 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
 
         cd build
         sudo ninja -C . install test
 

diff --git a/meson.build b/meson.build
index ce2ee11..09e527e 100644 (file)
--- 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
 
     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
 
     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
 
     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
 
     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'),
         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('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'),
         get_option('bindings').contains('capi'),
         get_option('log'),
         get_option('tests'),

diff --git a/meson_options.txt b/meson_options.txt
index 37ab912..bbf7cce 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -6,14 +6,14 @@ option('engines',
 
 option('loaders',
    type: 'array',
 
 option('loaders',
    type: 'array',

-   choices: ['', 'svg', 'png', 'jpg', 'tvg_beta'],
-   value: ['svg', 'png', 'jpg', 'tvg_beta'],
+   choices: ['', 'tvg', 'svg', 'png', 'jpg'],
+   value: ['svg', 'tvg'],

    description: 'Enable File Loaders in thorvg')
 
 option('savers',
    type: 'array',
    description: 'Enable File Loaders in thorvg')
 
 option('savers',
    type: 'array',

-   choices: ['', 'tvg_beta'],
-   value: ['tvg_beta'],
+   choices: ['', 'tvg'],
+   value: [''],

    description: 'Enable File Savers in thorvg')
 
 option('vector',
    description: 'Enable File Savers in thorvg')
 
 option('vector',

diff --git a/src/loaders/meson.build b/src/loaders/meson.build
index 6a4433b..24b6544 100644 (file)
--- a/src/loaders/meson.build
+++ b/src/loaders/meson.build
@@ -8,7 +8,7 @@ if get_option('loaders').contains('png') == true
     subdir('png')
 endif
 
     subdir('png')
 endif
 

-if get_option('loaders').contains('tvg_beta') == true
+if get_option('loaders').contains('tvg') == true

     subdir('tvg')
 endif
 
     subdir('tvg')
 endif
 

diff --git a/src/savers/meson.build b/src/savers/meson.build
index 0d8694c..2b35e38 100644 (file)
--- a/src/savers/meson.build
+++ b/src/savers/meson.build
@@ -1,6 +1,6 @@
 subsaver_dep = []
 
 subsaver_dep = []
 

-if get_option('savers').contains('tvg_beta') == true
+if get_option('savers').contains('tvg') == true

     subdir('tvg')
 endif
 
     subdir('tvg')
 endif