[pkgsrc/trunk]: pkgsrc/x11/libdrm Update to libdrm-2.4.20.

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/x11/libdrm Update to libdrm-2.4.20.
From: tnn <tnn%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 09:18:11 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/80c1bc935bdb
branches:  trunk
changeset: 574409:80c1bc935bdb
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Fri Apr 16 13:43:36 2010 +0000

description:
Update to libdrm-2.4.20.
Many changes since 2.4.13, I won't pretend to understand them all.
This update is a prerequisite for eventually moving forward with MesaLib
and xorg-server updates.

diffstat:

 x11/libdrm/Makefile         |   6 +++---
 x11/libdrm/PLIST            |  42 +++++++++++++++++++++++++-----------------
 x11/libdrm/buildlink3.mk    |  12 ++----------
 x11/libdrm/distinfo         |  13 ++++++-------
 x11/libdrm/patches/patch-aa |  16 ----------------
 x11/libdrm/patches/patch-ab |   8 ++++----
 x11/libdrm/patches/patch-ac |   8 ++++----
 7 files changed, 44 insertions(+), 61 deletions(-)

diffs (176 lines):

diff -r c02341a88071 -r 80c1bc935bdb x11/libdrm/Makefile
--- a/x11/libdrm/Makefile       Fri Apr 16 11:45:46 2010 +0000
+++ b/x11/libdrm/Makefile       Fri Apr 16 13:43:36 2010 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2009/08/29 15:37:47 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2010/04/16 13:43:36 tnn Exp $
 #
 
-DISTNAME=              libdrm-2.4.13
+DISTNAME=              libdrm-2.4.20
 CATEGORIES=            x11 graphics
 MASTER_SITES=          http://dri.freedesktop.org/libdrm/
 EXTRACT_SUFX=          .tar.bz2
@@ -23,7 +23,7 @@
 ATOMIC_OPS_CHECK?=     0
 
 SUBST_CLASSES+=                atomic
-SUBST_FILES.atomic=    libdrm/xf86drm.h
+SUBST_FILES.atomic=    xf86drm.h
 SUBST_MESSAGE.atomic=  Configuring xf86drm.h's atomic operations.
 SUBST_STAGE.atomic=    pre-configure
 SUBST_VARS.atomic=     ATOMIC_OPS_CHECK
diff -r c02341a88071 -r 80c1bc935bdb x11/libdrm/PLIST
--- a/x11/libdrm/PLIST  Fri Apr 16 11:45:46 2010 +0000
+++ b/x11/libdrm/PLIST  Fri Apr 16 13:43:36 2010 +0000
@@ -1,23 +1,31 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:24:59 joerg Exp $
-include/drm/drm.h
-include/drm/drm_mode.h
-include/drm/drm_sarea.h
-include/drm/i915_drm.h
-include/drm/mach64_drm.h
-include/drm/mga_drm.h
-include/drm/nouveau_drm.h
-include/drm/r128_drm.h
-include/drm/r300_reg.h
-include/drm/radeon_drm.h
-include/drm/savage_drm.h
-include/drm/sis_drm.h
-include/drm/via_3d_reg.h
-include/drm/via_drm.h
-include/drm/xgi_drm.h
-include/intel_bufmgr.h
+@comment $NetBSD: PLIST,v 1.5 2010/04/16 13:43:36 tnn Exp $
+include/libdrm/drm.h
+include/libdrm/drm_mode.h
+include/libdrm/drm_sarea.h
+include/libdrm/i915_drm.h
+include/libdrm/intel_bufmgr.h
+include/libdrm/mach64_drm.h
+include/libdrm/mga_drm.h
+include/libdrm/nouveau_drm.h
+include/libdrm/r128_drm.h
+include/libdrm/radeon_bo.h
+include/libdrm/radeon_bo_gem.h
+include/libdrm/radeon_bo_int.h
+include/libdrm/radeon_cs.h
+include/libdrm/radeon_cs_gem.h
+include/libdrm/radeon_cs_int.h
+include/libdrm/radeon_drm.h
+include/libdrm/savage_drm.h
+include/libdrm/sis_drm.h
+include/libdrm/via_drm.h
+include/libkms/libkms.h
 include/xf86drm.h
 include/xf86drmMode.h
 lib/libdrm.la
 lib/libdrm_intel.la
+lib/libdrm_radeon.la
+lib/libkms.la
 lib/pkgconfig/libdrm.pc
 lib/pkgconfig/libdrm_intel.pc
+lib/pkgconfig/libdrm_radeon.pc
+lib/pkgconfig/libkms.pc
diff -r c02341a88071 -r 80c1bc935bdb x11/libdrm/buildlink3.mk
--- a/x11/libdrm/buildlink3.mk  Fri Apr 16 11:45:46 2010 +0000
+++ b/x11/libdrm/buildlink3.mk  Fri Apr 16 13:43:36 2010 +0000
@@ -1,19 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:46 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2010/04/16 13:43:36 tnn Exp $
 
 BUILDLINK_TREE+=       libdrm
 
 .if !defined(LIBDRM_BUILDLINK3_MK)
 LIBDRM_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libdrm+= libdrm>=2.3.0
-###
-### XXX Explicitly required by (at least) Mesa 7.1, which is nearing release.
-###    Upon updating pkgsrc Mesa to 7.1 and/orr xorg-server to a version which
-###    requires libdrm-2.3.1, BUILDLINK_API_DEPENDS should be increased
-###    and a recursive dependency bump performed.
-###    [bjs 20080714]
-###
-#BUILDLINK_API_DEPENDS.libdrm+=        libdrm>=2.3.1
+BUILDLINK_API_DEPENDS.libdrm+= libdrm>=2.4.20
 BUILDLINK_PKGSRCDIR.libdrm?=   ../../x11/libdrm
 .endif # LIBDRM_BUILDLINK3_MK
 
diff -r c02341a88071 -r 80c1bc935bdb x11/libdrm/distinfo
--- a/x11/libdrm/distinfo       Fri Apr 16 11:45:46 2010 +0000
+++ b/x11/libdrm/distinfo       Fri Apr 16 13:43:36 2010 +0000
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.11 2009/08/29 15:37:47 wiz Exp $
+$NetBSD: distinfo,v 1.12 2010/04/16 13:43:36 tnn Exp $
 
-SHA1 (libdrm-2.4.13.tar.bz2) = 0d3065d8521fca97239ce4aecbc81dc08d07de7d
-RMD160 (libdrm-2.4.13.tar.bz2) = abd5bef589b4d5e3a241d9bcb2b85e2041a61e82
-Size (libdrm-2.4.13.tar.bz2) = 414494 bytes
-SHA1 (patch-aa) = 5881c75728feb088ae58b86c596e9c5f60648908
-SHA1 (patch-ab) = cb8a17c0f656640ea2d5c5c34b5a841fb1c37448
-SHA1 (patch-ac) = 4ff0b1986b12751b33d5a332c883761104683a7a
+SHA1 (libdrm-2.4.20.tar.bz2) = f1448ac0f1c7a5f74a86d2fb50941fc12dc932db
+RMD160 (libdrm-2.4.20.tar.bz2) = 5581c45abfb9cb2bd0b95d4754d7812bb8323e3a
+Size (libdrm-2.4.20.tar.bz2) = 400812 bytes
+SHA1 (patch-ab) = 66dadd3244bfa9c69be0982fd2108deb94483de2
+SHA1 (patch-ac) = 61635a93d4b83783023114cd96993dc1075cbe1b
diff -r c02341a88071 -r 80c1bc935bdb x11/libdrm/patches/patch-aa
--- a/x11/libdrm/patches/patch-aa       Fri Apr 16 11:45:46 2010 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2008/07/16 06:41:17 bjs Exp $
-
---- shared-core/drm.h.orig     2008-07-01 03:55:17.000000000 -0400
-+++ shared-core/drm.h
-@@ -92,7 +92,10 @@
- #ifdef __OpenBSD__
- #define DRM_MAJOR       81
- #endif
--#if defined(__linux__) || defined(__NetBSD__)
-+#if defined(__NetBSD__)
-+#define DRM_MAJOR     180
-+#endif
-+#if defined(__linux__)
- #define DRM_MAJOR       226
- #endif
- #define DRM_MAX_MINOR   15
diff -r c02341a88071 -r 80c1bc935bdb x11/libdrm/patches/patch-ab
--- a/x11/libdrm/patches/patch-ab       Fri Apr 16 11:45:46 2010 +0000
+++ b/x11/libdrm/patches/patch-ab       Fri Apr 16 13:43:36 2010 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2008/07/16 06:41:17 bjs Exp $
+$NetBSD: patch-ab,v 1.5 2010/04/16 13:43:36 tnn Exp $
 
---- libdrm/xf86drm.c.orig      2008-07-01 03:51:40.000000000 -0400
-+++ libdrm/xf86drm.c
-@@ -62,7 +62,7 @@
+--- xf86drm.c.orig     2010-03-05 23:21:13.000000000 +0000
++++ xf86drm.c
+@@ -64,7 +64,7 @@
  #endif
  
  #ifdef __NetBSD__
diff -r c02341a88071 -r 80c1bc935bdb x11/libdrm/patches/patch-ac
--- a/x11/libdrm/patches/patch-ac       Fri Apr 16 11:45:46 2010 +0000
+++ b/x11/libdrm/patches/patch-ac       Fri Apr 16 13:43:36 2010 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.2 2008/07/16 06:41:17 bjs Exp $
+$NetBSD: patch-ac,v 1.3 2010/04/16 13:43:36 tnn Exp $
 
---- libdrm/xf86drm.h.orig      2008-07-01 03:51:40.000000000 -0400
-+++ libdrm/xf86drm.h
+--- xf86drm.h.orig     2010-03-05 23:21:13.000000000 +0000
++++ xf86drm.h
 @@ -35,7 +35,11 @@
  #define _XF86DRM_H_
  
@@ -14,7 +14,7 @@
  #include <stdint.h>
  #include <drm.h>
  
-@@ -305,7 +309,12 @@ typedef struct _drmSetVersion {
+@@ -333,7 +337,12 @@ typedef struct _drmSetVersion {
  #define DRM_LOCK_HELD  0x80000000U /**< Hardware lock is held */
  #define DRM_LOCK_CONT  0x40000000U /**< Hardware lock is contended */
Prev by Date: [pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install Link using the "-search_paths_fir...
Next by Date: [pkgsrc/trunk]: pkgsrc revision bump for libdrm update.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install Link using the "-search_paths_fir...
Next by Thread: [pkgsrc/trunk]: pkgsrc revision bump for libdrm update.
Indexes:
Home | Main Index | Thread Index | Old Index