Changes - SailfishOS Open Build Service

Changes of Revision 6

[-] [+]	Changed	_service:tar_git:qt5-qpa-hwcomposer-plugin.changes
@@ -1,3 +1,9 @@ +* Fri Jul 03 2020 Matti Lehtimäki <matti.lehtimaki@gmail.com> - 5.6.2.14 +- [hwcomposer] Build with OpenGL ES 3.0. JB#49406 + +* Mon Jun 22 2020 Simonas Leleiva <simonas.leleiva@meramo.co.uk> - 5.6.2.13 +- [hwcomposer] 64bit fixes. JB#50285 + * Fri May 17 2019 Frajo <f_haider@gmx.at> - 5.6.2.12 - [hwcomposer] add QPA_HWC_WAIT_ON_RETIRE_FENCE environment variable to make blocking in swap optional. JB#45362 - [hwcomposer] Block in swap in the v11 backend too. Contributes to JB#45362
[-] [+]	Changed	_service:tar_git:qt5-qpa-hwcomposer-plugin.spec ^
@@ -1,6 +1,6 @@ Name: qt5-qpa-hwcomposer-plugin Summary: Qt 5 QPA hwcomposer plugin -Version: 5.6.2.12 +Version: 5.6.2.14 # The following two lines can be removed after next stop release. Provides: qt5-qpa-hwcomposer-plugin-sbj >= %{version} Obsoletes: qt5-qpa-hwcomposer-plugin-sbj < %{version} @@ -40,8 +40,7 @@ %build export QTDIR=/usr/share/qt5 cd hwcomposer -# Qt is built with mesa, which has gl3.h. We're built with hybris which doesn't include gl3.h, so explicitly disable es3 -%qmake5 DEFINES+=QT_NO_OPENGL_ES_3 +%qmake5 make %{_smp_mflags} %install @@ -50,8 +49,8 @@ %qmake5_install # doesn't exist on Qt 5.1, we don't currently care about this for 5.2 -rm -f %{buildroot}/usr/lib/cmake/Qt5Gui/Qt5Gui_QEglFSIntegrationPlugin.cmake -rm -f %{buildroot}/usr/lib/cmake/Qt5Gui/Qt5Gui_QEglFShwcIntegrationPlugin.cmake +rm -f %{buildroot}/%{_libdir}/cmake/Qt5Gui/Qt5Gui_QEglFSIntegrationPlugin.cmake +rm -f %{buildroot}/%{_libdir}/cmake/Qt5Gui/Qt5Gui_QEglFShwcIntegrationPlugin.cmake %files %defattr(-,root,root,-)
[-] [+]	Changed	_service ^
@@ -2,6 +2,6 @@ <service name="tar_git"> <param name="url">https://github.com/mer-hybris/qt5-qpa-hwcomposer-plugin.git</param> <param name="branch">master</param> - <param name="revision">5.6.2.12</param> + <param name="revision">5.6.2.14</param> </service> </services> \ No newline at end of file
[-] [+]	Changed	_service:tar_git:qt5-qpa-hwcomposer-plugin-5.6.2.14.tar.bz2/hwcomposer/hwcomposer_backend.h ^
@@ -44,6 +44,7 @@ #include <sys/types.h> #include <sync/sync.h> +#include <stdint.h> #include <android-config.h> #include <hardware/hardware.h> @@ -64,7 +65,7 @@ // Evaluate "x", if it isn't NULL, print a warning #define HWC_PLUGIN_EXPECT_NULL(x) \ { void res; if ((res = (x)) != NULL) \ - qWarning("QPA-HWC: %s in %s returned %x", (#x), __func__, (unsigned int)res); } + qWarning("QPA-HWC: %s in %s returned %x", (#x), __func__, (intptr_t)res); } // Evaluate "x", if it is NULL, exit with a fatal error #define HWC_PLUGIN_FATAL(x) \ @@ -73,7 +74,7 @@ // Evaluate "x", if it is NULL, exit with a fatal error #define HWC_PLUGIN_ASSERT_NOT_NULL(x) \ { void res; if ((res = (x)) == NULL) \ - qFatal("QPA-HWC: %s in %s returned %x", (#x), __func__, (unsigned int)res); } + qFatal("QPA-HWC: %s in %s returned %x", (#x), __func__, (intptr_t)res); } // Evaluate "x", if it doesn't return zero, exit with a fatal error #define HWC_PLUGIN_ASSERT_ZERO(x) \