Browse files

update to latest

  • Loading branch information...
1 parent 4387010 commit f7ea8a99beb0676768d63f999cd57fceff16805c @nightmorph committed Mar 19, 2012
View
7 media-libs/mesa/Manifest
@@ -1,3 +1,4 @@
-AUX eselect-mesa.conf.7.12 1670 RMD160 4714db2bb66a2fff04d33c05e8051f0c63892371 SHA1 d101931591ec5aefbf3d2ec48f1331709686a4f4 SHA256 3b760d19524870b067b3717f403c748a705fc71cdf5373a049d857ca1b3139fb
-EBUILD mesa-9999.ebuild 10278 RMD160 ac5ff23c7dac79764f5367d2d18ca2d7b16a191f SHA1 d8b7763c6bf85b6b5cbcb25089a9d29e272d22ce SHA256 6a2755d73a1d52e2fc0ada8b1a01506eb0c2b7bd381271f31accb9b2f478aa83
-MISC metadata.xml 1390 RMD160 bdbb90b74c10cfdf41752c14d2e95fd3480599f8 SHA1 603a30cfea4dadb9a29d5503c88a96d880e5111b SHA256 4d31889c5a5cb750e54d05ccaf6bd44de2f4c82be1addfc3e0010b468988bb80
+AUX eselect-mesa.conf.8.0 1528 RMD160 e18c82d808b00d7733d5f31d0336f7ca19adef52 SHA1 4aadc1dac59d7497a025c6cd7e02cf8944cd1397 SHA256 5580009fd7ede9455f1713b9dafe7b80031d4ab51b61f098acd291194cb10acd
+AUX mesa-9999-dont-require-llvm-for-r300.patch 937 RMD160 1204bc3cd5b75ef5eb6188f19ee80f63585f1aa9 SHA1 0eedb046de394fae51f5d1aa7a18a7199360d84a SHA256 99e2200ed72ab5203267ed8c61671774edd42f6b397ed2f8a8effc458251371c
+EBUILD mesa-9999.ebuild 10378 RMD160 3452bc333a5c1a73c4804c20c8274f261743c974 SHA1 76dbd2377e884a0f1440866013d83660710c931c SHA256 fb325111a127b5dae98ad62bc27761f620d3a6f9d82c4e9b86c537f8ba9add63
+MISC metadata.xml 1647 RMD160 c1efee779e891d85fa732d0f18aadd778135572a SHA1 977f6f8c08a8cc7a75afee2f673793bb822aee7e SHA256 03bf4d6d7ada38ea1bb9d5584e6617a584680ed1cde5d39d278b60e544c44034
View
36 media-libs/mesa/files/eselect-mesa.conf.8.0
@@ -0,0 +1,36 @@
+# mesa classic/gallium implementations in this release
+
+# Syntax description:
+# * MESA_IMPLEMENTATIONS contains a space-delimited list of switchable
+# classic/gallium implementations.
+# * MESA_DRIVERS is an associative array, for each member "foo" of
+# MESA_IMPLEMENTATIONS it contains the following elements:
+# foo,description - Human-readable description of the driver
+# foo,classicdriver - Filename of the classic driver
+# foo,galliumdriver - Filename of the gallium driver
+# foo,default - which of classic or gallium is chosen by default
+
+MESA_IMPLEMENTATIONS="i915 i965 r300 r600 sw"
+declare -A MESA_DRIVERS || die "MESA_DRIVERS already in environment and not associative."
+
+MESA_DRIVERS[i915,description]="i915 (Intel 915, 945)"
+MESA_DRIVERS[i915,classicdriver]="i915_dri.so"
+MESA_DRIVERS[i915,galliumdriver]="i915g_dri.so"
+MESA_DRIVERS[i915,default]="gallium"
+
+MESA_DRIVERS[i965,description]="i965 (Intel 965, G/Q3x, G/Q4x)"
+MESA_DRIVERS[i965,classicdriver]="i965_dri.so"
+MESA_DRIVERS[i965,default]="classic"
+
+MESA_DRIVERS[r300,description]="r300 (Radeon R300-R500)"
+MESA_DRIVERS[r300,galliumdriver]="r300g_dri.so"
+MESA_DRIVERS[r300,default]="gallium"
+
+MESA_DRIVERS[r600,description]="r600 (Radeon R600-R700, Evergreen, Northern Islands)"
+MESA_DRIVERS[r600,galliumdriver]="r600g_dri.so"
+MESA_DRIVERS[r600,default]="gallium"
+
+MESA_DRIVERS[sw,description]="sw (Software renderer)"
+MESA_DRIVERS[sw,classicdriver]="swrast_dri.so"
+MESA_DRIVERS[sw,galliumdriver]="swrastg_dri.so"
+MESA_DRIVERS[sw,default]="gallium"
View
27 media-libs/mesa/files/mesa-9999-dont-require-llvm-for-r300.patch
@@ -0,0 +1,27 @@
+diff --git a/configure.ac b/configure.ac
+index 846b623..fbd05c1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1839,14 +1839,6 @@ gallium_check_st() {
+ fi
+ }
+
+-gallium_require_llvm() {
+- if test "x$MESA_LLVM" = x0; then
+- case "$host_cpu" in
+- i*86|x86_64) AC_MSG_ERROR([LLVM is required to build $1 on x86 and x86_64]);;
+- esac
+- fi
+-}
+-
+ dnl Gallium drivers
+ dnl Duplicates in GALLIUM_DRIVERS_DIRS are removed by sorting it after this block
+ if test "x$with_gallium_drivers" != x; then
+@@ -1868,7 +1860,6 @@ if test "x$with_gallium_drivers" != x; then
+ ;;
+ xr300)
+ PKG_CHECK_MODULES([RADEON], [libdrm_radeon >= $LIBDRM_RADEON_REQUIRED])
+- gallium_require_llvm "Gallium R300"
+ GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300"
+ gallium_check_st "radeon/drm" "dri-r300" "xorg-r300" "" "xvmc-r300" "vdpau-r300" "va-r300"
+ ;;
View
53 media-libs/mesa/mesa-9999.ebuild
@@ -20,7 +20,6 @@ MY_P="${MY_PN}-${PV/_/-}"
MY_SRC_P="${MY_PN}Lib-${PV/_/-}"
FOLDER="${PV/_rc*/}"
-[[ ${PV/_rc*/} == ${PV} ]] || FOLDER+="/RC"
DESCRIPTION="OpenGL-like graphic library for Linux"
HOMEPAGE="http://mesa3d.sourceforge.net/"
@@ -48,35 +47,38 @@ for card in ${VIDEO_CARDS}; do
done
IUSE="${IUSE_VIDEO_CARDS}
- 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"
+ bindist +classic d3d debug +egl g3dvl +gallium gbm gles1 gles2 +llvm +nptl
+ openvg osmesa pax_kernel pic selinux +shared-glapi vdpau wayland xvmc xa
+ kernel_FreeBSD"
REQUIRED_USE="
d3d? ( gallium )
g3dvl? ( gallium )
llvm? ( gallium )
openvg? ( egl gallium )
- egl? ( shared-glapi )
- gallium? (
- video_cards_r300? ( x86? ( llvm ) amd64? ( llvm ) )
- video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
- )
+ gbm? ( shared-glapi )
g3dvl? ( || ( vdpau xvmc ) )
vdpau? ( g3dvl )
+ xa? ( 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_vmware? ( gallium )
"
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.27"
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.31"
# 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.14
+ >=x11-proto/glproto-1.4.15
"
# keep correct libdrm and dri2proto dep
# keep blocks in rdepend for binpkg
@@ -92,9 +94,10 @@ RDEPEND="${EXTERNAL_DEPEND}
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? ( x11-base/wayland )
+ wayland? ( dev-libs/wayland )
xvmc? ( x11-libs/libXvMC )
${LIBDRM_DEPSTRING}[video_cards_nouveau?,video_cards_vmware?]
"
@@ -133,13 +136,6 @@ QA_WX_LOAD="usr/lib*/opengl/xorg-x11/lib/libGL.so*"
# Think about: ggi, fbcon, no-X configs
pkg_setup() {
- # gcc 4.2 has buggy ivopts
- if [[ $(gcc-version) = "4.2" ]]; then
- append-flags -fno-ivopts
- fi
-
- # recommended by upstream
- append-flags -ffast-math
# workaround toc-issue wrt #386545
use ppc64 && append-flags -mminimal-toc
}
@@ -158,6 +154,9 @@ src_prepare() {
epatch
fi
+ # relax the requirement that r300 must have llvm, bug 380303
+ epatch "${FILESDIR}"/${P}-dont-require-llvm-for-r300.patch
+
# fix for hardened pax_kernel, bug 240956
[[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch
@@ -205,10 +204,6 @@ src_configure() {
"
fi
- if use !gallium && use !classic; then
- ewarn "You enabled neither classic nor gallium USE flags. No hardware"
- ewarn "drivers will be built."
- fi
if use gallium; then
myconf+="
$(use_enable d3d d3d1x)
@@ -242,10 +237,8 @@ src_configure() {
fi
econf \
- --disable-option-checking \
--enable-dri \
--enable-glx \
- --enable-xcb \
$(use_enable !bindist texture-float) \
$(use_enable debug) \
$(use_enable egl) \
@@ -255,8 +248,8 @@ src_configure() {
$(use_enable nptl glx-tls) \
$(use_enable osmesa) \
$(use_enable !pic asm) \
- $(use_enable shared-dricore) \
$(use_enable shared-glapi) \
+ $(use_enable xa) \
--with-dri-drivers=${DRI_DRIVERS} \
--with-gallium-drivers=${GALLIUM_DRIVERS} \
${myconf}
@@ -265,6 +258,8 @@ src_configure() {
src_install() {
base_src_install
+ find "${ED}" -name '*.la' -exec rm -f {} + || die
+
if use !bindist; then
dodoc docs/patents.txt
fi
@@ -276,7 +271,7 @@ src_install() {
# Install config file for eselect mesa
insinto /usr/share/mesa
- newins "${FILESDIR}/eselect-mesa.conf.7.12" eselect-mesa.conf
+ newins "${FILESDIR}/eselect-mesa.conf.8.0" eselect-mesa.conf
# Move libGL and others from /usr/lib to /usr/lib/opengl/blah/lib
# because user can eselect desired GL provider.
@@ -336,6 +331,14 @@ 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
View
8 media-libs/mesa/metadata.xml
@@ -1,22 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>no-herd</herd>
+<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='gles1'>Enable GLESv1 support.</flag>
+ <flag name='gles2'>Enable GLESv2 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='osmesa'>Enable the Off-screen Rendering Mesa API</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='wayland'>Enable support for dev-libs/wayland</flag>
+ <flag name='xa'>Enable the XA (X Acceleration) API for Gallium3D.</flag>
<flag name='xvmc'>Enable the XvMC acceleration interface for the Gallium3D Video Layer.</flag>
</use>
</pkgmetadata>

0 comments on commit f7ea8a9

Please sign in to comment.