summaryrefslogtreecommitdiff
path: root/x11/libdrm
diff options
context:
space:
mode:
authorbjs <bjs@pkgsrc.org>2008-07-16 06:41:17 +0000
committerbjs <bjs@pkgsrc.org>2008-07-16 06:41:17 +0000
commit7657825b67d5e073e0c4c463cb99bd626e769d6a (patch)
tree41030bbc131e0ec331aa0c736ee768da21b7ab03 /x11/libdrm
parent7ffc5e2de0cb12286c37053ec946a6ced155170d (diff)
downloadpkgsrc-7657825b67d5e073e0c4c463cb99bd626e769d6a.tar.gz
Update to libdrm-2.3.1. There is no up-to-date ChangeLog in the package
whatsoever, so I cannot include a list here (see GIT history if you're curious). NOTE: This version of libdrm no longer includes the TTM interface. If any [xorg/mesa] packages are updated to versions explicitly requiring libdrm-2.3.1, then BUILDLINK_API_DEPENDS for this package will need to be changed. Also, the i915tex dri driver found in graphics/MesaLib will not build with this version--but nor was it supported on any platform except Linux. I have remove i915tex from the MesaLib driver build; this should be enough to avoid problems.
Diffstat (limited to 'x11/libdrm')
-rw-r--r--x11/libdrm/Makefile5
-rw-r--r--x11/libdrm/PLIST3
-rw-r--r--x11/libdrm/buildlink3.mk10
-rw-r--r--x11/libdrm/distinfo14
-rw-r--r--x11/libdrm/patches/patch-aa6
-rw-r--r--x11/libdrm/patches/patch-ab14
-rw-r--r--x11/libdrm/patches/patch-ac10
7 files changed, 31 insertions, 31 deletions
diff --git a/x11/libdrm/Makefile b/x11/libdrm/Makefile
index db350f0025b..82508fd7294 100644
--- a/x11/libdrm/Makefile
+++ b/x11/libdrm/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2008/05/30 14:29:19 tnn Exp $
+# $NetBSD: Makefile,v 1.6 2008/07/16 06:41:17 bjs Exp $
#
-DISTNAME= libdrm-2.3.0
-PKGREVISION= 3
+DISTNAME= libdrm-2.3.1
CATEGORIES= x11 graphics
MASTER_SITES= http://dri.freedesktop.org/libdrm/
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/libdrm/PLIST b/x11/libdrm/PLIST
index 24d5acdc324..1b5d0ea4b54 100644
--- a/x11/libdrm/PLIST
+++ b/x11/libdrm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/11/14 14:22:12 joerg Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/07/16 06:41:17 bjs Exp $
include/drm/drm.h
include/drm/drm_sarea.h
include/drm/i915_drm.h
@@ -12,7 +12,6 @@ include/drm/sis_drm.h
include/drm/via_3d_reg.h
include/drm/via_drm.h
include/xf86drm.h
-include/xf86mm.h
lib/libdrm.la
lib/pkgconfig/libdrm.pc
@dirrm include/drm
diff --git a/x11/libdrm/buildlink3.mk b/x11/libdrm/buildlink3.mk
index 723f7c8a9d1..f01bdfc92a1 100644
--- a/x11/libdrm/buildlink3.mk
+++ b/x11/libdrm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2007/01/14 10:57:47 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2008/07/16 06:41:17 bjs Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBDRM_BUILDLINK3_MK:= ${LIBDRM_BUILDLINK3_MK}+
@@ -13,6 +13,14 @@ BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libdrm
.if ${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_PKGSRCDIR.libdrm?= ../../x11/libdrm
.endif # LIBDRM_BUILDLINK3_MK
diff --git a/x11/libdrm/distinfo b/x11/libdrm/distinfo
index 6e3ec1d26fa..0840644b3be 100644
--- a/x11/libdrm/distinfo
+++ b/x11/libdrm/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2008/06/03 10:47:03 wiz Exp $
+$NetBSD: distinfo,v 1.7 2008/07/16 06:41:17 bjs Exp $
-SHA1 (libdrm-2.3.0.tar.bz2) = af2e8d6e3ad6b906b4d6f1b2ada2d523188c28ea
-RMD160 (libdrm-2.3.0.tar.bz2) = ca9f6cdde2fcee40e63a43e0395781000472a2c1
-Size (libdrm-2.3.0.tar.bz2) = 267949 bytes
-SHA1 (patch-aa) = cc63dd837d6c25925e3a4d70c1ebd4860da1edd8
-SHA1 (patch-ab) = 8a117cbbc57b5276b4aaa4c6390053ecf232c288
-SHA1 (patch-ac) = 175e941bdb3689093a6c6ccf2a2591add742f94c
+SHA1 (libdrm-2.3.1.tar.bz2) = 775dc69fcabb324552b0b9fe3a67eceb324be194
+RMD160 (libdrm-2.3.1.tar.bz2) = 9a268aef4f7a4f3c8f968202d6a531f2200080a5
+Size (libdrm-2.3.1.tar.bz2) = 306013 bytes
+SHA1 (patch-aa) = 5881c75728feb088ae58b86c596e9c5f60648908
+SHA1 (patch-ab) = cb8a17c0f656640ea2d5c5c34b5a841fb1c37448
+SHA1 (patch-ac) = 4ff0b1986b12751b33d5a332c883761104683a7a
diff --git a/x11/libdrm/patches/patch-aa b/x11/libdrm/patches/patch-aa
index 4add3d483d5..35ee59818ec 100644
--- a/x11/libdrm/patches/patch-aa
+++ b/x11/libdrm/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2007/03/23 16:28:30 drochner Exp $
+$NetBSD: patch-aa,v 1.4 2008/07/16 06:41:17 bjs Exp $
---- shared-core/drm.h.orig 2007-03-19 22:59:31.000000000 +0100
+--- shared-core/drm.h.orig 2008-07-01 03:55:17.000000000 -0400
+++ shared-core/drm.h
-@@ -114,7 +114,10 @@
+@@ -92,7 +92,10 @@
#ifdef __OpenBSD__
#define DRM_MAJOR 81
#endif
diff --git a/x11/libdrm/patches/patch-ab b/x11/libdrm/patches/patch-ab
index 24f0bc75ea1..c9bc4bc0d1f 100644
--- a/x11/libdrm/patches/patch-ab
+++ b/x11/libdrm/patches/patch-ab
@@ -1,14 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2008/06/03 10:47:04 wiz Exp $
+$NetBSD: patch-ab,v 1.4 2008/07/16 06:41:17 bjs Exp $
---- ./libdrm/xf86drm.c.orig 2006-11-08 23:54:38 +0200
-+++ ./libdrm/xf86drm.c 2008-02-14 10:14:55 +0200
-@@ -62,12 +62,12 @@
-
- #include "xf86drm.h"
-
--#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
- #define DRM_MAJOR 145
+--- libdrm/xf86drm.c.orig 2008-07-01 03:51:40.000000000 -0400
++++ libdrm/xf86drm.c
+@@ -62,7 +62,7 @@
#endif
#ifdef __NetBSD__
diff --git a/x11/libdrm/patches/patch-ac b/x11/libdrm/patches/patch-ac
index 58b61d9d73b..bc429995226 100644
--- a/x11/libdrm/patches/patch-ac
+++ b/x11/libdrm/patches/patch-ac
@@ -1,19 +1,19 @@
-$NetBSD: patch-ac,v 1.1 2008/05/06 06:20:25 bjs Exp $
+$NetBSD: patch-ac,v 1.2 2008/07/16 06:41:17 bjs Exp $
---- libdrm/xf86drm.h.orig 2006-11-08 16:55:14.000000000 -0500
+--- libdrm/xf86drm.h.orig 2008-07-01 03:51:40.000000000 -0400
+++ libdrm/xf86drm.h
-@@ -37,7 +37,11 @@
+@@ -35,7 +35,11 @@
#define _XF86DRM_H_
#include <stdarg.h>
-+#if @ATOMIC_OPS_CHECK@ /* configured by pkgsrc */
++#if @ATOMIC_OPS_CHECK@
+#include <sys/atomic.h>
+#else
#include <sys/types.h>
+#endif
+ #include <stdint.h>
#include <drm.h>
- /* Defaults, if nothing set in xf86config */
@@ -305,7 +309,12 @@ typedef struct _drmSetVersion {
#define DRM_LOCK_HELD 0x80000000U /**< Hardware lock is held */
#define DRM_LOCK_CONT 0x40000000U /**< Hardware lock is contended */