meson: Update freetype2 git repository to upstream
The forked repository is unmaintained and several releases out of date. The upstream repository now includes meson support, so the forked repository is no longer necessary.
This commit is contained in:
parent
a07e2f1e8a
commit
1bea54624d
|
@ -30,7 +30,7 @@ freetype_dep = dependency('freetype2', method: 'pkg-config', version: freetype_r
|
||||||
# Give another shot using CMake
|
# Give another shot using CMake
|
||||||
if not freetype_dep.found()
|
if not freetype_dep.found()
|
||||||
freetype_dep = dependency('freetype', method: 'cmake', version: freetype_req_cmake,
|
freetype_dep = dependency('freetype', method: 'cmake', version: freetype_req_cmake,
|
||||||
fallback: ['freetype2', 'freetype_dep'])
|
fallback: ['freetype2', 'freetype_dep'], default_options: 'werror=false')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Linking expat should not be so difficult... see: https://github.com/mesonbuild/meson/issues/10516
|
# Linking expat should not be so difficult... see: https://github.com/mesonbuild/meson/issues/10516
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
[wrap-git]
|
[wrap-git]
|
||||||
directory=freetype2
|
directory=freetype2
|
||||||
url=https://github.com/centricular/freetype2.git
|
url=https://gitlab.freedesktop.org/freetype/freetype.git
|
||||||
push-url=git@github.com:centricular/freetype2.git
|
push-url=git@gitlab.freedesktop.org:freetype/freetype.git
|
||||||
revision=meson
|
revision=master
|
||||||
|
|
Loading…
Reference in New Issue