From owner-svn-ports-head@freebsd.org Mon Jan 23 13:57:08 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0524FCB8931; Mon, 23 Jan 2017 13:57:08 +0000 (UTC) (envelope-from jbeich@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 mx1.freebsd.org (Postfix) with ESMTPS id B9F9A9A0; Mon, 23 Jan 2017 13:57:07 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0NDv6ao040164; Mon, 23 Jan 2017 13:57:06 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0NDv6Cn040162; Mon, 23 Jan 2017 13:57:06 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201701231357.v0NDv6Cn040162@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 23 Jan 2017 13:57:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r432219 - head/graphics/libdrm X-SVN-Group: ports-head 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.23 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: Mon, 23 Jan 2017 13:57:08 -0000 Author: jbeich Date: Mon Jan 23 13:57:06 2017 New Revision: 432219 URL: https://svnweb.freebsd.org/changeset/ports/432219 Log: graphics/libdrm: unbreak on armv6 + aarch64 PR: 216377 Submitted by: mikael.urankar@gmail.com Approved by: portmgr blanket Modified: head/graphics/libdrm/Makefile (contents, props changed) head/graphics/libdrm/pkg-plist (contents, props changed) Modified: head/graphics/libdrm/Makefile ============================================================================== --- head/graphics/libdrm/Makefile Mon Jan 23 13:52:20 2017 (r432218) +++ head/graphics/libdrm/Makefile Mon Jan 23 13:57:06 2017 (r432219) @@ -3,6 +3,7 @@ PORTNAME= libdrm PORTVERSION= 2.4.74 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= graphics x11 MASTER_SITES= http://dri.freedesktop.org/libdrm/ @@ -62,7 +63,7 @@ PLIST_SUB+= ARM_DRIVERS="@comment " PLIST_SUB+= INTEL_DRIVER="@comment " PLIST_SUB+= NOUVEAU_DRIVER="" PLIST_SUB+= RADEON_DRIVERS="" -.elif ${ARCH} == arm6 || ${ARCH} == aarch64 +.elif ${ARCH} == armv6 || ${ARCH} == aarch64 PLIST_SUB+= ARM_DRIVERS="" PLIST_SUB+= INTEL_DRIVER="@comment " PLIST_SUB+= NOUVEAU_DRIVER="@comment " Modified: head/graphics/libdrm/pkg-plist ============================================================================== --- head/graphics/libdrm/pkg-plist Mon Jan 23 13:52:20 2017 (r432218) +++ head/graphics/libdrm/pkg-plist Mon Jan 23 13:57:06 2017 (r432219) @@ -1,3 +1,5 @@ +%%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 @@ -35,7 +37,7 @@ 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_gpq_defines.h +%%ARM_DRIVERS%%include/libdrm/vc4_qpu_defines.h include/libdrm/via_drm.h include/libdrm/virtgpu_drm.h %%KMS%%include/libkms/libkms.h @@ -48,6 +50,9 @@ 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 @@ -57,14 +62,12 @@ lib/libdrm.so.2.4.0 %%RADEON_DRIVERS%%lib/libdrm_radeon.so %%RADEON_DRIVERS%%lib/libdrm_radeon.so.1 %%RADEON_DRIVERS%%lib/libdrm_radeon.so.1.0.1 -%%ARM_DRIVERS%%lib/libdrm_vc4.so -%%ARM_DRIVERS%%lib/libdrm_vc4.so.1 -%%ARM_DRIVERS%%lib/libdrm_vc4.so.1.0.0 %%KMS%%lib/libkms.so %%KMS%%lib/libkms.so.1 %%KMS%%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