Fix build of libdrm_intel on amd64.

Remove pthread-stubs from build_ and run_depends it is already handled by 
lib_depend.
Disable the build of nouveau API we don't support it anyway.



git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@478 058c260c-8361-11dd-a0ac-aa2bafec7d09

2 files changed, 3 insertions, 24 deletions

diff --git a/graphics/libdrm/Makefile b/graphics/libdrm/Makefile
index bf30ce0..5c02cfe 100644
--- a/graphics/libdrm/Makefile
+++ b/graphics/libdrm/Makefile
@@ -14,17 +14,13 @@ MASTER_SITES=	http://dri.freedesktop.org/libdrm/
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Userspace interface to kernel Direct Rendering Module services
 
-BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:${PORTSDIR}/devel/libpthread-stubs
 LIB_DEPENDS=	pciaccess.0:${PORTSDIR}/devel/libpciaccess \
 		pthread-stubs.0:${PORTSDIR}/devel/libpthread-stubs
-RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:${PORTSDIR}/devel/libpthread-stubs
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-CONFIGURE_ARGS=	--enable-nouveau-experimental-api
-
 MAKE_JOBS_SAFE=	yes
 
 .if defined(WITH_NEW_XORG)
@@ -42,7 +38,7 @@ PLIST_SUB+=	KMS="@comment "
 .endif
 
 LIBDRM_VERSION=	2.4.33
-LIBDRM_REVISION=1
+LIBDRM_REVISION=2
 PLIST_SUB+=	OLD="@comment " NEW=""
 .else
 LIBDRM_VERSION=	2.4.17
@@ -52,7 +48,7 @@ PLIST_SUB+=	OLD="" NEW="@comment "
 
 pre-patch:
 	@${REINPLACE_CMD} 's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|g; \
-			   12661s/x86_/amd/g' \
+			   11721s/x86_/amd/g' \
 		${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/graphics/libdrm/pkg-plist b/graphics/libdrm/pkg-plist
index 5cef834..498eb1d 100644
--- a/graphics/libdrm/pkg-plist
+++ b/graphics/libdrm/pkg-plist
@@ -5,7 +5,6 @@
 %%OLD%%include/drm/mach64_drm.h
 %%OLD%%include/drm/mga_drm.h
 %%OLD%%include/drm/nouveau_drm.h
-%%OLD%%include/drm/nouveau_drmif.h
 %%OLD%%include/drm/r128_drm.h
 %%OLD%%include/drm/radeon_drm.h
 %%OLD%%include/drm/savage_drm.h
@@ -17,12 +16,12 @@
 %%NEW%%include/libdrm/drm_mode.h
 %%NEW%%include/libdrm/drm_sarea.h
 %%NEW%%include/libdrm/i915_drm.h
+%%NEW%%include/libdrm/intel_aub.h
 %%NEW%%include/libdrm/intel_bufmgr.h
 %%NEW%%include/libdrm/intel_debug.h
 %%NEW%%include/libdrm/mach64_drm.h
 %%NEW%%include/libdrm/mga_drm.h
 %%NEW%%include/libdrm/nouveau_drm.h
-%%NEW%%include/libdrm/nouveau_drmif.h
 %%NEW%%include/libdrm/r128_drm.h
 %%NEW%%include/libdrm/r600_pci_ids.h
 %%NEW%%include/libdrm/radeon_bo.h
@@ -37,17 +36,6 @@
 %%NEW%%include/libdrm/sis_drm.h
 %%NEW%%include/libdrm/via_drm.h
 %%NEW%%%%KMS%%include/libkms/libkms.h
-include/nouveau/nouveau_bo.h
-include/nouveau/nouveau_channel.h
-%%OLD%%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
-%%NEW%%include/nouveau/nouveau_reloc.h
-include/nouveau/nouveau_resource.h
-%%NEW%%include/nouveau/nv04_pushbuf.h
-%%NEW%%include/nouveau/nvc0_pushbuf.h
 include/xf86drm.h
 include/xf86drmMode.h
 lib/libdrm.la
@@ -56,9 +44,6 @@ 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
 %%NEW%%lib/libdrm_radeon.la
 %%NEW%%lib/libdrm_radeon.so
 %%NEW%%lib/libdrm_radeon.so.1
@@ -67,10 +52,8 @@ lib/libdrm_nouveau.so.1
 %%NEW%%%%KMS%%lib/libkms.so.1
 libdata/pkgconfig/libdrm.pc
 libdata/pkgconfig/libdrm_intel.pc
-libdata/pkgconfig/libdrm_nouveau.pc
 %%NEW%%libdata/pkgconfig/libdrm_radeon.pc
 %%NEW%%%%KMS%%libdata/pkgconfig/libkms.pc
-@dirrm include/nouveau
 %%NEW%%%%KMS%%@dirrm include/libkms
 %%NEW%%@dirrm include/libdrm
 %%OLD%%@dirrm include/drm