Martchus
/
PKGBUILDs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed bug caused by new ANGLE version

This commit is contained in:
Martchus 2016-03-07 21:16:08 +01:00
parent f1a36a51d8
commit b7fa77dbac
3 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qt5-base/mingw-w64-opengl/PKGBUILD
View File

@ -5,7 +5,7 @@
pkgname=mingw-w64-qt5-base-opengl pkgname=mingw-w64-qt5-base-opengl
pkgver=5.5.1 pkgver=5.5.1
pkgrel=1 pkgrel=2
pkgdesc="A cross-platform application and UI framework (mingw-w64)" pkgdesc="A cross-platform application and UI framework (mingw-w64)"
arch=(i686 x86_64) arch=(i686 x86_64)
url="https://www.qt.io/" url="https://www.qt.io/"
@ -252,8 +252,15 @@ build() {
# fix include directory of dbus # 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 --cflags)"
isOpenGL && qt_configure_args+=' -opengl desktop' if isStatic; then
isStatic && qt_configure_args+=' -opengl no' qt_configure_args+=' -opengl no'
elif isOpenGL; then
qt_configure_args+=' -opengl desktop'
else
# GL_GLEXT_PROTOTYPES must be defined to enable declarations GLES functions
qt_configure_args+=' -DGL_GLEXT_PROTOTYPES'
fi
# TODO: allow dynamic OpenGL configuration
unset PKG_CONFIG_PATH unset PKG_CONFIG_PATH

13
qt5-base/mingw-w64-static/PKGBUILD
View File

@ -5,7 +5,7 @@
pkgname=mingw-w64-qt5-base-static pkgname=mingw-w64-qt5-base-static
pkgver=5.5.1 pkgver=5.5.1
pkgrel=1 pkgrel=2
pkgdesc="A cross-platform application and UI framework (mingw-w64)" pkgdesc="A cross-platform application and UI framework (mingw-w64)"
arch=(i686 x86_64) arch=(i686 x86_64)
url="https://www.qt.io/" url="https://www.qt.io/"
@ -252,8 +252,15 @@ build() {
# fix include directory of dbus # 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 --cflags)"
isOpenGL && qt_configure_args+=' -opengl desktop' if isStatic; then
isStatic && qt_configure_args+=' -opengl no' qt_configure_args+=' -opengl no'
elif isOpenGL; then
qt_configure_args+=' -opengl desktop'
else
# GL_GLEXT_PROTOTYPES must be defined to enable declarations GLES functions
qt_configure_args+=' -DGL_GLEXT_PROTOTYPES'
fi
# TODO: allow dynamic OpenGL configuration
unset PKG_CONFIG_PATH unset PKG_CONFIG_PATH

14
qt5-base/mingw-w64/PKGBUILD
View File

@ -5,7 +5,7 @@
pkgname=mingw-w64-qt5-base pkgname=mingw-w64-qt5-base
pkgver=5.5.1 pkgver=5.5.1
pkgrel=1 pkgrel=2
pkgdesc="A cross-platform application and UI framework (mingw-w64)" pkgdesc="A cross-platform application and UI framework (mingw-w64)"
arch=(i686 x86_64) arch=(i686 x86_64)
url="https://www.qt.io/" url="https://www.qt.io/"
@ -252,14 +252,22 @@ build() {
# fix include directory of dbus # 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 --cflags)"
isOpenGL && qt_configure_args+=' -opengl desktop' if isStatic; then
isStatic && qt_configure_args+=' -opengl no' qt_configure_args+=' -opengl no'
elif isOpenGL; then
qt_configure_args+=' -opengl desktop'
else
# GL_GLEXT_PROTOTYPES must be defined to enable declarations GLES functions
qt_configure_args+=' -DGL_GLEXT_PROTOTYPES'
fi
# TODO: allow dynamic OpenGL configuration
unset PKG_CONFIG_PATH unset PKG_CONFIG_PATH
if ! isStatic; then if ! isStatic; then
export QT_LFLAGS_MYSQL="-L/usr/${_arch}/lib -lmysql" export QT_LFLAGS_MYSQL="-L/usr/${_arch}/lib -lmysql"
fi fi
# Qt doesn't detect mysql correctly, so use this: # Qt doesn't detect mysql correctly, so use this:
export QT_CFLAGS_MYSQL="-I/usr/${_arch}/include/mariadb" export QT_CFLAGS_MYSQL="-I/usr/${_arch}/include/mariadb"
#export QT_LFLAGS_MYSQL_R="-lmariadbclient -lws2_32 -lpthread -lz -lm -lssl -lcrypto" #export QT_LFLAGS_MYSQL_R="-lmariadbclient -lws2_32 -lpthread -lz -lm -lssl -lcrypto"