From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B5DBC58973 for ; Sat, 30 Jan 2016 12:19:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1513D21C002; Sat, 30 Jan 2016 12:19:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9928F21C002 for ; Sat, 30 Jan 2016 12:19:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2357A340955 for ; Sat, 30 Jan 2016 12:19:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ADDABC0 for ; Sat, 30 Jan 2016 12:19:39 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1454156284.7963b67b7bbee8240d0ce52a7e4b056f7db64b7c.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-drivers/nvidia-drivers/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-drivers/nvidia-drivers/Manifest x11-drivers/nvidia-drivers/nvidia-drivers-358.16-r2.ebuild x11-drivers/nvidia-drivers/nvidia-drivers-361.18-r2.ebuild X-VCS-Directories: x11-drivers/nvidia-drivers/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 7963b67b7bbee8240d0ce52a7e4b056f7db64b7c X-VCS-Branch: master Date: Sat, 30 Jan 2016 12:19:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1994d7d2-e196-46dc-8199-41b691670b81 X-Archives-Hash: fa8dc07ad64cb991cb142c30af445955 commit: 7963b67b7bbee8240d0ce52a7e4b056f7db64b7c Author: Jeroen Roovers gentoo org> AuthorDate: Sat Jan 30 12:18:04 2016 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Sat Jan 30 12:18:04 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7963b67b x11-drivers/nvidia-drivers: Update 358 branch for bug #562910. Clean up 361 branch ebuild. Package-Manager: portage-2.2.27 x11-drivers/nvidia-drivers/Manifest | 1 + ...8-r2.ebuild => nvidia-drivers-358.16-r2.ebuild} | 162 +++++++++++---------- .../nvidia-drivers/nvidia-drivers-361.18-r2.ebuild | 13 +- 3 files changed, 90 insertions(+), 86 deletions(-) diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest index 00809e0..39d279a 100644 --- a/x11-drivers/nvidia-drivers/Manifest +++ b/x11-drivers/nvidia-drivers/Manifest @@ -43,4 +43,5 @@ DIST NVIDIA-Linux-x86_64-96.43.23-pkg2.run 15962375 SHA256 ce8d8253e7dab7da63fbd DIST nvidia-settings-304.131.tar.bz2 1480447 SHA256 d36d2d1ae7c1bb72cd18e713470546d2aa7057624b1f61319daf559a94054d29 SHA512 9269f54f87581e29e6d7cabeaf989c70cb27aa55f6b8f5f1c71b8a14401326d06ea194710722b41283cca56f5808b90a9b1fb12158d48c6332cce15a701c5796 WHIRLPOOL be8e38a09a0bfa40267b9cdae2800a9ef00a89e28e618b743b7acb0cd9ece4b242b74ced32018d735989592300b49b2ee683caa11a1e161bcecf070a58952dfd DIST nvidia-settings-340.96.tar.bz2 1551011 SHA256 af7303b070a4b41e388a7be6dfae17f020a5cc197170d4815b9a291a3a98aaff SHA512 fc6096338e48c347e4e854d06e8f63d8edb6527953996e63f3f70619be59d0436176547b5197ef30d18a82cf5b58dd775dcca4a2624107b63cce1ae589f2b154 WHIRLPOOL e7266ca0395aa1a5666a43bf6e54e258706d4e76bfd15079485e2379b332d2d6ba0c97b32e49f5b041340bb2d3c0e11dace702754ffc952c149557e0ab9d820a DIST nvidia-settings-352.79.tar.bz2 1570988 SHA256 1f103cbfe162281355c484a5c3ef9ac1bb0528acba2d229111da7e58cf18f217 SHA512 d56e20844bf71d55e51aebca38e922a2985fdbd4edab29a07f9a4a8a0b883ca469c3b949f048837ec77464da90e2d485e5efcd314afc2810c44ad7dc497b53fe WHIRLPOOL 51999a744f6b3e36c4d12f841c136a754533de09c1802f60392666392beeccbb0bf1489269cac33b12ccb061554609d3dc8d8ffbf45b4cb860108fd9f86e2139 +DIST nvidia-settings-358.16.tar.bz2 1571104 SHA256 8cd78df738a824e282771755ae9a41d5b194b15f9df96b9fd23fcf3005967d35 SHA512 0438aa2599e98f68a04c9f663f4ef9b05092df512fbca40ad0fe17e25ca4d940d02cc55e9fd44a2551950a2a30782d1e48553c4bebd071bfff280869a6dde556 WHIRLPOOL 60b7e9abba3163ac877a3a9d944cf72352e28d2fd1a3af0996d3b7d40ef48be7f057c1063f9ca61c693cbf1bff57be61704f13d941220bf74a8049954f87154d DIST nvidia-settings-361.18.tar.bz2 1570821 SHA256 5e821bf9c92931da7c4ac2cac4c61a83e7f74641902935232cad747511fab363 SHA512 1a19ebb6773b53564a7996c8f963c161df599ed8ca577f505fbed1181f144a5e53fa970e3fee7fceed16909bd012f74f9af74080314ae9de9356894df9b1be4d WHIRLPOOL 23ff413900fca81427d755ecb5889dbb69033e101cf7c2f3edea4971defd03aedee95f5488779f634c690c05bfabe0763baf3dbf6377de950cabe48ad9c72684 diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-361.18-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-358.16-r2.ebuild similarity index 81% copy from x11-drivers/nvidia-drivers/nvidia-drivers-361.18-r2.ebuild copy to x11-drivers/nvidia-drivers/nvidia-drivers-358.16-r2.ebuild index b2f2410..9f0cd78 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-361.18-r2.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-358.16-r2.ebuild @@ -29,7 +29,7 @@ KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd" RESTRICT="bindist mirror strip" EMULTILIB_PKG="true" -IUSE="acpi +driver gtk2 gtk3 kernel_FreeBSD kernel_linux +kms multilib pax_kernel static-libs +tools uvm +X" +IUSE="acpi multilib kernel_FreeBSD kernel_linux +kms pax_kernel static-libs +tools gtk3 +X uvm" REQUIRED_USE=" tools? ( X ) static-libs? ( tools ) @@ -42,9 +42,7 @@ COMMON=" dev-libs/atk dev-libs/glib:2 dev-libs/jansson - gtk3? ( - x11-libs/gtk+:3 - ) + gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 @@ -57,7 +55,6 @@ COMMON=" ) X? ( >=app-eselect/eselect-opengl-1.0.9 - app-misc/pax-utils ) " DEPEND=" @@ -89,11 +86,11 @@ pkg_pretend() { die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}" fi - if use kernel_linux && kernel_is ge 4 5; then + if use kernel_linux && kernel_is ge 4 4; then ewarn "Gentoo supports kernels which are supported by NVIDIA" ewarn "which are limited to the following kernels:" - ewarn " userspace driver config lib - donvidia ${NV_OBJ}/libnvidia-cfg.so.${NV_SOVER} + donvidia ${NV_OBJ}/libnvidia-cfg.so ${NV_SOVER} # NVIDIA framebuffer capture library - donvidia ${NV_OBJ}/libnvidia-fbc.so.${NV_SOVER} + donvidia ${NV_OBJ}/libnvidia-fbc.so ${NV_SOVER} # NVIDIA video encode/decode <-> CUDA if use kernel_linux; then - donvidia ${NV_OBJ}/libnvcuvid.so.${NV_SOVER} - donvidia ${NV_OBJ}/libnvidia-encode.so.${NV_SOVER} + donvidia ${NV_OBJ}/libnvcuvid.so ${NV_SOVER} + donvidia ${NV_OBJ}/libnvidia-encode.so ${NV_SOVER} fi if use X; then @@ -296,7 +303,7 @@ src_install() { doins ${NV_X11}/nvidia_drv.so # Xorg GLX driver - donvidia ${NV_X11}/libglx.so.${NV_SOVER} \ + donvidia ${NV_X11}/libglx.so ${NV_SOVER} \ /usr/$(get_libdir)/opengl/nvidia/extensions # Xorg nvidia.conf @@ -368,6 +375,9 @@ src_install() { use static-libs && \ dolib.a "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a + insinto /usr/include/NVCtrl + doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h + insinto /usr/share/nvidia/ doins nvidia-application-profiles-${PV}-key-documentation @@ -375,9 +385,6 @@ src_install() { newins \ nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc - insinto /usr/include/NVCtrl - doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h - # There is no icon in the FreeBSD tarball. use kernel_FreeBSD || \ newicon ${NV_OBJ}/nvidia-settings.png ${PN}-settings.png @@ -389,7 +396,6 @@ src_install() { fi dobin ${NV_OBJ}/nvidia-bug-report.sh - #doenvd "${FILESDIR}"/50nvidia-prelink-blacklist if has_multilib_profile && use multilib; then local OABI=${ABI} @@ -419,57 +425,57 @@ src_install-libs() { if use X; then NV_GLX_LIBRARIES=( - "libEGL.so.1 ${GL_ROOT}" - "libEGL_nvidia.so.${NV_SOVER} ${GL_ROOT}" - "libGL.so.1 ${GL_ROOT}" - "libGLESv1_CM.so.1 ${GL_ROOT}" - "libGLESv1_CM_nvidia.so.${NV_SOVER} ${GL_ROOT}" - "libGLESv2.so.2 ${GL_ROOT}" - "libGLESv2_nvidia.so.${NV_SOVER} ${GL_ROOT}" - "libGLX.so.0 ${GL_ROOT}" - "libGLX_nvidia.so.${NV_SOVER} ${GL_ROOT}" - "libGLdispatch.so.0 ${GL_ROOT}" - "libOpenCL.so.1.0.0 ${CL_ROOT}" - "libOpenGL.so.0 ${GL_ROOT}" - "libcuda.so.${NV_SOVER}" - "libnvcuvid.so.${NV_SOVER}" - "libnvidia-compiler.so.${NV_SOVER}" - "libnvidia-eglcore.so.${NV_SOVER}" - "libnvidia-encode.so.${NV_SOVER}" - "libnvidia-fatbinaryloader.so.${NV_SOVER}" - "libnvidia-fbc.so.${NV_SOVER}" - "libnvidia-glcore.so.${NV_SOVER}" - "libnvidia-glsi.so.${NV_SOVER}" - "libnvidia-ifr.so.${NV_SOVER}" - "libnvidia-opencl.so.${NV_SOVER}" - "libnvidia-ptxjitcompiler.so.${NV_SOVER}" - "libvdpau_nvidia.so.${NV_SOVER}" + "libEGL.so 1 ${GL_ROOT}" + "libEGL_nvidia.so 0 ${GL_ROOT}" + "libGL.so ${NV_SOVER} ${GL_ROOT}" + "libGLESv1_CM.so ${NV_SOVER} ${GL_ROOT}" + "libGLdispatch.so 0 ${GL_ROOT}" + "libOpenCL.so 1.0.0 ${CL_ROOT}" + "libOpenGL.so 0 ${GL_ROOT}" + "libcuda.so ${NV_SOVER}" + "libnvcuvid.so ${NV_SOVER}" + "libnvidia-compiler.so ${NV_SOVER}" + "libnvidia-eglcore.so ${NV_SOVER}" + "libnvidia-encode.so ${NV_SOVER}" + "libnvidia-fbc.so ${NV_SOVER}" + "libnvidia-glcore.so ${NV_SOVER}" + "libnvidia-glsi.so ${NV_SOVER}" + "libnvidia-ifr.so ${NV_SOVER}" + "libnvidia-opencl.so ${NV_SOVER}" + "libvdpau.so ${NV_SOVER} ${GL_ROOT}" + "libvdpau_nvidia.so ${NV_SOVER}" + "libvdpau_trace.so ${NV_SOVER} ${GL_ROOT}" ) - if use kernel_linux && has_multilib_profile && [[ ${ABI} == "amd64" ]]; then - NV_GLX_LIBRARIES+=( "libnvidia-wfb.so.${NV_SOVER}" ) + NV_GLX_LIBRARIES+=( "libnvidia-wfb.so ${NV_SOVER}" ) fi if use kernel_FreeBSD; then - NV_GLX_LIBRARIES+=( "libnvidia-tls.so.${NV_SOVER}" ) + NV_GLX_LIBRARIES+=( "libnvidia-tls.so ${NV_SOVER}" ) fi if use kernel_linux; then NV_GLX_LIBRARIES+=( - "libnvidia-ml.so.${NV_SOVER}" - "tls/libnvidia-tls.so.${NV_SOVER}" + "libnvidia-ml.so ${NV_SOVER}" + "tls/libnvidia-tls.so ${NV_SOVER}" ) fi for NV_LIB in "${NV_GLX_LIBRARIES[@]}"; do donvidia ${libdir}/${NV_LIB} done + + # GLES v2 library is special + insinto ${GL_ROOT} + doexe ${libdir}/libGLESv2.so.${PV} + dosym libGLESv2.so.${PV} ${GL_ROOT}/libGLESv2.so.2 + dosym libGLESv2.so.2 ${GL_ROOT}/libGLESv2.so fi } pkg_preinst() { - if use driver && use kernel_linux; then + if use kernel_linux; then linux-mod_pkg_preinst local videogroup="$(egetent group video | cut -d ':' -f 3)" @@ -496,7 +502,7 @@ pkg_preinst() { } pkg_postinst() { - use driver && use kernel_linux && linux-mod_pkg_postinst + use kernel_linux && linux-mod_pkg_postinst # Switch to the nvidia implementation use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia @@ -527,6 +533,6 @@ pkg_prerm() { } pkg_postrm() { - use driver && use kernel_linux && linux-mod_pkg_postrm + use kernel_linux && linux-mod_pkg_postrm use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11 } diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-361.18-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-361.18-r2.ebuild index b2f2410..329f634 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-361.18-r2.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-361.18-r2.ebuild @@ -29,7 +29,7 @@ KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd" RESTRICT="bindist mirror strip" EMULTILIB_PKG="true" -IUSE="acpi +driver gtk2 gtk3 kernel_FreeBSD kernel_linux +kms multilib pax_kernel static-libs +tools uvm +X" +IUSE="acpi +driver gtk3 kernel_FreeBSD kernel_linux +kms multilib pax_kernel static-libs +tools uvm +X" REQUIRED_USE=" tools? ( X ) static-libs? ( tools ) @@ -42,9 +42,7 @@ COMMON=" dev-libs/atk dev-libs/glib:2 dev-libs/jansson - gtk3? ( - x11-libs/gtk+:3 - ) + gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 @@ -368,6 +366,9 @@ src_install() { use static-libs && \ dolib.a "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a + insinto /usr/include/NVCtrl + doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h + insinto /usr/share/nvidia/ doins nvidia-application-profiles-${PV}-key-documentation @@ -375,9 +376,6 @@ src_install() { newins \ nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc - insinto /usr/include/NVCtrl - doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h - # There is no icon in the FreeBSD tarball. use kernel_FreeBSD || \ newicon ${NV_OBJ}/nvidia-settings.png ${PN}-settings.png @@ -389,7 +387,6 @@ src_install() { fi dobin ${NV_OBJ}/nvidia-bug-report.sh - #doenvd "${FILESDIR}"/50nvidia-prelink-blacklist if has_multilib_profile && use multilib; then local OABI=${ABI}