From owner-svn-ports-head@freebsd.org Tue Jun 2 09:42:06 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2BEB532FA9A; Tue, 2 Jun 2020 09:42:06 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49bnBQ0NLxz4M9s; Tue, 2 Jun 2020 09:42:06 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 082521A677; Tue, 2 Jun 2020 09:42:06 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0529g5QE037530; Tue, 2 Jun 2020 09:42:05 GMT (envelope-from manu@FreeBSD.org) Received: (from manu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0529g5Dd037528; Tue, 2 Jun 2020 09:42:05 GMT (envelope-from manu@FreeBSD.org) Message-Id: <202006020942.0529g5Dd037528@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: manu set sender to manu@FreeBSD.org using -f From: Emmanuel Vadot Date: Tue, 2 Jun 2020 09:42:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r537533 - in head/graphics/libdrm: . files X-SVN-Group: ports-head X-SVN-Commit-Author: manu X-SVN-Commit-Paths: in head/graphics/libdrm: . files X-SVN-Commit-Revision: 537533 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2020 09:42:06 -0000 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 .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 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