Fix checksums and ensure system libs are used
Ensure system freetype2 and harfbuzz are used
This commit is contained in:
parent
3c1bd2e8a5
commit
1834647def
|
@ -44,25 +44,21 @@
|
|||
|
||||
# Helper functions for the split builds
|
||||
isDefault() {
|
||||
[[ $pkgname = "mingw-w64-qt5-base" ]] || [[ $pkgname = "mingw-w64-qt5-base-static" ]]
|
||||
[[ $pkgname = 'mingw-w64-qt5-base' ]] || [[ $pkgname = 'mingw-w64-qt5-base-static' ]]
|
||||
}
|
||||
isStatic() {
|
||||
[[ $pkgname = "mingw-w64-qt5-base-static" ]] || \
|
||||
[[ $pkgname = 'mingw-w64-qt5-base-angle-static' ]] || \
|
||||
[[ $pkgname = 'mingw-w64-qt5-base-opengl-static' ]] || \
|
||||
[[ $pkgname = 'mingw-w64-qt5-base-dynamic-static' ]] || \
|
||||
[[ $pkgname = 'mingw-w64-qt5-base-noopengl-static' ]]
|
||||
[ "${pkgname##*-}" = 'static' ]
|
||||
}
|
||||
isOpenGL() {
|
||||
isDefault || \ # currently use native OpenGL by default
|
||||
[[ $pkgname = "mingw-w64-qt5-base-opengl" ]] || [[ $pkgname = "mingw-w64-qt5-base-opengl-static" ]] \
|
||||
[[ $pkgname = 'mingw-w64-qt5-base-opengl' ]] || [[ $pkgname = 'mingw-w64-qt5-base-opengl-static' ]]
|
||||
}
|
||||
isANGLE() {
|
||||
[[ $pkgname = 'mingw-w64-qt5-base-angle' ]] || [[ $pkgname = 'mingw-w64-qt5-base-angle-static' ]] || \
|
||||
[[ $pkgname = "mingw-w64-qt5-base-dynamic" ]] || [[ $pkgname = "mingw-w64-qt5-base-dynamic-static" ]] # treat dynamic version like ANGLE version, correct?
|
||||
[[ $pkgname = 'mingw-w64-qt5-base-dynamic' ]] || [[ $pkgname = 'mingw-w64-qt5-base-dynamic-static' ]] # treat dynamic version like ANGLE version, correct?
|
||||
}
|
||||
isDynamic() {
|
||||
[[ $pkgname = "mingw-w64-qt5-base-dynamic" ]] || [[ $pkgname = "mingw-w64-qt5-base-dynamic-static" ]]
|
||||
[[ $pkgname = 'mingw-w64-qt5-base-dynamic' ]] || [[ $pkgname = 'mingw-w64-qt5-base-dynamic-static' ]]
|
||||
}
|
||||
isNoOpenGL() {
|
||||
[[ $pkgname = 'mingw-w64-qt5-base-noopengl' ]] || [[ $pkgname = 'mingw-w64-qt5-base-noopengl-static' ]]
|
||||
|
@ -112,7 +108,7 @@ md5sums=('184f9460b40752d71b15b827260580c2'
|
|||
'bab00ccc19d888997f323c80354a7c3f'
|
||||
'f7e1487de6e85116d9c6bde2eac4fb73'
|
||||
'bc99c4cc6998295d76f37ed681c20d47'
|
||||
'370218fd439f25ab3f35bd1f14652988'
|
||||
'e2ffff39673b37c4d9974e92fcf7213c'
|
||||
'4fe6523dd1c34398df3aa5a8763530cc'
|
||||
'f32a768e1acb9785c79c8e93aa266db2'
|
||||
'3bd322551924543553a2bf81b4419a09'
|
||||
|
@ -299,7 +295,9 @@ build() {
|
|||
-system-libpng \
|
||||
-system-libjpeg \
|
||||
-system-sqlite \
|
||||
-system-freetype \
|
||||
-system-harfbuzz \
|
||||
-system-pcre \
|
||||
-no-fontconfig \
|
||||
-iconv \
|
||||
-openssl \
|
||||
|
@ -326,7 +324,10 @@ build() {
|
|||
-device-option CROSS_COMPILE=${_arch}-"
|
||||
|
||||
# Fix include directory of dbus
|
||||
qt_configure_args+=" $(${_arch}-pkg-config --cflags-only-I dbus-1 --cflags)"
|
||||
qt_configure_args+=" $(${_arch}-pkg-config --cflags-only-I dbus-1)"
|
||||
|
||||
# Fix include directory of freetype2
|
||||
qt_configure_args+=" $(${_arch}-pkg-config --cflags-only-I freetype2)"
|
||||
|
||||
# Configure usage of ANGLE/OpenGL
|
||||
if isOpenGL; then
|
||||
|
|
|
@ -44,25 +44,21 @@
|
|||
|
||||
# Helper functions for the split builds
|
||||
isDefault() {
|
||||
[[ $pkgname = "mingw-w64-qt5-base" ]] || [[ $pkgname = "mingw-w64-qt5-base-static" ]]
|
||||
[[ $pkgname = 'mingw-w64-qt5-base' ]] || [[ $pkgname = 'mingw-w64-qt5-base-static' ]]
|
||||
}
|
||||
isStatic() {
|
||||
[[ $pkgname = "mingw-w64-qt5-base-static" ]] || \
|
||||
[[ $pkgname = 'mingw-w64-qt5-base-angle-static' ]] || \
|
||||
[[ $pkgname = 'mingw-w64-qt5-base-opengl-static' ]] || \
|
||||
[[ $pkgname = 'mingw-w64-qt5-base-dynamic-static' ]] || \
|
||||
[[ $pkgname = 'mingw-w64-qt5-base-noopengl-static' ]]
|
||||
[ "${pkgname##*-}" = 'static' ]
|
||||
}
|
||||
isOpenGL() {
|
||||
isDefault || \ # currently use native OpenGL by default
|
||||
[[ $pkgname = "mingw-w64-qt5-base-opengl" ]] || [[ $pkgname = "mingw-w64-qt5-base-opengl-static" ]] \
|
||||
[[ $pkgname = 'mingw-w64-qt5-base-opengl' ]] || [[ $pkgname = 'mingw-w64-qt5-base-opengl-static' ]]
|
||||
}
|
||||
isANGLE() {
|
||||
[[ $pkgname = 'mingw-w64-qt5-base-angle' ]] || [[ $pkgname = 'mingw-w64-qt5-base-angle-static' ]] || \
|
||||
[[ $pkgname = "mingw-w64-qt5-base-dynamic" ]] || [[ $pkgname = "mingw-w64-qt5-base-dynamic-static" ]] # treat dynamic version like ANGLE version, correct?
|
||||
[[ $pkgname = 'mingw-w64-qt5-base-dynamic' ]] || [[ $pkgname = 'mingw-w64-qt5-base-dynamic-static' ]] # treat dynamic version like ANGLE version, correct?
|
||||
}
|
||||
isDynamic() {
|
||||
[[ $pkgname = "mingw-w64-qt5-base-dynamic" ]] || [[ $pkgname = "mingw-w64-qt5-base-dynamic-static" ]]
|
||||
[[ $pkgname = 'mingw-w64-qt5-base-dynamic' ]] || [[ $pkgname = 'mingw-w64-qt5-base-dynamic-static' ]]
|
||||
}
|
||||
isNoOpenGL() {
|
||||
[[ $pkgname = 'mingw-w64-qt5-base-noopengl' ]] || [[ $pkgname = 'mingw-w64-qt5-base-noopengl-static' ]]
|
||||
|
@ -112,7 +108,7 @@ md5sums=('184f9460b40752d71b15b827260580c2'
|
|||
'bab00ccc19d888997f323c80354a7c3f'
|
||||
'f7e1487de6e85116d9c6bde2eac4fb73'
|
||||
'bc99c4cc6998295d76f37ed681c20d47'
|
||||
'370218fd439f25ab3f35bd1f14652988'
|
||||
'e2ffff39673b37c4d9974e92fcf7213c'
|
||||
'4fe6523dd1c34398df3aa5a8763530cc'
|
||||
'f32a768e1acb9785c79c8e93aa266db2'
|
||||
'3bd322551924543553a2bf81b4419a09'
|
||||
|
@ -299,7 +295,9 @@ build() {
|
|||
-system-libpng \
|
||||
-system-libjpeg \
|
||||
-system-sqlite \
|
||||
-system-freetype \
|
||||
-system-harfbuzz \
|
||||
-system-pcre \
|
||||
-no-fontconfig \
|
||||
-iconv \
|
||||
-openssl \
|
||||
|
@ -326,7 +324,10 @@ build() {
|
|||
-device-option CROSS_COMPILE=${_arch}-"
|
||||
|
||||
# Fix include directory of dbus
|
||||
qt_configure_args+=" $(${_arch}-pkg-config --cflags-only-I dbus-1 --cflags)"
|
||||
qt_configure_args+=" $(${_arch}-pkg-config --cflags-only-I dbus-1)"
|
||||
|
||||
# Fix include directory of freetype2
|
||||
qt_configure_args+=" $(${_arch}-pkg-config --cflags-only-I freetype2)"
|
||||
|
||||
# Configure usage of ANGLE/OpenGL
|
||||
if isOpenGL; then
|
||||
|
|
|
@ -44,25 +44,21 @@
|
|||
|
||||
# Helper functions for the split builds
|
||||
isDefault() {
|
||||
[[ $pkgname = "mingw-w64-qt5-base" ]] || [[ $pkgname = "mingw-w64-qt5-base-static" ]]
|
||||
[[ $pkgname = 'mingw-w64-qt5-base' ]] || [[ $pkgname = 'mingw-w64-qt5-base-static' ]]
|
||||
}
|
||||
isStatic() {
|
||||
[[ $pkgname = "mingw-w64-qt5-base-static" ]] || \
|
||||
[[ $pkgname = 'mingw-w64-qt5-base-angle-static' ]] || \
|
||||
[[ $pkgname = 'mingw-w64-qt5-base-opengl-static' ]] || \
|
||||
[[ $pkgname = 'mingw-w64-qt5-base-dynamic-static' ]] || \
|
||||
[[ $pkgname = 'mingw-w64-qt5-base-noopengl-static' ]]
|
||||
[ "${pkgname##*-}" = 'static' ]
|
||||
}
|
||||
isOpenGL() {
|
||||
isDefault || \ # currently use native OpenGL by default
|
||||
[[ $pkgname = "mingw-w64-qt5-base-opengl" ]] || [[ $pkgname = "mingw-w64-qt5-base-opengl-static" ]] \
|
||||
[[ $pkgname = 'mingw-w64-qt5-base-opengl' ]] || [[ $pkgname = 'mingw-w64-qt5-base-opengl-static' ]]
|
||||
}
|
||||
isANGLE() {
|
||||
[[ $pkgname = 'mingw-w64-qt5-base-angle' ]] || [[ $pkgname = 'mingw-w64-qt5-base-angle-static' ]] || \
|
||||
[[ $pkgname = "mingw-w64-qt5-base-dynamic" ]] || [[ $pkgname = "mingw-w64-qt5-base-dynamic-static" ]] # treat dynamic version like ANGLE version, correct?
|
||||
[[ $pkgname = 'mingw-w64-qt5-base-dynamic' ]] || [[ $pkgname = 'mingw-w64-qt5-base-dynamic-static' ]] # treat dynamic version like ANGLE version, correct?
|
||||
}
|
||||
isDynamic() {
|
||||
[[ $pkgname = "mingw-w64-qt5-base-dynamic" ]] || [[ $pkgname = "mingw-w64-qt5-base-dynamic-static" ]]
|
||||
[[ $pkgname = 'mingw-w64-qt5-base-dynamic' ]] || [[ $pkgname = 'mingw-w64-qt5-base-dynamic-static' ]]
|
||||
}
|
||||
isNoOpenGL() {
|
||||
[[ $pkgname = 'mingw-w64-qt5-base-noopengl' ]] || [[ $pkgname = 'mingw-w64-qt5-base-noopengl-static' ]]
|
||||
|
@ -112,7 +108,7 @@ md5sums=('184f9460b40752d71b15b827260580c2'
|
|||
'bab00ccc19d888997f323c80354a7c3f'
|
||||
'f7e1487de6e85116d9c6bde2eac4fb73'
|
||||
'bc99c4cc6998295d76f37ed681c20d47'
|
||||
'370218fd439f25ab3f35bd1f14652988'
|
||||
'e2ffff39673b37c4d9974e92fcf7213c'
|
||||
'4fe6523dd1c34398df3aa5a8763530cc'
|
||||
'f32a768e1acb9785c79c8e93aa266db2'
|
||||
'3bd322551924543553a2bf81b4419a09'
|
||||
|
@ -299,7 +295,9 @@ build() {
|
|||
-system-libpng \
|
||||
-system-libjpeg \
|
||||
-system-sqlite \
|
||||
-system-freetype \
|
||||
-system-harfbuzz \
|
||||
-system-pcre \
|
||||
-no-fontconfig \
|
||||
-iconv \
|
||||
-openssl \
|
||||
|
@ -326,7 +324,10 @@ build() {
|
|||
-device-option CROSS_COMPILE=${_arch}-"
|
||||
|
||||
# Fix include directory of dbus
|
||||
qt_configure_args+=" $(${_arch}-pkg-config --cflags-only-I dbus-1 --cflags)"
|
||||
qt_configure_args+=" $(${_arch}-pkg-config --cflags-only-I dbus-1)"
|
||||
|
||||
# Fix include directory of freetype2
|
||||
qt_configure_args+=" $(${_arch}-pkg-config --cflags-only-I freetype2)"
|
||||
|
||||
# Configure usage of ANGLE/OpenGL
|
||||
if isOpenGL; then
|
||||
|
|
|
@ -44,25 +44,21 @@
|
|||
|
||||
# Helper functions for the split builds
|
||||
isDefault() {
|
||||
[[ $pkgname = "mingw-w64-qt5-base" ]] || [[ $pkgname = "mingw-w64-qt5-base-static" ]]
|
||||
[[ $pkgname = 'mingw-w64-qt5-base' ]] || [[ $pkgname = 'mingw-w64-qt5-base-static' ]]
|
||||
}
|
||||
isStatic() {
|
||||
[[ $pkgname = "mingw-w64-qt5-base-static" ]] || \
|
||||
[[ $pkgname = 'mingw-w64-qt5-base-angle-static' ]] || \
|
||||
[[ $pkgname = 'mingw-w64-qt5-base-opengl-static' ]] || \
|
||||
[[ $pkgname = 'mingw-w64-qt5-base-dynamic-static' ]] || \
|
||||
[[ $pkgname = 'mingw-w64-qt5-base-noopengl-static' ]]
|
||||
[ "${pkgname##*-}" = 'static' ]
|
||||
}
|
||||
isOpenGL() {
|
||||
isDefault || \ # currently use native OpenGL by default
|
||||
[[ $pkgname = "mingw-w64-qt5-base-opengl" ]] || [[ $pkgname = "mingw-w64-qt5-base-opengl-static" ]] \
|
||||
[[ $pkgname = 'mingw-w64-qt5-base-opengl' ]] || [[ $pkgname = 'mingw-w64-qt5-base-opengl-static' ]]
|
||||
}
|
||||
isANGLE() {
|
||||
[[ $pkgname = 'mingw-w64-qt5-base-angle' ]] || [[ $pkgname = 'mingw-w64-qt5-base-angle-static' ]] || \
|
||||
[[ $pkgname = "mingw-w64-qt5-base-dynamic" ]] || [[ $pkgname = "mingw-w64-qt5-base-dynamic-static" ]] # treat dynamic version like ANGLE version, correct?
|
||||
[[ $pkgname = 'mingw-w64-qt5-base-dynamic' ]] || [[ $pkgname = 'mingw-w64-qt5-base-dynamic-static' ]] # treat dynamic version like ANGLE version, correct?
|
||||
}
|
||||
isDynamic() {
|
||||
[[ $pkgname = "mingw-w64-qt5-base-dynamic" ]] || [[ $pkgname = "mingw-w64-qt5-base-dynamic-static" ]]
|
||||
[[ $pkgname = 'mingw-w64-qt5-base-dynamic' ]] || [[ $pkgname = 'mingw-w64-qt5-base-dynamic-static' ]]
|
||||
}
|
||||
isNoOpenGL() {
|
||||
[[ $pkgname = 'mingw-w64-qt5-base-noopengl' ]] || [[ $pkgname = 'mingw-w64-qt5-base-noopengl-static' ]]
|
||||
|
@ -112,7 +108,7 @@ md5sums=('184f9460b40752d71b15b827260580c2'
|
|||
'bab00ccc19d888997f323c80354a7c3f'
|
||||
'f7e1487de6e85116d9c6bde2eac4fb73'
|
||||
'bc99c4cc6998295d76f37ed681c20d47'
|
||||
'370218fd439f25ab3f35bd1f14652988'
|
||||
'e2ffff39673b37c4d9974e92fcf7213c'
|
||||
'4fe6523dd1c34398df3aa5a8763530cc'
|
||||
'f32a768e1acb9785c79c8e93aa266db2'
|
||||
'3bd322551924543553a2bf81b4419a09'
|
||||
|
@ -299,7 +295,9 @@ build() {
|
|||
-system-libpng \
|
||||
-system-libjpeg \
|
||||
-system-sqlite \
|
||||
-system-freetype \
|
||||
-system-harfbuzz \
|
||||
-system-pcre \
|
||||
-no-fontconfig \
|
||||
-iconv \
|
||||
-openssl \
|
||||
|
@ -326,7 +324,10 @@ build() {
|
|||
-device-option CROSS_COMPILE=${_arch}-"
|
||||
|
||||
# Fix include directory of dbus
|
||||
qt_configure_args+=" $(${_arch}-pkg-config --cflags-only-I dbus-1 --cflags)"
|
||||
qt_configure_args+=" $(${_arch}-pkg-config --cflags-only-I dbus-1)"
|
||||
|
||||
# Fix include directory of freetype2
|
||||
qt_configure_args+=" $(${_arch}-pkg-config --cflags-only-I freetype2)"
|
||||
|
||||
# Configure usage of ANGLE/OpenGL
|
||||
if isOpenGL; then
|
||||
|
|
Loading…
Reference in New Issue