Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

pull latest from x11 overlay

  • Loading branch information...
commit 970a03ff2551f24c025cfe25bd907d65ca1ef05c 1 parent b6ec560
@nightmorph authored
View
4 media-libs/mesa/Manifest
@@ -1,3 +1,3 @@
AUX eselect-mesa.conf.7.12 1670 RMD160 4714db2bb66a2fff04d33c05e8051f0c63892371 SHA1 d101931591ec5aefbf3d2ec48f1331709686a4f4 SHA256 3b760d19524870b067b3717f403c748a705fc71cdf5373a049d857ca1b3139fb
-EBUILD mesa-9999.ebuild 11492 RMD160 97de4c1d9f8c0c167c07e30509fc26584a9ba3b7 SHA1 aab5a765c164f2447875fb6189b0de4924bfc83e SHA256 9880952fc0e501bb6c790f6baa0cb52d8068fb72fa600078234ff4514b2310ac
-MISC metadata.xml 499 RMD160 8b1c3af1b29d33174630662f5219fe41300b1922 SHA1 dc8503cbf26f9da673d8a820677063755d48e44c SHA256 bc664b69f9db31b2ed1598c94d05b7e53b6f0ae5927b0e01d581eee43a90a626
+EBUILD mesa-9999.ebuild 10357 RMD160 1e5ea0e9d5207b889efda2f03a7cd8c0f125d4cf SHA1 be5b82e675d9147a90c8db9b77fbfaa88c65ba93 SHA256 592de0cc4691e02f1917a82fba2624dbadcb942badc2f2e09e946ba9884f6534
+MISC metadata.xml 1386 RMD160 9e49a30ee10fab13e5bf1f1923d0a82226f747b5 SHA1 9ff3dc467a828827d0cf839e25ab820bdedc95e3 SHA256 897c76a90cf21398b2e2c9c4696eb2eb3d25b9401c0cd6b94961127c7a6890c3
View
96 media-libs/mesa/mesa-9999.ebuild
@@ -33,19 +33,22 @@ else
${SRC_PATCHES}"
fi
-LICENSE="LGPL-2 kilgard"
+# Most of the code is MIT/X11.
+# ralloc is LGPL-3
+# GLES[2]/gl[2]{,ext,platform}.h are SGI-B-2.0
+LICENSE="MIT LGPL-3 SGI-B-2.0"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-INTEL_CARDS="i810 i915 i965 intel"
+INTEL_CARDS="i915 i965 intel"
RADEON_CARDS="r100 r200 r300 r600 radeon"
-VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} mach64 mga nouveau r128 savage sis vmware tdfx via"
+VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} nouveau vmware"
for card in ${VIDEO_CARDS}; do
IUSE_VIDEO_CARDS+=" video_cards_${card}"
done
IUSE="${IUSE_VIDEO_CARDS}
- bindist +classic d3d debug +egl g3dvl +gallium gbm gles +llvm +nptl openvg pax_kernel pic selinux shared-dricore +shared-glapi vdpau wayland xvmc kernel_FreeBSD"
+ bindist +classic d3d debug +egl g3dvl +gallium gbm gles1 gles2 +llvm +nptl openvg osmesa pax_kernel pic selinux shared-dricore +shared-glapi vdpau wayland xvmc kernel_FreeBSD"
REQUIRED_USE="
d3d? ( gallium )
@@ -60,18 +63,10 @@ REQUIRED_USE="
g3dvl? ( || ( vdpau xvmc ) )
vdpau? ( g3dvl )
xvmc? ( g3dvl )
- video_cards_i810? ( classic )
video_cards_i915? ( classic )
- video_cards_mach64? ( classic )
- video_cards_mga? ( classic )
video_cards_r100? ( classic )
- video_cards_r128? ( classic )
video_cards_r200? ( classic )
- video_cards_savage? ( classic )
- video_cards_sis? ( classic )
video_cards_vmware? ( gallium )
- video_cards_tdfx? ( classic )
- video_cards_via? ( classic )
"
LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.24"
@@ -91,15 +86,11 @@ RDEPEND="${EXTERNAL_DEPEND}
>=app-admin/eselect-opengl-1.2.2
dev-libs/expat
gbm? ( sys-fs/udev )
- x11-libs/libICE
>=x11-libs/libX11-1.3.99.901
x11-libs/libXdamage
x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXmu
x11-libs/libXxf86vm
d3d? ( app-emulation/wine )
- llvm? ( >=sys-devel/llvm-2.9 )
vdpau? ( >=x11-libs/libvdpau-0.4.1 )
wayland? ( x11-base/wayland )
xvmc? ( x11-libs/libXvMC )
@@ -118,13 +109,13 @@ for card in ${RADEON_CARDS}; do
done
DEPEND="${RDEPEND}
+ llvm? ( >=sys-devel/llvm-2.9 )
=dev-lang/python-2*
dev-libs/libxml2[python]
dev-util/pkgconfig
sys-devel/bison
sys-devel/flex
x11-misc/makedepend
- x11-proto/inputproto
>=x11-proto/xextproto-7.0.99.1
x11-proto/xf86driproto
x11-proto/xf86vidmodeproto
@@ -166,24 +157,9 @@ src_prepare() {
# fix for hardened pax_kernel, bug 240956
[[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch
- # FreeBSD 6.* doesn't have posix_memalign().
- if [[ ${CHOST} == *-freebsd6.* ]]; then
- sed -i \
- -e "s/-DHAVE_POSIX_MEMALIGN//" \
- configure.ac || die
- fi
# Solaris needs some recent POSIX stuff in our case
if [[ ${CHOST} == *-solaris* ]] ; then
sed -i -e "s/-DSVR4/-D_POSIX_C_SOURCE=200112L/" configure.ac || die
- sed -i -e 's/uint/unsigned int/g' src/egl/drivers/glx/egl_glx.c || die
- fi
-
- # In order for mesa to complete it's build process we need to use a tool
- # that it compiles. When we cross compile this clearly does not work
- # so we require mesa to be built on the host system first. -solar
- if tc-is-cross-compiler; then
- sed -i -e "s#^GLSL_CL = .*\$#GLSL_CL = glsl_compiler#g" \
- "${S}"/src/mesa/shader/slang/library/Makefile || die
fi
base_src_prepare
@@ -199,23 +175,17 @@ src_configure() {
driver_enable swrast
# Intel code
- driver_enable video_cards_i810 i810
driver_enable video_cards_i915 i915
driver_enable video_cards_i965 i965
- if ! use video_cards_i810 && \
- ! use video_cards_i915 && \
+ if ! use video_cards_i915 && \
! use video_cards_i965; then
- driver_enable video_cards_intel i810 i915 i965
+ driver_enable video_cards_intel i915 i965
fi
# Nouveau code
driver_enable video_cards_nouveau nouveau
# ATI code
- driver_enable video_cards_mach64 mach64
- driver_enable video_cards_mga mga
- driver_enable video_cards_r128 r128
-
driver_enable video_cards_r100 radeon
driver_enable video_cards_r200 r200
driver_enable video_cards_r300 r300
@@ -226,19 +196,8 @@ src_configure() {
! use video_cards_r600; then
driver_enable video_cards_radeon radeon r200 r300 r600
fi
-
- driver_enable video_cards_savage savage
- driver_enable video_cards_sis sis
- driver_enable video_cards_tdfx tdfx
- driver_enable video_cards_via unichrome
fi
- myconf+="
- $(use_enable !bindist texture-float)
- $(use_enable gles gles1)
- $(use_enable gles gles2)
- $(use_enable egl)
- "
if use egl; then
myconf+="
--with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm")
@@ -252,8 +211,8 @@ src_configure() {
fi
if use gallium; then
myconf+="
- --with-state-trackers=glx,dri$(use egl && echo ",egl")$(use openvg && echo ",vega")$(use d3d && echo ",d3d1x")
- $(use_enable g3dvl)
+ $(use_enable d3d d3d1x)
+ $(use_enable g3dvl gallium-g3dvl)
$(use_enable llvm gallium-llvm)
$(use_enable openvg)
$(use_enable vdpau)
@@ -284,16 +243,19 @@ src_configure() {
"
fi
- # --with-driver=dri|xlib|osmesa || do we need osmesa?
econf \
--disable-option-checking \
- --with-driver=dri \
- --disable-glut \
- --without-demos \
+ --enable-dri \
+ --enable-glx \
--enable-xcb \
+ $(use_enable !bindist texture-float) \
$(use_enable debug) \
+ $(use_enable egl) \
$(use_enable gbm) \
+ $(use_enable gles1) \
+ $(use_enable gles2) \
$(use_enable nptl glx-tls) \
+ $(use_enable osmesa) \
$(use_enable !pic asm) \
$(use_enable shared-dricore) \
$(use_enable shared-glapi) \
@@ -313,12 +275,6 @@ src_install() {
if ! tc-is-cross-compiler; then
dobin "${S}"/src/glsl/glsl_compiler
fi
- # Remove redundant headers
- # GLUT thing
- rm -f "${ED}"/usr/include/GL/glut*.h || die "Removing glut include failed."
- # Glew includes
- rm -f "${ED}"/usr/include/GL/{glew,glxew,wglew}.h \
- || die "Removing glew includes failed."
# Install config file for eselect mesa
insinto /usr/share/mesa
@@ -392,6 +348,20 @@ pkg_postinst() {
elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
elog "enabled. Please see patents.txt for an explanation."
fi
+
+ local using_radeon r_flag
+ for r_flag in ${RADEON_CARDS}; do
+ if use video_cards_${r_flag}; then
+ using_radeon=1
+ break
+ fi
+ done
+
+ if [[ ${using_radeon} = 1 ]] && ! has_version media-libs/libtxc_dxtn; then
+ elog "Note that in order to have full S3TC support, it is necessary to install"
+ elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice"
+ elog "textures in some apps, and some others even require this to run."
+ fi
}
# $1 - VIDEO_CARDS flag
View
11 media-libs/mesa/metadata.xml
@@ -4,8 +4,19 @@
<herd>x11</herd>
<use>
<flag name='classic'>Build drivers based on the classic architecture.</flag>
+ <flag name='d3d'>Enable DirectX 10/10.1/11 backend for Gallium3D.</flag>
+ <flag name='egl'>Enable EGL support.</flag>
<flag name='gallium'>Build drivers based on Gallium3D, the new architecture for 3D graphics drivers.</flag>
+ <flag name='g3dvl'>Enable video decode acceleration support for Gallium3D.</flag>
+ <flag name='gbm'>Enable the Graphics Buffer Manager for EGL on KMS.</flag>
+ <flag name='gles'>Enable GLES support.</flag>
<flag name='llvm'>Enable LLVM backend for Gallium3D.</flag>
+ <flag name='openvg'>Enable the OpenVG 2D acceleration API for Gallium3D.</flag>
+ <flag name='pax_kernel'>Enable if the user plans to run the package under a pax enabled hardened kernel</flag>
<flag name='pic'>disable optimized assembly code that is not PIC friendly</flag>
+ <flag name='shared-dricore'>Enable sharing of common code for classic DRI drivers.</flag>
+ <flag name='shared-glapi'>Enable sharing of common code for the OpenGL API.</flag>
+ <flag name='vdpau'>Enable the VDPAU acceleration interface for the Gallium3D Video Layer.</flag>
+ <flag name='xvmc'>Enable the XvMC acceleration interface for the Gallium3D Video Layer.</flag>
</use>
</pkgmetadata>
View
2  x11-drivers/xf86-video-ati/Manifest
@@ -1,2 +1,2 @@
-EBUILD xf86-video-ati-9999.ebuild 636 RMD160 bac8f8ef9adf42c4ee805cccaff2d5ae17eb0e87 SHA1 890634c814cac4cd4c453858b489752187fb4a95 SHA256 5b0f629d838724fc0e793776f446cb2d0d897fe322e24079a81734008377a188
+EBUILD xf86-video-ati-9999.ebuild 442 RMD160 4efa76e1473c327517046aab42976dc7d5788235 SHA1 07929291e86c0a1b5cc142eaaff598fec963495c SHA256 2892d6d0ba4b306c108c2a5b2670353632e19445a8a6d9d0476a8edaace36659
MISC metadata.xml 250 RMD160 e09db525bf65f4448abb581285211ecf578fb1dd SHA1 615104f680032e3e281065808bda93935aa5e5fc SHA256 87ef06ccd40cff7885aa54b9e0f319f4b9c516b682892b21011c60d48e15e16e
View
26 x11-drivers/xf86-video-ati/xf86-video-ati-9999.ebuild
@@ -1,31 +1,25 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=3
+EAPI=4
+
+XORG_DRI=always
inherit xorg-2
DESCRIPTION="ATI video driver"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE=""
-RDEPEND=">=x11-base/xorg-server-1.6.3[-minimal]"
-DEPEND="${RDEPEND}
- >=x11-libs/libdrm-2.4.17[video_cards_radeon]
- x11-proto/fontsproto
- x11-proto/glproto
- x11-proto/randrproto
- x11-proto/videoproto
- x11-proto/xextproto
- x11-proto/xf86driproto
- x11-proto/xf86miscproto
- x11-proto/xproto"
+RDEPEND="x11-libs/libdrm[video_cards_radeon]"
+DEPEND="${RDEPEND}"
pkg_setup() {
xorg-2_pkg_setup
- CONFIGURE_OPTIONS="
+ XORG_CONFIGURE_OPTIONS=(
--enable-dri
--enable-kms
- "
+ --enable-exa
+ )
}
View
4 x11-libs/libdrm/Manifest
@@ -1,2 +1,2 @@
-EBUILD libdrm-9999.ebuild 1254 RMD160 cb7709e37400ef7abd2e28d6e1adc37307ace0f4 SHA1 51c531fd66961bbab3bacbaa9412c732f470bd39 SHA256 81c1d948e4f84091308035caae2a94004712a4b147b085d73c469d0b832ee5bf
-MISC metadata.xml 250 RMD160 e09db525bf65f4448abb581285211ecf578fb1dd SHA1 615104f680032e3e281065808bda93935aa5e5fc SHA256 87ef06ccd40cff7885aa54b9e0f319f4b9c516b682892b21011c60d48e15e16e
+EBUILD libdrm-9999.ebuild 1259 RMD160 67af9db66c797cea50f7679fbd449a038f53f96b SHA1 c6a751c48814af4a9a37dbfcc75ec5fafefb1ed5 SHA256 961fe933bbaa49c0dfc205b0400847ff8160f1589f4a3e19945b40b238497fd5
+MISC metadata.xml 366 RMD160 bee19e8209a424a460390c41f76fa85c3a435aa1 SHA1 9a15cf1334f1373d75f8563a4085f11a6de2c348 SHA256 1acef6171a181f51b3ef4450fe4af562e1a9aec424ed02b2ff628631339a256a
View
40 x11-libs/libdrm/libdrm-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=3
+EAPI=4
inherit xorg-2
EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm"
@@ -15,33 +15,33 @@ 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 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
VIDEO_CARDS="intel nouveau radeon vmware"
for card in ${VIDEO_CARDS}; do
IUSE_VIDEO_CARDS+=" video_cards_${card}"
done
-IUSE="${IUSE_VIDEO_CARDS}"
+IUSE="${IUSE_VIDEO_CARDS} +libkms"
RESTRICT="test" # see bug #236845
-RDEPEND="dev-libs/libpthread-stubs"
-DEPEND="${RDEPEND}"
+RDEPEND="dev-libs/libpthread-stubs
+ video_cards_intel? ( >=x11-libs/libpciaccess-0.10 )"
+DEPEND="${RDEPEND}
+ >=x11-libs/libpciaccess-0.10"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.4.23-solaris.patch
+)
pkg_setup() {
- CONFIGURE_OPTIONS="--enable-udev
- $(use_enable video_cards_intel intel)
- $(use_enable video_cards_nouveau nouveau-experimental-api)
- $(use_enable video_cards_radeon radeon)
- $(use_enable video_cards_vmware vmwgfx-experimental-api)
- $(use_enable kernel_linux libkms)"
+ XORG_CONFIGURE_OPTIONS=(
+ --enable-udev
+ $(use_enable video_cards_intel intel)
+ $(use_enable video_cards_nouveau nouveau-experimental-api)
+ $(use_enable video_cards_radeon radeon)
+ $(use_enable video_cards_vmware vmwgfx-experimental-api)
+ $(use_enable libkms)
+ )
xorg-2_pkg_setup
}
-
-pkg_postinst() {
- xorg-2_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/*."
-}
View
3  x11-libs/libdrm/metadata.xml
@@ -6,4 +6,7 @@
<name>Joshua Saddler</name>
</maintainer>
<herd>x11</herd>
+<use>
+<flag name="libkms">Enable building of libkms, a library for applications to interface with KMS</flag>
+</use>
</pkgmetadata>
Please sign in to comment.
Something went wrong with that request. Please try again.