summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkwm <kwm@058c260c-8361-11dd-a0ac-aa2bafec7d09>2014-04-12 02:20:41 +0800
committerkwm <kwm@058c260c-8361-11dd-a0ac-aa2bafec7d09>2014-04-12 02:20:41 +0800
commitb52fa0e79a01badf0a2007ac76648b1c1f1aea38 (patch)
treead6f55731aefaeb0643e91a62f35a279b9ce3f1a
parent2ea85d73618b70ed1fef4d810cc5ae3915236972 (diff)
downloadxorg-devel-ports-b52fa0e79a01badf0a2007ac76648b1c1f1aea38.tar
xorg-devel-ports-b52fa0e79a01badf0a2007ac76648b1c1f1aea38.tar.gz
xorg-devel-ports-b52fa0e79a01badf0a2007ac76648b1c1f1aea38.tar.bz2
xorg-devel-ports-b52fa0e79a01badf0a2007ac76648b1c1f1aea38.tar.lz
xorg-devel-ports-b52fa0e79a01badf0a2007ac76648b1c1f1aea38.tar.xz
xorg-devel-ports-b52fa0e79a01badf0a2007ac76648b1c1f1aea38.tar.zst
xorg-devel-ports-b52fa0e79a01badf0a2007ac76648b1c1f1aea38.zip
Update to 2.4.53.
git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@1424 058c260c-8361-11dd-a0ac-aa2bafec7d09
-rw-r--r--graphics/libdrm/Makefile6
-rw-r--r--graphics/libdrm/distinfo6
-rw-r--r--graphics/libdrm/files/extra-xf86drmMode.c29
3 files changed, 4 insertions, 37 deletions
diff --git a/graphics/libdrm/Makefile b/graphics/libdrm/Makefile
index d79f925..b5a13b4 100644
--- a/graphics/libdrm/Makefile
+++ b/graphics/libdrm/Makefile
@@ -13,8 +13,7 @@ COMMENT= Userspace interface to kernel Direct Rendering Module services
LIB_DEPENDS= libpciaccess.so:${PORTSDIR}/devel/libpciaccess \
libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs
-USES= pkgconfig
-USE_BZIP2= yes
+USES= pkgconfig tar:bzip2
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
@@ -33,7 +32,6 @@ USES+= gmake
# KMS support in the kernel is only build on these archs, disable others
.if ${ARCH} == "amd64" || ${ARCH} == "i386"
CONFIGURE_ARGS+=--enable-libkms
-EXTRA_PATCHES+= ${FILESDIR}/extra-xf86drmMode.c
PLIST_SUB+= KMS="" NOUVEAU=""
.else
CONFIGURE_ARGS+=--disable-libkms
@@ -49,7 +47,7 @@ CONFIGURE_ARGS+=--disable-manpages
PLIST_SUB+= MAN="@comment "
.endif
-LIBDRM_VERSION= 2.4.52
+LIBDRM_VERSION= 2.4.53
LIBDRM_REVISION=0
PLIST_SUB+= OLD="@comment " NEW=""
EXTRA_PATCHES+= ${FILESDIR}/extra-configure \
diff --git a/graphics/libdrm/distinfo b/graphics/libdrm/distinfo
index 2679106..170f572 100644
--- a/graphics/libdrm/distinfo
+++ b/graphics/libdrm/distinfo
@@ -1,4 +1,2 @@
-SHA256 (libdrm-2.4.17.tar.bz2) = b8a4e7c610b0e970546d791c06e28882857a49d34698633a89292d7ae142316a
-SIZE (libdrm-2.4.17.tar.bz2) = 408882
-SHA256 (libdrm-2.4.52.tar.bz2) = fa693c2f1f61befcefbdcc396673e38481110bac9db610afa4b8afb2be0218c1
-SIZE (libdrm-2.4.52.tar.bz2) = 551473
+SHA256 (libdrm-2.4.53.tar.bz2) = 1b0c28fd2f2b92d2df0a73d1aed88f43cb0dee1267aea6bc52ccb5fca5757a08
+SIZE (libdrm-2.4.53.tar.bz2) = 579171
diff --git a/graphics/libdrm/files/extra-xf86drmMode.c b/graphics/libdrm/files/extra-xf86drmMode.c
deleted file mode 100644
index d91a923..0000000
--- a/graphics/libdrm/files/extra-xf86drmMode.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- 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;
-