svn commit: r538567 - in head/graphics/mesa-devel: . files
Jan Beich
jbeich at FreeBSD.org
Fri Jun 12 07:45:05 UTC 2020
Author: jbeich
Date: Fri Jun 12 07:45:04 2020
New Revision: 538567
URL: https://svnweb.freebsd.org/changeset/ports/538567
Log:
graphics/mesa-devel: don't use PKGNAMESUFFIX outside of Makefile
In future the suffix maybe adjusted based on other conditions.
Modified:
head/graphics/mesa-devel/Makefile (contents, props changed)
head/graphics/mesa-devel/files/libmap.conf.in (contents, props changed)
head/graphics/mesa-devel/pkg-plist (contents, props changed)
Modified: head/graphics/mesa-devel/Makefile
==============================================================================
--- head/graphics/mesa-devel/Makefile Fri Jun 12 07:44:24 2020 (r538566)
+++ head/graphics/mesa-devel/Makefile Fri Jun 12 07:45:04 2020 (r538567)
@@ -59,8 +59,8 @@ MESON_ARGS= -Dgallium-omx=disabled \
${BINARY_ALIAS:D--native-file=binary_alias.ini} \
${NULL}
SUB_FILES= libmap.conf
-SUB_LIST= PKGNAMESUFFIX=${PKGNAMESUFFIX}
-PLIST_SUB= ARCH=${ARCH:S/amd/x86_/} PKGNAMESUFFIX=${PKGNAMESUFFIX}
+SUB_LIST= SUFFIX=${PKGNAMESUFFIX}
+PLIST_SUB= ARCH=${ARCH:S/amd/x86_/} SUFFIX=${PKGNAMESUFFIX}
.if exists(/usr/bin/ld.lld) && ${/usr/bin/ld:L:tA} != /usr/bin/ld.lld
# --build-id isn't supported by old GNU ld.bfd in base
Modified: head/graphics/mesa-devel/files/libmap.conf.in
==============================================================================
--- head/graphics/mesa-devel/files/libmap.conf.in Fri Jun 12 07:44:24 2020 (r538566)
+++ head/graphics/mesa-devel/files/libmap.conf.in Fri Jun 12 07:45:04 2020 (r538567)
@@ -1,25 +1,25 @@
# EGL/GLX built with -Dglvnd=false
-libEGL.so.1 libEGL%%PKGNAMESUFFIX%%.so.1
-libGL.so.1 libGL%%PKGNAMESUFFIX%%.so.1
-libGLESv1_CM.so.1 libGLESv1_CM%%PKGNAMESUFFIX%%.so.1
-libGLESv2.so.2 libGLESv2%%PKGNAMESUFFIX%%.so.2
+libEGL.so.1 libEGL%%SUFFIX%%.so.1
+libGL.so.1 libGL%%SUFFIX%%.so.1
+libGLESv1_CM.so.1 libGLESv1_CM%%SUFFIX%%.so.1
+libGLESv2.so.2 libGLESv2%%SUFFIX%%.so.2
# EGL/GLX built with -Dglvnd=true
# Xorg sets GLX_EXT_libglvnd to "mesa" by default
-libEGL_mesa.so.0 libEGL_mesa%%PKGNAMESUFFIX%%.so.0
-libGLX_mesa.so.0 libGLX_mesa%%PKGNAMESUFFIX%%.so.0
+libEGL_mesa.so.0 libEGL_mesa%%SUFFIX%%.so.0
+libGLX_mesa.so.0 libGLX_mesa%%SUFFIX%%.so.0
# Fallback if GLX_EXT_libglvnd is missing or vendor library doesn't exist
-libGLX_indirect.so.0 libGLX_mesa%%PKGNAMESUFFIX%%.so.0
+libGLX_indirect.so.0 libGLX_mesa%%SUFFIX%%.so.0
# GBM clients like eglkms and wlroots fail otherwise
-libgbm.so.1 libgbm%%PKGNAMESUFFIX%%.so.1
+libgbm.so.1 libgbm%%SUFFIX%%.so.1
%%VULKAN%%# Avoid different versions of the same driver showing up as multiple GPUs
-%%anv%%%%PREFIX%%/lib/libvulkan_intel.so libvulkan_intel%%PKGNAMESUFFIX%%.so
-%%radv%%%%PREFIX%%/lib/libvulkan_radeon.so libvulkan_radeon%%PKGNAMESUFFIX%%.so
+%%anv%%%%PREFIX%%/lib/libvulkan_intel.so libvulkan_intel%%SUFFIX%%.so
+%%radv%%%%PREFIX%%/lib/libvulkan_radeon.so libvulkan_radeon%%SUFFIX%%.so
-%%VAAPI%%%%r600%%%%PREFIX%%/lib/dri/r600_drv_video.so %%PREFIX%%/lib/dri%%PKGNAMESUFFIX%%/r600_drv_video.so
-%%VAAPI%%%%radeonsi%%%%PREFIX%%/lib/dri/radeonsi_drv_video.so %%PREFIX%%/lib/dri%%PKGNAMESUFFIX%%/radeonsi_drv_video.so
-%%VDPAU%%%%r600%%%%PREFIX%%/lib/vdpau/libvdpau_r600.so.1 %%PREFIX%%/lib/vdpau%%PKGNAMESUFFIX%%/libvdpau_r600.so.1
-%%VDPAU%%%%radeonsi%%%%PREFIX%%/lib/vdpau/libvdpau_radeonsi.so.1 %%PREFIX%%/lib/vdpau%%PKGNAMESUFFIX%%/libvdpau_radeonsi.so.1
+%%VAAPI%%%%r600%%%%PREFIX%%/lib/dri/r600_drv_video.so %%PREFIX%%/lib/dri%%SUFFIX%%/r600_drv_video.so
+%%VAAPI%%%%radeonsi%%%%PREFIX%%/lib/dri/radeonsi_drv_video.so %%PREFIX%%/lib/dri%%SUFFIX%%/radeonsi_drv_video.so
+%%VDPAU%%%%r600%%%%PREFIX%%/lib/vdpau/libvdpau_r600.so.1 %%PREFIX%%/lib/vdpau%%SUFFIX%%/libvdpau_r600.so.1
+%%VDPAU%%%%radeonsi%%%%PREFIX%%/lib/vdpau/libvdpau_radeonsi.so.1 %%PREFIX%%/lib/vdpau%%SUFFIX%%/libvdpau_radeonsi.so.1
Modified: head/graphics/mesa-devel/pkg-plist
==============================================================================
--- head/graphics/mesa-devel/pkg-plist Fri Jun 12 07:44:24 2020 (r538566)
+++ head/graphics/mesa-devel/pkg-plist Fri Jun 12 07:45:04 2020 (r538567)
@@ -1,5 +1,5 @@
%%VULKAN%%bin/mesa-overlay-control.py
- at sample etc/libmap.d/mesa%%PKGNAMESUFFIX%%.conf.sample
+ at sample etc/libmap.d/mesa%%SUFFIX%%.conf.sample
@comment include/EGL/egl.h
@comment include/EGL/eglext.h
@comment include/EGL/eglextchromium.h
@@ -26,49 +26,49 @@
@comment include/KHR/khrplatform.h
@comment include/gbm.h
%%anv%%@comment include/vulkan/vulkan_intel.h
-%%i965%%lib/dri%%PKGNAMESUFFIX%%/i965_dri.so
-%%iris%%lib/dri%%PKGNAMESUFFIX%%/iris_dri.so
-%%r600%%lib/dri%%PKGNAMESUFFIX%%/r600_dri.so
-%%radeonsi%%lib/dri%%PKGNAMESUFFIX%%/radeonsi_dri.so
-%%VAAPI%%%%r600%%lib/dri%%PKGNAMESUFFIX%%/r600_drv_video.so
-%%VAAPI%%%%radeonsi%%lib/dri%%PKGNAMESUFFIX%%/radeonsi_drv_video.so
- at comment lib/libEGL%%PKGNAMESUFFIX%%.so
-lib/libEGL%%PKGNAMESUFFIX%%.so.1
-lib/libEGL%%PKGNAMESUFFIX%%.so.1.0.0
-%%X11%%@comment lib/libGL%%PKGNAMESUFFIX%%.so
-%%X11%%lib/libGL%%PKGNAMESUFFIX%%.so.1
-%%X11%%lib/libGL%%PKGNAMESUFFIX%%.so.1.2.0
- at comment lib/libGLESv1_CM%%PKGNAMESUFFIX%%.so
-lib/libGLESv1_CM%%PKGNAMESUFFIX%%.so.1
-lib/libGLESv1_CM%%PKGNAMESUFFIX%%.so.1.1.0
- at comment lib/libGLESv2%%PKGNAMESUFFIX%%.so
-lib/libGLESv2%%PKGNAMESUFFIX%%.so.2
-lib/libGLESv2%%PKGNAMESUFFIX%%.so.2.0.0
+%%i965%%lib/dri%%SUFFIX%%/i965_dri.so
+%%iris%%lib/dri%%SUFFIX%%/iris_dri.so
+%%r600%%lib/dri%%SUFFIX%%/r600_dri.so
+%%radeonsi%%lib/dri%%SUFFIX%%/radeonsi_dri.so
+%%VAAPI%%%%r600%%lib/dri%%SUFFIX%%/r600_drv_video.so
+%%VAAPI%%%%radeonsi%%lib/dri%%SUFFIX%%/radeonsi_drv_video.so
+ at comment lib/libEGL%%SUFFIX%%.so
+lib/libEGL%%SUFFIX%%.so.1
+lib/libEGL%%SUFFIX%%.so.1.0.0
+%%X11%%@comment lib/libGL%%SUFFIX%%.so
+%%X11%%lib/libGL%%SUFFIX%%.so.1
+%%X11%%lib/libGL%%SUFFIX%%.so.1.2.0
+ at comment lib/libGLESv1_CM%%SUFFIX%%.so
+lib/libGLESv1_CM%%SUFFIX%%.so.1
+lib/libGLESv1_CM%%SUFFIX%%.so.1.1.0
+ at comment lib/libGLESv2%%SUFFIX%%.so
+lib/libGLESv2%%SUFFIX%%.so.2
+lib/libGLESv2%%SUFFIX%%.so.2.0.0
%%VULKAN%%lib/libVkLayer_MESA_device_select.so
%%VULKAN%%lib/libVkLayer_MESA_overlay.so
- at comment lib/libgbm%%PKGNAMESUFFIX%%.so
-lib/libgbm%%PKGNAMESUFFIX%%.so.1
-lib/libgbm%%PKGNAMESUFFIX%%.so.1.0.0
- at comment lib/libglapi%%PKGNAMESUFFIX%%.so
-lib/libglapi%%PKGNAMESUFFIX%%.so.0
-lib/libglapi%%PKGNAMESUFFIX%%.so.0.0.0
-%%anv%%lib/libvulkan_intel%%PKGNAMESUFFIX%%.so
-%%radv%%lib/libvulkan_radeon%%PKGNAMESUFFIX%%.so
-%%VDPAU%%%%r600%%lib/vdpau%%PKGNAMESUFFIX%%/libvdpau_r600.so
-%%VDPAU%%%%r600%%lib/vdpau%%PKGNAMESUFFIX%%/libvdpau_r600.so.1
-%%VDPAU%%%%r600%%lib/vdpau%%PKGNAMESUFFIX%%/libvdpau_r600.so.1.0
-%%VDPAU%%%%r600%%lib/vdpau%%PKGNAMESUFFIX%%/libvdpau_r600.so.1.0.0
-%%VDPAU%%%%radeonsi%%lib/vdpau%%PKGNAMESUFFIX%%/libvdpau_radeonsi.so
-%%VDPAU%%%%radeonsi%%lib/vdpau%%PKGNAMESUFFIX%%/libvdpau_radeonsi.so.1
-%%VDPAU%%%%radeonsi%%lib/vdpau%%PKGNAMESUFFIX%%/libvdpau_radeonsi.so.1.0
-%%VDPAU%%%%radeonsi%%lib/vdpau%%PKGNAMESUFFIX%%/libvdpau_radeonsi.so.1.0.0
+ at comment lib/libgbm%%SUFFIX%%.so
+lib/libgbm%%SUFFIX%%.so.1
+lib/libgbm%%SUFFIX%%.so.1.0.0
+ at comment lib/libglapi%%SUFFIX%%.so
+lib/libglapi%%SUFFIX%%.so.0
+lib/libglapi%%SUFFIX%%.so.0.0.0
+%%anv%%lib/libvulkan_intel%%SUFFIX%%.so
+%%radv%%lib/libvulkan_radeon%%SUFFIX%%.so
+%%VDPAU%%%%r600%%lib/vdpau%%SUFFIX%%/libvdpau_r600.so
+%%VDPAU%%%%r600%%lib/vdpau%%SUFFIX%%/libvdpau_r600.so.1
+%%VDPAU%%%%r600%%lib/vdpau%%SUFFIX%%/libvdpau_r600.so.1.0
+%%VDPAU%%%%r600%%lib/vdpau%%SUFFIX%%/libvdpau_r600.so.1.0.0
+%%VDPAU%%%%radeonsi%%lib/vdpau%%SUFFIX%%/libvdpau_radeonsi.so
+%%VDPAU%%%%radeonsi%%lib/vdpau%%SUFFIX%%/libvdpau_radeonsi.so.1
+%%VDPAU%%%%radeonsi%%lib/vdpau%%SUFFIX%%/libvdpau_radeonsi.so.1.0
+%%VDPAU%%%%radeonsi%%lib/vdpau%%SUFFIX%%/libvdpau_radeonsi.so.1.0.0
@comment libdata/pkgconfig/dri.pc
@comment libdata/pkgconfig/egl.pc
@comment libdata/pkgconfig/gbm.pc
@comment libdata/pkgconfig/gl.pc
@comment libdata/pkgconfig/glesv1_cm.pc
@comment libdata/pkgconfig/glesv2.pc
-share/drirc.d/00-mesa%%PKGNAMESUFFIX%%-defaults.conf
+share/drirc.d/00-mesa%%SUFFIX%%-defaults.conf
%%VULKAN%%share/vulkan/explicit_layer.d/VkLayer_MESA_overlay.json
%%anv%%@comment share/vulkan/icd.d/intel_icd.%%ARCH%%.json
%%radv%%@comment share/vulkan/icd.d/radeon_icd.%%ARCH%%.json
More information about the svn-ports-all
mailing list