Date: Tue, 2 Jun 2020 09:42:05 +0000 (UTC) From: Emmanuel Vadot <manu@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r537533 - in head/graphics/libdrm: . files Message-ID: <202006020942.0529g5Dd037528@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: manu Date: Tue Jun 2 09:42:05 2020 New Revision: 537533 URL: https://svnweb.freebsd.org/changeset/ports/537533 Log: libdrm: Update to 2.4.102 This update libdrm to the latest version which have all (-2) FreeBSD patches upstream. I'd like to keep it that way so please refrain from adding patches here. 2.4.101 release notes: https://lists.freedesktop.org/archives/dri-devel/2020-April/261067.html 2.4.102 release notes: https://lists.freedesktop.org/archives/dri-devel/2020-May/267255.html No timeline in https://abi-laboratory.pro/index.php?view=timeline&l=libdrm but should be ok based on what I saw Reviewed by: x11 (zeising) Differential Revision: https://reviews.freebsd.org/D25023 Deleted: head/graphics/libdrm/files/extra-xf86drm.c head/graphics/libdrm/files/patch-meson.build head/graphics/libdrm/files/patch-xf86drm.c head/graphics/libdrm/files/patch-xf86drm.h head/graphics/libdrm/files/patch-xf86drmMode.c Modified: head/graphics/libdrm/Makefile head/graphics/libdrm/distinfo head/graphics/libdrm/pkg-plist Modified: head/graphics/libdrm/Makefile ============================================================================== --- head/graphics/libdrm/Makefile Tue Jun 2 09:38:37 2020 (r537532) +++ head/graphics/libdrm/Makefile Tue Jun 2 09:42:05 2020 (r537533) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libdrm -PORTVERSION= 2.4.99 +PORTVERSION= 2.4.102 PORTEPOCH= 1 CATEGORIES= graphics x11 MASTER_SITES= https://dri.freedesktop.org/libdrm/ @@ -15,7 +15,7 @@ LICENSE= MIT BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:devel/libpthread-stubs LIB_DEPENDS= libpciaccess.so:devel/libpciaccess -USES= gnome meson pkgconfig tar:bzip2 +USES= gnome meson pkgconfig tar:xz USE_LDCONFIG= yes OPTIONS_DEFINE= MANPAGES TESTS @@ -36,39 +36,54 @@ TESTS_MESON_TRUE= install-test-programs # avoid circular dependency in case cairo supports OpenGL (cairo->mesa-libs->libdrm->cairo) CONFIGURE_ARGS+= -Dcairo-tests=false +# Disable some targets known to not work on FreeBSD +MESON_ARGS+= -Domap=false \ + -Dexynos=false \ + -Dfreedreno=false \ + -Dfreedreno-kgsl=false \ + -Dvc4=false \ + -Detnaviv=false + .include <bsd.port.options.mk> .if ${ARCH} == amd64 || ${ARCH} == i386 +MESON_ARGS+= -Dvmwgfx=true \ + -Dintel=true +.else +MESON_ARGS+= -Dvmwgfx=false \ + -Dintel=false +.endif + +.if ${ARCH} == amd64 || ${ARCH} == i386 PLIST_SUB+= ARM_DRIVERS="@comment " PLIST_SUB+= INTEL_DRIVER="" PLIST_SUB+= NOUVEAU_DRIVER="" PLIST_SUB+= RADEON_DRIVERS="" +PLIST_SUB+= VMWGFX_DRIVERS="" .elif ${ARCH:Mpowerpc*} PLIST_SUB+= ARM_DRIVERS="@comment " PLIST_SUB+= INTEL_DRIVER="@comment " PLIST_SUB+= NOUVEAU_DRIVER="" PLIST_SUB+= RADEON_DRIVERS="" +PLIST_SUB+= VMWGFX_DRIVERS="@comment " .elif ${ARCH} == aarch64 PLIST_SUB+= ARM_DRIVERS="" PLIST_SUB+= INTEL_DRIVER="@comment " PLIST_SUB+= NOUVEAU_DRIVER="" PLIST_SUB+= RADEON_DRIVERS="" +PLIST_SUB+= VMWGFX_DRIVERS="@comment " .elif ${ARCH:Marm*} PLIST_SUB+= ARM_DRIVERS="" PLIST_SUB+= INTEL_DRIVER="@comment " PLIST_SUB+= NOUVEAU_DRIVER="@comment " PLIST_SUB+= RADEON_DRIVERS="@comment " +PLIST_SUB+= VMWGFX_DRIVERS="@comment " .else PLIST_SUB+= ARM_DRIVERS="@comment " PLIST_SUB+= INTEL_DRIVER="@comment " PLIST_SUB+= NOUVEAU_DRIVER="@comment " PLIST_SUB+= RADEON_DRIVERS="@comment " -.endif - -# This variable is not for users. So use a non-default name, intended for -# people working on DRM kernel module development. -.if ${OPSYS} == FreeBSD && !defined(LIBDRM_SKIP_RETURN_PATCH) -EXTRA_PATCHES+= ${FILESDIR}/extra-xf86drm.c +PLIST_SUB+= VMWGFX_DRIVERS="@comment " .endif .include <bsd.port.mk> Modified: head/graphics/libdrm/distinfo ============================================================================== --- head/graphics/libdrm/distinfo Tue Jun 2 09:38:37 2020 (r537532) +++ head/graphics/libdrm/distinfo Tue Jun 2 09:42:05 2020 (r537533) @@ -1,3 +1,3 @@ -TIMESTAMP = 1562265364 -SHA256 (libdrm-2.4.99.tar.bz2) = 4dbf539c7ed25dbb2055090b77ab87508fc46be39a9379d15fed4b5517e1da5e -SIZE (libdrm-2.4.99.tar.bz2) = 853659 +TIMESTAMP = 1590568351 +SHA256 (libdrm-2.4.102.tar.xz) = 8bcbf9336c28e393d76c1f16d7e79e394a7fce8a2e929d52d3ad7ad8525ba05b +SIZE (libdrm-2.4.102.tar.xz) = 408844 Modified: head/graphics/libdrm/pkg-plist ============================================================================== --- head/graphics/libdrm/pkg-plist Tue Jun 2 09:38:37 2020 (r537532) +++ head/graphics/libdrm/pkg-plist Tue Jun 2 09:42:05 2020 (r537533) @@ -5,8 +5,6 @@ %%TESTS%%bin/modetest %%TESTS%%bin/proptest %%TESTS%%bin/vbltest -%%ARM_DRIVERS%%include/freedreno/freedreno_drmif.h -%%ARM_DRIVERS%%include/freedreno/freedreno_ringbuffer.h %%RADEON_DRIVERS%%include/libdrm/amdgpu.h %%RADEON_DRIVERS%%include/libdrm/amdgpu_drm.h include/libdrm/drm.h @@ -44,11 +42,9 @@ include/libdrm/savage_drm.h include/libdrm/sis_drm.h include/libdrm/tegra_drm.h include/libdrm/vc4_drm.h -%%ARM_DRIVERS%%include/libdrm/vc4_packet.h -%%ARM_DRIVERS%%include/libdrm/vc4_qpu_defines.h include/libdrm/via_drm.h include/libdrm/virtgpu_drm.h -include/libdrm/vmwgfx_drm.h +%%VMWGFX_DRIVERS%%include/libdrm/vmwgfx_drm.h include/libkms/libkms.h include/libsync.h include/xf86drm.h @@ -59,9 +55,6 @@ lib/libdrm.so.2.4.0 %%RADEON_DRIVERS%%lib/libdrm_amdgpu.so %%RADEON_DRIVERS%%lib/libdrm_amdgpu.so.1 %%RADEON_DRIVERS%%lib/libdrm_amdgpu.so.1.0.0 -%%ARM_DRIVERS%%lib/libdrm_freedreno.so -%%ARM_DRIVERS%%lib/libdrm_freedreno.so.1 -%%ARM_DRIVERS%%lib/libdrm_freedreno.so.1.0.0 %%INTEL_DRIVER%%lib/libdrm_intel.so %%INTEL_DRIVER%%lib/libdrm_intel.so.1 %%INTEL_DRIVER%%lib/libdrm_intel.so.1.0.0 @@ -76,11 +69,9 @@ lib/libkms.so.1 lib/libkms.so.1.0.0 libdata/pkgconfig/libdrm.pc %%RADEON_DRIVERS%%libdata/pkgconfig/libdrm_amdgpu.pc -%%ARM_DRIVERS%%libdata/pkgconfig/libdrm_freedreno.pc %%INTEL_DRIVER%%libdata/pkgconfig/libdrm_intel.pc %%NOUVEAU_DRIVER%%libdata/pkgconfig/libdrm_nouveau.pc %%RADEON_DRIVERS%%libdata/pkgconfig/libdrm_radeon.pc -%%ARM_DRIVERS%%libdata/pkgconfig/libdrm_vc4.pc libdata/pkgconfig/libkms.pc %%MANPAGES%%man/man3/drmAvailable.3.gz %%MANPAGES%%man/man3/drmHandleEvent.3.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006020942.0529g5Dd037528>