CVS commit: pkgsrc/x11/libdrm

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/x11/libdrm
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Tue, 2 Jul 2024 16:24:47 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Jul  2 16:24:47 UTC 2024

Modified Files:
        pkgsrc/x11/libdrm: distinfo
        pkgsrc/x11/libdrm/patches: patch-ac patch-amdgpu_amdgpu__cs.c
            patch-include_drm_drm.h patch-libsync.h patch-omap_omap__drm.c
            patch-tests_nouveau_threaded.c patch-xf86drm.c patch-xf86drmMode.c

Log Message:
libdrm: add URLs for try at upstreaming most of these.


To generate a diff of this commit:
cvs rdiff -u -r1.116 -r1.117 pkgsrc/x11/libdrm/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/libdrm/patches/patch-ac \
    pkgsrc/x11/libdrm/patches/patch-include_drm_drm.h
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/libdrm/patches/patch-amdgpu_amdgpu__cs.c \
    pkgsrc/x11/libdrm/patches/patch-omap_omap__drm.c
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/libdrm/patches/patch-libsync.h
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/x11/libdrm/patches/patch-tests_nouveau_threaded.c
cvs rdiff -u -r1.7 -r1.8 pkgsrc/x11/libdrm/patches/patch-xf86drm.c
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/libdrm/patches/patch-xf86drmMode.c

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

Modified files:

Index: pkgsrc/x11/libdrm/distinfo
diff -u pkgsrc/x11/libdrm/distinfo:1.116 pkgsrc/x11/libdrm/distinfo:1.117
--- pkgsrc/x11/libdrm/distinfo:1.116    Tue Jul  2 15:46:37 2024
+++ pkgsrc/x11/libdrm/distinfo  Tue Jul  2 16:24:47 2024
@@ -1,14 +1,13 @@
-$NetBSD: distinfo,v 1.116 2024/07/02 15:46:37 tnn Exp $
+$NetBSD: distinfo,v 1.117 2024/07/02 16:24:47 wiz Exp $
 
 BLAKE2s (libdrm-2.4.122.tar.xz) = ab59032d17d00f679a3292f524109acbd355c12c2dacc2e578466868bc68e49d
 SHA512 (libdrm-2.4.122.tar.xz) = ea6bac94416d4ba0e9805e142ae62904236bc49f803d4fc10c92968a4df64c818dd42524ad7a4e988062836783a148e27094050bb2754f751a368627f794ad13
 Size (libdrm-2.4.122.tar.xz) = 481012 bytes
-SHA1 (patch-ac) = 67c998df7dfc0dabc86320ea6d015cede3e464ea
-SHA1 (patch-amdgpu_amdgpu__cs.c) = 125eca62cd3e00a6e039066152780174dcde0705
-SHA1 (patch-include_drm_drm.h) = 48a912f40bf2b2a1c23edbe4446fa7869212f17b
-SHA1 (patch-libsync.h) = 50a6fd7ca2d379997941a9b2c33d086ae99d2d0d
-SHA1 (patch-omap_omap__drm.c) = 39aa7206726649a25f84299e07b40a1659352358
-SHA1 (patch-tests_nouveau_threaded.c) = 30cda11fcce1693b8b3cecec4f7915c08066b62a
-SHA1 (patch-xf86drm.c) = 6e4b3ee406666b37cc0b923ad49b945055919c83
-SHA1 (patch-xf86drmMode.c) = 078b1ecaa4fedd74992d682433701245ee51785b
-SHA1 (patch-xf86drmMode.h) = a28b02887389be8670193c119f711901af61a6b2
+SHA1 (patch-ac) = 8c5ca991174e3673e17cd67aa8d1e58c2f8907d8
+SHA1 (patch-amdgpu_amdgpu__cs.c) = b48780dd51d1386e194c8142702605380ceefb7d
+SHA1 (patch-include_drm_drm.h) = fb28cb7fee68f773275c8b5572c3bd231cbb88d9
+SHA1 (patch-libsync.h) = a7d2f4757ce4c26db1b689c8746829ccb522337e
+SHA1 (patch-omap_omap__drm.c) = 2fee4863c4304bc2144356581766efbbddb3486a
+SHA1 (patch-tests_nouveau_threaded.c) = 8ebef22d66308f55b4b018c21568a41a8e62d147
+SHA1 (patch-xf86drm.c) = f5bb9a1c468470bd5101ff7481f1d67bc0d5aac1
+SHA1 (patch-xf86drmMode.c) = 0ff766ae071391c57b08c45ff769ca6f8e2134b0

Index: pkgsrc/x11/libdrm/patches/patch-ac
diff -u pkgsrc/x11/libdrm/patches/patch-ac:1.4 pkgsrc/x11/libdrm/patches/patch-ac:1.5
--- pkgsrc/x11/libdrm/patches/patch-ac:1.4      Thu Feb 16 20:30:56 2012
+++ pkgsrc/x11/libdrm/patches/patch-ac  Tue Jul  2 16:24:47 2024
@@ -1,4 +1,8 @@
-$NetBSD: patch-ac,v 1.4 2012/02/16 20:30:56 hans Exp $
+$NetBSD: patch-ac,v 1.5 2024/07/02 16:24:47 wiz Exp $
+
+Chunk 1: ?
+Chunk 2: https://gitlab.freedesktop.org/mesa/drm/-/merge_requests/384
+Chunk 3: ?
 
 --- xf86drm.h.orig     2010-03-05 23:21:13.000000000 +0000
 +++ xf86drm.h
Index: pkgsrc/x11/libdrm/patches/patch-include_drm_drm.h
diff -u pkgsrc/x11/libdrm/patches/patch-include_drm_drm.h:1.4 pkgsrc/x11/libdrm/patches/patch-include_drm_drm.h:1.5
--- pkgsrc/x11/libdrm/patches/patch-include_drm_drm.h:1.4       Fri Apr 29 11:17:34 2016
+++ pkgsrc/x11/libdrm/patches/patch-include_drm_drm.h   Tue Jul  2 16:24:47 2024
@@ -1,7 +1,10 @@
-$NetBSD: patch-include_drm_drm.h,v 1.4 2016/04/29 11:17:34 wiz Exp $
+$NetBSD: patch-include_drm_drm.h,v 1.5 2024/07/02 16:24:47 wiz Exp $
 
 Fix compilation on systems that don't provide O_CLOEXEC.
 
+Not wanted upstream, see discussion in
+https://gitlab.freedesktop.org/mesa/drm/-/merge_requests/384
+
 --- include/drm/drm.h.orig     2016-04-28 00:44:16.000000000 +0000
 +++ include/drm/drm.h
 @@ -674,7 +674,11 @@ struct drm_set_client_cap {

Index: pkgsrc/x11/libdrm/patches/patch-amdgpu_amdgpu__cs.c
diff -u pkgsrc/x11/libdrm/patches/patch-amdgpu_amdgpu__cs.c:1.3 pkgsrc/x11/libdrm/patches/patch-amdgpu_amdgpu__cs.c:1.4
--- pkgsrc/x11/libdrm/patches/patch-amdgpu_amdgpu__cs.c:1.3     Sun Mar 13 15:20:01 2022
+++ pkgsrc/x11/libdrm/patches/patch-amdgpu_amdgpu__cs.c Tue Jul  2 16:24:47 2024
@@ -1,7 +1,9 @@
-$NetBSD: patch-amdgpu_amdgpu__cs.c,v 1.3 2022/03/13 15:20:01 tnn Exp $
+$NetBSD: patch-amdgpu_amdgpu__cs.c,v 1.4 2024/07/02 16:24:47 wiz Exp $
 
 libc-supplied compat alloca(3) should not be used
 
+XXX: argue for upstream
+
 --- amdgpu/amdgpu_cs.c.orig    2022-02-16 10:00:13.000000000 +0000
 +++ amdgpu/amdgpu_cs.c
 @@ -28,9 +28,7 @@
Index: pkgsrc/x11/libdrm/patches/patch-omap_omap__drm.c
diff -u pkgsrc/x11/libdrm/patches/patch-omap_omap__drm.c:1.3 pkgsrc/x11/libdrm/patches/patch-omap_omap__drm.c:1.4
--- pkgsrc/x11/libdrm/patches/patch-omap_omap__drm.c:1.3        Tue Jul  2 15:46:37 2024
+++ pkgsrc/x11/libdrm/patches/patch-omap_omap__drm.c    Tue Jul  2 16:24:47 2024
@@ -1,7 +1,9 @@
-$NetBSD: patch-omap_omap__drm.c,v 1.3 2024/07/02 15:46:37 tnn Exp $
+$NetBSD: patch-omap_omap__drm.c,v 1.4 2024/07/02 16:24:47 wiz Exp $
 
 Only include Linux-specific header on Linux.
 
+https://gitlab.freedesktop.org/mesa/drm/-/merge_requests/384
+
 --- omap/omap_drm.c.orig       2024-07-02 15:43:49.303040722 +0000
 +++ omap/omap_drm.c
 @@ -27,7 +27,9 @@

Index: pkgsrc/x11/libdrm/patches/patch-libsync.h
diff -u pkgsrc/x11/libdrm/patches/patch-libsync.h:1.5 pkgsrc/x11/libdrm/patches/patch-libsync.h:1.6
--- pkgsrc/x11/libdrm/patches/patch-libsync.h:1.5       Mon Jun 10 08:01:20 2024
+++ pkgsrc/x11/libdrm/patches/patch-libsync.h   Tue Jul  2 16:24:47 2024
@@ -1,7 +1,9 @@
-$NetBSD: patch-libsync.h,v 1.5 2024/06/10 08:01:20 jperkin Exp $
+$NetBSD: patch-libsync.h,v 1.6 2024/07/02 16:24:47 wiz Exp $
 
 Fix public header on SunOS.
 
+https://gitlab.freedesktop.org/mesa/drm/-/merge_requests/384
+
 --- libsync.h.orig     2024-06-10 07:58:37.832119633 +0000
 +++ libsync.h
 @@ -33,6 +33,9 @@

Index: pkgsrc/x11/libdrm/patches/patch-tests_nouveau_threaded.c
diff -u pkgsrc/x11/libdrm/patches/patch-tests_nouveau_threaded.c:1.2 pkgsrc/x11/libdrm/patches/patch-tests_nouveau_threaded.c:1.3
--- pkgsrc/x11/libdrm/patches/patch-tests_nouveau_threaded.c:1.2        Wed Apr  3 07:14:32 2024
+++ pkgsrc/x11/libdrm/patches/patch-tests_nouveau_threaded.c    Tue Jul  2 16:24:47 2024
@@ -1,7 +1,9 @@
-$NetBSD: patch-tests_nouveau_threaded.c,v 1.2 2024/04/03 07:14:32 charlotte Exp $
+$NetBSD: patch-tests_nouveau_threaded.c,v 1.3 2024/07/02 16:24:47 wiz Exp $
 
 Use the correct form of ioctl(2) for as many systems as possible.
 
+https://gitlab.freedesktop.org/mesa/drm/-/merge_requests/384
+
 --- tests/nouveau/threaded.c.orig      2021-07-02 12:49:05.455772000 +0000
 +++ tests/nouveau/threaded.c
 @@ -36,7 +36,7 @@ static int failed;

Index: pkgsrc/x11/libdrm/patches/patch-xf86drm.c
diff -u pkgsrc/x11/libdrm/patches/patch-xf86drm.c:1.7 pkgsrc/x11/libdrm/patches/patch-xf86drm.c:1.8
--- pkgsrc/x11/libdrm/patches/patch-xf86drm.c:1.7       Sun Mar 13 15:20:01 2022
+++ pkgsrc/x11/libdrm/patches/patch-xf86drm.c   Tue Jul  2 16:24:47 2024
@@ -1,7 +1,9 @@
-$NetBSD: patch-xf86drm.c,v 1.7 2022/03/13 15:20:01 tnn Exp $
+$NetBSD: patch-xf86drm.c,v 1.8 2024/07/02 16:24:47 wiz Exp $
 
 Implement drmParseSubsystemType, drmParsePciBusInfo for NetBSD
 
+https://gitlab.freedesktop.org/mesa/drm/-/merge_requests/384
+
 --- xf86drm.c.orig     2021-07-02 12:49:05.459105300 +0000
 +++ xf86drm.c
 @@ -86,7 +86,10 @@

Index: pkgsrc/x11/libdrm/patches/patch-xf86drmMode.c
diff -u pkgsrc/x11/libdrm/patches/patch-xf86drmMode.c:1.6 pkgsrc/x11/libdrm/patches/patch-xf86drmMode.c:1.7
--- pkgsrc/x11/libdrm/patches/patch-xf86drmMode.c:1.6   Sun Mar 13 15:20:01 2022
+++ pkgsrc/x11/libdrm/patches/patch-xf86drmMode.c       Tue Jul  2 16:24:47 2024
@@ -1,7 +1,10 @@
-$NetBSD: patch-xf86drmMode.c,v 1.6 2022/03/13 15:20:01 tnn Exp $
+$NetBSD: patch-xf86drmMode.c,v 1.7 2024/07/02 16:24:47 wiz Exp $
 
 FreeBSD/DragonFly/NetBSD support. From FreeBSD ports and NetBSD xsrc
 
+NetBSD part:
+https://gitlab.freedesktop.org/mesa/drm/-/merge_requests/384
+
 --- xf86drmMode.c.orig 2021-07-02 12:49:05.459105300 +0000
 +++ xf86drmMode.c
 @@ -38,9 +38,7 @@
@@ -99,12 +102,3 @@ FreeBSD/DragonFly/NetBSD support. From F
        int     fd;
        struct drm_mode_card_res res;
        drmModeResPtr r = 0;
-@@ -988,7 +1011,7 @@ drm_public int drmModePageFlipTarget(int
- 
- drm_public int drmModeSetPlane(int fd, uint32_t plane_id, uint32_t crtc_id,
-                   uint32_t fb_id, uint32_t flags,
--                  int32_t crtc_x, int32_t crtc_y,
-+                  uint32_t crtc_x, uint32_t crtc_y,
-                   uint32_t crtc_w, uint32_t crtc_h,
-                   uint32_t src_x, uint32_t src_y,
-                   uint32_t src_w, uint32_t src_h)

Prev by Date: CVS commit: pkgsrc/x11/libdrm
Next by Date: CVS commit: pkgsrc/x11/libdrm/patches
Previous by Thread: CVS commit: pkgsrc/x11/libdrm
Next by Thread: CVS commit: pkgsrc/x11/libdrm/patches
Indexes:

Home | Main Index | Thread Index | Old Index