Page MenuHomeFreeBSD
Files F145650412

D45743.1778383562.diff
No OneTemporary
Actions

Size
3 KB
Referenced Files
None
Subscribers
None

D45743.1778383562.diff
View Options

diff --git a/graphics/mesa-dri/Makefile b/graphics/mesa-dri/Makefile
--- a/graphics/mesa-dri/Makefile
+++ b/graphics/mesa-dri/Makefile
@@ -1,5 +1,6 @@
PORTNAME= mesa-dri
PORTVERSION= ${MESAVERSION}
+PORTREVISION= 1
CATEGORIES= graphics
COMMENT= OpenGL hardware acceleration drivers for DRI2+
@@ -10,20 +11,16 @@
USES+= llvm:lib,noexport
OPTIONS_GROUP= PLATFORM
-OPTIONS_GROUP_PLATFORM= PLATFORM_X11 PLATFORM_WAYLAND
-PLATFORM_X11_DESC= Enable X11 support for GBM/EGL
-PLATFORM_WAYLAND_DESC= Enable Wayland support for GBM/EGL
-PLATFORM_WAYLAND_IMPLIES= WAYLAND
-
-OPTIONS_DEFINE= WAYLAND ZSTD
-OPTIONS_DEFAULT= WAYLAND PLATFORM_X11 PLATFORM_WAYLAND ZSTD
+OPTIONS_GROUP_PLATFORM= X11 WAYLAND
+X11_DESC= Enable X11 support for GBM/EGL
+WAYLAND_DESC= Enable Wayland support for GBM/EGL and Vulkan
+WAYLAND_BUILD_DEPENDS= wayland-protocols>=1.8:graphics/wayland-protocols
+WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland
+
+OPTIONS_DEFINE= ZSTD
+OPTIONS_DEFAULT= WAYLAND X11 ZSTD
OPTIONS_SUB= yes
-WAYLAND_DESC= Enable support for the Wayland platform in Vulkan drivers
-WAYLAND_BUILD_DEPENDS= wayland-protocols>=1.8:graphics/wayland-protocols
-WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland
-WAYLAND_IMPLIES= PLATFORM_WAYLAND
-
ZSTD_DESC= Use ZSTD for shader cache
ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd
ZSTD_MESON_ENABLED= zstd
@@ -56,15 +53,12 @@
LDFLAGS_i386= -Wl,-znotext
-.if ${PORT_OPTIONS:MPLATFORM_X11}
+.if ${PORT_OPTIONS:MX11}
MESA_PLATFORMS+= x11
-USE_XORG+= xorgproto x11 xdamage xext xfixes xshmfence xv
-.if defined(VULKAN_DRIVERS)
-USE_XORG+= xcb xrandr
-.endif
+USE_XORG+= xcb xorgproto xrandr x11 xdamage xext xfixes xshmfence xv
.endif
-.if ${PORT_OPTIONS:MPLATFORM_WAYLAND}
+.if ${PORT_OPTIONS:MWAYLAND}
MESA_PLATFORMS+= wayland
.endif
diff --git a/graphics/mesa-dri/Makefile.common b/graphics/mesa-dri/Makefile.common
--- a/graphics/mesa-dri/Makefile.common
+++ b/graphics/mesa-dri/Makefile.common
@@ -28,7 +28,7 @@
BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR}
.if ${COMPONENT} != clover
-.if ${PORT_OPTIONS:MPLATFORM_X11}
+.if ${PORT_OPTIONS:MX11}
USES+= xorg
.endif
.endif
diff --git a/graphics/mesa-libs/Makefile b/graphics/mesa-libs/Makefile
--- a/graphics/mesa-libs/Makefile
+++ b/graphics/mesa-libs/Makefile
@@ -1,5 +1,6 @@
PORTNAME= mesa-libs
PORTVERSION= ${MESAVERSION}
+PORTREVISION= 1
CATEGORIES= graphics
COMMENT= OpenGL libraries that support GLX and EGL clients
@@ -12,20 +13,16 @@
BUILD_DEPENDS= libglvnd>=0:graphics/libglvnd
-OPTIONS_GROUP= PLATFORM
-OPTIONS_GROUP_PLATFORM= PLATFORM_X11 PLATFORM_WAYLAND
-PLATFORM_X11_DESC= Enable X11 support for GBM/EGL
-PLATFORM_WAYLAND_DESC= Enable Wayland support for GBM/EGL
-PLATFORM_WAYLAND_IMPLIES= WAYLAND
-
-OPTIONS_DEFINE= WAYLAND ZSTD
-OPTIONS_DEFAULT=WAYLAND PLATFORM_X11 PLATFORM_WAYLAND ZSTD
-OPTIONS_SUB= yes
-
-WAYLAND_DESC= Enable support for the Wayland platform in EGL
+OPTIONS_GROUP= PLATFORM
+OPTIONS_GROUP_PLATFORM= X11 WAYLAND
+X11_DESC= Enable X11 support for GBM/EGL
+WAYLAND_DESC= Enable Wayland support for GBM/EGL
WAYLAND_BUILD_DEPENDS= wayland-protocols>=1.8:graphics/wayland-protocols
WAYLAND_LIB_DEPENDS= libwayland-server.so:graphics/wayland
-WAYLAND_IMPLIES= PLATFORM_WAYLAND
+
+OPTIONS_DEFINE= ZSTD
+OPTIONS_DEFAULT= WAYLAND X11 ZSTD
+OPTIONS_SUB= yes
ZSTD_DESC= Use ZSTD for shader cache
ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd
@@ -54,7 +51,7 @@
# Building EGL and GBM requires a driver so add r300
MESON_ARGS+= -Dgallium-drivers="r300"
-.if ${PORT_OPTIONS:MPLATFORM_X11}
+.if ${PORT_OPTIONS:MX11}
MESA_PLATFORMS+= x11
USE_XORG+= xorgproto x11 xcb xdamage xext \
xfixes xshmfence xxf86vm xrandr
@@ -64,7 +61,7 @@
PLIST_SUB+= GLX="@comment "
.endif
-.if ${PORT_OPTIONS:MPLATFORM_WAYLAND} && ${PORT_OPTIONS:MWAYLAND}
+.if ${PORT_OPTIONS:MWAYLAND}
MESA_PLATFORMS+= wayland
.endif

File Metadata

Mime Type
text/plain
Expires
Sun, May 10, 3:26 AM (6 h, 13 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28630410
Default Alt Text
D45743.1778383562.diff (3 KB)

Event Timeline