[gentoo-commits] repo/proj/guru:dev commit in: sys-apps/drm_info/, sys-apps/drm_info/files/

[gentoo-commits] repo/proj/guru:dev commit in: sys-apps/drm_info/, sys-apps/drm_info/files/

[Haelwenn Monnier]

commit:     d9f6a167bf1e31a756ba9b89809291a66d29f216
Author:     Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me>
AuthorDate: Thu Jan 28 10:09:28 2021 +0000
Commit:     Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
CommitDate: Thu Jan 28 10:09:50 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d9f6a167

sys-apps/drm_info: Apply patch for drm_fourcc.h issue

Signed-off-by: Haelwenn (lanodan) Monnier <contact <AT> hacktivis.me>

 sys-apps/drm_info/drm_info-2.2.0.ebuild            |  4 +++
 .../files/drm_info-2.2.0-drm_fourcc-fix.patch      | 29 ++++++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/sys-apps/drm_info/drm_info-2.2.0.ebuild b/sys-apps/drm_info/drm_info-2.2.0.ebuild
index bd5c1a2e..6b3f11e4 100644
--- a/sys-apps/drm_info/drm_info-2.2.0.ebuild
+++ b/sys-apps/drm_info/drm_info-2.2.0.ebuild
@@ -19,6 +19,10 @@ HOMEPAGE="https://github.com/ascent12/drm_info"
 LICENSE="MIT"
 SLOT="0"
 
+PATCHES=(
+	"${FILESDIR}/${P}-drm_fourcc-fix.patch"
+)
+
 DEPEND="
 	x11-libs/libdrm
 	dev-libs/json-c:=

diff --git a/sys-apps/drm_info/files/drm_info-2.2.0-drm_fourcc-fix.patch b/sys-apps/drm_info/files/drm_info-2.2.0-drm_fourcc-fix.patch
new file mode 100644
index 00000000..d5592fd8
--- /dev/null
+++ b/sys-apps/drm_info/files/drm_info-2.2.0-drm_fourcc-fix.patch
@@ -0,0 +1,29 @@
+From 42dad741607d8889f93b2a12725af362c09732a2 Mon Sep 17 00:00:00 2001
+From: Simon Ser <contact@emersion.fr>
+Date: Sun, 10 Jan 2021 12:24:04 +0100
+Subject: [PATCH] Match #define when extracting DRM modifiers
+
+Newer drm_fourcc.h headers have comments which refer to
+DRM_FORMAT_MOD_*. These were matched by the regex.
+
+Fix the regex by requiring a "#define" prefix. I checked that only the
+duplicate values were removed using diff.
+---
+ fourcc.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/fourcc.py b/fourcc.py
+index 23f7be6..ebee1d9 100755
+--- a/fourcc.py
++++ b/fourcc.py
+@@ -22,8 +22,8 @@ def afbc_print(f, l):
+ 
+ info = {
+ 	'fmt': r'^#define (\w+)\s*(?:\\$\s*)?fourcc_code',
+-	'basic_pre': r'\bI915_FORMAT_MOD_\w+\b',
+-	'basic_post': r'\b(DRM_FORMAT_MOD_(?:INVALID|LINEAR|SAMSUNG|QCOM|VIVANTE|NVIDIA|BROADCOM|ALLWINNER)\w*)\s',
++	'basic_pre': r'^#define (I915_FORMAT_MOD_\w+)\b',
++	'basic_post': r'^#define (DRM_FORMAT_MOD_(?:INVALID|LINEAR|SAMSUNG|QCOM|VIVANTE|NVIDIA|BROADCOM|ALLWINNER)\w*)\s',
+ 	'afbc_block': r'\bAFBC_FORMAT_MOD_BLOCK_SIZE(?:_\d+x\d+)+\b',
+ 	'afbc_bitmask': r'\bAFBC_FORMAT_MOD_[A-Z]+\b',
+ }

[gentoo-commits] repo/proj/guru:dev commit in: sys-apps/drm_info/, sys-apps/drm_info/files/

[Haelwenn Monnier]

commit:     47c9ba0eaf8ea1118266a6e6d0fa122ec2f4a37b
Author:     Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me>
AuthorDate: Mon Nov 25 01:42:13 2024 +0000
Commit:     Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
CommitDate: Mon Nov 25 01:42:39 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=47c9ba0e

sys-apps/drm_info: add 2.7.0, drop 2.6.0

Signed-off-by: Haelwenn (lanodan) Monnier <contact <AT> hacktivis.me>

 sys-apps/drm_info/Manifest                         |  2 +-
 ...drm_info-2.6.0.ebuild => drm_info-2.7.0.ebuild} |  0
 .../files/drm_info-2.2.0-drm_fourcc-fix.patch      | 29 ----------------------
 3 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/sys-apps/drm_info/Manifest b/sys-apps/drm_info/Manifest
index 22f93c8a6..99b46a194 100644
--- a/sys-apps/drm_info/Manifest
+++ b/sys-apps/drm_info/Manifest
@@ -1 +1 @@
-DIST drm_info-v2.6.0.tar.bz2 16710 BLAKE2B 345b682156c2736102b14aa4f415ee676aa50342aaa0f30f23ac5fdf823883423e2a8c17a08d0e46b3e9a09a418d5a6578cba76037d18c498faed88041021e32 SHA512 19d7c7ded1b7ee2d9f9e1ebb2216a3ce6a9b8faca9ef98f8ab8882059592e513a6bc75f41efa5c5daf9f750e9457da65dfb8dad84c41fd22500818c52e4caa68
+DIST drm_info-v2.7.0.tar.bz2 16899 BLAKE2B 59c049613aebada228fa4a99af0baff60b5a4db8ce849b0ad59b0e4b1e0471306f5051c0962197d01fc4a06a603fcff14b5c0ce1a8013166758e398ef1f8a320 SHA512 da62282a265358b336c0cfe6a4df2a9e8b8545f15aea33deaa03ad2b79a3c5dcd3b2a3c290faaf595118686b548cc2d60cb2bc411bb9fb255fae2778cfc2bde3

diff --git a/sys-apps/drm_info/drm_info-2.6.0.ebuild b/sys-apps/drm_info/drm_info-2.7.0.ebuild
similarity index 100%
rename from sys-apps/drm_info/drm_info-2.6.0.ebuild
rename to sys-apps/drm_info/drm_info-2.7.0.ebuild

diff --git a/sys-apps/drm_info/files/drm_info-2.2.0-drm_fourcc-fix.patch b/sys-apps/drm_info/files/drm_info-2.2.0-drm_fourcc-fix.patch
deleted file mode 100644
index d5592fd84..000000000
--- a/sys-apps/drm_info/files/drm_info-2.2.0-drm_fourcc-fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 42dad741607d8889f93b2a12725af362c09732a2 Mon Sep 17 00:00:00 2001
-From: Simon Ser <contact@emersion.fr>
-Date: Sun, 10 Jan 2021 12:24:04 +0100
-Subject: [PATCH] Match #define when extracting DRM modifiers
-
-Newer drm_fourcc.h headers have comments which refer to
-DRM_FORMAT_MOD_*. These were matched by the regex.
-
-Fix the regex by requiring a "#define" prefix. I checked that only the
-duplicate values were removed using diff.
----
- fourcc.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/fourcc.py b/fourcc.py
-index 23f7be6..ebee1d9 100755
---- a/fourcc.py
-+++ b/fourcc.py
-@@ -22,8 +22,8 @@ def afbc_print(f, l):
- 
- info = {
- 	'fmt': r'^#define (\w+)\s*(?:\\$\s*)?fourcc_code',
--	'basic_pre': r'\bI915_FORMAT_MOD_\w+\b',
--	'basic_post': r'\b(DRM_FORMAT_MOD_(?:INVALID|LINEAR|SAMSUNG|QCOM|VIVANTE|NVIDIA|BROADCOM|ALLWINNER)\w*)\s',
-+	'basic_pre': r'^#define (I915_FORMAT_MOD_\w+)\b',
-+	'basic_post': r'^#define (DRM_FORMAT_MOD_(?:INVALID|LINEAR|SAMSUNG|QCOM|VIVANTE|NVIDIA|BROADCOM|ALLWINNER)\w*)\s',
- 	'afbc_block': r'\bAFBC_FORMAT_MOD_BLOCK_SIZE(?:_\d+x\d+)+\b',
- 	'afbc_bitmask': r'\bAFBC_FORMAT_MOD_[A-Z]+\b',
- }