diff --git a/qt5-base/mingw-w64-opengl/PKGBUILD b/qt5-base/mingw-w64-opengl/PKGBUILD index 57dd835c..fa5c4563 100644 --- a/qt5-base/mingw-w64-opengl/PKGBUILD +++ b/qt5-base/mingw-w64-opengl/PKGBUILD @@ -5,7 +5,7 @@ pkgname=mingw-w64-qt5-base-opengl pkgver=5.5.1 -pkgrel=1 +pkgrel=2 pkgdesc="A cross-platform application and UI framework (mingw-w64)" arch=(i686 x86_64) url="https://www.qt.io/" @@ -252,8 +252,15 @@ build() { # fix include directory of dbus qt_configure_args+=" $(${_arch}-pkg-config --cflags-only-I dbus-1 --cflags)" - isOpenGL && qt_configure_args+=' -opengl desktop' - isStatic && qt_configure_args+=' -opengl no' + if isStatic; then + 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 diff --git a/qt5-base/mingw-w64-static/PKGBUILD b/qt5-base/mingw-w64-static/PKGBUILD index 77518a12..ab84c7dd 100644 --- a/qt5-base/mingw-w64-static/PKGBUILD +++ b/qt5-base/mingw-w64-static/PKGBUILD @@ -5,7 +5,7 @@ pkgname=mingw-w64-qt5-base-static pkgver=5.5.1 -pkgrel=1 +pkgrel=2 pkgdesc="A cross-platform application and UI framework (mingw-w64)" arch=(i686 x86_64) url="https://www.qt.io/" @@ -252,8 +252,15 @@ build() { # fix include directory of dbus qt_configure_args+=" $(${_arch}-pkg-config --cflags-only-I dbus-1 --cflags)" - isOpenGL && qt_configure_args+=' -opengl desktop' - isStatic && qt_configure_args+=' -opengl no' + if isStatic; then + 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 diff --git a/qt5-base/mingw-w64/PKGBUILD b/qt5-base/mingw-w64/PKGBUILD index 219067fa..c8809529 100644 --- a/qt5-base/mingw-w64/PKGBUILD +++ b/qt5-base/mingw-w64/PKGBUILD @@ -5,7 +5,7 @@ pkgname=mingw-w64-qt5-base pkgver=5.5.1 -pkgrel=1 +pkgrel=2 pkgdesc="A cross-platform application and UI framework (mingw-w64)" arch=(i686 x86_64) url="https://www.qt.io/" @@ -252,14 +252,22 @@ build() { # fix include directory of dbus qt_configure_args+=" $(${_arch}-pkg-config --cflags-only-I dbus-1 --cflags)" - isOpenGL && qt_configure_args+=' -opengl desktop' - isStatic && qt_configure_args+=' -opengl no' + if isStatic; then + 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 if ! isStatic; then export QT_LFLAGS_MYSQL="-L/usr/${_arch}/lib -lmysql" fi + # Qt doesn't detect mysql correctly, so use this: export QT_CFLAGS_MYSQL="-I/usr/${_arch}/include/mariadb" #export QT_LFLAGS_MYSQL_R="-lmariadbclient -lws2_32 -lpthread -lz -lm -lssl -lcrypto"