ports/133454: [patch] graphics/libdrm: update to 2.4.6

[Anonymous]

>Number:         133454
>Category:       ports
>Synopsis:       [patch] graphics/libdrm: update to 2.4.6
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Apr 07 08:30:04 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Anonymous
>Release:        FreeBSD 8.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD luffy 8.0-CURRENT FreeBSD 8.0-CURRENT #0 r190794M: Tue Apr  7 06:21:51 UTC 2009     root at luffy:/usr/obj/usr/src/sys/PHOENIX  amd64

CPU: Intel(R) Core(TM)2 Duo CPU     E8400  @ 3.00GHz (3216.22-MHz K8-class CPU)
FreeBSD/SMP: Multiprocessor System Detected: 2 CPUs
 cpu0 (BSP): APIC ID:  0
 cpu1 (AP): APIC ID:  1

devel/ccache installed and used
nouveau ddx (20090407.a5d45c8) + drm (032109) installed and used
>Description:
- update to 2.4.6
- add compilation fix from git
- enable nouveau api, needed for xf86-video-nouveau update
- mark as MAKE_JOBS_SAFE: succeeds here with MAKE_JOBS_NUMBER=8
>How-To-Repeat:
>Fix:
--- libdrm-2.4.6.diff begins here ---
Index: graphics/libdrm/Makefile
===================================================================
RCS file: /home/csup/ports/graphics/libdrm/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- graphics/libdrm/Makefile	26 Feb 2009 07:05:43 -0000	1.13
+++ graphics/libdrm/Makefile	7 Apr 2009 07:39:46 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libdrm
-PORTVERSION=	2.4.5
+PORTVERSION=	2.4.6
 CATEGORIES=	graphics x11
 MASTER_SITES=	http://dri.freedesktop.org/libdrm/
 
@@ -20,7 +20,10 @@ USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-#CONFIGURE_ARGS=	--enable-nouveau-experimental-api
+MAKE_JOBS_SAFE=	yes
+
+PATCH_STRIP=	-p1
+CONFIGURE_ARGS=	--enable-nouveau-experimental-api
 
 pre-patch:
 	@${REINPLACE_CMD} 's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|g' \
Index: graphics/libdrm/distinfo
===================================================================
RCS file: /home/csup/ports/graphics/libdrm/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- graphics/libdrm/distinfo	26 Feb 2009 07:05:43 -0000	1.9
+++ graphics/libdrm/distinfo	7 Apr 2009 07:34:44 -0000
@@ -1,3 +1,3 @@
-MD5 (libdrm-2.4.5.tar.bz2) = 0d09025f069ff1a986cf3339e51908b3
-SHA256 (libdrm-2.4.5.tar.bz2) = 95daf23bce3fc7fc644e68ac17f1415a85c671511eb227183834204fec43a094
-SIZE (libdrm-2.4.5.tar.bz2) = 387733
+MD5 (libdrm-2.4.6.tar.bz2) = 77fb9621fbcc7a75599b656065c232a6
+SHA256 (libdrm-2.4.6.tar.bz2) = 6813f4ff5eb62d638bb452a6fc6ddbc26b7362f2d32b8be950c73a318239b006
+SIZE (libdrm-2.4.6.tar.bz2) = 417305
Index: graphics/libdrm/pkg-plist
===================================================================
RCS file: /home/csup/ports/graphics/libdrm/pkg-plist,v
retrieving revision 1.7
diff -u -p -r1.7 pkg-plist
--- graphics/libdrm/pkg-plist	26 Feb 2009 07:05:43 -0000	1.7
+++ graphics/libdrm/pkg-plist	26 Feb 2009 09:46:23 -0000
@@ -5,6 +5,7 @@ include/drm/i915_drm.h
 include/drm/mach64_drm.h
 include/drm/mga_drm.h
 include/drm/nouveau_drm.h
+include/drm/nouveau_drmif.h
 include/drm/r128_drm.h
 include/drm/r300_reg.h
 include/drm/radeon_drm.h
@@ -14,6 +15,14 @@ include/drm/via_3d_reg.h
 include/drm/via_drm.h
 include/drm/xgi_drm.h
 include/intel_bufmgr.h
+include/nouveau/nouveau_bo.h
+include/nouveau/nouveau_channel.h
+include/nouveau/nouveau_class.h
+include/nouveau/nouveau_device.h
+include/nouveau/nouveau_grobj.h
+include/nouveau/nouveau_notifier.h
+include/nouveau/nouveau_pushbuf.h
+include/nouveau/nouveau_resource.h
 include/xf86drm.h
 include/xf86drmMode.h
 lib/libdrm.la
@@ -22,6 +31,11 @@ lib/libdrm.so.2
 lib/libdrm_intel.la
 lib/libdrm_intel.so
 lib/libdrm_intel.so.1
+lib/libdrm_nouveau.la
+lib/libdrm_nouveau.so
+lib/libdrm_nouveau.so.1
 libdata/pkgconfig/libdrm.pc
 libdata/pkgconfig/libdrm_intel.pc
+libdata/pkgconfig/libdrm_nouveau.pc
 @dirrm include/drm
+ at dirrm include/nouveau
Index: graphics/libdrm/files/patch-tests-Makefile
===================================================================
RCS file: graphics/libdrm/files/patch-tests-Makefile
diff -N graphics/libdrm/files/patch-tests-Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ graphics/libdrm/files/patch-tests-Makefile	7 Apr 2009 07:45:20 -0000
@@ -0,0 +1,35 @@
+commit 1faab66cfd1a854925da6ff7109aa614292dea90
+Author: Dave Airlie <airlied at linux.ie>
+Date:   Tue Apr 7 09:26:32 2009 +1000
+
+    drm: fix test makefile
+    
+    no idea if this is correct but it works so meh
+---
+ tests/Makefile.am |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index bc99447..e5e9fc4 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -2,6 +2,8 @@ AM_CFLAGS = \
+ 	-I $(top_srcdir)/shared-core \
+ 	-I $(top_srcdir)/libdrm
+ 
++AM_LDFLAGS = $(top_builddir)/libdrm/libdrm.la
++
+ noinst_PROGRAMS = \
+ 	dristat \
+ 	drmstat
+diff -urNd a/tests/Makefile.in b/tests/Makefile.in
+--- a/tests/Makefile.in	2009-04-07 11:41:33.000000000 +0400
++++ b/tests/Makefile.in	2009-04-07 11:43:19.000000000 +0400
+@@ -265,6 +265,7 @@
+ 	-I $(top_srcdir)/shared-core \
+ 	-I $(top_srcdir)/libdrm
+ 
++AM_LDFLAGS = $(top_builddir)/libdrm/libdrm.la
+ SUBDIRS = \
+ 	modeprint \
+ 	modetest
--- libdrm-2.4.6.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted: