diff options
| author | kwm <kwm@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2011-07-20 05:31:57 +0800 |
|---|---|---|
| committer | kwm <kwm@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2011-07-20 05:31:57 +0800 |
| commit | 7e64774d321a86fdd4bfc2082c378cbf3d299d65 (patch) | |
| tree | 4923d378ae1ebafc75ff9d71efa85cb4fcd086f7 | |
| parent | 34b917a896265c09098bc494e3a292cac9f383f5 (diff) | |
| download | xorg-devel-ports-7e64774d321a86fdd4bfc2082c378cbf3d299d65.tar.gz xorg-devel-ports-7e64774d321a86fdd4bfc2082c378cbf3d299d65.tar.zst xorg-devel-ports-7e64774d321a86fdd4bfc2082c378cbf3d299d65.zip | |
Simpliy PORTVERSION. really add kib's patch, And add some more logic to the
KMS option to really get it to work.
Add depend on pthread-stubs.
Submitted by: Pan Tsu <inyaoo@gmail.com>
No cookies for: kwm@
git-svn-id: https://trillian.chruetertee.ch/svn/ports/branches/xorg-dev@263 058c260c-8361-11dd-a0ac-aa2bafec7d09
| -rw-r--r-- | graphics/libdrm/Makefile | 10 | ||||
| -rw-r--r-- | graphics/libdrm/files/extra-xf86drmMode.c | 29 | ||||
| -rw-r--r-- | graphics/libdrm/pkg-plist | 6 |
3 files changed, 41 insertions, 4 deletions
diff --git a/graphics/libdrm/Makefile b/graphics/libdrm/Makefile index 3bfc218..7caaca2 100644 --- a/graphics/libdrm/Makefile +++ b/graphics/libdrm/Makefile @@ -6,7 +6,7 @@ # PORTNAME= libdrm -PORTVERSION= ${LIBDRM_VERSION} +PORTVERSION= 2.4.26 CATEGORIES= graphics x11 MASTER_SITES= http://dri.freedesktop.org/libdrm/ @@ -21,7 +21,6 @@ USE_BZIP2= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes -LIBDRM_VERSION= 2.4.26 CONFIGURE_ARGS= --enable-nouveau-experimental-api MAKE_JOBS_SAFE= yes @@ -31,8 +30,11 @@ OPTIONS= KMS "Enable KMS support (very experimental)" off .include <bsd.port.options.mk> .if defined(WITH_KMS) -EXTRA_PATCHES+= ${FILESDIR}/extra-configure \ - ${FILESDIR}/extra-xf86drmMode.c +CONFIGURE_ARGS+=--enable-libkms +EXTRA_PATCHES+= ${FILESDIR}/extra-xf86drmMode.c +PLIST_SUB+= KMS="" +.else +PLIST_SUB+= KMS="@comment " .endif pre-patch: 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-plist b/graphics/libdrm/pkg-plist index 98a9617..27c67e0 100644 --- a/graphics/libdrm/pkg-plist +++ b/graphics/libdrm/pkg-plist @@ -18,6 +18,7 @@ include/libdrm/radeon_drm.h include/libdrm/savage_drm.h include/libdrm/sis_drm.h include/libdrm/via_drm.h +%%KMS%%include/libkms/libkms.h include/nouveau/nouveau_bo.h include/nouveau/nouveau_channel.h include/nouveau/nouveau_device.h @@ -42,9 +43,14 @@ lib/libdrm_nouveau.so.1 lib/libdrm_radeon.la lib/libdrm_radeon.so lib/libdrm_radeon.so.1 +%%KMS%%lib/libkms.la +%%KMS%%lib/libkms.so +%%KMS%%lib/libkms.so.1 libdata/pkgconfig/libdrm.pc libdata/pkgconfig/libdrm_intel.pc libdata/pkgconfig/libdrm_nouveau.pc libdata/pkgconfig/libdrm_radeon.pc +%%KMS%%libdata/pkgconfig/libkms.pc @dirrm include/nouveau +%%KMS%%@dirrm include/libkms @dirrm include/libdrm |