From: "Chi-Thanh Christopher Nguyen (chithanh)" <chithanh@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in media-libs/mesa: mesa-8.1_rc1_pre20120724.ebuild metadata.xml ChangeLog
Date: Tue, 24 Jul 2012 22:25:36 +0000 (UTC) [thread overview]
Message-ID: <20120724222536.71D652004B@flycatcher.gentoo.org> (raw)
chithanh 12/07/24 22:25:36
Modified: metadata.xml ChangeLog
Added: mesa-8.1_rc1_pre20120724.ebuild
Log:
New snapshot.
(Portage version: 2.2.0_alpha115/cvs/Linux x86_64)
Revision Changes Path
1.12 media-libs/mesa/metadata.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/metadata.xml?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/metadata.xml?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/metadata.xml?r1=1.11&r2=1.12
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/mesa/metadata.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- metadata.xml 14 Mar 2012 16:59:58 -0000 1.11
+++ metadata.xml 24 Jul 2012 22:25:36 -0000 1.12
@@ -15,6 +15,7 @@
<flag name='llvm'>Enable LLVM backend for Gallium3D.</flag>
<flag name='openvg'>Enable the OpenVG 2D acceleration API for Gallium3D.</flag>
<flag name='osmesa'>Build the Mesa library for off-screen rendering.</flag>
+ <flag name='r600-llvm-compiler'>Build the LLVM based r600 shader compiler.</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>
@@ -22,6 +23,7 @@
<flag name='vdpau'>Enable the VDPAU acceleration interface for the Gallium3D Video Layer.</flag>
<flag name='wayland'>Enable support for dev-libs/wayland</flag>
<flag name='xa'>Enable the XA (X Acceleration) API for Gallium3D.</flag>
+ <flag name='xorg'>Enable the X.org state tracker (DDX replacement) for Gallium3D.</flag>
<flag name='xvmc'>Enable the XvMC acceleration interface for the Gallium3D Video Layer.</flag>
</use>
</pkgmetadata>
1.409 media-libs/mesa/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/ChangeLog?rev=1.409&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/ChangeLog?rev=1.409&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/ChangeLog?r1=1.408&r2=1.409
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v
retrieving revision 1.408
retrieving revision 1.409
diff -u -r1.408 -r1.409
--- ChangeLog 21 Jul 2012 22:02:58 -0000 1.408
+++ ChangeLog 24 Jul 2012 22:25:36 -0000 1.409
@@ -1,6 +1,12 @@
# ChangeLog for media-libs/mesa
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.408 2012/07/21 22:02:58 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.409 2012/07/24 22:25:36 chithanh Exp $
+
+*mesa-8.1_rc1_pre20120724 (24 Jul 2012)
+
+ 24 Jul 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+ +mesa-8.1_rc1_pre20120724.ebuild, metadata.xml:
+ New snapshot.
*mesa-8.0.4 (21 Jul 2012)
1.1 media-libs/mesa/mesa-8.1_rc1_pre20120724.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/mesa-8.1_rc1_pre20120724.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/mesa-8.1_rc1_pre20120724.ebuild?rev=1.1&content-type=text/plain
Index: mesa-8.1_rc1_pre20120724.ebuild
===================================================================
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-8.1_rc1_pre20120724.ebuild,v 1.1 2012/07/24 22:25:36 chithanh Exp $
EAPI=4
EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
if [[ ${PV} = 9999* ]]; then
GIT_ECLASS="git-2"
EXPERIMENTAL="true"
fi
inherit base autotools multilib flag-o-matic toolchain-funcs ${GIT_ECLASS}
OPENGL_DIR="xorg-x11"
MY_PN="${PN/m/M}"
MY_P="${MY_PN}-${PV/_/-}"
MY_SRC_P="${MY_PN}Lib-${PV/_/-}"
FOLDER="${PV/_rc*/}"
DESCRIPTION="OpenGL-like graphic library for Linux"
HOMEPAGE="http://mesa3d.sourceforge.net/"
#SRC_PATCHES="mirror://gentoo/${P}-gentoo-patches-01.tar.bz2"
if [[ $PV = 9999* ]]; then
SRC_URI="${SRC_PATCHES}"
else
SRC_URI="mirror://gentoo/${P}.tar.xz
${SRC_PATCHES}"
fi
# The code is MIT/X11.
# GLES[2]/gl[2]{,ext,platform}.h are SGI-B-2.0
LICENSE="MIT SGI-B-2.0"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
INTEL_CARDS="i915 i965 intel"
RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
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 gles1 gles2 +llvm +nptl
openvg osmesa pax_kernel pic r600-llvm-compiler selinux +shared-glapi vdpau
wayland xvmc xa xorg kernel_FreeBSD"
REQUIRED_USE="
d3d? ( gallium )
g3dvl? ( gallium )
llvm? ( gallium )
openvg? ( egl gallium )
gbm? ( shared-glapi )
g3dvl? ( || ( vdpau xvmc ) )
vdpau? ( g3dvl )
r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeon ) )
xa? ( gallium )
xorg? ( gallium )
xvmc? ( g3dvl )
video_cards_intel? ( || ( classic gallium ) )
video_cards_i915? ( || ( classic gallium ) )
video_cards_i965? ( classic )
video_cards_nouveau? ( || ( classic gallium ) )
video_cards_radeon? ( || ( classic gallium ) )
video_cards_r100? ( classic )
video_cards_r200? ( classic )
video_cards_r300? ( gallium )
video_cards_r600? ( gallium )
video_cards_radeonsi? ( gallium llvm )
video_cards_vmware? ( gallium )
"
LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.34"
# not a runtime dependency of this package, but dependency of packages which
# depend on this package, bug #342393
EXTERNAL_DEPEND="
>=x11-proto/dri2proto-2.6
>=x11-proto/glproto-1.4.15-r1
"
# keep correct libdrm and dri2proto dep
# keep blocks in rdepend for binpkg
# gtest file collision bug #411825
RDEPEND="${EXTERNAL_DEPEND}
dev-util/indent
!<x11-base/xorg-server-1.7
!<=x11-proto/xf86driproto-2.0.3
classic? ( app-admin/eselect-mesa )
gallium? ( app-admin/eselect-mesa )
>=app-admin/eselect-opengl-1.2.6
dev-libs/expat
gbm? ( sys-fs/udev )
>=x11-libs/libX11-1.3.99.901
x11-libs/libXdamage
x11-libs/libXext
x11-libs/libXxf86vm
>=x11-libs/libxcb-1.8
d3d? ( app-emulation/wine )
vdpau? ( >=x11-libs/libvdpau-0.4.1 )
wayland? ( dev-libs/wayland )
xorg? (
x11-base/xorg-server
x11-libs/libdrm[libkms]
)
xvmc? ( >=x11-libs/libXvMC-1.0.6 )
${LIBDRM_DEPSTRING}[video_cards_nouveau?,video_cards_vmware?]
"
for card in ${INTEL_CARDS}; do
RDEPEND="${RDEPEND}
video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
"
done
for card in ${RADEON_CARDS}; do
RDEPEND="${RDEPEND}
video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
"
done
DEPEND="${RDEPEND}
llvm? (
>=sys-devel/llvm-2.9
r600-llvm-compiler? ( >=sys-devel/llvm-3.1 )
video_cards_radeonsi? ( >=sys-devel/llvm-3.1 )
)
=dev-lang/python-2*
dev-libs/libxml2[python]
sys-devel/bison
sys-devel/flex
virtual/pkgconfig
x11-misc/makedepend
>=x11-proto/xextproto-7.0.99.1
x11-proto/xf86driproto
x11-proto/xf86vidmodeproto
"
S="${WORKDIR}/${MY_P}"
# It is slow without texrels, if someone wants slow
# mesa without texrels +pic use is worth the shot
QA_EXECSTACK="usr/lib*/opengl/xorg-x11/lib/libGL.so*"
QA_WX_LOAD="usr/lib*/opengl/xorg-x11/lib/libGL.so*"
# Think about: ggi, fbcon, no-X configs
pkg_setup() {
# workaround toc-issue wrt #386545
use ppc64 && append-flags -mminimal-toc
}
src_unpack() {
default
if [[ ${PV} = 9999* ]]; then
git-2_src_unpack
fi
mv "${WORKDIR}"/${PN}-*/ "${WORKDIR}"/${MY_P} || die
}
src_prepare() {
# apply patches
if [[ ${PV} != 9999* && -n ${SRC_PATCHES} ]]; then
EPATCH_FORCE="yes" \
EPATCH_SOURCE="${WORKDIR}/patches" \
EPATCH_SUFFIX="patch" \
epatch
fi
# relax the requirement that r300 must have llvm, bug 380303
epatch "${FILESDIR}"/${PN}-8.1-dont-require-llvm-for-r300.patch
# fix for hardened pax_kernel, bug 240956
[[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch
# 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
fi
# Tests fail against python-3, bug #407887
sed -i 's|/usr/bin/env python|/usr/bin/env python2|' src/glsl/tests/compare_ir || die
base_src_prepare
eautoreconf
}
src_configure() {
local myconf
if use classic; then
# Configurable DRI drivers
driver_enable swrast
# Intel code
driver_enable video_cards_i915 i915
driver_enable video_cards_i965 i965
if ! use video_cards_i915 && \
! use video_cards_i965; then
driver_enable video_cards_intel i915 i965
fi
# Nouveau code
driver_enable video_cards_nouveau nouveau
# ATI code
driver_enable video_cards_r100 radeon
driver_enable video_cards_r200 r200
if ! use video_cards_r100 && \
! use video_cards_r200; then
driver_enable video_cards_radeon radeon r200
fi
fi
if use egl; then
myconf+="
--with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm")
$(use_enable gallium gallium-egl)
"
fi
if use gallium; then
myconf+="
$(use_enable d3d d3d1x)
$(use_enable g3dvl gallium-g3dvl)
$(use_enable llvm gallium-llvm)
$(use_enable openvg)
$(use_enable r600-llvm-compiler)
$(use_enable vdpau)
$(use_enable xvmc)
"
gallium_enable swrast
gallium_enable video_cards_vmware svga
gallium_enable video_cards_nouveau nouveau
gallium_enable video_cards_i915 i915
if ! use video_cards_i915; then
gallium_enable video_cards_intel i915
fi
gallium_enable video_cards_r300 r300
gallium_enable video_cards_r600 r600
gallium_enable video_cards_radeonsi radeonsi
if ! use video_cards_r300 && \
! use video_cards_r600; then
gallium_enable video_cards_radeon r300 r600
fi
fi
# x86 hardened pax_kernel needs glx-rts, bug 240956
if use pax_kernel; then
myconf+="
$(use_enable x86 glx-rts)
"
fi
econf \
--enable-dri \
--enable-glx \
$(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-glapi) \
$(use_enable xa) \
$(use_enable xorg) \
--with-dri-drivers=${DRI_DRIVERS} \
--with-gallium-drivers=${GALLIUM_DRIVERS} \
${myconf}
}
src_install() {
base_src_install
find "${ED}" -name '*.la' -exec rm -f {} + || die
if use !bindist; then
dodoc docs/patents.txt
fi
# Save the glsl-compiler for later use
if ! tc-is-cross-compiler; then
dobin "${S}"/src/glsl/glsl_compiler
fi
# Install config file for eselect mesa
insinto /usr/share/mesa
newins "${FILESDIR}/eselect-mesa.conf.8.1" eselect-mesa.conf
# Move libGL and others from /usr/lib to /usr/lib/opengl/blah/lib
# because user can eselect desired GL provider.
ebegin "Moving libGL and friends for dynamic switching"
local x
local gl_dir="/usr/$(get_libdir)/opengl/${OPENGL_DIR}/"
dodir ${gl_dir}/{lib,extensions,include/GL}
for x in "${ED}"/usr/$(get_libdir)/lib{EGL,GL*,OpenVG}.{la,a,so*}; do
if [ -f ${x} -o -L ${x} ]; then
mv -f "${x}" "${ED}${gl_dir}"/lib \
|| die "Failed to move ${x}"
fi
done
for x in "${ED}"/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
if [ -f ${x} -o -L ${x} ]; then
mv -f "${x}" "${ED}${gl_dir}"/include/GL \
|| die "Failed to move ${x}"
fi
done
for x in "${ED}"/usr/include/{EGL,GLES*,VG,KHR}; do
if [ -d ${x} ]; then
mv -f "${x}" "${ED}${gl_dir}"/include \
|| die "Failed to move ${x}"
fi
done
eend $?
if use classic || use gallium; then
ebegin "Moving DRI/Gallium drivers for dynamic switching"
local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so )
keepdir /usr/$(get_libdir)/dri
dodir /usr/$(get_libdir)/mesa
for x in ${gallium_drivers[@]}; do
if [ -f "${S}/$(get_libdir)/gallium/${x}" ]; then
mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
|| die "Failed to move ${x}"
insinto "/usr/$(get_libdir)/dri/"
if [ -f "${S}/$(get_libdir)/${x}" ]; then
insopts -m0755
doins "${S}/$(get_libdir)/${x}"
fi
fi
done
for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
if [ -f ${x} -o -L ${x} ]; then
mv -f "${x}" "${x/dri/mesa}" \
|| die "Failed to move ${x}"
fi
done
pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
ln -s ../mesa/*.so . || die "Creating symlink failed"
# remove symlinks to drivers known to eselect
for x in ${gallium_drivers[@]}; do
if [ -f ${x} -o -L ${x} ]; then
rm "${x}" || die "Failed to remove ${x}"
fi
done
popd
eend $?
fi
}
pkg_postinst() {
# Switch to the xorg implementation.
echo
eselect opengl set --use-old ${OPENGL_DIR}
# switch to xorg-x11 and back if necessary, bug #374647 comment 11
OLD_IMPLEM="$(eselect opengl show)"
if [[ ${OPENGL_DIR}x != ${OLD_IMPLEM}x ]]; then
eselect opengl set ${OPENGL_DIR}
eselect opengl set ${OLD_IMPLEM}
fi
# Select classic/gallium drivers
if use classic || use gallium; then
eselect mesa set --auto
fi
# warn about patent encumbered texture-float
if use !bindist; then
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
# other args - names of DRI drivers to enable
# TODO: avoid code duplication for a more elegant implementation
driver_enable() {
case $# in
# for enabling unconditionally
1)
DRI_DRIVERS+=",$1"
;;
*)
if use $1; then
shift
for i in $@; do
DRI_DRIVERS+=",${i}"
done
fi
;;
esac
}
gallium_enable() {
case $# in
# for enabling unconditionally
1)
GALLIUM_DRIVERS+=",$1"
;;
*)
if use $1; then
shift
for i in $@; do
GALLIUM_DRIVERS+=",${i}"
done
fi
;;
esac
}
reply other threads:[~2012-07-24 22:25 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120724222536.71D652004B@flycatcher.gentoo.org \
--to=chithanh@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox