Merge updates from master

This commit is contained in:
Repository QA checks
2015-08-31 17:47:53 -04:00
17 changed files with 2 additions and 725 deletions
-2
View File
@@ -16,9 +16,7 @@
<flag name='resize-optimization'>Increase performance, allocate more RAM. Recommended to disable on Raspberry Pi</flag>
<flag name='rpi'>Raspberry Pi GPU support</flag>
<flag name='screen-sharing'>Enable screen-sharing through RDP</flag>
<flag name='tablet'>Enable interface for tablets</flag>
<flag name='unwind'>Enable libunwind usage for backtraces</flag>
<flag name='view'>Install wayland-view example application</flag>
<flag name='wayland-compositor'>Enable Wayland compositor support</flag>
<flag name='xwayland'>Enable ability support native X11 applications</flag>
</use>
+1 -1
View File
@@ -1,4 +1,4 @@
DIST jenkins-bin-1.609.1.war 68908995 SHA256 7e150cc9dd3d9089d82fecbf5b1d0ffa5cc33782637338c418c324715e329bd5 SHA512 909496a0b3757c8187cf9bad6374ea4faf57979eafcd91d9793d57bcc3bfc7e821755fbc321a104b14acc2ddbd319c30e40cc52fb0456eeea4ad2f23d9d6ae1c WHIRLPOOL 951f2307d439c22b202082614b16df201b61ca0478eb2666aaba9a1140a6323eee3193dc38586c222424ea1d63431e8aee228523714837a5889f1703620ca932
DIST jenkins-bin-1.609.2.war 68976099 SHA256 60e775b1d5df417370a1768496fa3ccc9d17f9a093bf87f543765f9d4e401578 SHA512 f8d58fc5d8bb094932823ec40e53ef71412c44de2a82478fbc53c9f87e724597ab5afcba79fb776e69a42dd66529f0c31e875fafc305d411533dfb33afeb1948 WHIRLPOOL 107f47e16f91d98119564545d4b6c078d343690da558c7080471d4f0e3633b954257c290cc85200500165e2f145e7742509a27aa82cf2c9ea279ef27af3461d6
DIST jenkins-bin-1.622.war 62881823 SHA256 e219546e9db0bdf913ceee04ab3f79fcbbb27ac7ca27619d184b82f93457b899 SHA512 7ff6be395527dc3f512ad8fb1c1d8a5294aac9108ead851e7a8479cac58ab9b2ee28e0c0f87a70896be62096e92cdb8843d529d62ac73ce22a23f259a7106368 WHIRLPOOL b29ed678c8da5a1004a54b3cd3e7e93c4d9a7bcf834670d01d7a347ec7f102f4ebe0894753bd98a6dc6badd8a69c909b05826c68d928bafa59387b8c4017670b
DIST jenkins-bin-1.626.war 62885591 SHA256 e6df4d44f1110d1095b4e05c0d574f1120ac4f7bf943fba99c22edff0127c110 SHA512 7ca6c358d520f84380db74606e433db33bf2dad777e4386ca31bb22ae327aec209308d74214a391d9b1466ab01fca4eae1c93243212deefa4a5ca1d6dc3d718d WHIRLPOOL 6b5dfb86e2f62c97d695ec517457fa0d89a31e6f272cf25cf134efdb4654791707973a8944c7f0b52aaa649eaf5b9b098bdb5b0d50637919db23842fe93f9fca
DIST jenkins-bin-1.627.war 63251728 SHA256 9fc74aea24d806fb8810e2573793cc280bdcef8c3ac6f0e76dc242290d7773ad SHA512 bf588377ae8910b5cc9db42bc177aaf4d714c9433b851cb8daef3e592844dd8f17ecfbc9f9e6e989d9033feacaaaf05ead3537bf61163335e25001499acfe6d1 WHIRLPOOL 156c9c713a24c373bd5857e68a275a5bb671844181fb62b389a2a0e787a7bd3a1489f3b4b0328bfb6c2b3c040a35068beed389c964c60dcec0ed958de54858bf
+1 -1
View File
@@ -22,7 +22,7 @@ if [[ ${PV} = 9999* ]]; then
KEYWORDS=""
SRC_URI=""
else
KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
SRC_URI="https://github.com/anholt/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
fi
-9
View File
@@ -1,11 +1,2 @@
DIST libdrm-2.4.20.tar.bz2 400812 SHA256 24b5316839c1d459066eaee160132d45931462e301740a660932907350415cb9 SHA512 fa7a042a80b71057b7d15a36c7902e1882abb23dea77cabfa2e78590d9477d8e0259364f0e2eb6005b316254be2c728e295c114b1fe365074438539bc3dd9392 WHIRLPOOL 92a9fba9f64d0c988e8e6bcbdd1798583a420bc1287b4e85c1ca9a84c5fd3c95e5079dc111eee89811038832a5a90139780292d43554257465c99726b7f27661
DIST libdrm-2.4.33.tar.bz2 446817 SHA256 2d7b9d94ada0e3a6ede6243509883df2ded01c2983e24322759a366283898fea SHA512 ac355bab87c87b8540218401f89ad16ece0e6fdd28d937e41e8a4765d7f9792798f7e74d27f3b57c49d1d8dd3909d6668e10b0139b1c35bbab5ab9002ff64c1e WHIRLPOOL 5ebeb22ef22f8fceba628768725bbfe54316f7dcf41ea2b454ba5a504aae65bb3e918269fffadd8a13975e79eeecf50274f2ffa24d6ef42a13e7e3874a5b9bf4
DIST libdrm-2.4.46.tar.bz2 554190 SHA256 33cf320dad4e8060768714792e12643ddf6756a719d262ba7d60b39c2b2650f1 SHA512 9e1699e28b034b5dd7acccd76b9f4e83ff10bb2b62107282f1e02046c1d6e8f0b5abbab318f23967dc23d4d5afdeb3e78793384801da5cfeaba7567f837242c6 WHIRLPOOL 7c9bd1074cf1cab9cd8d5814d9b55d26cb0d6e9b4f0a959324ad0d6d20c185155ae1480b3be82603b83ca94b446518dca7994d21e5ee56cca76bcbfd39183539
DIST libdrm-2.4.52.tar.bz2 551473 SHA256 fa693c2f1f61befcefbdcc396673e38481110bac9db610afa4b8afb2be0218c1 SHA512 1cbd8898504d2a093f010216070507f41134a3f3cc4b94998feec33da651ec493b92fbf0beb65fe1734528e75ac6e94bc982de6b5ee277435622f974b1badcc5 WHIRLPOOL 8f3c10180e1f524aa3a295ebc1fc977a5e13af834b78c19887ed5ddb8785302632ef8723bf4f1320cafebc5420e13610be64e8ff462451068e4032978f0ea9d6
DIST libdrm-2.4.53.tar.bz2 579171 SHA256 1b0c28fd2f2b92d2df0a73d1aed88f43cb0dee1267aea6bc52ccb5fca5757a08 SHA512 5c4c16cbabf9b8f882503e645d1be11dbafa4d75b7e0536f824ca43f4a2a8f62a11c32b900c408862eade493f9eb56d92d323e1cc1945e2bacf05360ca2d4de3 WHIRLPOOL 6c3764c1347a6e3a455e847f6e3ecfa7b7b209e86039460071d40c2efb88f272ac62bfc64ebe98954bee6561fe9795bb6aaa2a3ca5d6efe01fb8a34fc56b58bb
DIST libdrm-2.4.54.tar.bz2 644930 SHA256 d94001ebfbe80e1523d1228ee2df57294698d1c734fad9ccf53efde8932fe4e9 SHA512 61b38df8ed2a4522a28605eb63a6e5c4dca89c7b24c7863f1046da3d34dca823856210abe3ef7eb7e5804bbc34712dc6203e60134a9398da3ba01b8bd7fe9dc5 WHIRLPOOL 1394c24c030f034a4fea7afa5cc3c2eac2641c1bbaa3611ee56efaae7fdfff5c562c58ca076fb7963a79a95cc3aee446e862d1a358e4465229dc8a036793131d
DIST libdrm-2.4.56.tar.bz2 590856 SHA256 e20fbbe092177a8422913d8884a1255477456ab5b10b07389fa891a4dce54030 SHA512 5ad28ddcfad666c207a7d7c6139140182bd96c0f2c6befafbb03a9f50aa40119366cc8750025626c7c2570416a6e9476ab5102b4075562b52cdca577ded5d64c WHIRLPOOL 5995bb10400bdfaba3db2aee929df63d5be773e30511c58c10bda7360598edba14a0cad45d9f3d783d8a37232d1ab7e07544eb982fc1bfb0172440a12136db19
DIST libdrm-2.4.58.tar.bz2 573202 SHA256 b155fae6b9c9a3b02ef8b77f58c7c219194c996a4018dc55ba66c03996a365dd SHA512 26776b3f93fe173f4e0f94668813ec1a756d9f15385d1cad70c7af8d4d5d503aef00e14081c76f6fcac6e0c606e106e47ddf76038f8601b71fc380306536f937 WHIRLPOOL 36d8915b3189fd0722f96698ce5e7a94188859c7372631c4126b0e09e8fa6dbd4e34de5e9d62e053c36e9f431d84d68d327be307d69caf92e1016893e77cf190
DIST libdrm-2.4.59.tar.bz2 592722 SHA256 68d26e1fd85582f4243d66864f9b43ca4ee93662825de32b5506fc8e181ea41b SHA512 b9f61cfd47cf4a02c10e7fe79b0e9c5701383c76425cf4985a9b91d909f905334ca1ace7334aa0a4ab400694ad84a1a3bc1c3f29842d808026702b35fa9f87c3 WHIRLPOOL 6b0e1be70164db86152503e4b72373736f0462ff97ffac2c79a6c1fce83d658e6030d5435be5a61c1f6ca50728db4c7e3a5d8f5e48073fc74169696ff1b7c5be
DIST libdrm-2.4.62.tar.bz2 637472 SHA256 906c294bdbe1c94c3ca084305d61a6e5a8367f3b4986e6cc13b1e9b3f75931dc SHA512 f7e2ef79c80dd0c3a837970052b7e66110e9b99d3e87b3cd278646bb4cb39832a9562144016a7e956a85212d9251b191279f5ba25d7e8bc0bfbfc1a311df3873 WHIRLPOOL e9ca493f01598bcb7e5664c531e48e74570a7ee0c754794ed2247314123821509448d62290b594073389ff545a019e24305d365ba7435f933665cc57d85385dc
DIST libdrm-2.4.64.tar.bz2 640440 SHA256 b60786fe7d6e42adb3966ce1a658f63fec528d537396381cbda93bcc99a934b6 SHA512 f4fae23b981c761622b6170ae1f5bc805fc9fe2c5f3531dd45b3e3fcb65c4c4f08d39744c30e2d7f9c14ce6f13dac4a655c0b0ca9785965c59917a4e594e507b WHIRLPOOL 49a96a5d2795f2a9c9fca5cc5808cbfa5e06717d7f4b8221cee55288e16cee503a109321aea04680900fb0bc80e56482a6c8cd15e887eee3d327f0af52706fac
@@ -1,21 +0,0 @@
diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h
index dfc390e..49b3b54 100644
--- a/include/drm/drm_mode.h
+++ b/include/drm/drm_mode.h
@@ -308,11 +308,11 @@ struct drm_mode_crtc_lut {
#define DRM_MODE_PAGE_FLIP_FLAGS DRM_MODE_PAGE_FLIP_EVENT
struct drm_mode_crtc_page_flip {
- uint32_t crtc_id;
- uint32_t fb_id;
- uint32_t flags;
- uint32_t reserved;
- uint64_t user_data;
+ __u32 crtc_id;
+ __u32 fb_id;
+ __u32 flags;
+ __u32 reserved;
+ __u64 user_data;
};
#endif
@@ -1,111 +0,0 @@
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;
+#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
};
/**
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;
+#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;
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
+#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
-48
View File
@@ -1,48 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=3
inherit xorg-2
EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm"
DESCRIPTION="X.Org libdrm library"
HOMEPAGE="http://dri.freedesktop.org/"
if [[ ${PV} = 9999* ]]; then
SRC_URI=""
else
SRC_URI="http://dri.freedesktop.org/${PN}/${P}.tar.bz2"
fi
KEYWORDS="~x86-fbsd"
IUSE="kernel_linux"
RESTRICT="test" # see bug #236845
RDEPEND="dev-libs/libpthread-stubs"
DEPEND="${RDEPEND}"
PATCHES=(
# Fixes buidling of x11-drivers/xf86-video-openchrome, Gentoo bug 298352,
# upstream bug 26994
"${FILESDIR}"/2.4.18-0001-datatypes.patch
)
pkg_setup() {
# libdrm_intel fails to build on some arches if dev-libs/libatomic_ops is
# installed, bugs 297630, bug 316421 and bug 316541, and is presently only
# useful on amd64 and x86.
CONFIGURE_OPTIONS="--enable-udev
--enable-nouveau-experimental-api
--enable-vmwgfx-experimental-api
$(use_enable kernel_linux libkms)
$(! use amd64 && ! use x86 && ! use x86-fbsd && echo "--disable-intel")"
}
pkg_postinst() {
x-modular_pkg_postinst
ewarn "libdrm's ABI may have changed without change in library name"
ewarn "Please rebuild media-libs/mesa, x11-base/xorg-server and"
ewarn "your video drivers in x11-drivers/*."
}
-55
View File
@@ -1,55 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=4
inherit xorg-2
EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm"
DESCRIPTION="X.Org libdrm library"
HOMEPAGE="http://dri.freedesktop.org/"
if [[ ${PV} = 9999* ]]; then
SRC_URI=""
else
SRC_URI="http://dri.freedesktop.org/${PN}/${P}.tar.bz2"
fi
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
VIDEO_CARDS="intel nouveau omap radeon vmware"
for card in ${VIDEO_CARDS}; do
IUSE_VIDEO_CARDS+=" video_cards_${card}"
done
IUSE="${IUSE_VIDEO_CARDS} libkms"
RESTRICT="test" # see bug #236845
RDEPEND="dev-libs/libpthread-stubs
video_cards_intel? ( >=x11-libs/libpciaccess-0.10 )"
DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}"/${PN}-2.4.28-solaris.patch
)
pkg_setup() {
XORG_CONFIGURE_OPTIONS=(
--enable-udev
$(use_enable video_cards_intel intel)
$(use_enable video_cards_nouveau nouveau-experimental-api)
$(use_enable video_cards_omap omap-experimental-api)
$(use_enable video_cards_radeon radeon)
$(use_enable video_cards_vmware vmwgfx-experimental-api)
$(use_enable libkms)
)
xorg-2_pkg_setup
}
src_prepare() {
if [[ ${PV} = 9999* ]]; then
# tests are restricted, no point in building them
sed -ie 's/tests //' "${S}"/Makefile.am
fi
xorg-2_src_prepare
}
-57
View File
@@ -1,57 +0,0 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
inherit xorg-2
EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm"
DESCRIPTION="X.Org libdrm library"
HOMEPAGE="http://dri.freedesktop.org/"
if [[ ${PV} = 9999* ]]; then
SRC_URI=""
else
SRC_URI="http://dri.freedesktop.org/${PN}/${P}.tar.bz2"
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"
for card in ${VIDEO_CARDS}; do
IUSE_VIDEO_CARDS+=" video_cards_${card}"
done
IUSE="${IUSE_VIDEO_CARDS} libkms"
REQUIRED_USE="video_cards_exynos? ( libkms )"
RESTRICT="test" # see bug #236845
RDEPEND="dev-libs/libpthread-stubs
video_cards_intel? ( >=x11-libs/libpciaccess-0.10 )"
DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}"/${PN}-2.4.28-solaris.patch
)
src_prepare() {
if [[ ${PV} = 9999* ]]; then
# tests are restricted, no point in building them
sed -ie 's/tests //' "${S}"/Makefile.am
fi
xorg-2_src_prepare
}
src_configure() {
XORG_CONFIGURE_OPTIONS=(
--enable-udev
$(use_enable video_cards_exynos exynos-experimental-api)
$(use_enable video_cards_freedreno freedreno-experimental-api)
$(use_enable video_cards_intel intel)
$(use_enable video_cards_nouveau nouveau)
$(use_enable video_cards_omap omap-experimental-api)
$(use_enable video_cards_radeon radeon)
$(use_enable video_cards_vmware vmwgfx)
$(use_enable libkms)
)
xorg-2_src_configure
}
-60
View File
@@ -1,60 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
XORG_MULTILIB=yes
inherit xorg-2
EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm"
DESCRIPTION="X.Org libdrm library"
HOMEPAGE="http://dri.freedesktop.org/"
if [[ ${PV} = 9999* ]]; then
SRC_URI=""
else
SRC_URI="http://dri.freedesktop.org/${PN}/${P}.tar.bz2"
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"
for card in ${VIDEO_CARDS}; do
IUSE_VIDEO_CARDS+=" video_cards_${card}"
done
IUSE="${IUSE_VIDEO_CARDS} libkms"
REQUIRED_USE="video_cards_exynos? ( libkms )"
RESTRICT="test" # see bug #236845
RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1[${MULTILIB_USEDEP}]
video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}] )
abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}"/${PN}-2.4.28-solaris.patch
)
src_prepare() {
if [[ ${PV} = 9999* ]]; then
# tests are restricted, no point in building them
sed -ie 's/tests //' "${S}"/Makefile.am
fi
xorg-2_src_prepare
}
src_configure() {
XORG_CONFIGURE_OPTIONS=(
--enable-udev
$(use_enable video_cards_exynos exynos-experimental-api)
$(use_enable video_cards_freedreno freedreno-experimental-api)
$(use_enable video_cards_intel intel)
$(use_enable video_cards_nouveau nouveau)
$(use_enable video_cards_omap omap-experimental-api)
$(use_enable video_cards_radeon radeon)
$(use_enable video_cards_vmware vmwgfx)
$(use_enable libkms)
)
xorg-2_src_configure
}
-60
View File
@@ -1,60 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
XORG_MULTILIB=yes
inherit xorg-2
EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm"
DESCRIPTION="X.Org libdrm library"
HOMEPAGE="http://dri.freedesktop.org/"
if [[ ${PV} = 9999* ]]; then
SRC_URI=""
else
SRC_URI="http://dri.freedesktop.org/${PN}/${P}.tar.bz2"
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"
for card in ${VIDEO_CARDS}; do
IUSE_VIDEO_CARDS+=" video_cards_${card}"
done
IUSE="${IUSE_VIDEO_CARDS} libkms"
REQUIRED_USE="video_cards_exynos? ( libkms )"
RESTRICT="test" # see bug #236845
RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1[${MULTILIB_USEDEP}]
video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}] )
abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}"/${PN}-2.4.28-solaris.patch
)
src_prepare() {
if [[ ${PV} = 9999* ]]; then
# tests are restricted, no point in building them
sed -ie 's/tests //' "${S}"/Makefile.am
fi
xorg-2_src_prepare
}
src_configure() {
XORG_CONFIGURE_OPTIONS=(
--enable-udev
$(use_enable video_cards_exynos exynos-experimental-api)
$(use_enable video_cards_freedreno freedreno-experimental-api)
$(use_enable video_cards_intel intel)
$(use_enable video_cards_nouveau nouveau)
$(use_enable video_cards_omap omap-experimental-api)
$(use_enable video_cards_radeon radeon)
$(use_enable video_cards_vmware vmwgfx)
$(use_enable libkms)
)
xorg-2_src_configure
}
-60
View File
@@ -1,60 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
XORG_MULTILIB=yes
inherit xorg-2
EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm"
DESCRIPTION="X.Org libdrm library"
HOMEPAGE="http://dri.freedesktop.org/"
if [[ ${PV} = 9999* ]]; then
SRC_URI=""
else
SRC_URI="http://dri.freedesktop.org/${PN}/${P}.tar.bz2"
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"
for card in ${VIDEO_CARDS}; do
IUSE_VIDEO_CARDS+=" video_cards_${card}"
done
IUSE="${IUSE_VIDEO_CARDS} libkms"
REQUIRED_USE="video_cards_exynos? ( libkms )"
RESTRICT="test" # see bug #236845
RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1[${MULTILIB_USEDEP}]
video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}] )
abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}"/${PN}-2.4.28-solaris.patch
)
src_prepare() {
if [[ ${PV} = 9999* ]]; then
# tests are restricted, no point in building them
sed -ie 's/tests //' "${S}"/Makefile.am
fi
xorg-2_src_prepare
}
src_configure() {
XORG_CONFIGURE_OPTIONS=(
--enable-udev
$(use_enable video_cards_exynos exynos-experimental-api)
$(use_enable video_cards_freedreno freedreno-experimental-api)
$(use_enable video_cards_intel intel)
$(use_enable video_cards_nouveau nouveau)
$(use_enable video_cards_omap omap-experimental-api)
$(use_enable video_cards_radeon radeon)
$(use_enable video_cards_vmware vmwgfx)
$(use_enable libkms)
)
xorg-2_src_configure
}
-57
View File
@@ -1,57 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
XORG_MULTILIB=yes
inherit xorg-2
DESCRIPTION="X.Org libdrm library"
HOMEPAGE="http://dri.freedesktop.org/"
if [[ ${PV} = 9999* ]]; then
EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm"
else
SRC_URI="http://dri.freedesktop.org/${PN}/${P}.tar.bz2"
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"
for card in ${VIDEO_CARDS}; do
IUSE_VIDEO_CARDS+=" video_cards_${card}"
done
IUSE="${IUSE_VIDEO_CARDS} libkms"
RESTRICT="test" # see bug #236845
RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1:=[${MULTILIB_USEDEP}]
video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )
abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}"/${PN}-2.4.28-solaris.patch
)
src_prepare() {
if [[ ${PV} = 9999* ]]; then
# tests are restricted, no point in building them
sed -ie 's/tests //' "${S}"/Makefile.am
fi
xorg-2_src_prepare
}
src_configure() {
XORG_CONFIGURE_OPTIONS=(
--enable-udev
$(use_enable video_cards_exynos exynos-experimental-api)
$(use_enable video_cards_freedreno freedreno-experimental-api)
$(use_enable video_cards_intel intel)
$(use_enable video_cards_nouveau nouveau)
$(use_enable video_cards_omap omap-experimental-api)
$(use_enable video_cards_radeon radeon)
$(use_enable video_cards_vmware vmwgfx)
$(use_enable libkms)
)
xorg-2_src_configure
}
-57
View File
@@ -1,57 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
XORG_MULTILIB=yes
inherit xorg-2
DESCRIPTION="X.Org libdrm library"
HOMEPAGE="http://dri.freedesktop.org/"
if [[ ${PV} = 9999* ]]; then
EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm"
else
SRC_URI="http://dri.freedesktop.org/${PN}/${P}.tar.bz2"
fi
KEYWORDS="alpha amd64 arm ~arm64 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"
for card in ${VIDEO_CARDS}; do
IUSE_VIDEO_CARDS+=" video_cards_${card}"
done
IUSE="${IUSE_VIDEO_CARDS} libkms"
RESTRICT="test" # see bug #236845
RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1:=[${MULTILIB_USEDEP}]
video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )
abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}"/${PN}-2.4.58-solaris.patch
)
src_prepare() {
if [[ ${PV} = 9999* ]]; then
# tests are restricted, no point in building them
sed -ie 's/tests //' "${S}"/Makefile.am
fi
xorg-2_src_prepare
}
src_configure() {
XORG_CONFIGURE_OPTIONS=(
--enable-udev
$(use_enable video_cards_exynos exynos-experimental-api)
$(use_enable video_cards_freedreno freedreno-experimental-api)
$(use_enable video_cards_intel intel)
$(use_enable video_cards_nouveau nouveau)
$(use_enable video_cards_omap omap-experimental-api)
$(use_enable video_cards_radeon radeon)
$(use_enable video_cards_vmware vmwgfx)
$(use_enable libkms)
)
xorg-2_src_configure
}
-66
View File
@@ -1,66 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
XORG_MULTILIB=yes
inherit xorg-2
DESCRIPTION="X.Org libdrm library"
HOMEPAGE="http://dri.freedesktop.org/"
if [[ ${PV} = 9999* ]]; then
EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm"
else
SRC_URI="http://dri.freedesktop.org/${PN}/${P}.tar.bz2"
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 tegra vmware"
for card in ${VIDEO_CARDS}; do
IUSE_VIDEO_CARDS+=" video_cards_${card}"
done
IUSE="${IUSE_VIDEO_CARDS} libkms valgrind"
RESTRICT="test" # see bug #236845
RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1:=[${MULTILIB_USEDEP}]
video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )
abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
DEPEND="${RDEPEND}
valgrind? ( dev-util/valgrind )"
PATCHES=(
"${FILESDIR}"/${PN}-2.4.58-solaris.patch
)
src_prepare() {
if [[ ${PV} = 9999* ]]; then
# tests are restricted, no point in building them
sed -ie 's/tests //' "${S}"/Makefile.am
fi
xorg-2_src_prepare
# There is no configure flag for this.
sed -i -r \
-e "/have_valgrind=/s:=(yes|no):=$(usex valgrind):" \
configure || die
}
src_configure() {
XORG_CONFIGURE_OPTIONS=(
# Udev is only used by tests now.
--disable-udev
--disable-cairo-tests
$(use_enable video_cards_exynos exynos-experimental-api)
$(use_enable video_cards_freedreno freedreno)
$(use_enable video_cards_intel intel)
$(use_enable video_cards_nouveau nouveau)
$(use_enable video_cards_omap omap-experimental-api)
$(use_enable video_cards_radeon radeon)
$(use_enable video_cards_tegra tegra-experimental-api)
$(use_enable video_cards_vmware vmwgfx)
$(use_enable libkms)
)
xorg-2_src_configure
}
-60
View File
@@ -1,60 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
XORG_MULTILIB=yes
inherit xorg-2
DESCRIPTION="X.Org libdrm library"
HOMEPAGE="http://dri.freedesktop.org/"
if [[ ${PV} = 9999* ]]; then
EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm"
else
SRC_URI="http://dri.freedesktop.org/${PN}/${P}.tar.bz2"
fi
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux"
VIDEO_CARDS="exynos freedreno intel nouveau omap radeon tegra vmware"
for card in ${VIDEO_CARDS}; do
IUSE_VIDEO_CARDS+=" video_cards_${card}"
done
IUSE="${IUSE_VIDEO_CARDS} libkms valgrind"
RESTRICT="test" # see bug #236845
RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1:=[${MULTILIB_USEDEP}]
video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )
abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
DEPEND="${RDEPEND}
valgrind? ( dev-util/valgrind )"
src_prepare() {
if [[ ${PV} = 9999* ]]; then
# tests are restricted, no point in building them
sed -ie 's/tests //' "${S}"/Makefile.am
fi
xorg-2_src_prepare
}
src_configure() {
XORG_CONFIGURE_OPTIONS=(
# Udev is only used by tests now.
--disable-udev
--disable-cairo-tests
$(use_enable video_cards_exynos exynos-experimental-api)
$(use_enable video_cards_freedreno freedreno)
$(use_enable video_cards_intel intel)
$(use_enable video_cards_nouveau nouveau)
$(use_enable video_cards_omap omap-experimental-api)
$(use_enable video_cards_radeon radeon)
$(use_enable video_cards_tegra tegra-experimental-api)
$(use_enable video_cards_vmware vmwgfx)
$(use_enable libkms)
# valgrind installs its .pc file to the pkgconfig for the primary arch
--enable-valgrind=$(usex valgrind auto no)
)
xorg-2_src_configure
}