* [gentoo-commits] proj/x11:master commit in: x11-libs/libdrm/files/, x11-libs/libdrm/
@ 2011-11-02 12:51 Chi-Thanh Christopher Nguyen
0 siblings, 0 replies; 3+ messages in thread
From: Chi-Thanh Christopher Nguyen @ 2011-11-02 12:51 UTC (permalink / raw
To: gentoo-commits
commit: 6cff9707fc06ec6da6fedb0fe5f5081d8dd1dc92
Author: Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 2 12:50:59 2011 +0000
Commit: Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Wed Nov 2 12:50:59 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=6cff9707
x11-libs/libdrm: rename solaris patch
---
...3-solaris.patch => libdrm-2.4.28-solaris.patch} | 0
x11-libs/libdrm/libdrm-9999.ebuild | 2 +-
2 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/x11-libs/libdrm/files/libdrm-2.4.23-solaris.patch b/x11-libs/libdrm/files/libdrm-2.4.28-solaris.patch
similarity index 100%
rename from x11-libs/libdrm/files/libdrm-2.4.23-solaris.patch
rename to x11-libs/libdrm/files/libdrm-2.4.28-solaris.patch
diff --git a/x11-libs/libdrm/libdrm-9999.ebuild b/x11-libs/libdrm/libdrm-9999.ebuild
index ddff76f..2dd7700 100644
--- a/x11-libs/libdrm/libdrm-9999.ebuild
+++ b/x11-libs/libdrm/libdrm-9999.ebuild
@@ -30,7 +30,7 @@ DEPEND="${RDEPEND}
>=x11-libs/libpciaccess-0.10"
PATCHES=(
- "${FILESDIR}"/${PN}-2.4.23-solaris.patch
+ "${FILESDIR}"/${PN}-2.4.28-solaris.patch
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] proj/x11:master commit in: x11-libs/libdrm/files/, x11-libs/libdrm/
@ 2015-02-11 21:58 Matt Turner
0 siblings, 0 replies; 3+ messages in thread
From: Matt Turner @ 2015-02-11 21:58 UTC (permalink / raw
To: gentoo-commits
commit: 3378c88822a31d05d68b4a21d82a0cfadcf657e8
Author: Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Wed Feb 11 21:57:52 2015 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Feb 11 21:57:52 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=3378c888
x11-libs/libdrm: Drop Solaris patch.
Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=539822
---
x11-libs/libdrm/files/libdrm-2.4.58-solaris.patch | 104 ----------------------
x11-libs/libdrm/libdrm-9999.ebuild | 1 -
2 files changed, 105 deletions(-)
diff --git a/x11-libs/libdrm/files/libdrm-2.4.58-solaris.patch b/x11-libs/libdrm/files/libdrm-2.4.58-solaris.patch
deleted file mode 100644
index 9e41100..0000000
--- a/x11-libs/libdrm/files/libdrm-2.4.58-solaris.patch
+++ /dev/null
@@ -1,104 +0,0 @@
---- 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;
- typedef uint64_t __u64;
-+#if defined(__sun)
-+typedef unsigned long long drm_handle_t;
-+#else
- typedef unsigned long drm_handle_t;
-+#endif
-
- #endif
-
-@@ -210,12 +214,22 @@ struct drm_ctx_priv_map {
- * \sa drmAddMap().
- */
- struct drm_map {
-+#ifdef __sun
-+ unsigned long long offset;
-+ /**< Requested physical address (0 for SAREA)*/
-+ unsigned long long handle;
-+ /**< User-space: "Handle" to pass to mmap() */
-+ /**< Kernel-space: kernel-virtual address */
-+#else
- unsigned long offset; /**< Requested physical address (0 for SAREA)*/
-+#endif
- unsigned long size; /**< Requested physical size (bytes) */
- enum drm_map_type type; /**< Type of memory to map */
- enum drm_map_flags flags; /**< Flags */
-+#ifndef __sun
- void *handle; /**< User-space: "Handle" to pass to mmap() */
- /**< Kernel-space: kernel-virtual address */
-+#endif
- int mtrr; /**< MTRR slot used */
- /* Private data */
- };
-@@ -379,6 +393,9 @@ struct drm_buf_map {
- void *virtual; /**< Mmap'd area in user-virtual */
- #endif
- struct drm_buf_pub *list; /**< Buffer information */
-+#ifdef __sun
-+ int fd;
-+#endif
- };
-
- /**
---- a/radeon/radeon_bo_gem.c
-+++ b/radeon/radeon_bo_gem.c
-@@ -38,6 +38,13 @@
- #include <string.h>
- #include <sys/mman.h>
- #include <errno.h>
-+
-+/* On solaris unistd.h and stropts.h are needed for ioctl */
-+#ifdef __sun
-+#include <unistd.h>
-+#include <stropts.h>
-+#endif
-+
- #include "libdrm.h"
- #include "xf86drm.h"
- #include "xf86atomic.h"
- #include "drm.h"
---- a/xf86drm.c
-+++ b/xf86drm.c
-@@ -972,7 +972,11 @@ int drmRmMap(int fd, drm_handle_t handle
- {
- drm_map_t map;
-
-+#ifdef __sun
-+ map.handle = handle;
-+#else
- map.handle = (void *)(uintptr_t)handle;
-+#endif
-
- if(drmIoctl(fd, DRM_IOCTL_RM_MAP, &map))
- return -errno;
-@@ -1210,6 +1214,9 @@ drmBufMapPtr drmMapBufs(int fd)
- bufs.count = 0;
- bufs.list = NULL;
- bufs.virtual = NULL;
-+#ifdef __sun
-+ bufs.fd = fd;
-+#endif
- if (drmIoctl(fd, DRM_IOCTL_MAP_BUFS, &bufs))
- return NULL;
-
---- a/xf86drm.h
-+++ b/xf86drm.h
-@@ -64,6 +64,13 @@
-
- #endif
-
-+#if defined(__sun) && !defined(_IOC)
-+#define _IOC(dir, group, nr, size) \
-+ (dir == DRM_IOC_READWRITE ? _IOWRN(group, nr, size) : \
-+ (dir == DRM_IOC_WRITE ? _IOWN(group, nr, size) : \
-+ /* dir == DRM_IOC_READ */ _IORN(group, nr, size) ))
-+#endif
-+
- /* Defaults, if nothing set in xf86config */
- #define DRM_DEV_UID 0
- #define DRM_DEV_GID 0
diff --git a/x11-libs/libdrm/libdrm-9999.ebuild b/x11-libs/libdrm/libdrm-9999.ebuild
index 98da7c5..8589a76 100644
--- a/x11-libs/libdrm/libdrm-9999.ebuild
+++ b/x11-libs/libdrm/libdrm-9999.ebuild
@@ -30,7 +30,6 @@ RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1:=[${MULTILIB_USEDEP}]
DEPEND="${RDEPEND}"
PATCHES=(
- "${FILESDIR}"/${PN}-2.4.58-solaris.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] proj/x11:master commit in: x11-libs/libdrm/files/, x11-libs/libdrm/
@ 2011-03-29 13:23 Tomas Chvatal
0 siblings, 0 replies; 3+ messages in thread
From: Tomas Chvatal @ 2011-03-29 13:23 UTC (permalink / raw
To: gentoo-commits
commit: e65788e108d33b956d3b76bc944223eaf822efa7
Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 29 13:23:21 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Tue Mar 29 13:23:21 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=e65788e1
[x11-libs/libdrm] sync with main tree
---
x11-libs/libdrm/files/libdrm-2.4.15-solaris.patch | 33 ------------
...6-solaris.patch => libdrm-2.4.23-solaris.patch} | 52 ++++++++++++++------
x11-libs/libdrm/libdrm-9999.ebuild | 3 +-
3 files changed, 37 insertions(+), 51 deletions(-)
diff --git a/x11-libs/libdrm/files/libdrm-2.4.15-solaris.patch b/x11-libs/libdrm/files/libdrm-2.4.15-solaris.patch
deleted file mode 100644
index f344f0c..0000000
--- a/x11-libs/libdrm/files/libdrm-2.4.15-solaris.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=288064
-
---- libdrm/nouveau/nouveau_bo.c
-+++ libdrm/nouveau/nouveau_bo.c
-@@ -31,6 +31,12 @@
- #include <sys/mman.h>
- #include <sys/ioctl.h>
-
-+/* On solaris unistd.h and stropts.h are needed for ioctl */
-+#ifdef __sun
-+#include <unistd.h>
-+#include <stropts.h>
-+#endif
-+
- #include "nouveau_private.h"
-
- int
---- libdrm/radeon/radeon_bo_gem.c
-+++ libdrm/radeon/radeon_bo_gem.c
-@@ -39,6 +39,13 @@
- #include <sys/mman.h>
- #include <sys/ioctl.h>
- #include <errno.h>
-+
-+/* On solaris unistd.h and stropts.h are needed for ioctl */
-+#ifdef __sun
-+#include <unistd.h>
-+#include <stropts.h>
-+#endif
-+
- #include "xf86drm.h"
- #include "drm.h"
- #include "radeon_drm.h"
diff --git a/x11-libs/libdrm/files/libdrm-2.4.16-solaris.patch b/x11-libs/libdrm/files/libdrm-2.4.23-solaris.patch
similarity index 61%
rename from x11-libs/libdrm/files/libdrm-2.4.16-solaris.patch
rename to x11-libs/libdrm/files/libdrm-2.4.23-solaris.patch
index 90f9a3d..5c148a4 100644
--- a/x11-libs/libdrm/files/libdrm-2.4.16-solaris.patch
+++ b/x11-libs/libdrm/files/libdrm-2.4.23-solaris.patch
@@ -1,10 +1,8 @@
-This is a reapply (hopefully in the relevant places) of the original
-patch found here:
-http://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg35327.html
-
---- libdrm-2.4.16/include/drm/drm.h
-+++ libdrm-2.4.16/include/drm/drm.h
-@@ -54,7 +54,11 @@
+Index: libdrm-2.4.23/include/drm/drm.h
+===================================================================
+--- libdrm-2.4.23.orig/include/drm/drm.h
++++ libdrm-2.4.23/include/drm/drm.h
+@@ -54,7 +54,11 @@ typedef int32_t __s32;
typedef uint32_t __u32;
typedef int64_t __s64;
typedef uint64_t __u64;
@@ -16,7 +14,7 @@ http://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg35327.html
#endif
-@@ -210,12 +214,22 @@
+@@ -210,12 +214,22 @@ struct drm_ctx_priv_map {
* \sa drmAddMap().
*/
struct drm_map {
@@ -39,9 +37,9 @@ http://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg35327.html
int mtrr; /**< MTRR slot used */
/* Private data */
};
-@@ -375,6 +389,9 @@
- int count; /**< Length of the buffer list */
+@@ -379,6 +393,9 @@ struct drm_buf_map {
void *virtual; /**< Mmap'd area in user-virtual */
+ #endif
struct drm_buf_pub *list; /**< Buffer information */
+#ifdef __sun
+ int fd;
@@ -49,9 +47,29 @@ http://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg35327.html
};
/**
---- libdrm-2.4.16/xf86drm.c
-+++ libdrm-2.4.16/xf86drm.c
-@@ -967,7 +967,11 @@
+Index: libdrm-2.4.23/radeon/radeon_bo_gem.c
+===================================================================
+--- libdrm-2.4.23.orig/radeon/radeon_bo_gem.c
++++ libdrm-2.4.23/radeon/radeon_bo_gem.c
+@@ -38,6 +38,13 @@
+ #include <string.h>
+ #include <sys/mman.h>
+ #include <errno.h>
++
++/* On solaris unistd.h and stropts.h are needed for ioctl */
++#ifdef __sun
++#include <unistd.h>
++#include <stropts.h>
++#endif
++
+ #include "xf86drm.h"
+ #include "xf86atomic.h"
+ #include "drm.h"
+Index: libdrm-2.4.23/xf86drm.c
+===================================================================
+--- libdrm-2.4.23.orig/xf86drm.c
++++ libdrm-2.4.23/xf86drm.c
+@@ -972,7 +972,11 @@ int drmRmMap(int fd, drm_handle_t handle
{
drm_map_t map;
@@ -63,7 +81,7 @@ http://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg35327.html
if(drmIoctl(fd, DRM_IOCTL_RM_MAP, &map))
return -errno;
-@@ -1205,6 +1209,9 @@
+@@ -1210,6 +1214,9 @@ drmBufMapPtr drmMapBufs(int fd)
bufs.count = 0;
bufs.list = NULL;
bufs.virtual = NULL;
@@ -73,8 +91,10 @@ http://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg35327.html
if (drmIoctl(fd, DRM_IOCTL_MAP_BUFS, &bufs))
return NULL;
---- libdrm-2.4.16/xf86drm.h
-+++ libdrm-2.4.16/xf86drm.h
+Index: libdrm-2.4.23/xf86drm.h
+===================================================================
+--- libdrm-2.4.23.orig/xf86drm.h
++++ libdrm-2.4.23/xf86drm.h
@@ -64,6 +64,13 @@
#endif
diff --git a/x11-libs/libdrm/libdrm-9999.ebuild b/x11-libs/libdrm/libdrm-9999.ebuild
index 30c7d54..d4af1f5 100644
--- a/x11-libs/libdrm/libdrm-9999.ebuild
+++ b/x11-libs/libdrm/libdrm-9999.ebuild
@@ -28,8 +28,7 @@ RDEPEND="dev-libs/libpthread-stubs"
DEPEND="${RDEPEND}"
PATCHES=(
- "${FILESDIR}"/${PN}-2.4.16-solaris.patch
- "${FILESDIR}"/${PN}-2.4.15-solaris.patch
+ "${FILESDIR}"/${PN}-2.4.23-solaris.patch
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-02-11 21:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-02 12:51 [gentoo-commits] proj/x11:master commit in: x11-libs/libdrm/files/, x11-libs/libdrm/ Chi-Thanh Christopher Nguyen
-- strict thread matches above, loose matches on Subject: below --
2015-02-11 21:58 Matt Turner
2011-03-29 13:23 Tomas Chvatal
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox