svn commit: r561619 - head/graphics/drm_info

[Jan Beich]

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 at 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