Date: Wed, 16 Dec 2020 00:07:55 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r558191 - head/graphics/qt5-wayland/files Message-ID: <202012160007.0BG07tr9034616@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Wed Dec 16 00:07:55 2020 New Revision: 558191 URL: https://svnweb.freebsd.org/changeset/ports/558191 Log: graphics/qt5-wayland: unbreak with libglvnd after r557300 Checking for Linux dma-buf Buffer Sharing... no Checking for Linux Client dma-buf Buffer Sharing... no Checking for Linux dma-buf Buffer Sharing... no [...] executing config test dmabuf-server-buffer + cd /wrkdirs/usr/ports/graphics/qt5-wayland/work/qtwayland-everywhere-src-5.15.2/config.tests/dmabuf-server-buffer && /usr/local/lib/qt5/bin/qmake "CONFIG -= qt debug_and_release app_bundle lib_bundle" "CONFIG += shared warn_off console single_arch" 'QMAKE_USE += egl' /wrkdirs/usr/ports/graphics/qt5-wayland/work/qtwayland-everywhere-src-5.15.2/config.tests/dmabuf-server-buffer + cd /wrkdirs/usr/ports/graphics/qt5-wayland/work/qtwayland-everywhere-src-5.15.2/config.tests/dmabuf-server-buffer && MAKEFLAGS= make > clang++ -c -pipe -O2 -w -fPIC -I. -I/usr/local/include -I/usr/local/include -I/usr/local/lib/qt5/mkspecs/freebsd-clang -o main.o main.cpp > main.cpp:4:10: fatal error: 'drm_fourcc.h' file not found > #include <drm_fourcc.h> > ^~~~~~~~~~~~~~ > 1 error generated. > *** Error code 1 > Stop. > make[2]: stopped in /wrkdirs/usr/ports/graphics/qt5-wayland/work/qtwayland-everywhere-src-5.15.2/config.tests/dmabuf-server-buffer test config.qtwayland_client.tests.dmabuf-server-buffer FAILED [...] executing config test dmabuf-client-buffer + cd /wrkdirs/usr/ports/graphics/qt5-wayland/work/qtwayland-everywhere-src-5.15.2/config.tests/dmabuf-client-buffer && /usr/local/lib/qt5/bin/qmake "CONFIG -= qt debug_and_release app_bundle lib_bundle" "CONFIG += shared warn_off console single_arch" 'QMAKE_USE += egl' /wrkdirs/usr/ports/graphics/qt5-wayland/work/qtwayland-everywhere-src-5.15.2/config.tests/dmabuf-client-buffer + cd /wrkdirs/usr/ports/graphics/qt5-wayland/work/qtwayland-everywhere-src-5.15.2/config.tests/dmabuf-client-buffer && MAKEFLAGS= make > clang++ -c -pipe -O2 -w -fPIC -I. -I/usr/local/include -I/usr/local/include -I/usr/local/lib/qt5/mkspecs/freebsd-clang -o main.o main.cpp > main.cpp:4:10: fatal error: 'drm_mode.h' file not found > #include <drm_mode.h> > ^~~~~~~~~~~~ > 1 error generated. > *** Error code 1 > Stop. > make[2]: stopped in /wrkdirs/usr/ports/graphics/qt5-wayland/work/qtwayland-everywhere-src-5.15.2/config.tests/dmabuf-client-buffer test config.qtwayland_compositor.tests.dmabuf-client-buffer FAILED [...] ===> Checking for items in pkg-plist which are not in STAGEDIR Error: Missing: %%QT_CMAKEDIR%%/Qt5WaylandClient/Qt5WaylandClient_DmaBufServerBufferPlugin.cmake Error: Missing: %%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositor_DmaBufServerBufferIntegrationPlugin.cmake Error: Missing: %%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositor_QWaylandDmabufClientBufferIntegrationPlugin.cmake Error: Missing: %%QT_PLUGINDIR%%/wayland-graphics-integration-client/libdmabuf-server.so Error: Missing: %%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-dmabuf-server-buffer.so Error: Missing: %%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-linux-dmabuf-unstable-v1.so ===> Error: Plist issues found. *** Error code 1 Added: head/graphics/qt5-wayland/files/patch-libglvnd (contents, props changed) Added: head/graphics/qt5-wayland/files/patch-libglvnd ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/qt5-wayland/files/patch-libglvnd Wed Dec 16 00:07:55 2020 (r558191) @@ -0,0 +1,38 @@ +drm_*.h are part of kernel DRM API, installed under /usr/include on Linux. +FreeBSD (drm-kmod) doesn't install those anywhere, relying on libdrm copies. +libglvnd replaces libEGL from Mesa, so libdrm dependency needs to be explicit. + +--- src/client/configure.json.orig 2020-10-27 08:02:11 UTC ++++ src/client/configure.json +@@ -149,8 +149,7 @@ + "#endif" + ] + }, +- "libs": "-ldrm", +- "use": "egl" ++ "use": "egl drm" + }, + "vulkan-server-buffer": { + "label": "Vulkan Buffer Sharing", +--- src/compositor/configure.json.orig 2020-10-27 08:02:11 UTC ++++ src/compositor/configure.json +@@ -151,8 +151,7 @@ + "#endif" + ] + }, +- "libs": "-ldrm", +- "use": "egl" ++ "use": "egl drm" + }, + "dmabuf-client-buffer": { + "label": "Linux Client dma-buf Buffer Sharing", +@@ -176,8 +175,7 @@ + "return 0;" + ] + }, +- "libs": "-ldrm", +- "use": "egl" ++ "use": "egl drm" + }, + "vulkan-server-buffer": { + "label": "Vulkan Buffer Sharing",
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202012160007.0BG07tr9034616>