svn commit: r556929 - in head: graphics/libosmesa graphics/mesa-dri graphics/mesa-dri/files graphics/mesa-gallium-va graphics/mesa-gallium-vdpau graphics/mesa-gallium-xa graphics/mesa-libs lang/clover
Emmanuel Vadot
manu at FreeBSD.org
Thu Dec 3 20:55:35 UTC 2020
Author: manu
Date: Thu Dec 3 20:55:32 2020
New Revision: 556929
URL: https://svnweb.freebsd.org/changeset/ports/556929
Log:
mesa-*: Update to 20.2.3
- Fix mesa-gallium-va and mesa-gallium-vdpau for X11 usage
- Add a patch so iris will be prefered for compatible intel GPUs (>=broadwell)
PR: 250307 250325
Added:
head/graphics/mesa-dri/files/patch-src_loader_meson.build (contents, props changed)
Modified:
head/graphics/libosmesa/Makefile
head/graphics/mesa-dri/Makefile
head/graphics/mesa-dri/Makefile.common
head/graphics/mesa-dri/distinfo
head/graphics/mesa-gallium-va/Makefile
head/graphics/mesa-gallium-va/pkg-plist
head/graphics/mesa-gallium-vdpau/Makefile
head/graphics/mesa-gallium-vdpau/pkg-plist
head/graphics/mesa-gallium-xa/Makefile
head/graphics/mesa-libs/Makefile
head/lang/clover/Makefile
Modified: head/graphics/libosmesa/Makefile
==============================================================================
--- head/graphics/libosmesa/Makefile Thu Dec 3 20:53:44 2020 (r556928)
+++ head/graphics/libosmesa/Makefile Thu Dec 3 20:55:32 2020 (r556929)
@@ -3,7 +3,6 @@
PORTNAME= libosmesa
PORTVERSION= ${MESAVERSION}
-PORTREVISION= 2
CATEGORIES= graphics
COMMENT= Off-Screen Mesa implementation of the OpenGL API
Modified: head/graphics/mesa-dri/Makefile
==============================================================================
--- head/graphics/mesa-dri/Makefile Thu Dec 3 20:53:44 2020 (r556928)
+++ head/graphics/mesa-dri/Makefile Thu Dec 3 20:55:32 2020 (r556929)
@@ -3,7 +3,6 @@
PORTNAME= mesa-dri
PORTVERSION= ${MESAVERSION}
-PORTREVISION= 2
CATEGORIES= graphics
COMMENT= OpenGL hardware acceleration drivers for DRI2+
@@ -71,9 +70,9 @@ MESA_PLATFORMS+= wayland
.endif
MESON_ARGS+= -Ddri-drivers="${DRI_DRIVERS:ts,:tl}" \
- -Dgallium-drivers="${GALLIUM_DRIVERS:ts,:tl}" \
- -Dvulkan-drivers="${VULKAN_DRIVERS:ts,:tl}" \
- -Dplatforms="${MESA_PLATFORMS:ts,:tl}"
+ -Dgallium-drivers="${GALLIUM_DRIVERS:ts,:tl}" \
+ -Dvulkan-drivers="${VULKAN_DRIVERS:ts,:tl}" \
+ -Dplatforms="${MESA_PLATFORMS:ts,:tl}"
# Disable some options
MESON_ARGS+= -Dgallium-xa=disabled \
Modified: head/graphics/mesa-dri/Makefile.common
==============================================================================
--- head/graphics/mesa-dri/Makefile.common Thu Dec 3 20:53:44 2020 (r556928)
+++ head/graphics/mesa-dri/Makefile.common Thu Dec 3 20:55:32 2020 (r556929)
@@ -14,7 +14,7 @@
MESAVERSION= ${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
-MESABASEVERSION= 20.2.0
+MESABASEVERSION= 20.2.3
# if there is a subversion, don't include the '-' between 7.11-rc2.
MESASUBVERSION=
Modified: head/graphics/mesa-dri/distinfo
==============================================================================
--- head/graphics/mesa-dri/distinfo Thu Dec 3 20:53:44 2020 (r556928)
+++ head/graphics/mesa-dri/distinfo Thu Dec 3 20:55:32 2020 (r556929)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1601893546
-SHA256 (mesa-20.2.0.tar.xz) = 63f0359575d558ef98dd78adffc0df4c66b76964ebf603b778b7004964191d30
-SIZE (mesa-20.2.0.tar.xz) = 13675596
+TIMESTAMP = 1607017629
+SHA256 (mesa-20.2.3.tar.xz) = ae1b240e11531df528d14dc214d2dc4d2b4f2e835c6230ba0b492b171eceb82b
+SIZE (mesa-20.2.3.tar.xz) = 13844212
Added: head/graphics/mesa-dri/files/patch-src_loader_meson.build
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/mesa-dri/files/patch-src_loader_meson.build Thu Dec 3 20:55:32 2020 (r556929)
@@ -0,0 +1,11 @@
+--- src/loader/meson.build.orig 2020-12-03 18:59:28.209491000 +0100
++++ src/loader/meson.build 2020-12-03 18:59:40.685431000 +0100
+@@ -41,7 +41,7 @@
+ '-DDEFAULT_DRIVER_DIR="@0@"'.format(dri_search_path),
+ ]
+
+-if with_gallium_iris and get_option('prefer-iris')
++if get_option('prefer-iris')
+ loader_c_args += ['-DPREFER_IRIS']
+ endif
+
Modified: head/graphics/mesa-gallium-va/Makefile
==============================================================================
--- head/graphics/mesa-gallium-va/Makefile Thu Dec 3 20:53:44 2020 (r556928)
+++ head/graphics/mesa-gallium-va/Makefile Thu Dec 3 20:55:32 2020 (r556929)
@@ -7,13 +7,15 @@ CATEGORIES= graphics
COMMENT= Mesa Gallium VAAPI drivers
-USES= xorg
-USE_XORG= xcb xfixes xrandr
-
LIB_DEPENDS= libva.so:multimedia/libva \
libzstd.so:archivers/zstd
-BUILD_DEPENDS= wayland-protocols>=1.8:graphics/wayland-protocols
+OPTIONS_DEFINE= X11
+OPTIONS_DEFAULT= X11
+X11_DESC= Enable X11 support
+X11_USES= xorg
+X11_USE= xorg=xorgproto,x11,xcb,xdamage,xext,xfixes,xshmfence,xxf86vm,xrandr
+
.include <bsd.port.options.mk>
.include "${.CURDIR:H:H}/graphics/mesa-dri/Makefile.common"
@@ -29,17 +31,25 @@ MESON_ARGS+= -Ddri-drivers="" \
-Dgallium-opencl=disabled \
-Dgallium-xvmc=disabled \
-Dgallium-nine=false \
- -Degl=disabled \
-Dgbm=disabled \
+ -Dgles1=disabled \
-Dgles2=disabled \
+ -Dosmesa=none \
-Dglx=disabled \
- -Dopengl=false \
- -Dshared-glapi=disabled \
- -Dosmesa=none
+ -Ddri3=disabled
-LDFLAGS_i386= -Wl,-znotext
+LDFLAGS_i386= -Wl,-znotext
MESON_ARGS+= -Dgallium-va=enabled
+
+.if ${PORT_OPTIONS:MX11}
+MESON_ARGS+= -Dplatforms="x11"
+.else
+MESON_ARGS+= -Dglx=disabled \
+ -Degl=disabled \
+ -Dopengl=false \
+ -Dshared-glapi=disabled
+.endif
.include "${MASTERDIR}/Makefile.targets"
.include <bsd.port.post.mk>
Modified: head/graphics/mesa-gallium-va/pkg-plist
==============================================================================
--- head/graphics/mesa-gallium-va/pkg-plist Thu Dec 3 20:53:44 2020 (r556928)
+++ head/graphics/mesa-gallium-va/pkg-plist Thu Dec 3 20:55:32 2020 (r556929)
@@ -1,3 +1,23 @@
+ at comment include/EGL/egl.h
+ at comment include/EGL/eglext.h
+ at comment include/EGL/eglextchromium.h
+ at comment include/EGL/eglmesaext.h
+ at comment include/EGL/eglplatform.h
+ at comment include/GL/gl.h
+ at comment include/GL/glcorearb.h
+ at comment include/GL/glext.h
+ at comment include/GL/internal/dri_interface.h
+ at comment include/KHR/khrplatform.h
+ at comment lib/dri/r600_dri.so
lib/dri/r600_drv_video.so
+ at comment lib/dri/radeonsi_dri.so
lib/dri/radeonsi_drv_video.so
+ at comment lib/libEGL.so
+ at comment lib/libEGL.so.1
+ at comment lib/libEGL.so.1.0.0
+ at comment lib/libglapi.so
+ at comment lib/libglapi.so.0
+ at comment lib/libglapi.so.0.0.0
+ at comment libdata/pkgconfig/dri.pc
+ at comment libdata/pkgconfig/egl.pc
@comment share/drirc.d/00-mesa-defaults.conf
Modified: head/graphics/mesa-gallium-vdpau/Makefile
==============================================================================
--- head/graphics/mesa-gallium-vdpau/Makefile Thu Dec 3 20:53:44 2020 (r556928)
+++ head/graphics/mesa-gallium-vdpau/Makefile Thu Dec 3 20:55:32 2020 (r556929)
@@ -2,19 +2,20 @@
PORTNAME= mesa-gallium-vdpau
PORTVERSION= ${MESAVERSION}
-PORTREVISION= 2
CATEGORIES= graphics
COMMENT= Mesa Gallium VDPAU drivers
-USES= xorg
-USE_XORG= xcb xfixes xrandr
-
LIB_DEPENDS= libva.so:multimedia/libva \
libvdpau.so:multimedia/libvdpau \
libzstd.so:archivers/zstd
-BUILD_DEPENDS= wayland-protocols>=1.8:graphics/wayland-protocols
+OPTIONS_DEFINE= X11
+OPTIONS_DEFAULT= X11
+X11_DESC= Enable X11 support
+X11_USES= xorg
+X11_USE= xorg=xorgproto,x11,xcb,xdamage,xext,xfixes,xshmfence,xxf86vm,xrandr
+
.include <bsd.port.options.mk>
.include "${.CURDIR:H:H}/graphics/mesa-dri/Makefile.common"
@@ -24,23 +25,31 @@ ONLY_FOR_ARCHS_REASON= Used only by amd/radeon hardwar
MESON_ARGS+= -Ddri-drivers="" \
-Dgallium-drivers="r300,r600,radeonsi" \
-Dvulkan-drivers="" \
- -Dgallium-va=disabled \
+ -Dgallium-vdpau=disabled \
-Dgallium-omx=disabled \
-Dgallium-xa=disabled \
-Dgallium-opencl=disabled \
-Dgallium-xvmc=disabled \
-Dgallium-nine=false \
- -Degl=disabled \
-Dgbm=disabled \
+ -Dgles1=disabled \
-Dgles2=disabled \
+ -Dosmesa=none \
-Dglx=disabled \
- -Dopengl=false \
- -Dshared-glapi=disabled \
- -Dosmesa=none
+ -Ddri3=disabled
LDFLAGS_i386= -Wl,-znotext
MESON_ARGS+= -Dgallium-vdpau=enabled
+
+.if ${PORT_OPTIONS:MX11}
+MESON_ARGS+= -Dplatforms="x11"
+.else
+MESON_ARGS+= -Dglx=disabled \
+ -Degl=disabled \
+ -Dopengl=false \
+ -Dshared-glapi=disabled
+.endif
.include "${MASTERDIR}/Makefile.targets"
.include <bsd.port.post.mk>
Modified: head/graphics/mesa-gallium-vdpau/pkg-plist
==============================================================================
--- head/graphics/mesa-gallium-vdpau/pkg-plist Thu Dec 3 20:53:44 2020 (r556928)
+++ head/graphics/mesa-gallium-vdpau/pkg-plist Thu Dec 3 20:55:32 2020 (r556929)
@@ -1,3 +1,24 @@
+ at comment include/EGL/egl.h
+ at comment include/EGL/eglext.h
+ at comment include/EGL/eglextchromium.h
+ at comment include/EGL/eglmesaext.h
+ at comment include/EGL/eglplatform.h
+ at comment include/GL/gl.h
+ at comment include/GL/glcorearb.h
+ at comment include/GL/glext.h
+ at comment include/GL/internal/dri_interface.h
+ at comment include/KHR/khrplatform.h
+ at comment lib/dri/r300_dri.so
+ at comment lib/dri/r600_dri.so
+ at comment lib/dri/r600_drv_video.so
+ at comment lib/dri/radeonsi_dri.so
+ at comment lib/dri/radeonsi_drv_video.so
+ at comment lib/libEGL.so
+ at comment lib/libEGL.so.1
+ at comment lib/libEGL.so.1.0.0
+ at comment lib/libglapi.so
+ at comment lib/libglapi.so.0
+ at comment lib/libglapi.so.0.0.0
lib/vdpau/libvdpau_r300.so
lib/vdpau/libvdpau_r300.so.1
lib/vdpau/libvdpau_r300.so.1.0
@@ -10,4 +31,6 @@ lib/vdpau/libvdpau_radeonsi.so
lib/vdpau/libvdpau_radeonsi.so.1
lib/vdpau/libvdpau_radeonsi.so.1.0
lib/vdpau/libvdpau_radeonsi.so.1.0.0
+ at comment libdata/pkgconfig/dri.pc
+ at comment libdata/pkgconfig/egl.pc
@comment share/drirc.d/00-mesa-defaults.conf
Modified: head/graphics/mesa-gallium-xa/Makefile
==============================================================================
--- head/graphics/mesa-gallium-xa/Makefile Thu Dec 3 20:53:44 2020 (r556928)
+++ head/graphics/mesa-gallium-xa/Makefile Thu Dec 3 20:55:32 2020 (r556929)
@@ -3,7 +3,6 @@
PORTNAME= mesa-gallium-xa
PORTVERSION= ${MESAVERSION}
-PORTREVISION= 2
CATEGORIES= graphics
COMMENT= Mesa Gallium XA state tracker
Modified: head/graphics/mesa-libs/Makefile
==============================================================================
--- head/graphics/mesa-libs/Makefile Thu Dec 3 20:53:44 2020 (r556928)
+++ head/graphics/mesa-libs/Makefile Thu Dec 3 20:55:32 2020 (r556929)
@@ -3,7 +3,6 @@
PORTNAME= mesa-libs
PORTVERSION= ${MESAVERSION}
-PORTREVISION= 2
CATEGORIES= graphics
COMMENT= OpenGL libraries that support GLX and EGL clients
@@ -44,7 +43,8 @@ MESON_ARGS+= -Dgallium-drivers="" \
-Dtools="" \
-Degl=enabled \
-Dgbm=enabled \
- -Dvulkan-drivers=""
+ -Dvulkan-drivers="" \
+ -Dprefer-iris=true
# Building EGL and GBM requires a dri driver so add swrast
MESON_ARGS+= -Ddri-drivers="swrast"
Modified: head/lang/clover/Makefile
==============================================================================
--- head/lang/clover/Makefile Thu Dec 3 20:53:44 2020 (r556928)
+++ head/lang/clover/Makefile Thu Dec 3 20:55:32 2020 (r556929)
@@ -2,7 +2,6 @@
PORTNAME= clover
PORTVERSION= ${MESAVERSION}
-PORTREVISION= 1
CATEGORIES= lang
COMMENT= Mesa OpenCL implementation for AMD GPUs
More information about the svn-ports-head
mailing list