libdrm: fix build of more ARM specific device APIs

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: libdrm: fix build of more ARM specific device APIs
From: Tobias Nygren <tnn%NetBSD.org@localhost>
Date: Thu, 22 Jul 2021 10:06:47 +0000
Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Thu Jul 22 12:06:47 2021 +0200
Changeset:	0dd78dd0c5ed6cfb06f2d5f958542229dbb0cd10

Modified Files:
	libdrm/Makefile
	libdrm/PLIST
	libdrm/distinfo
Added Files:
	libdrm/patches/patch-etnaviv_etnaviv__device.c
	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: fix build of more ARM specific device APIs

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

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

diffstat:
 libdrm/Makefile                                    | 11 +++++++----
 libdrm/PLIST                                       | 22 ++++++++++++++++++++--
 libdrm/distinfo                                    |  5 +++++
 libdrm/patches/patch-etnaviv_etnaviv__device.c     | 17 +++++++++++++++++
 libdrm/patches/patch-exynos_exynos__drm.c          | 17 +++++++++++++++++
 libdrm/patches/patch-exynos_exynos__fimg2d.c       | 18 ++++++++++++++++++
 libdrm/patches/patch-omap_omap__drm.c              | 18 ++++++++++++++++++
 .../patch-tests_exynos_exynos__fimg2d__test.c      | 17 +++++++++++++++++
 8 files changed, 119 insertions(+), 6 deletions(-)

diffs:
diff --git a/libdrm/Makefile b/libdrm/Makefile
index 542986cee5..7e07cc6897 100644
--- a/libdrm/Makefile
+++ b/libdrm/Makefile
@@ -71,18 +71,21 @@ MESON_ARGS+=	-Dnouveau=true
 .if !empty(MACHINE_ARCH:Marm*) || \
       !empty(MACHINE_ARCH:Mearm*) || \
       ${MACHINE_ARCH} == "aarch64"
+MESON_ARGS+=	-Detnaviv=true
+MESON_ARGS+=	-Dexynos=true
 MESON_ARGS+=	-Dfreedreno=true
-MESON_ARGS+=	-Dtegra=true
 MESON_ARGS+=	-Dvc4=true
+MESON_ARGS+=	-Domap=true
+MESON_ARGS+=	-Dtegra=true
 PLIST.arm=	yes
 .else
+MESON_ARGS+=	-Detnaviv=false
+MESON_ARGS+=	-Dexynos=false
 MESON_ARGS+=	-Dfreedreno=false
+MESON_ARGS+=	-Domap=false
 MESON_ARGS+=	-Dtegra=false
 MESON_ARGS+=	-Dvc4=false
 .endif
-MESON_ARGS+=	-Domap=false
-MESON_ARGS+=	-Dexynos=false
-MESON_ARGS+=	-Detnaviv=false
 
 MESON_ARGS+=	-Dman-pages=false
 MESON_ARGS+=	-Dvalgrind=false
diff --git a/libdrm/PLIST b/libdrm/PLIST
index 16d7eebf96..d0cc5abec7 100644
--- a/libdrm/PLIST
+++ b/libdrm/PLIST
@@ -1,4 +1,6 @@
 @comment $NetBSD$
+${PLIST.arm}include/exynos/exynos_drm.h
+${PLIST.arm}include/exynos/exynos_fimg2d.h
 ${PLIST.arm}include/freedreno/freedreno_drmif.h
 ${PLIST.arm}include/freedreno/freedreno_ringbuffer.h
 include/libdrm/amdgpu.h
@@ -7,6 +9,8 @@ include/libdrm/drm.h
 include/libdrm/drm_fourcc.h
 include/libdrm/drm_mode.h
 include/libdrm/drm_sarea.h
+${PLIST.arm}include/libdrm/etnaviv_drmif.h
+${PLIST.arm}include/libdrm/exynos_drmif.h
 include/libdrm/i915_drm.h
 ${PLIST.intel}include/libdrm/intel_aub.h
 ${PLIST.intel}include/libdrm/intel_bufmgr.h
@@ -23,6 +27,7 @@ include/libdrm/nouveau/nvif/if0003.h
 include/libdrm/nouveau/nvif/ioctl.h
 include/libdrm/nouveau/nvif/unpack.h
 include/libdrm/nouveau_drm.h
+${PLIST.arm}include/libdrm/omap_drmif.h
 include/libdrm/qxl_drm.h
 include/libdrm/r128_drm.h
 include/libdrm/r600_pci_ids.h
@@ -39,13 +44,14 @@ include/libdrm/sis_drm.h
 ${PLIST.arm}include/libdrm/tegra.h
 include/libdrm/tegra_drm.h
 include/libdrm/vc4_drm.h
-${PLIST.intel}include/libdrm/vmwgfx_drm.h
 ${PLIST.arm}include/libdrm/vc4_packet.h
 ${PLIST.arm}include/libdrm/vc4_qpu_defines.h
 include/libdrm/via_drm.h
 include/libdrm/virtgpu_drm.h
+${PLIST.intel}include/libdrm/vmwgfx_drm.h
 ${PLIST.kms}include/libkms/libkms.h
 include/libsync.h
+${PLIST.arm}include/omap/omap_drm.h
 include/xf86drm.h
 include/xf86drmMode.h
 lib/libdrm.so
@@ -54,6 +60,12 @@ lib/libdrm.so.2.4.0
 lib/libdrm_amdgpu.so
 lib/libdrm_amdgpu.so.1
 lib/libdrm_amdgpu.so.1.0.0
+${PLIST.arm}lib/libdrm_etnaviv.so
+${PLIST.arm}lib/libdrm_etnaviv.so.1
+${PLIST.arm}lib/libdrm_etnaviv.so.1.0.0
+${PLIST.arm}lib/libdrm_exynos.so
+${PLIST.arm}lib/libdrm_exynos.so.1
+${PLIST.arm}lib/libdrm_exynos.so.1.0.0
 ${PLIST.arm}lib/libdrm_freedreno.so
 ${PLIST.arm}lib/libdrm_freedreno.so.1
 ${PLIST.arm}lib/libdrm_freedreno.so.1.0.0
@@ -63,6 +75,9 @@ ${PLIST.intel}lib/libdrm_intel.so.1.0.0
 lib/libdrm_nouveau.so
 lib/libdrm_nouveau.so.2
 lib/libdrm_nouveau.so.2.0.0
+${PLIST.arm}lib/libdrm_omap.so
+${PLIST.arm}lib/libdrm_omap.so.1
+${PLIST.arm}lib/libdrm_omap.so.1.0.0
 lib/libdrm_radeon.so
 lib/libdrm_radeon.so.1
 lib/libdrm_radeon.so.1.0.1
@@ -74,11 +89,14 @@ ${PLIST.kms}lib/libkms.so.1
 ${PLIST.kms}lib/libkms.so.1.0.0
 lib/pkgconfig/libdrm.pc
 lib/pkgconfig/libdrm_amdgpu.pc
+${PLIST.arm}lib/pkgconfig/libdrm_etnaviv.pc
+${PLIST.arm}lib/pkgconfig/libdrm_exynos.pc
 ${PLIST.arm}lib/pkgconfig/libdrm_freedreno.pc
 ${PLIST.intel}lib/pkgconfig/libdrm_intel.pc
 lib/pkgconfig/libdrm_nouveau.pc
+${PLIST.arm}lib/pkgconfig/libdrm_omap.pc
 lib/pkgconfig/libdrm_radeon.pc
-${PLIST.kms}lib/pkgconfig/libkms.pc
 ${PLIST.arm}lib/pkgconfig/libdrm_tegra.pc
 ${PLIST.arm}lib/pkgconfig/libdrm_vc4.pc
+${PLIST.kms}lib/pkgconfig/libkms.pc
 share/libdrm/amdgpu.ids
diff --git a/libdrm/distinfo b/libdrm/distinfo
index 592efe642a..182792755b 100644
--- a/libdrm/distinfo
+++ b/libdrm/distinfo
@@ -5,10 +5,15 @@ RMD160 (libdrm-2.4.107.tar.xz) = bd639d34024bfc203123a87b4513e1b45202e237
 SHA512 (libdrm-2.4.107.tar.xz) = c7542ba15c4c934519a6a1f3cb1ec21effa820a805a030d0175313bb1cc796cd311f39596ead883f9f251679d701e262894c5a297d5cf45093c80a6cd818def0
 Size (libdrm-2.4.107.tar.xz) = 425612 bytes
 SHA1 (patch-ac) = 67c998df7dfc0dabc86320ea6d015cede3e464ea
+SHA1 (patch-etnaviv_etnaviv__device.c) = 236b2df05a918c35c4decfee416ff5bfe9c073d4
+SHA1 (patch-exynos_exynos__drm.c) = 374d8765faf0a0f59be62e17dce29671aaf99694
+SHA1 (patch-exynos_exynos__fimg2d.c) = 8953ac42a4aa86b3d96c11d626c84df93c61d8a5
 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-tests_nouveau_threaded.c) = 82b566666e77898c209d66ce804c913b53e53a50
 SHA1 (patch-xf86drm.c) = 6e4b3ee406666b37cc0b923ad49b945055919c83
 SHA1 (patch-xf86drmMode.c) = 078b1ecaa4fedd74992d682433701245ee51785b
diff --git a/libdrm/patches/patch-etnaviv_etnaviv__device.c b/libdrm/patches/patch-etnaviv_etnaviv__device.c
new file mode 100644
index 0000000000..18f96e8834
--- /dev/null
+++ b/libdrm/patches/patch-etnaviv_etnaviv__device.c
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Fix Linuxisms.
+
+--- etnaviv/etnaviv_device.c.orig	2021-07-02 12:49:05.425771700 +0000
++++ etnaviv/etnaviv_device.c
+@@ -25,8 +25,10 @@
+  */
+ 
+ #include <stdlib.h>
++#ifdef __linux__
+ #include <linux/stddef.h>
+ #include <linux/types.h>
++#endif
+ #include <errno.h>
+ #include <sys/mman.h>
+ #include <fcntl.h>
diff --git a/libdrm/patches/patch-exynos_exynos__drm.c b/libdrm/patches/patch-exynos_exynos__drm.c
new file mode 100644
index 0000000000..8fd8a709db
--- /dev/null
+++ b/libdrm/patches/patch-exynos_exynos__drm.c
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Fix Linuxisms.
+
+--- exynos/exynos_drm.c.orig	2021-07-02 12:49:05.425771700 +0000
++++ exynos/exynos_drm.c
+@@ -31,7 +31,10 @@
+ #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
new file mode 100644
index 0000000000..be4d718c96
--- /dev/null
+++ b/libdrm/patches/patch-exynos_exynos__fimg2d.c
@@ -0,0 +1,18 @@
+$NetBSD$
+
+Fix Linuxisms.
+
+--- exynos/exynos_fimg2d.c.orig	2021-07-02 12:49:05.429105000 +0000
++++ exynos/exynos_fimg2d.c
+@@ -30,7 +30,11 @@
+ #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
new file mode 100644
index 0000000000..6fdff267a5
--- /dev/null
+++ b/libdrm/patches/patch-omap_omap__drm.c
@@ -0,0 +1,18 @@
+$NetBSD$
+
+Fix Linuxisms.
+
+--- omap/omap_drm.c.orig	2021-07-02 12:49:05.445771700 +0000
++++ omap/omap_drm.c
+@@ -27,8 +27,11 @@
+  */
+ 
+ #include <stdlib.h>
++#ifdef __linux__
+ #include <linux/stddef.h>
+ #include <linux/types.h>
++#else
++#endif
+ #include <errno.h>
+ #include <sys/mman.h>
+ #include <fcntl.h>
diff --git a/libdrm/patches/patch-tests_exynos_exynos__fimg2d__test.c b/libdrm/patches/patch-tests_exynos_exynos__fimg2d__test.c
new file mode 100644
index 0000000000..df9138354a
--- /dev/null
+++ b/libdrm/patches/patch-tests_exynos_exynos__fimg2d__test.c
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Fix Linuxisms.
+
+--- tests/exynos/exynos_fimg2d_test.c.orig	2021-07-02 12:49:05.452438600 +0000
++++ tests/exynos/exynos_fimg2d_test.c
+@@ -31,7 +31,10 @@
+ #include <unistd.h>
+ 
+ #include <sys/mman.h>
++#ifdef __linux__
+ #include <linux/stddef.h>
++#else
++#endif
+ 
+ #include <xf86drm.h>
+ #include <xf86drmMode.h>
Prev by Date: py-virtualenv20: Update to 20.6.0
Next by Date: libusbmuxd: update to version 2.0.2
Previous by Thread: py-virtualenv20: Update to 20.6.0
Next by Thread: libusbmuxd: update to version 2.0.2
Indexes:
Home | Main Index | Thread Index | Old Index