From owner-svn-ports-head@freebsd.org Fri Jan 15 06:57:38 2021 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 619C04DA0C9; Fri, 15 Jan 2021 06:57:38 +0000 (UTC) (envelope-from jbeich@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DHBnt2JrVz4VWJ; Fri, 15 Jan 2021 06:57:38 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3DFBE1825D; Fri, 15 Jan 2021 06:57:38 +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 10F6vclu041099; Fri, 15 Jan 2021 06:57:38 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 10F6vbGp041097; Fri, 15 Jan 2021 06:57:37 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202101150657.10F6vbGp041097@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 15 Jan 2021 06:57:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r561619 - head/graphics/drm_info X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/graphics/drm_info X-SVN-Commit-Revision: 561619 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.34 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: Fri, 15 Jan 2021 06:57:38 -0000 Author: jbeich Date: Fri Jan 15 06:57:37 2021 New Revision: 561619 URL: https://svnweb.freebsd.org/changeset/ports/561619 Log: graphics/drm_info: unbreak build after r561311 tables.c:247:7: error: duplicate case value '0' case DRM_FORMAT_MOD_LINEAR: ^ /usr/local/include/libdrm/drm_fourcc.h:422:31: note: expanded from macro 'DRM_FORMAT_MOD_LINEAR' #define DRM_FORMAT_MOD_LINEAR fourcc_mod_code(NONE, 0) ^ /usr/local/include/libdrm/drm_fourcc.h:370:2: note: expanded from macro 'fourcc_mod_code' ((((__u64)DRM_FORMAT_MOD_VENDOR_## vendor) << 56) | ((val) & 0x00ffffffffffffffULL)) ^ tables.c:245:7: note: previous case defined here case DRM_FORMAT_MOD_LINEAR: ^ /usr/local/include/libdrm/drm_fourcc.h:422:31: note: expanded from macro 'DRM_FORMAT_MOD_LINEAR' #define DRM_FORMAT_MOD_LINEAR fourcc_mod_code(NONE, 0) ^ /usr/local/include/libdrm/drm_fourcc.h:370:2: note: expanded from macro 'fourcc_mod_code' ((((__u64)DRM_FORMAT_MOD_VENDOR_## vendor) << 56) | ((val) & 0x00ffffffffffffffULL)) ^ tables.c:251:7: error: duplicate case value '288230376151711746' case DRM_FORMAT_MOD_SAMSUNG_16_16_TILE: ^ /usr/local/include/libdrm/drm_fourcc.h:552:43: note: expanded from macro 'DRM_FORMAT_MOD_SAMSUNG_16_16_TILE' #define DRM_FORMAT_MOD_SAMSUNG_16_16_TILE fourcc_mod_code(SAMSUNG, 2) ^ /usr/local/include/libdrm/drm_fourcc.h:370:2: note: expanded from macro 'fourcc_mod_code' ((((__u64)DRM_FORMAT_MOD_VENDOR_## vendor) << 56) | ((val) & 0x00ffffffffffffffULL)) ^ tables.c:241:7: note: previous case defined here case DRM_FORMAT_MOD_SAMSUNG_16_16_TILE: ^ /usr/local/include/libdrm/drm_fourcc.h:552:43: note: expanded from macro 'DRM_FORMAT_MOD_SAMSUNG_16_16_TILE' #define DRM_FORMAT_MOD_SAMSUNG_16_16_TILE fourcc_mod_code(SAMSUNG, 2) ^ /usr/local/include/libdrm/drm_fourcc.h:370:2: note: expanded from macro 'fourcc_mod_code' ((((__u64)DRM_FORMAT_MOD_VENDOR_## vendor) << 56) | ((val) & 0x00ffffffffffffffULL)) ^ Reported by: pkg-fallout Modified: head/graphics/drm_info/Makefile (contents, props changed) head/graphics/drm_info/distinfo (contents, props changed) Modified: head/graphics/drm_info/Makefile ============================================================================== --- head/graphics/drm_info/Makefile Fri Jan 15 01:09:24 2021 (r561618) +++ head/graphics/drm_info/Makefile Fri Jan 15 06:57:37 2021 (r561619) @@ -6,6 +6,9 @@ DISTVERSION= 2.2.0 PORTREVISION= 1 CATEGORIES= graphics +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= 42dad741607d8.patch:-p1 # libdrm 2.4.104 + MAINTAINER= jbeich@FreeBSD.org COMMENT= Small utility to dump info about DRM devices Modified: head/graphics/drm_info/distinfo ============================================================================== --- head/graphics/drm_info/distinfo Fri Jan 15 01:09:24 2021 (r561618) +++ head/graphics/drm_info/distinfo Fri Jan 15 06:57:37 2021 (r561619) @@ -1,3 +1,5 @@ TIMESTAMP = 1578887873 SHA256 (ascent12-drm_info-v2.2.0_GH0.tar.gz) = 0a903e52b89ec010367f8bd008793cde0fe042f3112c4840ca33657e476e2d27 SIZE (ascent12-drm_info-v2.2.0_GH0.tar.gz) = 13510 +SHA256 (42dad741607d8.patch) = a16d34a6d842aabfa24257e6528d559a2ba597904a532e5d802b3d7ddb4a9235 +SIZE (42dad741607d8.patch) = 1144