From 9cc2e392bf910d703254bcb70e00e20398805fae Mon Sep 17 00:00:00 2001 From: Kolan Sh Date: Fri, 4 Apr 2014 15:31:30 +0400 Subject: [PATCH] Disabling opencl at global. Mesa ebuilds removed. --- media-libs/mesa/Manifest | 4 - media-libs/mesa/files/eselect-mesa.conf.9.2 | 39 -- media-libs/mesa/files/glx_ro_text_segm.patch | 28 - .../mesa-9.2-dont-require-llvm-for-r300.patch | 12 - media-libs/mesa/mesa-10.0.4.ebuild | 500 ----------------- media-libs/mesa/mesa-10.1.0.ebuild | 503 ------------------ media-libs/mesa/mesa-9.2.5-r1.ebuild | 503 ------------------ .../amd64/13.0/backbone/desktop/make.defaults | 2 +- .../amd64/13.0/backbone/desktop/package.mask | 5 - 9 files changed, 1 insertion(+), 1595 deletions(-) delete mode 100644 media-libs/mesa/Manifest delete mode 100644 media-libs/mesa/files/eselect-mesa.conf.9.2 delete mode 100644 media-libs/mesa/files/glx_ro_text_segm.patch delete mode 100644 media-libs/mesa/files/mesa-9.2-dont-require-llvm-for-r300.patch delete mode 100644 media-libs/mesa/mesa-10.0.4.ebuild delete mode 100644 media-libs/mesa/mesa-10.1.0.ebuild delete mode 100644 media-libs/mesa/mesa-9.2.5-r1.ebuild diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest deleted file mode 100644 index e1735d17..00000000 --- a/media-libs/mesa/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST MesaLib-10.0.4.tar.bz2 6794593 SHA256 ff6eb552becb25a318e53ac56b95a8c2d49e83ad674d87f52e811c0a20c25a40 SHA512 5e5d42def9b867436beaa1f1a2a73e80ce098efcbb840a37c2977410be87dbf88dab994dc5ebbca90b4dc9d13966742924dc73893d3f93bc3d95b61c9149fae5 WHIRLPOOL 965eb710ecd8d3916de6bdb04f36e8ea2a9fbbac1004913c235b06c0f2dc872842495c3dbc0a784c4769d90d1e0cef9bf9ca00394a6bc9aa4d890bde9037238d -DIST MesaLib-10.1.0.tar.bz2 6908005 SHA256 5941c3d4772a9f447f51569dfca48e01af98080bc996991d00a13f900dab2230 SHA512 a8c57e50c360f3d4ebc850de6b24b87175100cedcbb48ceace2b228f654d29ffa97ec24118ad8e0f281fee80750568fdb2f8b58866713424889c69387e3a6adb WHIRLPOOL 1504057d84e91c2ef39da3659c34f48dd49351f2e7bd08fa893aa0afd542071f6a84deb3e90cec531722b0cb10edee3c609c8d53f9a84f615809bb4c513b260c -DIST MesaLib-9.2.5.tar.bz2 6678076 SHA256 b46ab9efed176df0591993397594d712ada9da6a47fd31bbe75050fe28eb6bf0 SHA512 faf18507907344b1021d0ea183bab49b1aa805516a5c328349bdf36dc1f8fcae6b7f9a1de0cb736cd1c534d64b23e14c7b0c3f81a7a8431bf52ee9663ae46544 WHIRLPOOL f326ef4b0e6c04770b100f751d4953b4b6404ac802de6bd034685d953e858f2f3659c7f322d99cec0551c2e1562828daa6f3f24093fd4ebce2109aec0d90d789 -DIST mesa-9.2-gentoo-patches-04.tar.xz 4200 SHA256 f7d530fe703a1b14a6e75f37a995a4402b339f4ae2fa76e8d92106902a273061 SHA512 b3f2031197bf11134860dd5bd378e725d2ac4481f4dcc3b9328eb0817b9d4bc19e8f21b4249aab954441a34553a97bf549c538c5333d9dd670c9c6577de3def9 WHIRLPOOL 0fa660f5532902a3ccdc64896397af9197c752936a72fcdfda79add70900dfb50f7ee47be0a1c400e6ea65964b8ed9d5690a650e47539a7baf54212fc09f6f28 diff --git a/media-libs/mesa/files/eselect-mesa.conf.9.2 b/media-libs/mesa/files/eselect-mesa.conf.9.2 deleted file mode 100644 index ff590f59..00000000 --- a/media-libs/mesa/files/eselect-mesa.conf.9.2 +++ /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 GMA 965, G/Q3x, G/Q4x, HD)" -MESA_DRIVERS[i965,classicdriver]="i965_dri.so" -MESA_DRIVERS[i965,galliumdriver]="ilo_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/files/glx_ro_text_segm.patch b/media-libs/mesa/files/glx_ro_text_segm.patch deleted file mode 100644 index 495b7dc4..00000000 --- a/media-libs/mesa/files/glx_ro_text_segm.patch +++ /dev/null @@ -1,28 +0,0 @@ -2011-02-09 Jeremy Huddleston @])], -+ [enable_glx_rts="$enableval"], -+ [enable_glx_rts=no]) -+if test "x$enable_glx_rts" = xyes; then -+ DEFINES="$DEFINES -DGLX_X86_READONLY_TEXT" -+else -+ enable_glx_rts=no -+fi -+ -+ - dnl - dnl libGL configuration per driver - dnl diff --git a/media-libs/mesa/files/mesa-9.2-dont-require-llvm-for-r300.patch b/media-libs/mesa/files/mesa-9.2-dont-require-llvm-for-r300.patch deleted file mode 100644 index bd24787e..00000000 --- a/media-libs/mesa/files/mesa-9.2-dont-require-llvm-for-r300.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 21a1986..94b2247 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1777,7 +1777,6 @@ if test "x$with_gallium_drivers" != x; then - xr300) - HAVE_GALLIUM_R300=yes - 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" "" "" "xvmc-r300" "vdpau-r300" - ;; diff --git a/media-libs/mesa/mesa-10.0.4.ebuild b/media-libs/mesa/mesa-10.0.4.ebuild deleted file mode 100644 index 0ac00673..00000000 --- a/media-libs/mesa/mesa-10.0.4.ebuild +++ /dev/null @@ -1,500 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-10.0.4.ebuild,v 1.3 2014/03/28 01:43:51 jer Exp $ - -EAPI=5 - -EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa" - -if [[ ${PV} = 9999* ]]; then - GIT_ECLASS="git-2" - EXPERIMENTAL="true" -fi - -PYTHON_COMPAT=( python{2_6,2_7} ) - -inherit base autotools multilib multilib-minimal flag-o-matic \ - python-any-r1 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}" - -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 - -# 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 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" - -INTEL_CARDS="i915 i965 ilo intel" -RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi" -VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vmware" -for card in ${VIDEO_CARDS}; do - IUSE_VIDEO_CARDS+=" video_cards_${card}" -done - -IUSE="${IUSE_VIDEO_CARDS} - bindist +classic debug +egl +gallium gbm gles1 gles2 +llvm +nptl - llvm-shared-libs opencl openvg osmesa pax_kernel pic r600-llvm-compiler - selinux vdpau wayland xvmc xa kernel_FreeBSD" - -REQUIRED_USE=" - llvm? ( gallium ) - openvg? ( egl gallium ) - opencl? ( - gallium - video_cards_r600? ( r600-llvm-compiler ) - video_cards_radeon? ( r600-llvm-compiler ) - video_cards_radeonsi? ( r600-llvm-compiler ) - ) - gles1? ( egl ) - gles2? ( egl ) - r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeonsi video_cards_radeon ) ) - wayland? ( egl gbm ) - xa? ( gallium ) - video_cards_freedreno? ( gallium ) - video_cards_intel? ( || ( classic gallium ) ) - video_cards_i915? ( || ( classic gallium ) ) - video_cards_i965? ( classic ) - video_cards_ilo? ( gallium ) - 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 ) - ${PYTHON_REQUIRED_USE} -" - -LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.49" -# keep correct libdrm and dri2proto dep -# keep blocks in rdepend for binpkg -RDEPEND=" - !=app-admin/eselect-opengl-1.2.7 - dev-libs/expat[${MULTILIB_USEDEP}] - gbm? ( virtual/udev[${MULTILIB_USEDEP}] ) - >=x11-libs/libX11-1.3.99.901[${MULTILIB_USEDEP}] - >=x11-libs/libxshmfence-1.0[${MULTILIB_USEDEP}] - x11-libs/libXdamage[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - x11-libs/libXxf86vm[${MULTILIB_USEDEP}] - >=x11-libs/libxcb-1.9.2[${MULTILIB_USEDEP}] - llvm? ( - video_cards_radeonsi? ( || ( - dev-libs/elfutils[${MULTILIB_USEDEP}] - dev-libs/libelf[${MULTILIB_USEDEP}] - ) ) - video_cards_r600? ( || ( - dev-libs/elfutils[${MULTILIB_USEDEP}] - dev-libs/libelf[${MULTILIB_USEDEP}] - ) ) - !video_cards_r600? ( - video_cards_radeon? ( || ( - dev-libs/elfutils[${MULTILIB_USEDEP}] - dev-libs/libelf[${MULTILIB_USEDEP}] - ) ) - ) - llvm-shared-libs? ( >=sys-devel/llvm-2.9[${MULTILIB_USEDEP}] ) - ) - opencl? ( - app-admin/eselect-opencl - dev-libs/libclc - ) - vdpau? ( >=x11-libs/libvdpau-0.4.1[${MULTILIB_USEDEP}] ) - wayland? ( >=dev-libs/wayland-1.2.0[${MULTILIB_USEDEP}] ) - xvmc? ( >=x11-libs/libXvMC-1.0.6[${MULTILIB_USEDEP}] ) - ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,${MULTILIB_USEDEP}] -" -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[${MULTILIB_USEDEP}] - r600-llvm-compiler? ( sys-devel/llvm[video_cards_radeon] ) - video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] ) - ) - opencl? ( - >=sys-devel/llvm-3.3-r1[${MULTILIB_USEDEP}] - >=sys-devel/clang-3.3[${MULTILIB_USEDEP}] - >=sys-devel/gcc-4.6 - ) - sys-devel/bison - sys-devel/flex - virtual/pkgconfig - >=x11-proto/dri2proto-2.6[${MULTILIB_USEDEP}] - >=x11-proto/dri3proto-1.0[${MULTILIB_USEDEP}] - >=x11-proto/presentproto-1.0[${MULTILIB_USEDEP}] - >=x11-proto/glproto-1.4.15-r1[${MULTILIB_USEDEP}] - >=x11-proto/xextproto-7.0.99.1[${MULTILIB_USEDEP}] - x11-proto/xf86driproto[${MULTILIB_USEDEP}] - x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}] - $(python_gen_any_dep 'dev-libs/libxml2[python,${PYTHON_USEDEP}]') -" - -python_check_deps() { - has_version --host-root "dev-libs/libxml2[python,${PYTHON_USEDEP}]" -} - -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 - - # warning message for bug 459306 - if use llvm && has_version sys-devel/llvm[!debug=]; then - ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm" - ewarn "detected! This can cause problems. For details, see bug 459306." - fi - - python-any-r1_pkg_setup -} - -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 - - # relax the requirement that r300 must have llvm, bug 380303 - epatch "${FILESDIR}"/mesa-9.2-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 - - base_src_prepare - - eautoreconf - multilib_copy_sources -} - -multilib_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") " - fi - - if use gallium; then - myconf+=" - $(use_enable llvm gallium-llvm) - $(use_enable openvg) - $(use_enable openvg gallium-egl) - $(use_enable r600-llvm-compiler) - $(use_enable vdpau) - $(use_enable xa) - $(use_enable xvmc) - " - gallium_enable swrast - gallium_enable video_cards_vmware svga - gallium_enable video_cards_nouveau nouveau - gallium_enable video_cards_i915 i915 - gallium_enable video_cards_ilo ilo - if ! use video_cards_i915 && \ - ! use video_cards_i965; 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 - - gallium_enable video_cards_freedreno freedreno - # opencl stuff - if use opencl; then - myconf+=" - $(use_enable opencl) - --with-opencl-libdir="${EPREFIX}/usr/$(get_libdir)/OpenCL/vendors/mesa" - --with-clang-libdir="${EPREFIX}/usr/lib" - " - fi - fi - - # x86 hardened pax_kernel needs glx-rts, bug 240956 - if use pax_kernel; then - myconf+=" - $(use_enable x86 glx-rts) - " - fi - - # build fails with BSD indent, bug #428112 - use userland_GNU || export INDENT=cat - - if ! multilib_is_native_abi; then - myconf+="LLVM_CONFIG=${EPREFIX}/usr/bin/llvm-config.${ABI}" - fi - - econf \ - --enable-dri \ - --enable-glx \ - --enable-shared-glapi \ - $(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_with llvm-shared-libs) \ - --with-dri-drivers=${DRI_DRIVERS} \ - --with-gallium-drivers=${GALLIUM_DRIVERS} \ - PYTHON2="${PYTHON}" \ - ${myconf} -} - -multilib_src_install() { - emake install DESTDIR="${D}" - - # 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 "$(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 "$(get_libdir)/${x}" ]; then - insopts -m0755 - doins "$(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 - if use opencl; then - ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching" - local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa" - dodir ${cl_dir}/{lib,include} - if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then - mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \ - "${ED}"${cl_dir} - fi - if [ -f "${ED}/usr/include/CL/opencl.h" ]; then - mv -f "${ED}"/usr/include/CL \ - "${ED}"${cl_dir}/include - fi - eend $? - fi -} - -multilib_src_install_all() { - prune_libtool_files --all - einstalldocs - - if use !bindist; then - dodoc docs/patents.txt - fi - - # Install config file for eselect mesa - insinto /usr/share/mesa - newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf -} - -multilib_src_test() { - emake check -} - -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 - - # Switch to mesa opencl - if use opencl; then - eselect opencl set --use-old ${PN} - 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/mesa-10.1.0.ebuild b/media-libs/mesa/mesa-10.1.0.ebuild deleted file mode 100644 index b5321624..00000000 --- a/media-libs/mesa/mesa-10.1.0.ebuild +++ /dev/null @@ -1,503 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-10.1.0.ebuild,v 1.4 2014/03/13 23:21:42 mattst88 Exp $ - -EAPI=5 - -EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa" - -if [[ ${PV} = 9999* ]]; then - GIT_ECLASS="git-r3" - EXPERIMENTAL="true" -fi - -PYTHON_COMPAT=( python{2_6,2_7} ) - -inherit base autotools multilib multilib-minimal flag-o-matic \ - python-any-r1 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/.0/}" - -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 - -# 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 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" - -INTEL_CARDS="i915 i965 ilo intel" -RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi" -VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vmware" -for card in ${VIDEO_CARDS}; do - IUSE_VIDEO_CARDS+=" video_cards_${card}" -done - -IUSE="${IUSE_VIDEO_CARDS} - bindist +classic debug +dri3 +egl +gallium gbm gles1 gles2 +llvm +nptl - +llvm-shared-libs opencl openvg osmesa pax_kernel pic - r600-llvm-compiler selinux vdpau wayland xvmc xa kernel_FreeBSD" - -REQUIRED_USE=" - llvm? ( gallium ) - openvg? ( egl gallium ) - opencl? ( - gallium - video_cards_r600? ( r600-llvm-compiler ) - video_cards_radeon? ( r600-llvm-compiler ) - video_cards_radeonsi? ( r600-llvm-compiler ) - ) - gles1? ( egl ) - gles2? ( egl ) - r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeonsi video_cards_radeon ) ) - wayland? ( egl gbm ) - xa? ( gallium ) - video_cards_freedreno? ( gallium ) - video_cards_intel? ( || ( classic gallium ) ) - video_cards_i915? ( || ( classic gallium ) ) - video_cards_i965? ( classic ) - video_cards_ilo? ( gallium ) - 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 ) - ${PYTHON_REQUIRED_USE} -" - -LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.52" -# keep correct libdrm and dri2proto dep -# keep blocks in rdepend for binpkg -RDEPEND=" - !=app-admin/eselect-opengl-1.2.7 - dev-libs/expat[${MULTILIB_USEDEP}] - gbm? ( virtual/udev[${MULTILIB_USEDEP}] ) - dri3? ( virtual/udev[${MULTILIB_USEDEP}] ) - >=x11-libs/libX11-1.3.99.901[${MULTILIB_USEDEP}] - >=x11-libs/libxshmfence-1.1[${MULTILIB_USEDEP}] - x11-libs/libXdamage[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - x11-libs/libXxf86vm[${MULTILIB_USEDEP}] - >=x11-libs/libxcb-1.9.2[${MULTILIB_USEDEP}] - llvm? ( - video_cards_radeonsi? ( || ( - dev-libs/elfutils[${MULTILIB_USEDEP}] - dev-libs/libelf[${MULTILIB_USEDEP}] - ) ) - video_cards_r600? ( || ( - dev-libs/elfutils[${MULTILIB_USEDEP}] - dev-libs/libelf[${MULTILIB_USEDEP}] - ) ) - !video_cards_r600? ( - video_cards_radeon? ( || ( - dev-libs/elfutils[${MULTILIB_USEDEP}] - dev-libs/libelf[${MULTILIB_USEDEP}] - ) ) - ) - llvm-shared-libs? ( >=sys-devel/llvm-2.9[${MULTILIB_USEDEP}] ) - ) - opencl? ( - app-admin/eselect-opencl - dev-libs/libclc - ) - vdpau? ( >=x11-libs/libvdpau-0.4.1[${MULTILIB_USEDEP}] ) - wayland? ( >=dev-libs/wayland-1.2.0[${MULTILIB_USEDEP}] ) - xvmc? ( >=x11-libs/libXvMC-1.0.6[${MULTILIB_USEDEP}] ) - ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,${MULTILIB_USEDEP}] -" -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[${MULTILIB_USEDEP}] - r600-llvm-compiler? ( sys-devel/llvm[video_cards_radeon] ) - video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] ) - ) - opencl? ( - >=sys-devel/llvm-3.3-r1[${MULTILIB_USEDEP}] - >=sys-devel/clang-3.3[${MULTILIB_USEDEP}] - >=sys-devel/gcc-4.6 - ) - sys-devel/bison - sys-devel/flex - virtual/pkgconfig - >=x11-proto/dri2proto-2.6[${MULTILIB_USEDEP}] - dri3? ( - >=x11-proto/dri3proto-1.0[${MULTILIB_USEDEP}] - >=x11-proto/presentproto-1.0[${MULTILIB_USEDEP}] - ) - >=x11-proto/glproto-1.4.15-r1[${MULTILIB_USEDEP}] - >=x11-proto/xextproto-7.0.99.1[${MULTILIB_USEDEP}] - x11-proto/xf86driproto[${MULTILIB_USEDEP}] - x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}] - $(python_gen_any_dep 'dev-libs/libxml2[python,${PYTHON_USEDEP}]') -" - -python_check_deps() { - has_version --host-root "dev-libs/libxml2[python,${PYTHON_USEDEP}]" -} - -S="${WORKDIR}/${MY_P}" -EGIT_CHECKOUT_DIR=${S} - -# 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 - - # warning message for bug 459306 - if use llvm && has_version sys-devel/llvm[!debug=]; then - ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm" - ewarn "detected! This can cause problems. For details, see bug 459306." - fi - - python-any-r1_pkg_setup -} - -src_unpack() { - default - [[ $PV = 9999* ]] && git-r3_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 - - # relax the requirement that r300 must have llvm, bug 380303 - epatch "${FILESDIR}"/${PN}-9.2-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 - - base_src_prepare - - eautoreconf - multilib_copy_sources -} - -multilib_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") " - fi - - if use gallium; then - myconf+=" - $(use_enable llvm gallium-llvm) - $(use_enable openvg) - $(use_enable openvg gallium-egl) - $(use_enable r600-llvm-compiler) - $(use_enable vdpau) - $(use_enable xa) - $(use_enable xvmc) - " - gallium_enable swrast - gallium_enable video_cards_vmware svga - gallium_enable video_cards_nouveau nouveau - gallium_enable video_cards_i915 i915 - gallium_enable video_cards_ilo ilo - if ! use video_cards_i915 && \ - ! use video_cards_i965; 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 - - gallium_enable video_cards_freedreno freedreno - # opencl stuff - if use opencl; then - myconf+=" - $(use_enable opencl) - --with-opencl-libdir="${EPREFIX}/usr/$(get_libdir)/OpenCL/vendors/mesa" - --with-clang-libdir="${EPREFIX}/usr/lib" - " - fi - fi - - # x86 hardened pax_kernel needs glx-rts, bug 240956 - if use pax_kernel; then - myconf+=" - $(use_enable x86 glx-rts) - " - fi - - # build fails with BSD indent, bug #428112 - use userland_GNU || export INDENT=cat - - if ! multilib_is_native_abi; then - myconf+="LLVM_CONFIG=${EPREFIX}/usr/bin/llvm-config.${ABI}" - fi - - econf \ - --enable-dri \ - --enable-glx \ - --enable-shared-glapi \ - $(use_enable !bindist texture-float) \ - $(use_enable debug) \ - $(use_enable dri3) \ - $(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_with llvm-shared-libs) \ - --with-dri-drivers=${DRI_DRIVERS} \ - --with-gallium-drivers=${GALLIUM_DRIVERS} \ - PYTHON2="${PYTHON}" \ - ${myconf} -} - -multilib_src_install() { - emake install DESTDIR="${D}" - - # 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 "$(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}" - fi - done - if use classic; then - emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install - fi - 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 - if use opencl; then - ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching" - local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa" - dodir ${cl_dir}/{lib,include} - if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then - mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \ - "${ED}"${cl_dir} - fi - if [ -f "${ED}/usr/include/CL/opencl.h" ]; then - mv -f "${ED}"/usr/include/CL \ - "${ED}"${cl_dir}/include - fi - eend $? - fi -} - -multilib_src_install_all() { - prune_libtool_files --all - einstalldocs - - if use !bindist; then - dodoc docs/patents.txt - fi - - # Install config file for eselect mesa - insinto /usr/share/mesa - newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf -} - -multilib_src_test() { - emake check -} - -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 - - # Switch to mesa opencl - if use opencl; then - eselect opencl set --use-old ${PN} - 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/mesa-9.2.5-r1.ebuild b/media-libs/mesa/mesa-9.2.5-r1.ebuild deleted file mode 100644 index 6fab1d2e..00000000 --- a/media-libs/mesa/mesa-9.2.5-r1.ebuild +++ /dev/null @@ -1,503 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-9.2.5-r1.ebuild,v 1.1 2014/02/24 19:42:05 chithanh Exp $ - -EAPI=5 - -EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa" - -if [[ ${PV} = 9999* ]]; then - GIT_ECLASS="git-2" - EXPERIMENTAL="true" -fi - -PYTHON_COMPAT=( python{2_6,2_7} ) - -inherit base autotools multilib multilib-minimal flag-o-matic \ - python-any-r1 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/${PN}-9.2-gentoo-patches-04.tar.xz" -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 - -# 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 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" - -INTEL_CARDS="i915 i965 ilo intel" -RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi" -VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vmware" -for card in ${VIDEO_CARDS}; do - IUSE_VIDEO_CARDS+=" video_cards_${card}" -done - -IUSE="${IUSE_VIDEO_CARDS} - bindist +classic debug +egl +gallium gbm gles1 gles2 +llvm +nptl - llvm-shared-libs opencl openvg osmesa pax_kernel pic r600-llvm-compiler - selinux vdpau wayland xvmc xa xorg kernel_FreeBSD" - -REQUIRED_USE=" - llvm? ( gallium ) - openvg? ( egl gallium ) - opencl? ( - gallium - llvm-shared-libs - video_cards_r600? ( r600-llvm-compiler ) - video_cards_radeon? ( r600-llvm-compiler ) - video_cards_radeonsi? ( r600-llvm-compiler ) - ) - gles1? ( egl ) - gles2? ( egl ) - r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeonsi video_cards_radeon ) ) - wayland? ( egl ) - xa? ( gallium ) - xorg? ( gallium ) - video_cards_freedreno? ( gallium ) - video_cards_intel? ( || ( classic gallium ) ) - video_cards_i915? ( || ( classic gallium ) ) - video_cards_i965? ( classic ) - video_cards_ilo? ( gallium ) - 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 ) - ${PYTHON_REQUIRED_USE} -" - -LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.46" -# keep correct libdrm and dri2proto dep -# keep blocks in rdepend for binpkg -RDEPEND=" - !=app-admin/eselect-opengl-1.2.7 - dev-libs/expat[${MULTILIB_USEDEP}] - gbm? ( virtual/udev[${MULTILIB_USEDEP}] ) - >=x11-libs/libX11-1.3.99.901[${MULTILIB_USEDEP}] - x11-libs/libXdamage[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - x11-libs/libXxf86vm[${MULTILIB_USEDEP}] - >=x11-libs/libxcb-1.8.1[${MULTILIB_USEDEP}] - llvm? ( - video_cards_radeonsi? ( || ( - dev-libs/elfutils[${MULTILIB_USEDEP}] - dev-libs/libelf[${MULTILIB_USEDEP}] - ) ) - video_cards_r600? ( || ( - dev-libs/elfutils[${MULTILIB_USEDEP}] - dev-libs/libelf[${MULTILIB_USEDEP}] - ) ) - !video_cards_r600? ( - video_cards_radeon? ( || ( - dev-libs/elfutils[${MULTILIB_USEDEP}] - dev-libs/libelf[${MULTILIB_USEDEP}] - ) ) - ) - llvm-shared-libs? ( >=sys-devel/llvm-2.9[${MULTILIB_USEDEP}] ) - ) - opencl? ( - app-admin/eselect-opencl - dev-libs/libclc - ) - vdpau? ( >=x11-libs/libvdpau-0.4.1[${MULTILIB_USEDEP}] ) - wayland? ( >=dev-libs/wayland-1.0.3[${MULTILIB_USEDEP}] ) - xorg? ( - x11-base/xorg-server:= - x11-libs/libdrm[libkms] - ) - xvmc? ( >=x11-libs/libXvMC-1.0.6[${MULTILIB_USEDEP}] ) - ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,${MULTILIB_USEDEP}] -" -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[${MULTILIB_USEDEP}] - r600-llvm-compiler? ( sys-devel/llvm[video_cards_radeon] ) - video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] ) - ) - opencl? ( - >=sys-devel/llvm-3.3-r1[${MULTILIB_USEDEP}] - >=sys-devel/clang-3.3[${MULTILIB_USEDEP}] - >=sys-devel/gcc-4.6 - ) - sys-devel/bison - sys-devel/flex - virtual/pkgconfig - >=x11-proto/dri2proto-2.6[${MULTILIB_USEDEP}] - >=x11-proto/glproto-1.4.15-r1[${MULTILIB_USEDEP}] - >=x11-proto/xextproto-7.0.99.1[${MULTILIB_USEDEP}] - x11-proto/xf86driproto[${MULTILIB_USEDEP}] - x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}] - $(python_gen_any_dep 'dev-libs/libxml2[python,${PYTHON_USEDEP}]') -" - -python_check_deps() { - has_version --host-root "dev-libs/libxml2[python,${PYTHON_USEDEP}]" -} - -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 - - # warning message for bug 459306 - if use llvm && has_version sys-devel/llvm[!debug=]; then - ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm" - ewarn "detected! This can cause problems. For details, see bug 459306." - fi - - python-any-r1_pkg_setup -} - -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 - - # relax the requirement that r300 must have llvm, bug 380303 - epatch "${FILESDIR}"/${PN}-9.2-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 - - base_src_prepare - - eautoreconf - multilib_copy_sources -} - -multilib_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 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 - gallium_enable video_cards_ilo ilo - if ! use video_cards_i915 && \ - ! use video_cards_i965; 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 - - gallium_enable video_cards_freedreno freedreno - # opencl stuff - if use opencl; then - myconf+=" - $(use_enable opencl) - --with-opencl-libdir="${EPREFIX}/usr/$(get_libdir)/OpenCL/vendors/mesa" - --with-clang-libdir="${EPREFIX}/usr/lib" - " - fi - fi - - # x86 hardened pax_kernel needs glx-rts, bug 240956 - if use pax_kernel; then - myconf+=" - $(use_enable x86 glx-rts) - " - fi - - # build fails with BSD indent, bug #428112 - use userland_GNU || export INDENT=cat - - if ! multilib_is_native_abi; then - myconf+="--disable-xorg - LLVM_CONFIG=${EPREFIX}/usr/bin/llvm-config.${ABI}" - fi - - econf \ - --enable-dri \ - --enable-glx \ - --enable-shared-glapi \ - $(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 xa) \ - $(use_enable xorg) \ - $(use_with llvm-shared-libs) \ - --with-dri-drivers=${DRI_DRIVERS} \ - --with-gallium-drivers=${GALLIUM_DRIVERS} \ - PYTHON2="${PYTHON}" \ - ${myconf} -} - -multilib_src_install() { - emake install DESTDIR="${D}" - - # 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 "$(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 "$(get_libdir)/${x}" ]; then - insopts -m0755 - doins "$(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 - if use opencl; then - ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching" - local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa" - dodir ${cl_dir}/{lib,include} - if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then - mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \ - "${ED}"${cl_dir} - fi - if [ -f "${ED}/usr/include/CL/opencl.h" ]; then - mv -f "${ED}"/usr/include/CL \ - "${ED}"${cl_dir}/include - fi - eend $? - fi -} - -multilib_src_install_all() { - prune_libtool_files --all - einstalldocs - - if use !bindist; then - dodoc docs/patents.txt - fi - - # Install config file for eselect mesa - insinto /usr/share/mesa - newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf -} - -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 - - # Switch to mesa opencl - if use opencl; then - eselect opencl set --use-old ${PN} - 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/profiles/default/linux/amd64/13.0/backbone/desktop/make.defaults b/profiles/default/linux/amd64/13.0/backbone/desktop/make.defaults index e111a713..11a1f0e1 100644 --- a/profiles/default/linux/amd64/13.0/backbone/desktop/make.defaults +++ b/profiles/default/linux/amd64/13.0/backbone/desktop/make.defaults @@ -29,7 +29,7 @@ RUBY_TARGETS="ruby20" USE="${USE} custom-cflags graphite" # gpu -USE="${USE} directfb dri dri2 fbcon fbcondecor fbosd opengl opencl vaapi" +USE="${USE} directfb dri dri2 fbcon fbcondecor fbosd opengl vaapi" # fonts USE="${USE} cairo cleartype -lcdfilter truetype unicode" diff --git a/profiles/default/linux/amd64/13.0/backbone/desktop/package.mask b/profiles/default/linux/amd64/13.0/backbone/desktop/package.mask index 4f1b312e..b88f0e66 100644 --- a/profiles/default/linux/amd64/13.0/backbone/desktop/package.mask +++ b/profiles/default/linux/amd64/13.0/backbone/desktop/package.mask @@ -3,8 +3,3 @@ >=gnome-base/gsettings-desktop-schemas-3.10.1 >=media-plugins/caps-plugins-0.9.10 # brokes alsaequal >=media-plugins/alsaequal-0.6-r1 - -# >=mesa-9.2 isn't compiled -=media-libs/mesa-10.0.4 -=virtual/opengl-7.0-r1 -=x11-base/xorg-server-1.15.0