diff options
author | 2012-01-24 09:02:00 +0100 | |
---|---|---|
committer | 2012-01-24 09:02:00 +0100 | |
commit | 067e016dc2cd72e690cdf5521a20713609b10b22 (patch) | |
tree | 9439edcb8860b968f8454cc2e6681df05fbe77b7 | |
parent | Rename wayland-demos to weston (diff) | |
download | benf-067e016dc2cd72e690cdf5521a20713609b10b22.tar.gz benf-067e016dc2cd72e690cdf5521a20713609b10b22.tar.bz2 benf-067e016dc2cd72e690cdf5521a20713609b10b22.zip |
mesa: sync with x11 overlay
-rw-r--r-- | media-libs/mesa/Manifest | 4 | ||||
-rw-r--r-- | media-libs/mesa/files/eselect-mesa.conf.8.0 (renamed from media-libs/mesa/files/eselect-mesa.conf.7.12) | 0 | ||||
-rw-r--r-- | media-libs/mesa/mesa-99999999.ebuild | 69 |
3 files changed, 29 insertions, 44 deletions
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest index 9a98234..69fca11 100644 --- a/media-libs/mesa/Manifest +++ b/media-libs/mesa/Manifest @@ -1,3 +1,3 @@ -AUX eselect-mesa.conf.7.12 1670 RMD160 4714db2bb66a2fff04d33c05e8051f0c63892371 SHA1 d101931591ec5aefbf3d2ec48f1331709686a4f4 SHA256 3b760d19524870b067b3717f403c748a705fc71cdf5373a049d857ca1b3139fb -EBUILD mesa-99999999.ebuild 10449 RMD160 4c1cb7db997a89e5b5b0e8382dde0e5f6e8be3a8 SHA1 c0a8b7e460aa2b6fe0c003e21b738b63a960a7c0 SHA256 3e1a632cdf466036a720eccd71d177a61f2ec771fe48dbd4437e4a9518fa7565 +AUX eselect-mesa.conf.8.0 1670 RMD160 4714db2bb66a2fff04d33c05e8051f0c63892371 SHA1 d101931591ec5aefbf3d2ec48f1331709686a4f4 SHA256 3b760d19524870b067b3717f403c748a705fc71cdf5373a049d857ca1b3139fb +EBUILD mesa-99999999.ebuild 9987 RMD160 7dede88c66712f8d9f1d53b6f714e6c08ba01463 SHA1 dd140b05444af6633b9e808231369c01cef02ad4 SHA256 c605babf9ddce12b825c79555a1ce6136771cb3d4c69f91d7dd72e038011b1e5 MISC metadata.xml 634 RMD160 59788d7e2bf636524b39e79a3551cb195fa68165 SHA1 f029c7ae8ec021d038e9cf5faa7ebcb289786aac SHA256 036eb55f89b63ade50ee567210629edd450303abb4ddb9acefc0ef2bfb92b8b1 diff --git a/media-libs/mesa/files/eselect-mesa.conf.7.12 b/media-libs/mesa/files/eselect-mesa.conf.8.0 index 73b2752..73b2752 100644 --- a/media-libs/mesa/files/eselect-mesa.conf.7.12 +++ b/media-libs/mesa/files/eselect-mesa.conf.8.0 diff --git a/media-libs/mesa/mesa-99999999.ebuild b/media-libs/mesa/mesa-99999999.ebuild index f2c78f2..d3b1584 100644 --- a/media-libs/mesa/mesa-99999999.ebuild +++ b/media-libs/mesa/mesa-99999999.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,14 +47,13 @@ for card in ${VIDEO_CARDS}; do done IUSE="${IUSE_VIDEO_CARDS} - bindist +classic d3d debug +egl g3dvl +gallium gbm gles1 gles2 +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 vdpau wayland xvmc kernel_FreeBSD" REQUIRED_USE=" d3d? ( gallium ) g3dvl? ( gallium ) llvm? ( gallium ) - openvg? ( gallium ) - egl? ( shared-glapi ) + openvg? ( egl gallium ) gallium? ( video_cards_r300? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) ) @@ -63,13 +61,19 @@ REQUIRED_USE=" g3dvl? ( || ( vdpau xvmc ) ) vdpau? ( g3dvl ) xvmc? ( g3dvl ) - video_cards_i915? ( classic ) + 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.24" +LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.30" # not a runtime dependency of this package, but dependency of packages which # depend on this package, bug #342393 EXTERNAL_DEPEND=" @@ -90,6 +94,7 @@ 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? ( media-libs/wayland ) @@ -131,13 +136,8 @@ 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 } src_unpack() { @@ -188,22 +188,12 @@ src_configure() { # ATI code driver_enable video_cards_r100 radeon driver_enable video_cards_r200 r200 - driver_enable video_cards_r300 r300 - driver_enable video_cards_r600 r600 if ! use video_cards_r100 && \ - ! use video_cards_r200 && \ - ! use video_cards_r300 && \ - ! use video_cards_r600; then - driver_enable video_cards_radeon radeon r200 r300 r600 + ! use video_cards_r200; then + driver_enable video_cards_radeon radeon r200 fi fi - myconf+=" - $(use_enable !bindist texture-float) - $(use_enable gles1) - $(use_enable gles2) - $(use_enable egl) - " if use egl; then myconf+=" --with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm") @@ -211,14 +201,10 @@ 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+=" - --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) @@ -228,10 +214,8 @@ src_configure() { gallium_enable video_cards_vmware svga gallium_enable video_cards_nouveau nouveau gallium_enable video_cards_i915 i915 - gallium_enable video_cards_i965 i965 - if ! use video_cards_i915 && \ - ! use video_cards_i965; then - gallium_enable video_cards_intel i915 i965 + if ! use video_cards_i915; then + gallium_enable video_cards_intel i915 fi gallium_enable video_cards_r300 r300 @@ -249,17 +233,18 @@ src_configure() { " fi - # --with-driver=dri|xlib|osmesa || do we need osmesa? econf \ - --disable-option-checking \ - --with-driver=dri \ - --enable-xcb \ + --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-dricore) \ - $(use_enable shared-glapi) \ --with-dri-drivers=${DRI_DRIVERS} \ --with-gallium-drivers=${GALLIUM_DRIVERS} \ ${myconf} @@ -279,7 +264,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. |