commit: 2411166e56da41fc163475c0ce0f6c10310d6468 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Sun May 27 06:51:04 2018 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Sun May 27 06:54:19 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2411166e
media-libs/mesa: Drop eselect-mesa support It only allowed selecting between two i915 drivers and two swrast drivers. Not interesting. Now, if gallium is enabled we will default to the gallium version of these drivers, otherwise the classic version. Closes: https://bugs.gentoo.org/546198 Closes: https://bugs.gentoo.org/576334 .../{mesa-9999.ebuild => mesa-18.1.0-r1.ebuild} | 43 +--------------------- media-libs/mesa/mesa-9999.ebuild | 43 +--------------------- 2 files changed, 2 insertions(+), 84 deletions(-) diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-18.1.0-r1.ebuild similarity index 90% copy from media-libs/mesa/mesa-9999.ebuild copy to media-libs/mesa/mesa-18.1.0-r1.ebuild index cf00b47b8bc..70702be097d 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-18.1.0-r1.ebuild @@ -77,8 +77,7 @@ REQUIRED_USE=" LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.91" RDEPEND=" - classic? ( app-eselect/eselect-mesa ) - gallium? ( app-eselect/eselect-mesa ) + !app-eselect/eselect-mesa >=app-eselect/eselect-opengl-1.3.0 >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}] >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}] @@ -402,37 +401,6 @@ multilib_src_configure() { multilib_src_install() { emake install DESTDIR="${D}" - 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" @@ -462,10 +430,6 @@ multilib_src_install_all() { 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() { @@ -484,11 +448,6 @@ pkg_postinst() { echo eselect opengl set --use-old ${OPENGL_DIR} - # 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} diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index cf00b47b8bc..70702be097d 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -77,8 +77,7 @@ REQUIRED_USE=" LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.91" RDEPEND=" - classic? ( app-eselect/eselect-mesa ) - gallium? ( app-eselect/eselect-mesa ) + !app-eselect/eselect-mesa >=app-eselect/eselect-opengl-1.3.0 >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}] >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}] @@ -402,37 +401,6 @@ multilib_src_configure() { multilib_src_install() { emake install DESTDIR="${D}" - 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" @@ -462,10 +430,6 @@ multilib_src_install_all() { 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() { @@ -484,11 +448,6 @@ pkg_postinst() { echo eselect opengl set --use-old ${OPENGL_DIR} - # 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}
