diff --git a/graphics/waffle/Makefile b/graphics/waffle/Makefile index c778ea06a157..aff43edc267e 100644 --- a/graphics/waffle/Makefile +++ b/graphics/waffle/Makefile @@ -1,57 +1,58 @@ PORTNAME= waffle -DISTVERSION= 1.6.1-15 -PORTREVISION= 4 +DISTVERSIONPREFIX=v +DISTVERSION= 1.8.1 CATEGORIES= graphics -# Wayland xdg-shell support (to run on sway/wayfire/etc. that have removed wl-shell) -PATCH_SITES= https://gitlab.freedesktop.org/bl4ckb0ne/${PORTNAME}/-/commit/ -PATCHFILES= 39ad2b26f46e90cbae13a9cbc58e1f9df03f0980.patch:-p1 \ - e4a1e7e9670b77d5b145520d60c4b7570fe3c6ea.patch:-p1 \ - 8c202f88ab4f0f851e3f19dd82bc6b5236120564.patch:-p1 - MAINTAINER= x11@FreeBSD.org COMMENT= Library that allows to defer selection of an OpenGL API until runtime WWW= https://www.waffle-gl.org/ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -USES= cmake:indirect compiler:c11 gl localbase meson pkgconfig python:build +TEST_DEPENDS= ${LOCALBASE}/lib/dri/swrast_dri.so:graphics/mesa-dri + +USES= cmake:indirect compiler:c11 gl localbase meson pkgconfig \ + python:build display:test USE_GITLAB= yes GL_SITE= https://gitlab.freedesktop.org GL_ACCOUNT= mesa -GL_TAGNAME= 2485a41c321a29463b5c0af7813c2d1046e2f925 USE_GL= egl gl USE_LDCONFIG= yes DOCSDIR= ${PREFIX}/share/doc/waffle1 BINARY_ALIAS= python3=${PYTHON_CMD} -OPTIONS_DEFINE= DOCS GBM MANPAGES SURFACELESS WAYLAND X11 +TESTING_UNSAFE= Requires DRM device under /dev/, running X server, running Wayland compositor + +OPTIONS_DEFINE= DOCS GBM MANPAGES SURFACELESS TEST WAYLAND X11 OPTIONS_DEFAULT= GBM MANPAGES SURFACELESS WAYLAND X11 OPTIONS_SUB= yes GBM_DESC= GBM/DRM/KMS direct-on-hardware support SURFACELESS_DESC= Surfaceless EGL support GBM_LIB_DEPENDS= libudev.so:devel/libudev-devd GBM_USE= GL=gbm GBM_MESON_ENABLED= gbm MANPAGES_BUILD_DEPENDS= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl MANPAGES_USES= gnome MANPAGES_USE= GNOME=libxslt:build MANPAGES_MESON_TRUE= build-manpages SURFACELESS_MESON_ENABLED= surfaceless_egl +TEST_LIB_DEPENDS= libcmocka.so:sysutils/cmocka +TEST_MESON_TRUE= build-tests + WAYLAND_BUILD_DEPENDS= wayland-protocols>0:graphics/wayland-protocols \ wayland-scanner:graphics/wayland WAYLAND_LIB_DEPENDS= libwayland-egl.so:graphics/wayland WAYLAND_MESON_ENABLED= wayland X11_USES= xorg X11_USE= XORG=x11,xcb X11_MESON_ENABLED= glx x11_egl .include diff --git a/graphics/waffle/distinfo b/graphics/waffle/distinfo index f478e216921a..68053c020407 100644 --- a/graphics/waffle/distinfo +++ b/graphics/waffle/distinfo @@ -1,9 +1,3 @@ -TIMESTAMP = 1617891491 -SHA256 (mesa-waffle-2485a41c321a29463b5c0af7813c2d1046e2f925_GL0.tar.gz) = 60aaefec2ee50090671790a0be4feb28b190194bdbbd854ff659249100f0517b -SIZE (mesa-waffle-2485a41c321a29463b5c0af7813c2d1046e2f925_GL0.tar.gz) = 383388 -SHA256 (39ad2b26f46e90cbae13a9cbc58e1f9df03f0980.patch) = 323c8960476839a0475d8a07548a00c54eddb8a3352ab6241127394c4486e297 -SIZE (39ad2b26f46e90cbae13a9cbc58e1f9df03f0980.patch) = 3234 -SHA256 (e4a1e7e9670b77d5b145520d60c4b7570fe3c6ea.patch) = 9ec8f3a0716a8db80f1ef3ae9d29959baa01798ff4ec63d00f703445d4747f62 -SIZE (e4a1e7e9670b77d5b145520d60c4b7570fe3c6ea.patch) = 10686 -SHA256 (8c202f88ab4f0f851e3f19dd82bc6b5236120564.patch) = 01c02df645abfcf7749b60281c9fb6e934e1c21c5fd2696d5b5fbb5bda5dcffe -SIZE (8c202f88ab4f0f851e3f19dd82bc6b5236120564.patch) = 1040 +TIMESTAMP = 1777969357 +SHA256 (waffle-v1.8.1.tar.bz2) = e049540a11add8174f7067740b36e46fc9da49d1daf7fbb46f42ef41c2991101 +SIZE (waffle-v1.8.1.tar.bz2) = 309259 diff --git a/graphics/waffle/pkg-plist b/graphics/waffle/pkg-plist index 2671327bb7a5..b0d59b741c7e 100644 --- a/graphics/waffle/pkg-plist +++ b/graphics/waffle/pkg-plist @@ -1,111 +1,126 @@ bin/wflinfo include/waffle-1/waffle.h include/waffle-1/waffle_gbm.h include/waffle-1/waffle_glx.h +include/waffle-1/waffle_surfaceless_egl.h include/waffle-1/waffle_version.h include/waffle-1/waffle_wayland.h include/waffle-1/waffle_x11_egl.h -lib/cmake/Waffle/WaffleConfig.cmake -lib/cmake/Waffle/WaffleConfigVersion.cmake lib/libwaffle-1.so lib/libwaffle-1.so.0 -lib/libwaffle-1.so.0.6.90 +lib/libwaffle-1.so.0.8.1 libdata/pkgconfig/waffle-1.pc +share/bash-completion/completions/wflinfo +share/zsh/site-functions/_wflinfo +%%PORTDOCS%%%%DOCSDIR%%/HACKING.txt +%%PORTDOCS%%%%DOCSDIR%%/LICENSE-threads.txt +%%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt +%%PORTDOCS%%%%DOCSDIR%%/README.md +%%PORTDOCS%%%%DOCSDIR%%/examples/Makefile.example +%%PORTDOCS%%%%DOCSDIR%%/examples/gl_basic.c +%%PORTDOCS%%%%DOCSDIR%%/examples/simple-x11-egl.c +%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-0.1.txt +%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-0.2.txt +%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-0.3.0.txt +%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-0.3.1.txt +%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.0.0.txt +%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.0.1.txt +%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.1.0.txt +%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.1.1.txt +%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.1.2.txt +%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.2.0.txt +%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.2.1.txt +%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.2.2.txt +%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.2.3-announcement.txt +%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.3.0-announcement.txt +%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.3.0.txt +%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.4.0-rc1.announce.eml +%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.4.0-rc1.txt +%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.4.0.txt +%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.4.1.txt +%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.4.2.txt +%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.4.3.txt +%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.4.4.txt +%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.5.0-rc1.txt +%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.5.0-rc2.txt +%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.5.0.txt +%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.5.1.txt +%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.5.2.txt +%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.6.0.md +%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.6.1.md +%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.6.2.md +%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.6.3.md +%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.7.0.md +%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.7.1.md +%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.7.2.md +%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.8.0.md +%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.8.1.md %%MANPAGES%%share/man/man1/wflinfo.1.gz %%MANPAGES%%share/man/man3/waffle_attrib_list.3.gz %%MANPAGES%%share/man/man3/waffle_attrib_list_get.3.gz %%MANPAGES%%share/man/man3/waffle_attrib_list_get_with_default.3.gz %%MANPAGES%%share/man/man3/waffle_attrib_list_length.3.gz %%MANPAGES%%share/man/man3/waffle_attrib_list_update.3.gz %%MANPAGES%%share/man/man3/waffle_config.3.gz %%MANPAGES%%share/man/man3/waffle_config_choose.3.gz %%MANPAGES%%share/man/man3/waffle_config_destroy.3.gz %%MANPAGES%%share/man/man3/waffle_config_get_native.3.gz %%MANPAGES%%share/man/man3/waffle_context.3.gz %%MANPAGES%%share/man/man3/waffle_context_create.3.gz %%MANPAGES%%share/man/man3/waffle_context_destroy.3.gz %%MANPAGES%%share/man/man3/waffle_context_get_native.3.gz %%MANPAGES%%share/man/man3/waffle_display.3.gz %%MANPAGES%%share/man/man3/waffle_display_connect.3.gz %%MANPAGES%%share/man/man3/waffle_display_disconnect.3.gz %%MANPAGES%%share/man/man3/waffle_display_get_native.3.gz %%MANPAGES%%share/man/man3/waffle_display_supports_context_api.3.gz %%MANPAGES%%share/man/man3/waffle_dl.3.gz %%MANPAGES%%share/man/man3/waffle_dl_can_open.3.gz %%MANPAGES%%share/man/man3/waffle_dl_sym.3.gz %%MANPAGES%%share/man/man3/waffle_enum.3.gz %%MANPAGES%%share/man/man3/waffle_enum_to_string.3.gz %%MANPAGES%%share/man/man3/waffle_error.3.gz %%MANPAGES%%share/man/man3/waffle_error_get_code.3.gz %%MANPAGES%%share/man/man3/waffle_error_get_info.3.gz %%MANPAGES%%share/man/man3/waffle_error_to_string.3.gz %%MANPAGES%%share/man/man3/waffle_gbm.3.gz %%MANPAGES%%share/man/man3/waffle_gbm_config.3.gz %%MANPAGES%%share/man/man3/waffle_gbm_context.3.gz %%MANPAGES%%share/man/man3/waffle_gbm_display.3.gz %%MANPAGES%%share/man/man3/waffle_gbm_window.3.gz %%MANPAGES%%share/man/man3/waffle_get_current_context.3.gz %%MANPAGES%%share/man/man3/waffle_get_current_display.3.gz %%MANPAGES%%share/man/man3/waffle_get_current_window.3.gz %%MANPAGES%%share/man/man3/waffle_get_proc_address.3.gz %%MANPAGES%%share/man/man3/waffle_glx.3.gz %%MANPAGES%%share/man/man3/waffle_glx_config.3.gz %%MANPAGES%%share/man/man3/waffle_glx_context.3.gz %%MANPAGES%%share/man/man3/waffle_glx_display.3.gz %%MANPAGES%%share/man/man3/waffle_glx_window.3.gz %%MANPAGES%%share/man/man3/waffle_init.3.gz %%MANPAGES%%share/man/man3/waffle_is_extension_in_string.3.gz %%MANPAGES%%share/man/man3/waffle_make_current.3.gz %%MANPAGES%%share/man/man3/waffle_native.3.gz %%MANPAGES%%share/man/man3/waffle_native_config.3.gz %%MANPAGES%%share/man/man3/waffle_native_context.3.gz %%MANPAGES%%share/man/man3/waffle_native_display.3.gz %%MANPAGES%%share/man/man3/waffle_native_window.3.gz %%MANPAGES%%share/man/man3/waffle_teardown.3.gz %%MANPAGES%%share/man/man3/waffle_wayland.3.gz %%MANPAGES%%share/man/man3/waffle_wayland_config.3.gz %%MANPAGES%%share/man/man3/waffle_wayland_context.3.gz %%MANPAGES%%share/man/man3/waffle_wayland_display.3.gz %%MANPAGES%%share/man/man3/waffle_wayland_window.3.gz %%MANPAGES%%share/man/man3/waffle_window.3.gz %%MANPAGES%%share/man/man3/waffle_window_create.3.gz %%MANPAGES%%share/man/man3/waffle_window_destroy.3.gz %%MANPAGES%%share/man/man3/waffle_window_get_native.3.gz %%MANPAGES%%share/man/man3/waffle_window_show.3.gz %%MANPAGES%%share/man/man3/waffle_window_swap_buffers.3.gz %%MANPAGES%%share/man/man3/waffle_x11_egl.3.gz %%MANPAGES%%share/man/man3/waffle_x11_egl_config.3.gz %%MANPAGES%%share/man/man3/waffle_x11_egl_context.3.gz %%MANPAGES%%share/man/man3/waffle_x11_egl_display.3.gz %%MANPAGES%%share/man/man3/waffle_x11_egl_window.3.gz %%MANPAGES%%share/man/man7/waffle.7.gz %%MANPAGES%%share/man/man7/waffle_feature_test_macros.7.gz -%%PORTDOCS%%%%DOCSDIR%%/HACKING.txt -%%PORTDOCS%%%%DOCSDIR%%/LICENSE-threads.txt -%%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt -%%PORTDOCS%%%%DOCSDIR%%/README.md -%%PORTDOCS%%%%DOCSDIR%%/examples/Makefile.example -%%PORTDOCS%%%%DOCSDIR%%/examples/gl_basic.c -%%PORTDOCS%%%%DOCSDIR%%/examples/simple-x11-egl.c -%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-0.1.txt -%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-0.2.txt -%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-0.3.0.txt -%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-0.3.1.txt -%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.0.0.txt -%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.0.1.txt -%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.1.0.txt -%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.1.1.txt -%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.1.2.txt -%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.2.0.txt -%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.2.1.txt -%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.2.2.txt -%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.3.0.txt -%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.4.0.txt -%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.4.1.txt -%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.4.2.txt -%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.4.3.txt -%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.4.4.txt -%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.5.0.txt -%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.5.1.txt -%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.5.2.txt -%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.6.0.md