CVS commit: pkgsrc/x11/qt5-qtwayland

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Nov  5 15:29:36 UTC 2019

Modified Files:
        pkgsrc/x11/qt5-qtwayland: Makefile PLIST distinfo
Added Files:
        pkgsrc/x11/qt5-qtwayland/patches:
            patch-src_hardwareintegration_compositor_linux-dmabuf-unstable-v1_linuxdmabuf.h

Log Message:
qt5-qtwayland: updated to 5.13.2


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/qt5-qtwayland/Makefile \
    pkgsrc/x11/qt5-qtwayland/PLIST pkgsrc/x11/qt5-qtwayland/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/qt5-qtwayland/patches/patch-src_hardwareintegration_compositor_linux-dmabuf-unstable-v1_linuxdmabuf.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/qt5-qtwayland/Makefile
diff -u pkgsrc/x11/qt5-qtwayland/Makefile:1.1 pkgsrc/x11/qt5-qtwayland/Makefile:1.2
--- pkgsrc/x11/qt5-qtwayland/Makefile:1.1       Mon Oct 28 21:35:43 2019
+++ pkgsrc/x11/qt5-qtwayland/Makefile   Tue Nov  5 15:29:35 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2019/10/28 21:35:43 nia Exp $
+# $NetBSD: Makefile,v 1.2 2019/11/05 15:29:35 adam Exp $
 
 DISTNAME=      qtwayland-everywhere-src-${QTVERSION}
 PKGNAME=       qt5-qtwayland-${QTVERSION}
@@ -17,8 +17,10 @@ SUBST_VARS.conf+=    PREFIX
 
 .include "../../x11/qt5-qtbase/Makefile.common"
 
+MAKE_ENV+=     QMAKE_WAYLAND_SCANNER=${PREFIX}/bin/wayland-scanner
+
 do-configure:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QTPREFIX}/bin/qmake -o Makefile QMAKE_WAYLAND_SCANNER=${PREFIX}/bin/wayland-scanner
+       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QTPREFIX}/bin/qmake -o Makefile
 
 post-install:
 .for i in Qt5Wayland.pc
@@ -28,6 +30,6 @@ post-install:
 
 .include "../../devel/wayland/buildlink3.mk"
 .include "../../devel/wayland-protocols/buildlink3.mk"
-.include "../../x11/qt5-qtdeclarative/buildlink3.mk"
 .include "../../x11/libXcomposite/buildlink3.mk"
+.include "../../x11/qt5-qtdeclarative/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/qt5-qtwayland/PLIST
diff -u pkgsrc/x11/qt5-qtwayland/PLIST:1.1 pkgsrc/x11/qt5-qtwayland/PLIST:1.2
--- pkgsrc/x11/qt5-qtwayland/PLIST:1.1  Mon Oct 28 21:35:43 2019
+++ pkgsrc/x11/qt5-qtwayland/PLIST      Tue Nov  5 15:29:35 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2019/10/28 21:35:43 nia Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/11/05 15:29:35 adam Exp $
 lib/pkgconfig/Qt5Wayland.pc
 qt5/bin/qtwaylandscanner
 qt5/include/QtWaylandClient/${PKGVERSION}/QtWaylandClient/private/qtwaylandclient-config_p.h
@@ -142,6 +142,7 @@ qt5/include/QtWaylandCompositor/${PKGVER
 qt5/include/QtWaylandCompositor/${PKGVERSION}/QtWaylandCompositor/private/qwlserverbufferintegration_p.h
 qt5/include/QtWaylandCompositor/${PKGVERSION}/QtWaylandCompositor/private/qwlserverbufferintegrationfactory_p.h
 qt5/include/QtWaylandCompositor/${PKGVERSION}/QtWaylandCompositor/private/qwlserverbufferintegrationplugin_p.h
+qt5/include/QtWaylandCompositor/${PKGVERSION}/QtWaylandCompositor/private/qwltexturesharingextension_p.h
 qt5/include/QtWaylandCompositor/${PKGVERSION}/QtWaylandCompositor/private/wayland-hardware-integration-server-protocol.h
 qt5/include/QtWaylandCompositor/${PKGVERSION}/QtWaylandCompositor/private/wayland-ivi-application-server-protocol.h
 qt5/include/QtWaylandCompositor/${PKGVERSION}/QtWaylandCompositor/private/wayland-qt-key-unstable-v1-server-protocol.h
@@ -285,14 +286,14 @@ qt5/lib/cmake/Qt5WaylandCompositor/Qt5Wa
 qt5/lib/cmake/Qt5WaylandCompositor/Qt5WaylandCompositor_ShmServerBufferIntegrationPlugin.cmake
 qt5/lib/libQt5WaylandClient.prl
 qt5/lib/libQt5WaylandClient.so
+qt5/lib/libQt5WaylandClient.so.${PKGVERSION}
 qt5/lib/libQt5WaylandClient.so.5
 qt5/lib/libQt5WaylandClient.so.5.13
-qt5/lib/libQt5WaylandClient.so.${PKGVERSION}
 qt5/lib/libQt5WaylandCompositor.prl
 qt5/lib/libQt5WaylandCompositor.so
+qt5/lib/libQt5WaylandCompositor.so.${PKGVERSION}
 qt5/lib/libQt5WaylandCompositor.so.5
 qt5/lib/libQt5WaylandCompositor.so.5.13
-qt5/lib/libQt5WaylandCompositor.so.${PKGVERSION}
 qt5/lib/pkgconfig/Qt5WaylandClient.pc
 qt5/lib/pkgconfig/Qt5WaylandCompositor.pc
 qt5/mkspecs/modules/qt_lib_waylandclient.pri
Index: pkgsrc/x11/qt5-qtwayland/distinfo
diff -u pkgsrc/x11/qt5-qtwayland/distinfo:1.1 pkgsrc/x11/qt5-qtwayland/distinfo:1.2
--- pkgsrc/x11/qt5-qtwayland/distinfo:1.1       Mon Oct 28 21:35:43 2019
+++ pkgsrc/x11/qt5-qtwayland/distinfo   Tue Nov  5 15:29:35 2019
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.1 2019/10/28 21:35:43 nia Exp $
+$NetBSD: distinfo,v 1.2 2019/11/05 15:29:35 adam Exp $
 
-SHA1 (qtwayland-everywhere-src-5.13.1.tar.xz) = 63576833b5f253971dc06c51b27ba5bb01a327bf
-RMD160 (qtwayland-everywhere-src-5.13.1.tar.xz) = 6c1d753366ca4ff74ee5ef67ac9c8dc2a7b108b6
-SHA512 (qtwayland-everywhere-src-5.13.1.tar.xz) = 5dde4e4625cd4569246bb4066dd6f56e2f6a01d14c83d46294372b8713ec0ae8d40dd5f62f6a8d6e3929de9f443cd892942d616d60df2142ae3b9a942521a50b
-Size (qtwayland-everywhere-src-5.13.1.tar.xz) = 478744 bytes
+SHA1 (qtwayland-everywhere-src-5.13.2.tar.xz) = 3825365c59dc585d0174869a41808aa581aabc44
+RMD160 (qtwayland-everywhere-src-5.13.2.tar.xz) = 894b960436468d030ff3a882177df2bfebb483af
+SHA512 (qtwayland-everywhere-src-5.13.2.tar.xz) = 5eb895c2ef8e2e72b71fed027f760913bf754da213e488a6103d9034170a6333f034b3488115a87a5a4e90761425487b9a8ab8e84a68e2e614c159d747408d53
+Size (qtwayland-everywhere-src-5.13.2.tar.xz) = 495536 bytes
 SHA1 (patch-config.tests_wayland__scanner_wayland__scanner.pro) = 3b6338a1d2c1425ce71b41e6515824ffc7e67fbc
 SHA1 (patch-features_wayland-scanner-client-wayland-protocol-include.prf) = e35ebe8543309373b12670eb2abc911263d15039
 SHA1 (patch-qtwayland.pro) = 550877e09d9b09a718b47c7ca36dbdbbb7727762
+SHA1 (patch-src_hardwareintegration_compositor_linux-dmabuf-unstable-v1_linuxdmabuf.h) = 3e6dde410c58d2f5e60634b6628069420dbc2250

Added files:

Index: pkgsrc/x11/qt5-qtwayland/patches/patch-src_hardwareintegration_compositor_linux-dmabuf-unstable-v1_linuxdmabuf.h
diff -u /dev/null pkgsrc/x11/qt5-qtwayland/patches/patch-src_hardwareintegration_compositor_linux-dmabuf-unstable-v1_linuxdmabuf.h:1.1
--- /dev/null   Tue Nov  5 15:29:36 2019
+++ pkgsrc/x11/qt5-qtwayland/patches/patch-src_hardwareintegration_compositor_linux-dmabuf-unstable-v1_linuxdmabuf.h    Tue Nov  5 15:29:35 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_hardwareintegration_compositor_linux-dmabuf-unstable-v1_linuxdmabuf.h,v 1.1 2019/11/05 15:29:35 adam Exp $
+
+Add missing #include.
+
+--- src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h.orig     2019-11-05 15:25:42.917834520 +0000
++++ src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h
+@@ -54,6 +54,8 @@
+ #include <EGL/egl.h>
+ #include <EGL/eglext.h>
+ 
++#include <array>
++
+ // compatibility with libdrm <= 2.4.74
+ #ifndef DRM_FORMAT_RESERVED
+ #define DRM_FORMAT_RESERVED           ((1ULL << 56) - 1)