diff options
author | 2012-01-30 20:16:05 +0100 | |
---|---|---|
committer | 2012-01-30 20:19:53 +0100 | |
commit | 815293e0d661bcc5207740e35c249d722b9fb9ff (patch) | |
tree | ed39e93dd73730abbd70f8fbe20bce11ce39fb98 | |
parent | mesa: sync with x11 (diff) | |
download | benf-815293e0d661bcc5207740e35c249d722b9fb9ff.tar.gz benf-815293e0d661bcc5207740e35c249d722b9fb9ff.tar.bz2 benf-815293e0d661bcc5207740e35c249d722b9fb9ff.zip |
Drop mesa ebuild
Since the x11 overlay uses dev-libs category for wayland finally :)
-rw-r--r-- | dev-libs/wayland/Manifest (renamed from media-libs/wayland/Manifest) | 0 | ||||
-rw-r--r-- | dev-libs/wayland/wayland-9999.ebuild (renamed from media-libs/wayland/wayland-9999.ebuild) | 0 | ||||
-rw-r--r-- | media-libs/mesa/Manifest | 3 | ||||
-rw-r--r-- | media-libs/mesa/files/eselect-mesa.conf.8.0 | 39 | ||||
-rw-r--r-- | media-libs/mesa/mesa-99999999.ebuild | 391 | ||||
-rw-r--r-- | media-libs/mesa/metadata.xml | 13 | ||||
-rw-r--r-- | media-misc/weston/Manifest | 2 | ||||
-rw-r--r-- | media-misc/weston/weston-9999.ebuild | 2 | ||||
-rw-r--r-- | profiles/package.mask | 3 |
9 files changed, 3 insertions, 450 deletions
diff --git a/media-libs/wayland/Manifest b/dev-libs/wayland/Manifest index 2bbecc6..2bbecc6 100644 --- a/media-libs/wayland/Manifest +++ b/dev-libs/wayland/Manifest diff --git a/media-libs/wayland/wayland-9999.ebuild b/dev-libs/wayland/wayland-9999.ebuild index 7c61e23..7c61e23 100644 --- a/media-libs/wayland/wayland-9999.ebuild +++ b/dev-libs/wayland/wayland-9999.ebuild diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest deleted file mode 100644 index 03b68ea..0000000 --- a/media-libs/mesa/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -AUX eselect-mesa.conf.8.0 1670 RMD160 4714db2bb66a2fff04d33c05e8051f0c63892371 SHA1 d101931591ec5aefbf3d2ec48f1331709686a4f4 SHA256 3b760d19524870b067b3717f403c748a705fc71cdf5373a049d857ca1b3139fb -EBUILD mesa-99999999.ebuild 10059 RMD160 2d33bf51aa03c66a4d17a14d3338298fd04c7cea SHA1 3d32bee71d121b270e6c81d03c6152ed02165302 SHA256 55cda977cd646954b916988b015b1b8347bc2b35075f6c39dc9823a384bf7881 -MISC metadata.xml 634 RMD160 59788d7e2bf636524b39e79a3551cb195fa68165 SHA1 f029c7ae8ec021d038e9cf5faa7ebcb289786aac SHA256 036eb55f89b63ade50ee567210629edd450303abb4ddb9acefc0ef2bfb92b8b1 diff --git a/media-libs/mesa/files/eselect-mesa.conf.8.0 b/media-libs/mesa/files/eselect-mesa.conf.8.0 deleted file mode 100644 index 73b2752..0000000 --- a/media-libs/mesa/files/eselect-mesa.conf.8.0 +++ /dev/null @@ -1,39 +0,0 @@ -# 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,galliumdriver]="i965g_dri.so" -MESA_DRIVERS[i965,default]="classic" - -MESA_DRIVERS[r300,description]="r300 (Radeon R300-R500)" -MESA_DRIVERS[r300,classicdriver]="r300_dri.so" -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,classicdriver]="r600_dri.so" -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" diff --git a/media-libs/mesa/mesa-99999999.ebuild b/media-libs/mesa/mesa-99999999.ebuild deleted file mode 100644 index 3ba8ee4..0000000 --- a/media-libs/mesa/mesa-99999999.ebuild +++ /dev/null @@ -1,391 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -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="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_SRC_P}.tar.bz2 - ${SRC_PATCHES}" -fi - -# 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="i915 i965 intel" -RADEON_CARDS="r100 r200 r300 r600 radeon" -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 selinux +shared-glapi vdpau wayland xvmc kernel_FreeBSD" - -REQUIRED_USE=" - d3d? ( gallium ) - g3dvl? ( gallium ) - llvm? ( gallium ) - openvg? ( egl gallium ) - gbm? ( shared-glapi ) - gallium? ( - video_cards_r300? ( x86? ( llvm ) amd64? ( llvm ) ) - video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) ) - ) - g3dvl? ( || ( vdpau xvmc ) ) - vdpau? ( g3dvl ) - 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.30" -# 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 -" -# keep correct libdrm and dri2proto dep -# keep blocks in rdepend for binpkg -RDEPEND="${EXTERNAL_DEPEND} - !<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.2 - 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? ( media-libs/wayland ) - xvmc? ( x11-libs/libXvMC ) - ${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 ) - =dev-lang/python-2* - dev-libs/libxml2[python] - dev-util/pkgconfig - sys-devel/bison - sys-devel/flex - 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 - [[ $PV = 9999* ]] && git-2_src_unpack -} - -src_prepare() { - # apply patches - if [[ ${PV} != 9999* && -n ${SRC_PATCHES} ]]; then - EPATCH_FORCE="yes" \ - EPATCH_SOURCE="${WORKDIR}/patches" \ - EPATCH_SUFFIX="patch" \ - epatch - fi - - # 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 - - 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 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 - 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) \ - --with-dri-drivers=${DRI_DRIVERS} \ - --with-gallium-drivers=${GALLIUM_DRIVERS} \ - ${myconf} -} - -src_install() { - base_src_install - - 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.0" 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" - dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/{lib,extensions,include} - local x - 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}"/usr/$(get_libdir)/opengl/${OPENGL_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}"/usr/$(get_libdir)/opengl/${OPENGL_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} - # 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 -} diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml deleted file mode 100644 index 3f8d840..0000000 --- a/media-libs/mesa/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<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='gallium'>Build drivers based on Gallium3D, the new architecture for 3D graphics drivers.</flag> - <flag name='gles'>Enable GLES support for Gallium3D.</flag> - <flag name='llvm'>Enable LLVM backend for Gallium3D.</flag> - <flag name='pic'>disable optimized assembly code that is not PIC friendly</flag> -</use> -</pkgmetadata> diff --git a/media-misc/weston/Manifest b/media-misc/weston/Manifest index 1de7921..fbfe028 100644 --- a/media-misc/weston/Manifest +++ b/media-misc/weston/Manifest @@ -1 +1 @@ -EBUILD weston-9999.ebuild 1825 RMD160 371bf48c140cbe0e10712b5d4d88847a5ee4d4b6 SHA1 192ad8613810a4b080396c08516207f4fdeae974 SHA256 93e1c9b2a6de907fba22915cfd8e738e7d6dfe111c81d4d55acad86890ccf120 +EBUILD weston-9999.ebuild 1823 RMD160 d1c9302a79fcf250739ef224a0a27fc4504a6f44 SHA1 309adceeb3291ed399406b933dba679d807ac7b4 SHA256 de75aea65e536b37f4c625cc7bc3cba8f358167f95dd3723cded03bcfa3f04b0 diff --git a/media-misc/weston/weston-9999.ebuild b/media-misc/weston/weston-9999.ebuild index 46608b6..a9e4d7d 100644 --- a/media-misc/weston/weston-9999.ebuild +++ b/media-misc/weston/weston-9999.ebuild @@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86" IUSE="+poppler +svg +clients +simple-clients +compositor-drm +compositor-x11 +compositor-wayland compositor-openwfd" -DEPEND="media-libs/wayland +DEPEND="dev-libs/wayland >=media-libs/mesa-9999[gles2,egl] x11-libs/pixman media-libs/libpng diff --git a/profiles/package.mask b/profiles/package.mask index b98c8d9..7d92e98 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,7 +1,6 @@ # Benjamin Franzke <benjaminfranzke@googlemail.com> (30 Juli 2010) # wayland live ebuilds -=media-libs/mesa-99999999 -=media-libs/wayland-9999 +=dev-libs/wayland-9999 # Benjamin Franzke <benjaminfranzke@googlemail.com> (22 Juli 2011) # gst-plugins-vaapi live ebuild |