libdrm: tidy up patches

[Tobias Nygren <tnn%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Sun Mar 13 15:45:11 2022 +0100
Changeset:	57d069132f4688be637b52a3ef6562d9ef2dd6c6

Modified Files:
	libdrm/distinfo
	libdrm/patches/patch-exynos_exynos__drm.c
	libdrm/patches/patch-exynos_exynos__fimg2d.c
	libdrm/patches/patch-omap_omap__drm.c
	libdrm/patches/patch-tests_exynos_exynos__fimg2d__test.c

Log Message:
libdrm: tidy up patches

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=57d069132f4688be637b52a3ef6562d9ef2dd6c6

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 libdrm/distinfo                                          | 8 ++++----
 libdrm/patches/patch-exynos_exynos__drm.c                | 5 ++---
 libdrm/patches/patch-exynos_exynos__fimg2d.c             | 6 ++----
 libdrm/patches/patch-omap_omap__drm.c                    | 5 ++---
 libdrm/patches/patch-tests_exynos_exynos__fimg2d__test.c | 5 ++---
 5 files changed, 12 insertions(+), 17 deletions(-)

diffs:
diff --git a/libdrm/distinfo b/libdrm/distinfo
index 7ae4aeb286..f19fb1ddbd 100644
--- a/libdrm/distinfo
+++ b/libdrm/distinfo
@@ -6,14 +6,14 @@ Size (libdrm-2.4.110.tar.xz) = 436372 bytes
 SHA1 (patch-ac) = 67c998df7dfc0dabc86320ea6d015cede3e464ea
 SHA1 (patch-amdgpu_amdgpu__cs.c) = 125eca62cd3e00a6e039066152780174dcde0705
 SHA1 (patch-etnaviv_etnaviv__device.c) = 236b2df05a918c35c4decfee416ff5bfe9c073d4
-SHA1 (patch-exynos_exynos__drm.c) = 374d8765faf0a0f59be62e17dce29671aaf99694
-SHA1 (patch-exynos_exynos__fimg2d.c) = 8953ac42a4aa86b3d96c11d626c84df93c61d8a5
+SHA1 (patch-exynos_exynos__drm.c) = 3fa4c8a592a5f4e0c4001eb6fa1bc7811e398605
+SHA1 (patch-exynos_exynos__fimg2d.c) = 298438b128bdb4ff57a8c0d7d6a081485e64e49a
 SHA1 (patch-include_drm_drm.h) = 48a912f40bf2b2a1c23edbe4446fa7869212f17b
 SHA1 (patch-libkms_vmwgfx.c) = d2204c0b79098c6c36b7f282b486c58c6354bd1d
 SHA1 (patch-libsync.h) = 1e0603e72a54a069fc9d2ab2c9559d22381a69d3
 SHA1 (patch-meson.build) = b9ebb763a807da931f83f4d5c02925ab5498ef69
-SHA1 (patch-omap_omap__drm.c) = 02ee6c9c75bc6b5b107ae2253ece886e87c76a3c
-SHA1 (patch-tests_exynos_exynos__fimg2d__test.c) = 2fd943d34bb999b4af87528ee3fe7c16fd04dcab
+SHA1 (patch-omap_omap__drm.c) = a23eefa9a57315d3ae77e528fd29de70ff9b2648
+SHA1 (patch-tests_exynos_exynos__fimg2d__test.c) = 9fc874ecc9a42db75327f736d04038f7cf8f00ff
 SHA1 (patch-tests_nouveau_threaded.c) = 82b566666e77898c209d66ce804c913b53e53a50
 SHA1 (patch-xf86drm.c) = 6e4b3ee406666b37cc0b923ad49b945055919c83
 SHA1 (patch-xf86drmMode.c) = 078b1ecaa4fedd74992d682433701245ee51785b
diff --git a/libdrm/patches/patch-exynos_exynos__drm.c b/libdrm/patches/patch-exynos_exynos__drm.c
index 8fd8a709db..1e5d2463e1 100644
--- a/libdrm/patches/patch-exynos_exynos__drm.c
+++ b/libdrm/patches/patch-exynos_exynos__drm.c
@@ -2,15 +2,14 @@ $NetBSD$
 
 Fix Linuxisms.
 
---- exynos/exynos_drm.c.orig	2021-07-02 12:49:05.425771700 +0000
+--- exynos/exynos_drm.c.orig	2022-02-16 10:00:13.000000000 +0000
 +++ exynos/exynos_drm.c
-@@ -31,7 +31,10 @@
+@@ -31,7 +31,9 @@
  #include <unistd.h>
  
  #include <sys/mman.h>
 +#ifdef __linux__
  #include <linux/stddef.h>
-+#else
 +#endif
  
  #include <xf86drm.h>
diff --git a/libdrm/patches/patch-exynos_exynos__fimg2d.c b/libdrm/patches/patch-exynos_exynos__fimg2d.c
index be4d718c96..23608ee416 100644
--- a/libdrm/patches/patch-exynos_exynos__fimg2d.c
+++ b/libdrm/patches/patch-exynos_exynos__fimg2d.c
@@ -2,17 +2,15 @@ $NetBSD$
 
 Fix Linuxisms.
 
---- exynos/exynos_fimg2d.c.orig	2021-07-02 12:49:05.429105000 +0000
+--- exynos/exynos_fimg2d.c.orig	2022-02-16 10:00:13.000000000 +0000
 +++ exynos/exynos_fimg2d.c
-@@ -30,7 +30,11 @@
+@@ -30,7 +30,9 @@
  #include <assert.h>
  
  #include <sys/mman.h>
 +#ifdef __linux__
  #include <linux/stddef.h>
-+#else
 +#endif
-+
  
  #include <xf86drm.h>
  
diff --git a/libdrm/patches/patch-omap_omap__drm.c b/libdrm/patches/patch-omap_omap__drm.c
index 6fdff267a5..bbda4b4a86 100644
--- a/libdrm/patches/patch-omap_omap__drm.c
+++ b/libdrm/patches/patch-omap_omap__drm.c
@@ -2,16 +2,15 @@ $NetBSD$
 
 Fix Linuxisms.
 
---- omap/omap_drm.c.orig	2021-07-02 12:49:05.445771700 +0000
+--- omap/omap_drm.c.orig	2022-02-16 10:00:13.000000000 +0000
 +++ omap/omap_drm.c
-@@ -27,8 +27,11 @@
+@@ -27,8 +27,10 @@
   */
  
  #include <stdlib.h>
 +#ifdef __linux__
  #include <linux/stddef.h>
  #include <linux/types.h>
-+#else
 +#endif
  #include <errno.h>
  #include <sys/mman.h>
diff --git a/libdrm/patches/patch-tests_exynos_exynos__fimg2d__test.c b/libdrm/patches/patch-tests_exynos_exynos__fimg2d__test.c
index df9138354a..84cfafca70 100644
--- a/libdrm/patches/patch-tests_exynos_exynos__fimg2d__test.c
+++ b/libdrm/patches/patch-tests_exynos_exynos__fimg2d__test.c
@@ -2,15 +2,14 @@ $NetBSD$
 
 Fix Linuxisms.
 
---- tests/exynos/exynos_fimg2d_test.c.orig	2021-07-02 12:49:05.452438600 +0000
+--- tests/exynos/exynos_fimg2d_test.c.orig	2022-02-16 10:00:13.000000000 +0000
 +++ tests/exynos/exynos_fimg2d_test.c
-@@ -31,7 +31,10 @@
+@@ -31,7 +31,9 @@
  #include <unistd.h>
  
  #include <sys/mman.h>
 +#ifdef __linux__
  #include <linux/stddef.h>
-+#else
 +#endif
  
  #include <xf86drm.h>