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 4671458973 for ; Sat, 30 Jan 2016 11:47:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 563B7E0853; Sat, 30 Jan 2016 11:47:39 +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 D3898E0853 for ; Sat, 30 Jan 2016 11:47:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 82827340C66 for ; Sat, 30 Jan 2016 11:47:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E58578E7 for ; Sat, 30 Jan 2016 11:47:34 +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: <1454154425.2686aee327716ccc1768f41cde0979a9441c4ad0.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-304.131-r1.ebuild x11-drivers/nvidia-drivers/nvidia-drivers-352.79-r1.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: 2686aee327716ccc1768f41cde0979a9441c4ad0 X-VCS-Branch: master Date: Sat, 30 Jan 2016 11:47:34 +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: 9b48c826-49a4-4f10-9dc8-0e94c82103f5 X-Archives-Hash: 57ecc23d1e8a124ffbf97ee5193ac5d9 commit: 2686aee327716ccc1768f41cde0979a9441c4ad0 Author: Jeroen Roovers gentoo org> AuthorDate: Sat Jan 30 11:47:05 2016 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Sat Jan 30 11:47:05 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2686aee3 x11-drivers/nvidia-drivers: USE=static-libs requires USE=tools. Update 352 branch for bug #562910. Package-Manager: portage-2.2.27 x11-drivers/nvidia-drivers/Manifest | 1 + .../nvidia-drivers-304.131-r1.ebuild | 5 +- ...1-r1.ebuild => nvidia-drivers-352.79-r1.ebuild} | 148 +++++++++++++-------- .../nvidia-drivers/nvidia-drivers-361.18-r2.ebuild | 14 +- 4 files changed, 105 insertions(+), 63 deletions(-) diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest index 13b7ae7..00809e0 100644 --- a/x11-drivers/nvidia-drivers/Manifest +++ b/x11-drivers/nvidia-drivers/Manifest @@ -42,4 +42,5 @@ DIST NVIDIA-Linux-x86_64-361.18.run 86447500 SHA256 94cccc3ff10ee9544f60bf1d32d0 DIST NVIDIA-Linux-x86_64-96.43.23-pkg2.run 15962375 SHA256 ce8d8253e7dab7da63fbdac449ebf190cd0c10cbfffea0f8d0165515f851bc64 SHA512 04bec1187a6024a2b9839f008ec829281f1f2602dae2e639030bc385943186506bcaa2b46a230b2ab87f9217190841abc62f9e2d6395ab5559623389c31c6563 WHIRLPOOL 0651c44a51a1a06fcff5bfddbf9c3e408977e03263c7fe806cb6c01f9fe92f716dfe4e5190ffe1048bde72fcffdc8bca8267e74dd43ba5c9dfb22b6201fcc2bb 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-361.18.tar.bz2 1570821 SHA256 5e821bf9c92931da7c4ac2cac4c61a83e7f74641902935232cad747511fab363 SHA512 1a19ebb6773b53564a7996c8f963c161df599ed8ca577f505fbed1181f144a5e53fa970e3fee7fceed16909bd012f74f9af74080314ae9de9356894df9b1be4d WHIRLPOOL 23ff413900fca81427d755ecb5889dbb69033e101cf7c2f3edea4971defd03aedee95f5488779f634c690c05bfabe0763baf3dbf6377de950cabe48ad9c72684 diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-304.131-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-304.131-r1.ebuild index 50aa106..4de38e1 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-304.131-r1.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-304.131-r1.ebuild @@ -65,7 +65,10 @@ RDEPEND="${COMMON} " PDEPEND="X? ( >=x11-libs/libvdpau-0.3-r1 )" -REQUIRED_USE="tools? ( X )" +REQUIRED_USE=" + tools? ( X ) + static-libs? ( tools ) +" QA_PREBUILT="opt/* usr/lib*" diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-304.131-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-352.79-r1.ebuild similarity index 79% copy from x11-drivers/nvidia-drivers/nvidia-drivers-304.131-r1.ebuild copy to x11-drivers/nvidia-drivers/nvidia-drivers-352.79-r1.ebuild index 50aa106..2435263 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-304.131-r1.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-352.79-r1.ebuild @@ -3,8 +3,9 @@ # $Id$ EAPI=5 + inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \ - portability toolchain-funcs unpacker user versionator udev + portability toolchain-funcs unpacker user udev NV_URI="http://us.download.nvidia.com/XFree86/" X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}" @@ -22,57 +23,65 @@ SRC_URI=" tools? ( ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${PV}.tar.bz2 ) " -LICENSE="GPL-2 NVIDIA-r1" +LICENSE="GPL-2 NVIDIA-r2" SLOT="0/${PV%.*}" KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd" -IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel static-libs +tools +X" RESTRICT="bindist mirror strip" EMULTILIB_PKG="true" +IUSE="acpi gtk3 multilib kernel_FreeBSD kernel_linux pax_kernel static-libs +tools +X uvm" +REQUIRED_USE=" + tools? ( X ) + static-libs? ( tools ) +" + COMMON=" app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 - x11-libs/gdk-pixbuf + dev-libs/jansson + gtk3? ( + x11-libs/gtk+:3 + ) + x11-libs/cairo + x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext + x11-libs/libXrandr + x11-libs/libXv + x11-libs/libXxf86vm x11-libs/pango[X] - x11-libs/pangox-compat ) X? ( >=app-eselect/eselect-opengl-1.0.9 ) " -DEPEND="${COMMON} - kernel_linux? ( - virtual/linux-sources - virtual/pkgconfig - )" -RDEPEND="${COMMON} +DEPEND=" + ${COMMON} + kernel_linux? ( virtual/linux-sources ) +" +RDEPEND=" + ${COMMON} acpi? ( sys-power/acpid ) tools? ( !media-video/nvidia-settings ) X? ( =x11-libs/libvdpau-0.3-r1 multilib? ( >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] ) ) " -PDEPEND="X? ( >=x11-libs/libvdpau-0.3-r1 )" - -REQUIRED_USE="tools? ( X )" QA_PREBUILT="opt/* usr/lib*" S=${WORKDIR}/ pkg_pretend() { - if use amd64 && has_multilib_profile && \ [ "${DEFAULT_ABI}" != "amd64" ]; then eerror "This ebuild doesn't currently support changing your default ABI" @@ -113,10 +122,17 @@ pkg_setup() { export CCACHE_DISABLE=1 if use kernel_linux; then - linux-mod_pkg_setup MODULE_NAMES="nvidia(video:${S}/kernel)" + use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel/uvm)" + + # This needs to run after MODULE_NAMES (so that the eclass checks + # whether the kernel supports loadable modules) but before BUILD_PARAMS + # is set (so that KV_DIR is populated). + linux-mod_pkg_setup + BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \ SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)" + # linux-mod_src_compile calls set_arch_to_kernel, which # sets the ARCH to x86 but NVIDIA's wrapping Makefile # expects x86_64 or i386 and then converts it to x86 @@ -155,21 +171,17 @@ src_prepare() { fi # If greater than 2.6.5 use M= instead of SUBDIR= - convert_to_m "${NV_SRC}"/Makefile.kbuild +# convert_to_m "${NV_SRC}"/Makefile.kbuild fi if use pax_kernel; then ewarn "Using PAX patches is not supported. You will be asked to" ewarn "use a standard kernel should you have issues. Should you" ewarn "need support with these patches, contact the PaX team." - epatch "${FILESDIR}"/${PN}-pax-const.patch - epatch "${FILESDIR}"/${PN}-pax-usercopy.patch + epatch "${FILESDIR}"/${PN}-346.16-pax-usercopy.patch + epatch "${FILESDIR}"/${PN}-346.16-pax-constify.patch fi - cat <<- EOF > "${S}"/nvidia.icd - /usr/$(get_libdir)/libnvidia-opencl.so - EOF - # Allow user patches so they can support RC kernels and whatever else epatch_user } @@ -184,25 +196,26 @@ src_compile() { MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \ LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die elif use kernel_linux; then - MAKEOPTS=-j1 linux-mod_src_compile + MAKEOPTS=-j1 + linux-mod_src_compile fi if use tools; then - emake -C "${S}"/nvidia-settings-${PV}/src/libXNVCtrl clean - emake -C "${S}"/nvidia-settings-${PV}/src/libXNVCtrl \ + emake -C "${S}"/nvidia-settings-${PV}/src \ AR="$(tc-getAR)" \ CC="$(tc-getCC)" \ + LIBDIR="$(get_libdir)" \ RANLIB="$(tc-getRANLIB)" \ - libXNVCtrl.a + build-xnvctrl + emake -C "${S}"/nvidia-settings-${PV}/src \ - AR="$(tc-getAR)" \ CC="$(tc-getCC)" \ + GTK3_AVAILABLE=$(usex gtk3 1 0) \ LD="$(tc-getCC)" \ LIBDIR="$(get_libdir)" \ NVML_ENABLED=0 \ NV_USE_BUNDLED_LIBJANSSON=0 \ NV_VERBOSE=1 \ - RANLIB="$(tc-getRANLIB)" \ STRIP_CMD=true fi } @@ -258,6 +271,7 @@ src_install() { # pkg_preinst, see bug #491414 insinto /etc/modprobe.d newins "${FILESDIR}"/nvidia-169.07 nvidia.conf + use uvm && doins "${FILESDIR}"/nvidia-uvm.conf # Ensures that our device nodes are created when not using X exeinto "$(get_udevdir)" @@ -276,9 +290,13 @@ src_install() { # NVIDIA kernel <-> userspace driver config lib donvidia ${NV_OBJ}/libnvidia-cfg.so ${NV_SOVER} + # NVIDIA framebuffer capture library + donvidia ${NV_OBJ}/libnvidia-fbc.so ${NV_SOVER} + + # NVIDIA video encode/decode <-> CUDA if use kernel_linux; then - # NVIDIA video decode <-> CUDA donvidia ${NV_OBJ}/libnvcuvid.so ${NV_SOVER} + donvidia ${NV_OBJ}/libnvidia-encode.so ${NV_SOVER} fi if use X; then @@ -290,20 +308,17 @@ src_install() { donvidia ${NV_X11}/libglx.so ${NV_SOVER} \ /usr/$(get_libdir)/opengl/nvidia/extensions - # XvMC driver - dolib.a ${NV_X11}/libXvMCNVIDIA.a || \ - die "failed to install libXvMCNVIDIA.so" - donvidia ${NV_X11}/libXvMCNVIDIA.so ${NV_SOVER} - dosym libXvMCNVIDIA.so.${NV_SOVER} \ - /usr/$(get_libdir)/libXvMCNVIDIA_dynamic.so.1 || \ - die "failed to create libXvMCNVIDIA_dynamic.so symlink" + # Xorg nvidia.conf + if has_version '>=x11-base/xorg-server-1.16'; then + insinto /usr/share/X11/xorg.conf.d + newins {,50-}nvidia-drm-outputclass.conf + fi fi # OpenCL ICD for NVIDIA if use kernel_linux; then insinto /etc/OpenCL/vendors - doins nvidia.icd - donvidia ${NV_OBJ}/libnvidia-opencl.so ${NV_SOVER} + doins ${NV_OBJ}/nvidia.icd fi # Documentation @@ -319,7 +334,7 @@ src_install() { doman "${NV_MAN}/nvidia-smi.1.gz" use X && doman "${NV_MAN}/nvidia-xconfig.1.gz" use tools && doman "${NV_MAN}/nvidia-settings.1.gz" - doman "${NV_MAN}/nvidia-cuda-proxy-control.1.gz" + doman "${NV_MAN}/nvidia-cuda-mps-control.1.gz" fi # Helper Apps @@ -330,19 +345,30 @@ src_install() { fi if use kernel_linux ; then + doexe ${NV_OBJ}/nvidia-cuda-mps-control + doexe ${NV_OBJ}/nvidia-cuda-mps-server doexe ${NV_OBJ}/nvidia-debugdump - doexe ${NV_OBJ}/nvidia-cuda-proxy-control - doexe ${NV_OBJ}/nvidia-cuda-proxy-server + doexe ${NV_OBJ}/nvidia-persistenced doexe ${NV_OBJ}/nvidia-smi + + # install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092) + doexe ${NV_OBJ}/nvidia-modprobe + fowners root:video /opt/bin/nvidia-modprobe + fperms 4710 /opt/bin/nvidia-modprobe + dosym /{opt,usr}/bin/nvidia-modprobe + + doman nvidia-cuda-mps-control.1.gz + doman nvidia-modprobe.1.gz + doman nvidia-persistenced.1.gz newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi + newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced + newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced fi - dobin ${NV_OBJ}/nvidia-bug-report.sh - - # Desktop entries for nvidia-settings - if use tools ; then + if use tools; then emake -C "${S}"/nvidia-settings-${PV}/src/ \ DESTDIR="${D}" \ + GTK3_AVAILABLE=$(usex gtk3 1 0) \ LIBDIR="${D}/usr/$(get_libdir)" \ PREFIX=/usr \ NV_USE_BUNDLED_LIBJANSSON=0 \ @@ -351,8 +377,12 @@ 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 + + insinto /etc/nvidia + newins \ + nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc # There is no icon in the FreeBSD tarball. use kernel_FreeBSD || \ @@ -364,7 +394,7 @@ src_install() { doexe "${FILESDIR}"/95-nvidia-settings fi - #doenvd "${FILESDIR}"/50nvidia-prelink-blacklist + dobin ${NV_OBJ}/nvidia-bug-report.sh if has_multilib_profile && use multilib ; then local OABI=${ABI} @@ -395,16 +425,27 @@ src_install-libs() { if use X; then # The GLX libraries + donvidia ${libdir}/libEGL.so ${NV_SOVER} ${GL_ROOT} donvidia ${libdir}/libGL.so ${NV_SOVER} ${GL_ROOT} + donvidia ${libdir}/libGLESv1_CM.so ${NV_SOVER} ${GL_ROOT} + donvidia ${libdir}/libnvidia-eglcore.so ${NV_SOVER} donvidia ${libdir}/libnvidia-glcore.so ${NV_SOVER} + donvidia ${libdir}/libnvidia-glsi.so ${NV_SOVER} + donvidia ${libdir}/libnvidia-ifr.so ${NV_SOVER} if use kernel_FreeBSD; then - donvidia ${libdir}/libnvidia-tls.so ${NV_SOVER} ${GL_ROOT} + donvidia ${libdir}/libnvidia-tls.so ${NV_SOVER} else - donvidia ${libdir}/tls/libnvidia-tls.so ${NV_SOVER} ${GL_ROOT} + donvidia ${libdir}/tls/libnvidia-tls.so ${NV_SOVER} fi # VDPAU donvidia ${libdir}/libvdpau_nvidia.so ${NV_SOVER} + + # GLES v2 libraries + 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 # NVIDIA monitoring library @@ -417,6 +458,7 @@ src_install-libs() { donvidia ${libdir}/libcuda.so ${NV_SOVER} donvidia ${libdir}/libnvidia-compiler.so ${NV_SOVER} donvidia ${libdir}/libOpenCL.so 1.0.0 ${CL_ROOT} + donvidia ${libdir}/libnvidia-opencl.so ${NV_SOVER} fi } @@ -458,7 +500,7 @@ pkg_postinst() { if ! use X; then elog "You have elected to not install the X.org driver. Along with" - elog "this the OpenGL libraries, XvMC, and VDPAU libraries were not" + elog "this the OpenGL libraries and VDPAU libraries were not" elog "installed. Additionally, once the driver is loaded your card" elog "and fan will run at max speed which may not be desirable." elog "Use the 'nvidia-smi' init script to have your card and fan" 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 e2759ed..b2f2410 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-361.18-r2.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-361.18-r2.ebuild @@ -31,23 +31,20 @@ EMULTILIB_PKG="true" IUSE="acpi +driver gtk2 gtk3 kernel_FreeBSD kernel_linux +kms multilib pax_kernel static-libs +tools uvm +X" REQUIRED_USE=" - tools? ( X || ( gtk2 gtk3 ) ) + tools? ( X ) + static-libs? ( tools ) " COMMON=" app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( - >=x11-libs/libvdpau-1.0 dev-libs/atk dev-libs/glib:2 dev-libs/jansson - gtk2? ( >=x11-libs/gtk+-2.4:2 ) gtk3? ( - x11-libs/cairo x11-libs/gtk+:3 ) - media-libs/mesa x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 @@ -65,7 +62,6 @@ COMMON=" " DEPEND=" ${COMMON} - app-arch/xz-utils kernel_linux? ( virtual/linux-sources ) " RDEPEND=" @@ -369,6 +365,9 @@ src_install() { NV_USE_BUNDLED_LIBJANSSON=0 \ install + use static-libs && \ + dolib.a "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a + insinto /usr/share/nvidia/ doins nvidia-application-profiles-${PV}-key-documentation @@ -376,9 +375,6 @@ src_install() { newins \ nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc - 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