Skip to content
Browse files

Merge branch 'master' of github.com:nightmorph/overnight

  • Loading branch information...
2 parents 83a5d59 + e1ccd24 commit 836a73897610d722e6251329d9d4fca2b4a11581 @nightmorph committed
View
6 x11-libs/libdrm/Manifest
@@ -1,3 +1,3 @@
-AUX libdrm-2.4.23-solaris.patch 3191 RMD160 562eb2f40642112ba419838494173f64969e49f1 SHA1 6d07a6cda05942c593c9d60e2c56b982d565f356 SHA256 1ddfb794d0edf64727af0a423250769b0be3132d55d53374b8ef68e2419478e6
-EBUILD libdrm-9999.ebuild 1259 RMD160 67af9db66c797cea50f7679fbd449a038f53f96b SHA1 c6a751c48814af4a9a37dbfcc75ec5fafefb1ed5 SHA256 961fe933bbaa49c0dfc205b0400847ff8160f1589f4a3e19945b40b238497fd5
-MISC metadata.xml 366 RMD160 bee19e8209a424a460390c41f76fa85c3a435aa1 SHA1 9a15cf1334f1373d75f8563a4085f11a6de2c348 SHA256 1acef6171a181f51b3ef4450fe4af562e1a9aec424ed02b2ff628631339a256a
+AUX libdrm-2.4.28-solaris.patch 3202 RMD160 309af61f8356acd5ea4c0f3a80e2a80fe248cbf6 SHA1 edeb3b2a257f793770fe4655cb822c0b7b296c12 SHA256 04440ea802761e27c6f3a39a8bbfba71d707c3b3380885540be2e0f56ef58334
+EBUILD libdrm-9999.ebuild 1388 RMD160 cf47c413eef6dd4000696a109ad91d4a26f2b0e5 SHA1 d78d55e719fc0abbc24568058d8bddfd742f294f SHA256 476c81d6c5973738b119d0e16c9f314ff81554c9a5a18361076f1a978948c1d3
+MISC metadata.xml 276 RMD160 89c169c10718592f85d82f7d5cce2e5fb9b6bbc6 SHA1 fbeeebbe679d7a65bd3213fc3d8009cb6c883d1e SHA256 b5d49e87c47d7ffcc28f95b39a0e105b4b5ab4ad5eab72a6ed8989936e0223b4
View
2 .../libdrm/files/libdrm-2.4.23-solaris.patch → .../libdrm/files/libdrm-2.4.28-solaris.patch
@@ -76,7 +76,7 @@ Index: libdrm-2.4.23/xf86drm.c
+#ifdef __sun
+ map.handle = handle;
+#else
- map.handle = (void *)handle;
+ map.handle = (void *)(uintptr_t)handle;
+#endif
if(drmIoctl(fd, DRM_IOCTL_RM_MAP, &map))
View
11 x11-libs/libdrm/libdrm-9999.ebuild
@@ -21,7 +21,7 @@ for card in ${VIDEO_CARDS}; do
IUSE_VIDEO_CARDS+=" video_cards_${card}"
done
-IUSE="${IUSE_VIDEO_CARDS} +libkms"
+IUSE="${IUSE_VIDEO_CARDS} libkms"
RESTRICT="test" # see bug #236845
RDEPEND="dev-libs/libpthread-stubs
@@ -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() {
@@ -45,3 +45,10 @@ pkg_setup() {
xorg-2_pkg_setup
}
+
+src_prepare() {
+ # tests are restricted, no point in building them
+ sed -ie 's/tests //' ${S}/Makefile.am
+
+ xorg-2_src_prepare
+}
View
8 x11-libs/libdrm/metadata.xml
@@ -1,12 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
- <email>nightmorph@gentoo.org</email>
- <name>Joshua Saddler</name>
-</maintainer>
-<herd>x11</herd>
+<herd>no-herd</herd>
<use>
-<flag name="libkms">Enable building of libkms, a library for applications to interface with KMS</flag>
+<flag name='libkms'>Enable building of libkms, a library for applications to interface with KMS</flag>
</use>
</pkgmetadata>

0 comments on commit 836a738

Please sign in to comment.
Something went wrong with that request. Please try again.