aboutsummaryrefslogtreecommitdiffhomepage
path: root/org
diff options
context:
space:
mode:
Diffstat (limited to 'org')
-rw-r--r--org/spine_build_scaffold.org9
1 files changed, 4 insertions, 5 deletions
diff --git a/org/spine_build_scaffold.org b/org/spine_build_scaffold.org
index 711014b..e594fe0 100644
--- a/org/spine_build_scaffold.org
+++ b/org/spine_build_scaffold.org
@@ -201,8 +201,7 @@ all_debug: dmd_debug gdc_debug ldc_debug
******** _meson_ build :meson:
- bug in build of imageformats > v7.0.0 (currently at 7.0.2)
- checkout of v7.0.0 hopefully a tmp fix
- (remove when possible & use upstream head)
+ (try fix meson/ninja/ld.gold for imageformats HEAD)
#+BEGIN_SRC makefile :tangle ../makefile
meson_clean_build_dir:
@@ -218,7 +217,7 @@ meson_get_subprojects: meson_clean_build_dir
git add . ; git commit -m"project meson.build added"; \
cd ../..
cd subprojects/imageformats; \
- git checkout -b add_meson_build_patch v7.0.0; \
+ git checkout -b add_meson_build_patch; \
cp ../imageformats.meson.build meson.build; \
git add . ; git commit -m"project meson.build added"; \
cd ../..
@@ -1089,7 +1088,7 @@ sources_dir = include_directories('src/')
# Dependencies
dep_dyaml = dependency('dyaml', version: '>= 0.8.0', fallback: ['dyaml', 'dyaml_dep'])
dep_d2sqlite3 = dependency('d2sqlite3', version: '>= 0.18.3', fallback: ['d2sqlite3', 'd2sqlite3_dep'])
-dep_imageformats = dependency('imageformats', version: '>= 7.0.0', fallback: ['imageformats', 'imageformats_dep'])
+dep_imageformats = dependency('imageformats', version: '>= 7.0.2', fallback: ['imageformats', 'imageformats_dep'])
# Executable
spine_exe = executable('spine',
[spine_sources],
@@ -1297,7 +1296,7 @@ revision = head
project('imageformats', 'd',
meson_version: '>=0.46',
license: 'BSL-1.0',
- version: '7.0.0'
+ version: '7.0.2'
)
project_soversion = '0'