summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
Diffstat (limited to 'x11')
-rw-r--r--x11/libdrm/Makefile6
-rw-r--r--x11/libdrm/PLIST42
-rw-r--r--x11/libdrm/buildlink3.mk12
-rw-r--r--x11/libdrm/distinfo13
-rw-r--r--x11/libdrm/patches/patch-aa16
-rw-r--r--x11/libdrm/patches/patch-ab8
-rw-r--r--x11/libdrm/patches/patch-ac8
7 files changed, 44 insertions, 61 deletions
diff --git a/x11/libdrm/Makefile b/x11/libdrm/Makefile
index 2db9a660e00..c151583c25e 100644
--- a/x11/libdrm/Makefile
+++ b/x11/libdrm/Makefile
@@ -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 @@ GNU_CONFIGURE= yes
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 --git a/x11/libdrm/PLIST b/x11/libdrm/PLIST
index 1c0fee3a75b..fa1100efa80 100644
--- a/x11/libdrm/PLIST
+++ b/x11/libdrm/PLIST
@@ -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 --git a/x11/libdrm/buildlink3.mk b/x11/libdrm/buildlink3.mk
index 8009f398777..03e598b0431 100644
--- a/x11/libdrm/buildlink3.mk
+++ b/x11/libdrm/buildlink3.mk
@@ -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 --git a/x11/libdrm/distinfo b/x11/libdrm/distinfo
index a4cf4beceaf..a55d9c85e24 100644
--- a/x11/libdrm/distinfo
+++ b/x11/libdrm/distinfo
@@ -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 --git a/x11/libdrm/patches/patch-aa b/x11/libdrm/patches/patch-aa
deleted file mode 100644
index 35ee59818ec..00000000000
--- a/x11/libdrm/patches/patch-aa
+++ /dev/null
@@ -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 --git a/x11/libdrm/patches/patch-ab b/x11/libdrm/patches/patch-ab
index c9bc4bc0d1f..5becab0a760 100644
--- a/x11/libdrm/patches/patch-ab
+++ b/x11/libdrm/patches/patch-ab
@@ -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 --git a/x11/libdrm/patches/patch-ac b/x11/libdrm/patches/patch-ac
index bc429995226..cff1e4f65c7 100644
--- a/x11/libdrm/patches/patch-ac
+++ b/x11/libdrm/patches/patch-ac
@@ -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 @@ $NetBSD: patch-ac,v 1.2 2008/07/16 06:41:17 bjs Exp $
#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 */
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-12 13:50:50 +0000