- Move ports/branches/xorg-dev to ports/trunk/

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

5 files changed, 167 insertions, 0 deletions

diff --git a/graphics/libdrm/Makefile b/graphics/libdrm/Makefile
new file mode 100644
index 0000000..8d859d2
--- /dev/null
+++ b/graphics/libdrm/Makefile
@@ -0,0 +1,57 @@
+# New ports collection makefile for:	libdrm
+# Date created:				29 Dec 2005
+# Whom:					lesi@FreeBSD.org
+#
+# $FreeBSD$
+#
+
+PORTNAME=	libdrm
+PORTVERSION=	${LIBDRM_VERSION}
+PORTREVISION=	${LIBDRM_REVISION}
+CATEGORIES=	graphics x11
+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)
+
+OPTIONS=	KMS "Enable KMS support (very experimental)" off
+
+.include <bsd.port.options.mk>
+
+.if defined(WITH_KMS)
+CONFIGURE_ARGS+=--enable-libkms
+EXTRA_PATCHES+=	${FILESDIR}/extra-xf86drmMode.c
+PLIST_SUB+=	KMS=""
+.else
+PLIST_SUB+=	KMS="@comment "
+.endif
+
+LIBDRM_VERSION=	2.4.30
+LIBDRM_REVISION=1
+PLIST_SUB+=	OLD="@comment " NEW=""
+.else
+LIBDRM_VERSION=	2.4.17
+LIBDRM_REVISION=0
+PLIST_SUB+=	OLD="" NEW="@comment "
+.endif
+
+pre-patch:
+	@${REINPLACE_CMD} 's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|g' \
+	    ${WRKSRC}/configure
+
+.include <bsd.port.mk>
diff --git a/graphics/libdrm/distinfo b/graphics/libdrm/distinfo
new file mode 100644
index 0000000..86810e9
--- /dev/null
+++ b/graphics/libdrm/distinfo
@@ -0,0 +1,4 @@
+SHA256 (libdrm-2.4.17.tar.bz2) = b8a4e7c610b0e970546d791c06e28882857a49d34698633a89292d7ae142316a
+SIZE (libdrm-2.4.17.tar.bz2) = 408882
+SHA256 (libdrm-2.4.30.tar.bz2) = cacea9c157ec824ad278a06f4910659b2f3ae69686518ece8d6967843cddcd56
+SIZE (libdrm-2.4.30.tar.bz2) = 547931
diff --git a/graphics/libdrm/files/extra-xf86drmMode.c b/graphics/libdrm/files/extra-xf86drmMode.c
new file mode 100644
index 0000000..d91a923
--- /dev/null
+++ b/graphics/libdrm/files/extra-xf86drmMode.c
@@ -0,0 +1,29 @@
+--- xf86drmMode.c.orig	2010-09-08 14:23:39.000000000 +0200
++++ xf86drmMode.c	2011-07-18 18:59:11.000000000 +0200
+@@ -54,7 +54,7 @@
+ 
+ static inline DRM_IOCTL(int fd, int cmd, void *arg)
+ {
+-	int ret = drmIoctl(fd, cmd, arg);
++	int ret = drmIoctl(fd, (unsigned)cmd, arg);
+ 	return ret < 0 ? -errno : ret;
+ }
+ 
+@@ -659,7 +659,7 @@
+ */
+ int drmCheckModesettingSupported(const char *busid)
+ {
+-#ifdef __linux__
++#if defined (__linux__)
+ 	char pci_dev_dir[1024];
+ 	int domain, bus, dev, func;
+ 	DIR *sysdir;
+@@ -709,6 +709,8 @@
+ 	closedir(sysdir);
+ 	if (found)
+ 		return 0;
++#elif defined(__FreeBSD__)
++	return 0;
+ #endif
+ 	return -ENOSYS;
+ 
diff --git a/graphics/libdrm/pkg-descr b/graphics/libdrm/pkg-descr
new file mode 100644
index 0000000..2258459
--- /dev/null
+++ b/graphics/libdrm/pkg-descr
@@ -0,0 +1,3 @@
+Userspace interface to kernel DRM (Direct Rendering Module) services.
+
+WWW: http://dri.freedesktop.org
diff --git a/graphics/libdrm/pkg-plist b/graphics/libdrm/pkg-plist
new file mode 100644
index 0000000..75af57d
--- /dev/null
+++ b/graphics/libdrm/pkg-plist
@@ -0,0 +1,74 @@
+%%OLD%%include/drm/drm.h
+%%OLD%%include/drm/drm_mode.h
+%%OLD%%include/drm/drm_sarea.h
+%%OLD%%include/drm/i915_drm.h
+%%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
+%%OLD%%include/drm/sis_drm.h
+%%OLD%%include/drm/via_drm.h
+%%OLD%%include/intel_bufmgr.h
+%%NEW%%include/libdrm/drm.h
+%%NEW%%include/libdrm/drm_fourcc.h
+%%NEW%%include/libdrm/drm_mode.h
+%%NEW%%include/libdrm/drm_sarea.h
+%%NEW%%include/libdrm/i915_drm.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/radeon_bo.h
+%%NEW%%include/libdrm/radeon_bo_gem.h
+%%NEW%%include/libdrm/radeon_bo_int.h
+%%NEW%%include/libdrm/radeon_cs.h
+%%NEW%%include/libdrm/radeon_cs_gem.h
+%%NEW%%include/libdrm/radeon_cs_int.h
+%%NEW%%include/libdrm/radeon_drm.h
+%%NEW%%include/libdrm/savage_drm.h
+%%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
+lib/libdrm.so
+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
+%%NEW%%%%KMS%%lib/libkms.la
+%%NEW%%%%KMS%%lib/libkms.so
+%%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