summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChi-Thanh Christopher Nguyen <chithanh@gentoo.org>2015-01-29 17:31:16 +0100
committerChi-Thanh Christopher Nguyen <chithanh@gentoo.org>2015-01-29 17:31:16 +0100
commitb95af98573fceb8bd567bbadffd244002277bbf4 (patch)
tree45354a2fa2c04fb915a49142afbefbf3af4efc42
parentx11-libs/libdrm: update for freedreno and tegra changes (diff)
downloadx11-b95af98573fceb8bd567bbadffd244002277bbf4.tar.gz
x11-b95af98573fceb8bd567bbadffd244002277bbf4.tar.bz2
x11-b95af98573fceb8bd567bbadffd244002277bbf4.zip
x11-libs/libdrm: sync some more changes with portage
-rw-r--r--x11-libs/libdrm/files/libdrm-2.4.58-solaris.patch (renamed from x11-libs/libdrm/files/libdrm-2.4.28-solaris.patch)24
-rw-r--r--x11-libs/libdrm/libdrm-9999.ebuild4
2 files changed, 10 insertions, 18 deletions
diff --git a/x11-libs/libdrm/files/libdrm-2.4.28-solaris.patch b/x11-libs/libdrm/files/libdrm-2.4.58-solaris.patch
index 4707b8b0..9e411001 100644
--- a/x11-libs/libdrm/files/libdrm-2.4.28-solaris.patch
+++ b/x11-libs/libdrm/files/libdrm-2.4.58-solaris.patch
@@ -1,7 +1,5 @@
-Index: include/drm/drm.h
-===================================================================
---- include/drm/drm.h
-+++ include/drm/drm.h
+--- a/include/drm/drm.h
++++ b/include/drm/drm.h
@@ -54,7 +54,11 @@ typedef int32_t __s32;
typedef uint32_t __u32;
typedef int64_t __s64;
@@ -47,10 +45,8 @@ Index: include/drm/drm.h
};
/**
-Index: radeon/radeon_bo_gem.c
-===================================================================
---- radeon/radeon_bo_gem.c
-+++ radeon/radeon_bo_gem.c
+--- a/radeon/radeon_bo_gem.c
++++ b/radeon/radeon_bo_gem.c
@@ -38,6 +38,13 @@
#include <string.h>
#include <sys/mman.h>
@@ -66,10 +62,8 @@ Index: radeon/radeon_bo_gem.c
#include "xf86drm.h"
#include "xf86atomic.h"
#include "drm.h"
-Index: xf86drm.c
-===================================================================
---- xf86drm.c
-+++ xf86drm.c
+--- a/xf86drm.c
++++ b/xf86drm.c
@@ -972,7 +972,11 @@ int drmRmMap(int fd, drm_handle_t handle
{
drm_map_t map;
@@ -92,10 +86,8 @@ Index: xf86drm.c
if (drmIoctl(fd, DRM_IOCTL_MAP_BUFS, &bufs))
return NULL;
-Index: xf86drm.h
-===================================================================
---- xf86drm.h
-+++ xf86drm.h
+--- a/xf86drm.h
++++ b/xf86drm.h
@@ -64,6 +64,13 @@
#endif
diff --git a/x11-libs/libdrm/libdrm-9999.ebuild b/x11-libs/libdrm/libdrm-9999.ebuild
index 8357c631..98da7c5b 100644
--- a/x11-libs/libdrm/libdrm-9999.ebuild
+++ b/x11-libs/libdrm/libdrm-9999.ebuild
@@ -16,7 +16,7 @@ else
fi
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-VIDEO_CARDS="exynos freedreno intel nouveau omap radeon vmware"
+VIDEO_CARDS="exynos freedreno intel nouveau omap radeon tegra vmware"
for card in ${VIDEO_CARDS}; do
IUSE_VIDEO_CARDS+=" video_cards_${card}"
done
@@ -30,7 +30,7 @@ RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1:=[${MULTILIB_USEDEP}]
DEPEND="${RDEPEND}"
PATCHES=(
- "${FILESDIR}"/${PN}-2.4.28-solaris.patch
+ "${FILESDIR}"/${PN}-2.4.58-solaris.patch
)
src_prepare() {