From a949e9737169547ae9ddef4b24469520ce98d748 Mon Sep 17 00:00:00 2001 From: "Kacper Kowalik (Xarthisius)" Date: Wed, 8 Feb 2012 12:00:51 +0100 Subject: moved to g-x86 --- app-admin/eselect-opencl/Manifest | 10 - .../eselect-opencl/eselect-opencl-1.1.0.ebuild | 58 -- app-admin/eselect-opencl/metadata.xml | 11 - virtual/opencl/ChangeLog | 14 - virtual/opencl/Manifest | 3 - virtual/opencl/metadata.xml | 5 - virtual/opencl/opencl-0-r1.ebuild | 20 - x11-drivers/ati-drivers/Manifest | 6 - .../ati-drivers/ati-drivers-11.12-r1.ebuild | 607 --------------------- .../files/ati-powermode-opt-path-2.patch | 42 -- x11-drivers/ati-drivers/files/atieventsd.init | 20 - x11-drivers/ati-drivers/files/switchlibGL | 61 --- x11-drivers/ati-drivers/metadata.xml | 26 - x11-drivers/nvidia-drivers/Manifest | 6 - .../nvidia-drivers/files/256.35-unified-arch.patch | 31 -- x11-drivers/nvidia-drivers/files/nvidia-169.07 | 14 - .../nvidia-drivers/nvidia-drivers-290.10-r1.ebuild | 561 ------------------- 17 files changed, 1495 deletions(-) delete mode 100644 app-admin/eselect-opencl/Manifest delete mode 100644 app-admin/eselect-opencl/eselect-opencl-1.1.0.ebuild delete mode 100644 app-admin/eselect-opencl/metadata.xml delete mode 100644 virtual/opencl/ChangeLog delete mode 100644 virtual/opencl/Manifest delete mode 100644 virtual/opencl/metadata.xml delete mode 100644 virtual/opencl/opencl-0-r1.ebuild delete mode 100644 x11-drivers/ati-drivers/Manifest delete mode 100644 x11-drivers/ati-drivers/ati-drivers-11.12-r1.ebuild delete mode 100644 x11-drivers/ati-drivers/files/ati-powermode-opt-path-2.patch delete mode 100644 x11-drivers/ati-drivers/files/atieventsd.init delete mode 100644 x11-drivers/ati-drivers/files/switchlibGL delete mode 100644 x11-drivers/ati-drivers/metadata.xml delete mode 100644 x11-drivers/nvidia-drivers/Manifest delete mode 100644 x11-drivers/nvidia-drivers/files/256.35-unified-arch.patch delete mode 100644 x11-drivers/nvidia-drivers/files/nvidia-169.07 delete mode 100644 x11-drivers/nvidia-drivers/nvidia-drivers-290.10-r1.ebuild diff --git a/app-admin/eselect-opencl/Manifest b/app-admin/eselect-opencl/Manifest deleted file mode 100644 index 608e78e..0000000 --- a/app-admin/eselect-opencl/Manifest +++ /dev/null @@ -1,10 +0,0 @@ -DIST cl.h.1.1.xz 6940 RMD160 697d52b04bba416c233433ff5b9cba47d7327631 SHA1 2092a622e1494f0a31c1371147bc87478226b44b SHA256 11b0249ec6c35000686cfe775b1789fa010b6d058e123b00c720e8408881f13f -DIST cl.hpp.1.1.xz 14764 RMD160 009ff35d03da82b8271785077d94f046193f91d6 SHA1 096b0e0fd42d841effa24c6323cf109aa2f6ecce SHA256 5d90ef4d964a6365d8e9305913c85dd0ffe6916df0a151a116b1b58b0e6c7ef4 -DIST cl_ext.h.1.1.xz 2740 RMD160 f2debb481b3f3c94cbca5a50bb77fb571c9538dd SHA1 f7c759f6d8077e6d1eb222d1acb4a9638bee4741 SHA256 aeb729345004bf67d2564e1dc55feb326ff017f3b291ffb8e1391de353e09620 -DIST cl_gl.h.1.1.xz 1856 RMD160 e92b5e843322c9e78f3fe72da43c1502109dc1f5 SHA1 3c4ad063ea5e4ee232b273cecbb85abf17dbf112 SHA256 eeddf3403c13776b3d13a25c9e47a01eee750c0120f74d402fad5d78b29f925a -DIST cl_gl_ext.h.1.1.xz 1356 RMD160 0ba4c5d6f3c1d119d7a8844abd43b83db987b565 SHA1 829ae549cdd0de3878626858fb041d5a424ebd96 SHA256 594e463e3a24e62870c5c1914b05e796aeda8892bf6830ee8db3f722993fdf02 -DIST cl_platform.h.1.1.xz 5584 RMD160 034d4be552aa3ddb6cc45718c5aa7a195d7f3f59 SHA1 bdc027789de959d1aa33e70de8af90dd103780d3 SHA256 2f70eb47285fd46f75d48476e90ee3b7e9ba62166bc573bbb35cb0f9d7a2ea53 -DIST eselect-opencl-1.1.0.tar.xz 3272 RMD160 e6538d2207823487288dabce18e1baf8bd59ddf3 SHA1 fef7bf2949fb9b9f9f73a8fd30fca2f063abeb51 SHA256 0b49d847d4475119f969fc7bbcdc4ceb1905e37e102b10d0bdad4f8e6010bbbe -DIST opencl.h.1.1.xz 944 RMD160 d9c8ee867a0068fbb05624d48d9e236d0f43acd3 SHA1 2b94aff101b7a3ee4261957b6d46edd6b81faf24 SHA256 c076e410eaffd9fbb056528f31a59fe1908481f0fd38981c13970727a0c4d096 -EBUILD eselect-opencl-1.1.0.ebuild 1598 RMD160 43ab4e74d0b17952a8f1811c9ad18942a4020881 SHA1 cf2cf07fd325b7db555e5bf77000d55317056959 SHA256 05bfe44af5c2aebfe28cf83bc7ce12334ac0d8dca107515a28ec7018e69bb22e -MISC metadata.xml 346 RMD160 0c92ffb77efabdb583731ded733cc93c90b9185e SHA1 d9fc5f5cb3457c3c9fc9718809244e865309d3a8 SHA256 1ad263671e904451c1626471f26da723d969a084dd5d7b53cdcc450a12910a5f diff --git a/app-admin/eselect-opencl/eselect-opencl-1.1.0.ebuild b/app-admin/eselect-opencl/eselect-opencl-1.1.0.ebuild deleted file mode 100644 index 488e6c4..0000000 --- a/app-admin/eselect-opencl/eselect-opencl-1.1.0.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header$ - -EAPI=4 -CL_ABI=1.1 - -inherit multilib - -DESCRIPTION="Utility to change the OpenCL implementation being used" -HOMEPAGE="http://www.gentoo.org/" - -# Source: -# http://www.khronos.org/registry/cl/api/${CL_ABI}/opencl.h -# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl_platform.h -# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl.h -# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl_ext.h -# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl_gl.h -# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl_gl_ext.h -# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl.hpp - -MIRROR="http://dev.gentoo.org/~xarthisius/distfiles/" -SRC_URI="${MIRROR}/opencl.h.${CL_ABI}.xz - ${MIRROR}/cl_platform.h.${CL_ABI}.xz - ${MIRROR}/cl.h.${CL_ABI}.xz - ${MIRROR}/cl_ext.h.${CL_ABI}.xz - ${MIRROR}/cl_gl.h.${CL_ABI}.xz - ${MIRROR}/cl_gl_ext.h.${CL_ABI}.xz - ${MIRROR}/cl.hpp.${CL_ABI}.xz - ${MIRROR}/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="app-arch/xz-utils" -RDEPEND=">=app-admin/eselect-1.2.4" - -pkg_postinst() { - local impl="$(eselect opencl show)" - if [[ -n "${impl}" && "${impl}" != '(none)' ]] ; then - eselect opencl set "${impl}" - fi -} - -src_install() { - insinto /usr/share/eselect/modules - doins opencl.eselect - #doman opencl.eselect.5 - - local headers=( opencl.h cl_platform.h cl.h cl_ext.h cl_gl.h cl_gl_ext.h cl.hpp ) - insinto /usr/$(get_libdir)/OpenCL/global/include/CL - cd "${WORKDIR}" - for f in ${headers[@]}; do - newins ${f}.${CL_ABI} ${f} - done -} diff --git a/app-admin/eselect-opencl/metadata.xml b/app-admin/eselect-opencl/metadata.xml deleted file mode 100644 index 0d69e85..0000000 --- a/app-admin/eselect-opencl/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - xarthisius@gentoo.org - Kacper Kowalik - - - Utility to switch OpenCL implementations between various providers. - - diff --git a/virtual/opencl/ChangeLog b/virtual/opencl/ChangeLog deleted file mode 100644 index 7de2a68..0000000 --- a/virtual/opencl/ChangeLog +++ /dev/null @@ -1,14 +0,0 @@ -# ChangeLog for virtual/opencl -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/virtual/opencl/ChangeLog,v 1.2 2011/12/20 22:09:15 vapier Exp $ - - 20 Dec 2011; Mike Frysinger opencl-0.ebuild: - Drop ATI from dep list for now since that only provides the libraries and not - the required headers #392179#2 by Emil Karlson. - -*opencl-0 (20 Dec 2011) - - 20 Dec 2011; Mike Frysinger +opencl-0.ebuild, - +metadata.xml: - Initial ebuild by me for #392179 by Michal Pytasz. - diff --git a/virtual/opencl/Manifest b/virtual/opencl/Manifest deleted file mode 100644 index e3cfd14..0000000 --- a/virtual/opencl/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -EBUILD opencl-0-r1.ebuild 564 RMD160 6b9bbed449955c2cee6edc665e097155980a9c07 SHA1 a86cd2450aec06b8f9a3181b0de9c7c6af1f1694 SHA256 00f530bb5f0974cbf10bd037d6f9392655c8162f257e961be9711255b7b349cd -MISC ChangeLog 563 RMD160 aa2dd37824bca3c9e8676a43f7e4856190b82ab0 SHA1 fa77721c3e624a171d1b40ca84f6edf440e00c90 SHA256 d73326fe95e263947a3266673baa0894b270efa8e32a6b63ba44d0f53a07a9a7 -MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 diff --git a/virtual/opencl/metadata.xml b/virtual/opencl/metadata.xml deleted file mode 100644 index 01c4c00..0000000 --- a/virtual/opencl/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - -x11 - diff --git a/virtual/opencl/opencl-0-r1.ebuild b/virtual/opencl/opencl-0-r1.ebuild deleted file mode 100644 index 53988f0..0000000 --- a/virtual/opencl/opencl-0-r1.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/virtual/opencl/opencl-0.ebuild,v 1.2 2011/12/20 22:09:15 vapier Exp $ - -EAPI="4" - -DESCRIPTION="Virtual for OpenCL implementations" - -SLOT="0" -KEYWORDS="~amd64 ~x86" -CARDS=( fglrx nvidia ) -IUSE="${CARDS[@]/#/video_cards_}" - -REQUIRED_USE="|| ( ${IUSE} )" - -RDEPEND="app-admin/eselect-opencl - || ( - video_cards_fglrx? ( >=x11-drivers/ati-drivers-11.2[opencl] ) - video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-290.10 ) - )" diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest deleted file mode 100644 index 068d39a..0000000 --- a/x11-drivers/ati-drivers/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX ati-powermode-opt-path-2.patch 1634 RMD160 a9c4ecc90a748f94282521a555ad7b64db242249 SHA1 3f61d804710bd88ee45cd3a9e3672b356359dd73 SHA256 e7749e04a3aa24132b13d0c694563a45c0d38e238f7412a75bd89aa9f9e9ead1 -AUX atieventsd.init 533 RMD160 b9b95a8a3f32dcafba3e5fa08d6d1053e831291a SHA1 982ffdb8064785c8b96fb0213ad7892ac918b5d7 SHA256 20010ebc5cb286149f3c4c9c099b6470463ccdb8fd47cea054b783dc2ad1fff3 -AUX switchlibGL 1349 RMD160 d3c9f36fabf65b21f26456e303d8127779fd1bd2 SHA1 277a549afd62fdeae9f09022a8e55ceabf180f9f SHA256 a4aa2107fdb903da77fea432bc809a1155e213db460fdec72fd1c3c7cc0d13a0 -DIST ati-driver-installer-11-12-x86.x86_64.run 99618112 RMD160 70ae7407bab182c7fc9b1d4a177c2e1493ffb508 SHA1 d20a185165eff1b6d9631b7e3ed7201eeda9312a SHA256 0179d1f0425036e50b637e5153b0c64b25836d09e9d22bc50edfbdf6aed32b42 -EBUILD ati-drivers-11.12-r1.ebuild 19306 RMD160 88350248c3b82a0b639d0029dbd1d2e4cd227fee SHA1 87bafea65a73a3228edca63ebf871a1f1ed8f14c SHA256 c7859cfe28cf6540709d84453d9ef23ee1ef2e8b15b86aa72eceb0ce2e49b1ff -MISC metadata.xml 654 RMD160 3e7fd3ab86650df6ffa64df4cd3bd603e4f01afd SHA1 0236c5a647f00b5a49934753fc4ab83da27f41a0 SHA256 46041d48f808d0bf985c35c7b1d7a46730654c576d20d9d9d3a46b487d08b916 diff --git a/x11-drivers/ati-drivers/ati-drivers-11.12-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-11.12-r1.ebuild deleted file mode 100644 index 11bf281..0000000 --- a/x11-drivers/ati-drivers/ati-drivers-11.12-r1.ebuild +++ /dev/null @@ -1,607 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=4 - -inherit eutils multilib linux-info linux-mod toolchain-funcs versionator - -DESCRIPTION="Ati precompiled drivers for r600 (HD Series) and newer chipsets" -HOMEPAGE="http://www.ati.com" -# 8.ble will be used for beta releases. -if [[ $(get_major_version) -gt 8 ]]; then - ATI_URL="http://www2.ati.com/drivers/linux/" - SRC_URI="${ATI_URL}/ati-driver-installer-${PV/./-}-x86.x86_64.run" - FOLDER_PREFIX="common/" -else - SRC_URI="https://launchpad.net/ubuntu/natty/+source/fglrx-installer/2:${PV}-0ubuntu1/+files/fglrx-installer_${PV}.orig.tar.gz" - FOLDER_PREFIX="" -fi -IUSE="debug +modules multilib opencl pax_kernel qt4" - -LICENSE="AMD GPL-2 QPL-1.0 as-is" -KEYWORDS="~amd64 ~x86" -SLOT="1" - -RDEPEND=" - <=x11-base/xorg-server-1.11.49 - >=app-admin/eselect-opengl-1.0.7 - sys-power/acpid - x11-apps/xauth - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - multilib? ( - app-emulation/emul-linux-x86-opengl - app-emulation/emul-linux-x86-xlibs - ) - qt4? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libXcursor - x11-libs/libXfixes - x11-libs/libXxf86vm - x11-libs/qt-core - x11-libs/qt-gui - ) -" - -DEPEND="${RDEPEND} - x11-proto/inputproto - x11-proto/xf86miscproto - x11-proto/xf86vidmodeproto - x11-proto/xineramaproto - x11-libs/libXtst - sys-apps/findutils - app-misc/pax-utils -" - -EMULTILIB_PKG="true" - -S="${WORKDIR}" - -# QA Silencing -QA_TEXTRELS=" - usr/lib*/opengl/ati/lib/libGL.so.1.2 - usr/lib*/libatiadlxx.so - usr/lib*/xorg/modules/glesx.so - usr/lib*/libaticaldd.so - usr/lib*/dri/fglrx_dri.so -" - -QA_EXECSTACK=" - opt/bin/atiode - opt/bin/amdcccle - usr/lib*/opengl/ati/lib/libGL.so.1.2 - usr/lib*/dri/fglrx_dri.so -" - -QA_WX_LOAD=" - usr/lib*/opengl/ati/lib/libGL.so.1.2 - usr/lib*/dri/fglrx_dri.so -" - -QA_PRESTRIPPED=" - usr/lib\(32\|64\)\?/libXvBAW.so.1.0 - usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2 - usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so - usr/lib\(32\|64\)\?/xorg/modules/glesx.so - usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0 - usr/lib\(32\|64\)\?/libaticaldd.so - usr/lib\(32\|64\)\?/dri/fglrx_dri.so -" - -QA_SONAME=" - usr/lib\(32\|64\)\?/libatiadlxx.so - usr/lib\(32\|64\)\?/libaticalcl.so - usr/lib\(32\|64\)\?/libaticaldd.so - usr/lib\(32\|64\)\?/libaticalrt.so - usr/lib\(32\|64\)\?/libamdocl\(32\|64\)\?.so -" - -QA_DT_HASH=" - opt/bin/amdcccle - opt/bin/aticonfig - opt/bin/atiodcli - opt/bin/atiode - opt/bin/clinfo - opt/bin/fglrxinfo - opt/sbin/atieventsd - opt/sbin/amdnotifyui - usr/lib\(32\|64\)\?/libaticalcl.so - usr/lib\(32\|64\)\?/libaticalrt.so - usr/lib\(32\|64\)\?/libatiuki.so.1.0 - usr/lib\(32\|64\)\?/libatiadlxx.so - usr/lib\(32\|64\)\?/libfglrx_dm.so.1.0 - usr/lib\(32\|64\)\?/libXvBAW.so.1.0 - usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0 - usr/lib\(32\|64\)\?/xorg/modules/amdxmm.so - usr/lib\(32\|64\)\?/xorg/modules/glesx.so - usr/lib\(32\|64\)\?/xorg/modules/linux/libfglrxdrm.so - usr/lib\(32\|64\)\?/xorg/modules/drivers/fglrx_drv.so - usr/lib\(32\|64\)\?/libaticaldd.so - usr/lib\(32\|64\)\?/dri/fglrx_dri.so - usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so - usr/lib\(32\|64\)\?/opengl/ati/extensions/fglrx-libglx.so - usr/lib\(32\|64\)\?/opengl/ati/lib/fglrx-libGL.so.1.2 - usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2 - usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libamdocl\(32\|64\)\?.so - usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1 -" - -_check_kernel_config() { - local failed=0 - local error="" - if ! kernel_is ge 2 6; then - eerror "You need a 2.6 linux kernel to compile against!" - die "No 2.6 Kernel found" - fi - - if ! linux_chkconfig_present MTRR; then - ewarn "You don't have MTRR support enabled in the kernel." - ewarn "Direct rendering will not work." - fi - - if linux_chkconfig_builtin DRM; then - ewarn "You have DRM support built in to the kernel" - ewarn "Direct rendering will not work." - fi - - if ! linux_chkconfig_present AGP && \ - ! linux_chkconfig_present PCIEPORTBUS; then - ewarn "You don't have AGP and/or PCIe support enabled in the kernel" - ewarn "Direct rendering will not work." - fi - - if ! linux_chkconfig_present ACPI; then - eerror "${P} requires the ACPI support in the kernel" - eerror "Please enable it:" - eerror " CONFIG_ACPI=y" - eerror "in /usr/src/linux/.config or" - eerror " Power management and ACPI options --->" - eerror " [*] Power Management support" - eerror "in the 'menuconfig'" - error+=" CONFIG_ACPI disabled;" - failed=1 - fi - - if ! linux_chkconfig_present PCI_MSI; then - eerror "${P} requires MSI in the kernel." - eerror "Please enable it:" - eerror " CONFIG_PCI_MSI=y" - eerror "in /usr/src/linux/.config or" - eerror " Bus options (PCI etc.) --->" - eerror " [*] Message Signaled Interrupts (MSI and MSI-X)" - eerror "in the kernel config." - error+=" CONFIG_PCI_MSI disabled;" - failed=1 - fi - - if linux_chkconfig_present LOCKDEP; then - eerror "You've enabled LOCKDEP -- lock tracking -- in the kernel." - eerror "Unfortunately, this option exports the symbol lock_acquire as GPL-only." - eerror "This prevents ${P} from compiling with an error like this:" - eerror "FATAL: modpost: GPL-incompatible module fglrx.ko uses GPL-only symbol 'lock_acquire'" - eerror "Please make sure the following options have been unset:" - eerror " Kernel hacking --->" - eerror " [ ] Lock debugging: detect incorrect freeing of live locks" - eerror " [ ] Lock debugging: prove locking correctness" - eerror " [ ] Lock usage statistics" - eerror "in 'menuconfig'" - error+=" LOCKDEP enabled;" - failed=1 - fi - - use amd64 && if ! linux_chkconfig_present COMPAT; then - eerror "${P} requires COMPAT." - eerror "Please enable the 32 bit emulation:" - eerror "Executable file formats / Emulations --->" - eerror " [*] IA32 Emulation" - eerror "in the kernel config." - eerror "if this doesn't enable CONFIG_COMPAT add" - eerror " CONFIG_COMPAT=y" - eerror "in /usr/src/linux/.config" - error+=" COMPAT disabled;" - failed=1 - fi - - kernel_is ge 2 6 37 && kernel_is le 2 6 38 && if ! linux_chkconfig_present BKL ; then - eerror "${P} requires BKL." - eerror "Please enable the Big Kernel Lock:" - eerror "Kernel hacking --->" - eerror " [*] Big Kernel Lock" - eerror "in the kernel config." - eerror "or add" - eerror " CONFIG_BKL=y" - eerror "in /usr/src/linux/.config" - error+=" BKL disabled;" - failed=1 - fi - - [[ ${failed} -ne 0 ]] && die "${error}" -} - -pkg_pretend() { - # workaround until bug 365543 is solved - if use modules; then - linux-info_pkg_setup - require_configured_kernel - _check_kernel_config - fi -} - -pkg_setup() { - if use modules; then - MODULE_NAMES="fglrx(video:${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod/2.6.x)" - BUILD_TARGETS="kmod_build" - linux-mod_pkg_setup - BUILD_PARAMS="GCC_VER_MAJ=$(gcc-major-version) KVER=${KV_FULL} KDIR=${KV_DIR}" - BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=\"-DMODULE -DATI -DFGL\"" - if grep -q arch_compat_alloc_user_space ${KV_DIR}/arch/x86/include/asm/compat.h ; then - BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space" - else - BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=compat_alloc_user_space" - fi - fi - # Define module dir. - MODULE_DIR="${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod" - # get the xorg-server version and set BASE_DIR for that - BASE_DIR="${S}/xpic" - - # amd64/x86 - if use amd64 ; then - MY_BASE_DIR="${BASE_DIR}_64a" - PKG_LIBDIR=lib64 - ARCH_DIR="${S}/arch/x86_64" - else - MY_BASE_DIR="${BASE_DIR}" - PKG_LIBDIR=lib - ARCH_DIR="${S}/arch/x86" - fi - - elog - elog "Please note that this driver supports only graphic cards based on" - elog "r600 chipset and newer." - elog "This represent the ATI Radeon HD series at this moment." - elog - elog "If your card is older then use ${CATEGORY}/xf86-video-ati" - elog "For migration informations please reffer to:" - elog "http://www.gentoo.org/proj/en/desktop/x/x11/ati-migration-guide.xml" - einfo -} - -src_unpack() { - if [[ $(get_major_version) -gt 8 ]]; then - # Switching to a standard way to extract the files since otherwise no signature file - # would be created - local src="${DISTDIR}/${A}" - sh "${src}" --extract "${S}" 2&>1 /dev/null - else - unpack ${A} - fi -} - -src_prepare() { - # All kernel options for prepare are ment to be in here - if use modules; then - # version patches - # epatch "${FILESDIR}"/kernel/${PV}-*.patch - if use debug; then - sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \ - "${MODULE_DIR}/firegl_public.c" \ - || die "Failed to enable debug output." - fi - fi - - # These are the userspace utilities that we also have source for. - # We rebuild these later. - rm \ - "${ARCH_DIR}"/usr/X11R6/bin/fgl_glxgears \ - || die "bin rm failed" - - # in this version amdcccle isn't static, thus we depend on qt4 - use qt4 || rm "${ARCH_DIR}"/usr/X11R6/bin/amdcccle - - # ACPI fixups - sed -i \ - -e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \ - -e "s:/var/lib/gdm/:/var/gdm/:" \ - "${S}/${FOLDER_PREFIX}etc/ati/authatieventsd.sh" \ - || die "sed failed." - - # Since "who" is in coreutils, we're using that one instead of "finger". - sed -i -e 's:finger:who:' \ - "${S}/${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \ - || die "Replacing 'finger' with 'who' failed." - # Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and - # add function to detect default state. - epatch "${FILESDIR}"/ati-powermode-opt-path-2.patch - - # fix needed for at least hardened-sources, see bug #392753 - use pax_kernel && epatch "${FILESDIR}"/ati-drivers-redefine-WARN.patch - - - cd "${MODULE_DIR}" - - # bugged fglrx build system, this file should be copied by hand - cp ${ARCH_DIR}/lib/modules/fglrx/build_mod/libfglrx_ip.a 2.6.x - - convert_to_m 2.6.x/Makefile || die "convert_to_m failed" - - # When built with ati's make.sh it defines a bunch of macros if - # certain .config values are set, falling back to less reliable - # detection methods if linux/autoconf.h is not available. We - # simply use the linux/autoconf.h settings directly, bypassing the - # detection script. - sed -i -e 's/__SMP__/CONFIG_SMP/' *.c *h || die "SMP sed failed" - sed -i -e 's/ifdef MODVERSIONS/ifdef CONFIG_MODVERSIONS/' *.c *.h \ - || die "MODVERSIONS sed failed" - cd "${S}" - - mkdir extra || die "mkdir failed" - cd extra - unpack ./../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz -} - -src_compile() { - use modules && linux-mod_src_compile - - ebegin "Building fgl_glxgears" - cd "${S}"/extra/fgl_glxgears - # These extra libs/utils either have an Imakefile that does not - # work very well without tweaking or a Makefile ignoring CFLAGS - # and the like. We bypass those. -src_test() { :; } # no tests present - # The -DUSE_GLU is needed to compile using nvidia headers - # according to a comment in ati-drivers-extra-8.33.6.ebuild. - "$(tc-getCC)" -o fgl_glxgears ${CFLAGS} ${LDFLAGS} -DUSE_GLU \ - -I"${S}"/${FOLDER_PREFIX}usr/include fgl_glxgears.c \ - -lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed" - eend $? -} - -src_test() { :; } # no tests presentsrc_test() { :; } # no tests present - -src_install() { - use modules && linux-mod_src_install - - # We can do two things here, and neither of them is very nice. - - # For direct rendering libGL has to be able to load one or more - # dri modules (files ending in _dri.so, like fglrx_dri.so). - # Gentoo's mesa looks for these files in the location specified by - # LIBGL_DRIVERS_PATH or LIBGL_DRIVERS_DIR, then in the hardcoded - # location /usr/$(get_libdir)/dri. Ati's libGL does the same - # thing, but the hardcoded location is /usr/X11R6/lib/modules/dri - # on x86 and amd64 32bit, /usr/X11R6/lib64/modules/dri on amd64 - # 64bit. So we can either put the .so files in that (unusual, - # compared to "normal" mesa libGL) location or set - # LIBGL_DRIVERS_PATH. We currently do the latter. See also bug - # 101539. - - # The problem with this approach is that LIBGL_DRIVERS_PATH - # *overrides* the default hardcoded location, it does not extend - # it. So if ati-drivers is merged but a non-ati libGL is selected - # and its hardcoded path does not match our LIBGL_DRIVERS_PATH - # (because it changed in a newer mesa or because it was compiled - # for a different set of multilib abis than we are) stuff breaks. - - # We create one file per ABI to work with "native" multilib, see - # below. - - echo "COLON_SEPARATED=LIBGL_DRIVERS_PATH" > "${T}/03ati-colon-sep" - doenvd "${T}/03ati-colon-sep" || die - - # All libraries that we have a 32 bit and 64 bit version of on - # amd64 are installed in src_install-libs. Everything else - # (including libraries only available in native 64bit on amd64) - # goes in here. - - # There used to be some code here that tried to detect running - # under a "native multilib" portage ((precursor of) - # http://dev.gentoo.org/~kanaka/auto-multilib/). I removed that, it - # should just work (only doing some duplicate work). --marienz - if has_multilib_profile; then - local OABI=${ABI} - for ABI in $(get_install_abis); do - src_install-libs - done - ABI=${OABI} - unset OABI - else - src_install-libs - fi - - # This is sorted by the order the files occur in the source tree. - - # X modules. - exeinto /usr/$(get_libdir)/xorg/modules/drivers - doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so - exeinto /usr/$(get_libdir)/xorg/modules/linux - doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/linux/libfglrxdrm.so - exeinto /usr/$(get_libdir)/xorg/modules - doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/{glesx.so,amdxmm.so} - - # Arch-specific files. - # (s)bin. - into /opt - dosbin "${ARCH_DIR}"/usr/sbin/atieventsd - use qt4 && dosbin "${ARCH_DIR}"/usr/sbin/amdnotifyui - use opencl && dobin "${ARCH_DIR}"/usr/bin/clinfo - # We cleaned out the compilable stuff in src_unpack - dobin "${ARCH_DIR}"/usr/X11R6/bin/* - - # Common files. - # etc. - insinto /etc/ati - exeinto /etc/ati - # Everything except for the authatieventsd.sh script. - doins ${FOLDER_PREFIX}etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.default} - doexe ${FOLDER_PREFIX}etc/ati/authatieventsd.sh - - # include. - insinto /usr - doins -r ${FOLDER_PREFIX}usr/include - insinto /usr/include/X11/extensions - - # Just the atigetsysteminfo.sh script. - into /usr - dosbin ${FOLDER_PREFIX}usr/sbin/* - - # data files for the control panel. - if use qt4 ; then - insinto /usr/share - doins -r ${FOLDER_PREFIX}usr/share/ati - insinto /usr/share/pixmaps - doins ${FOLDER_PREFIX}usr/share/icons/ccc_large.xpm - make_desktop_entry amdcccle 'ATI Catalyst Control Center' \ - ccc_large System - fi - - # doc. - dohtml -r ${FOLDER_PREFIX}usr/share/doc/fglrx - - doman ${FOLDER_PREFIX}usr/share/man/man8/atieventsd.8 - - pushd ${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi > /dev/null - - exeinto /etc/acpi - doexe ati-powermode.sh - insinto /etc/acpi/events - doins events/* - - popd > /dev/null - - # Done with the "source" tree. Install tools we rebuilt: - dobin extra/fgl_glxgears/fgl_glxgears - newdoc extra/fgl_glxgears/README README.fgl_glxgears - - # Gentoo-specific stuff: - newinitd "${FILESDIR}"/atieventsd.init atieventsd - echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf - newconfd "${T}"/atieventsd.conf atieventsd - - # PowerXpress stuff - exeinto /usr/$(get_libdir)/fglrx - doexe "${FILESDIR}"/switchlibGL || die "doexe switchlibGL failed" - cp "${FILESDIR}"/switchlibGL "${T}"/switchlibglx - doexe "${T}"/switchlibglx || die "doexe switchlibglx failed" -} - -src_install-libs() { - if [[ "${ABI}" == "amd64" ]]; then - local EX_BASE_DIR="${BASE_DIR}_64a" - local pkglibdir=lib64 - local MY_ARCH_DIR="${S}/arch/x86_64" - local oclsuffix=64 - else - local EX_BASE_DIR="${BASE_DIR}" - local pkglibdir=lib - local MY_ARCH_DIR="${S}/arch/x86" - local oclsuffix=32 - fi - einfo "ati tree '${pkglibdir}' -> '$(get_libdir)' on system" - - local ATI_ROOT=/usr/$(get_libdir)/opengl/ati - # To make sure we do not miss a spot when these change. - local libmajor=1 libminor=2 - local libver=${libmajor}.${libminor} - - # The GLX libraries - # (yes, this really is "lib" even on amd64/multilib --marienz) - exeinto ${ATI_ROOT}/lib - newexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/fglrx/fglrx-libGL.so.${libver} \ - libGL.so.${libver} - dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so.${libmajor} - dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so - - exeinto ${ATI_ROOT}/extensions - doexe "${EX_BASE_DIR}"/usr/X11R6/${pkglibdir}/modules/extensions/fglrx/fglrx-libglx.so - mv "${D}"/${ATI_ROOT}/extensions/{fglrx-,}libglx.so - - # other libs - exeinto /usr/$(get_libdir) - # Everything except for the libGL.so installed some row above - doexe $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \ - -maxdepth 1 -type f -name '*.so*' -not -name '*libGL.so*') - insinto /usr/$(get_libdir) - doins $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \ - -maxdepth 1 -type f -not -name '*.so*') - - # DRI modules, installed into the path used by recent versions of mesa. - exeinto /usr/$(get_libdir)/dri - doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so - - # AMD Cal and OpenCL libraries - if use opencl ; then - exeinto /usr/$(get_libdir)/OpenCL/vendors/amd - doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libamdocl*.so* - doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libOpenCL*.so* - dosym libOpenCL.so.${libmajor} /usr/$(get_libdir)/OpenCL/vendors/amd/libOpenCL.so - fi - exeinto /usr/$(get_libdir) - doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libati*.so* - - # OpenCL vendor files - if use opencl ; then - insinto /etc/OpenCL/vendors/ - cat > "${T}"/amdocl${oclsuffix}.icd <<-EOF - /usr/$(get_libdir)/OpenCL/vendors/amd/libamdocl${oclsuffix}.so - EOF - doins "${T}"/amdocl${oclsuffix}.icd - fi - - local envname="${T}"/04ati-dri-path - if [[ -n ${ABI} ]]; then - envname="${envname}-${ABI}" - fi - echo "LIBGL_DRIVERS_PATH=/usr/$(get_libdir)/dri" > "${envname}" - doenvd "${envname}" - - # Silence the QA notice by creating missing soname symlinks - for so in $(find "${D}"/usr/$(get_libdir) -maxdepth 1 -name *.so.[0-9].[0-9]) - do - local soname=${so##*/} - ## let's keep also this alternative way ;) - #dosym ${soname} /usr/$(get_libdir)/${soname%.[0-9]} - dosym ${soname} /usr/$(get_libdir)/$(scanelf -qF "#f%S" ${so}) - done -} - -pkg_postinst() { - elog "To switch to ATI OpenGL, run \"eselect opengl set ati\"" - elog "To change your xorg.conf you can use the bundled \"aticonfig\"" - elog - elog "If you experience unexplained segmentation faults and kernel crashes" - elog "with this driver and multi-threaded applications such as wine," - elog "set UseFastTLS in xorg.conf to either 0 or 1, but not 2." - elog - elog "Fully rebooting the system after an ${PN} update is recommended" - elog "Stopping Xorg, reloading fglrx kernel module and restart Xorg" - elog "might not work" - elog - elog "Some cards need acpid running to handle events" - elog "Please add it to boot runlevel with rc-update add acpid boot" - elog - ewarn "This release of ati-drivers has a crashing bug when using Xv video." - ewarn "To avoid this problem, configure your video playback software for" - ewarn "OpenGL output. See https://bugs.gentoo.org/show_bug.cgi?id=391193" - - use modules && linux-mod_pkg_postinst - "${ROOT}"/usr/bin/eselect opengl set --use-old ati -} - -pkg_preinst() { - use modules && linux-mod_pkg_preinst -} - -pkg_prerm() { - "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11 -} - -pkg_postrm() { - use modules && linux-mod_pkg_postrm - "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11 -} diff --git a/x11-drivers/ati-drivers/files/ati-powermode-opt-path-2.patch b/x11-drivers/ati-drivers/files/ati-powermode-opt-path-2.patch deleted file mode 100644 index f5a35a3..0000000 --- a/x11-drivers/ati-drivers/files/ati-powermode-opt-path-2.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -ur common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh ---- common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-07-28 04:22:36.000000000 +0100 -+++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-08-04 12:19:42.000000000 +0100 -@@ -4,6 +4,8 @@ - # Control script for ACPI lid state and AC adapter state - # - -+aticonfig='/opt/bin/aticonfig' -+ - getXuser() { - user=`finger| grep -m1 ":$displaynum " | awk '{print $1}'` - if [ x"$user" = x"" ]; then -@@ -47,7 +49,7 @@ - done - - #If PPLIB is enabled --su $user -c '/usr/bin/aticonfig --pplib-cmd="get version"' | grep PPLIB -+su $user -c '$aticonfig --pplib-cmd="get version"' | grep PPLIB - if [ $? = 0 ]; then - echo "Has PPLIB" - has_pplib=1 -@@ -61,15 +63,15 @@ - if [ ${lid_closed} -eq 1 -o ${on_dc} -eq 1 ]; then - echo "Low power" - if [ ${has_pplib} -eq 1 ]; then -- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc dc"' -+ su $user -c '$aticonfig --pplib-cmd="notify psrc dc"' - else -- su $user -c "/usr/bin/aticonfig --set-powerstate=1 --effective=now" -+ su $user -c "$aticonfig --set-powerstate=1" - fi - else - echo "high power" - if [ ${has_pplib} -eq 1 ]; then -- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc ac"' -+ su $user -c '$aticonfig --pplib-cmd="notify psrc ac"' - else -- su $user -c "/usr/bin/aticonfig --set-powerstate=3 --effective=now" -+ su $user -c "$aticonfig --set-powerstate=$($aticonfig --lsp | grep 'default state' | cut -c 3)" - fi - fi - diff --git a/x11-drivers/ati-drivers/files/atieventsd.init b/x11-drivers/ati-drivers/files/atieventsd.init deleted file mode 100644 index 73139ce..0000000 --- a/x11-drivers/ati-drivers/files/atieventsd.init +++ /dev/null @@ -1,20 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/files/atieventsd.init,v 1.3 2007/05/18 23:58:01 marienz Exp $ - -depend() { - need acpid -} - -start() { - ebegin "Starting ${SVCNAME}" - start-stop-daemon --start --exec /opt/sbin/atieventsd -- ${ATIEVENTSDOPTS} - eend $? -} - -stop() { - ebegin "Stopping ${SVCNAME}" - start-stop-daemon --stop --quiet --exec /opt/sbin/atieventsd - eend $? -} \ No newline at end of file diff --git a/x11-drivers/ati-drivers/files/switchlibGL b/x11-drivers/ati-drivers/files/switchlibGL deleted file mode 100644 index a6aa4fc..0000000 --- a/x11-drivers/ati-drivers/files/switchlibGL +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/bash -# switchlibGL -# -# Copyright (c) 2011 Advanced Micro Devices, Inc. -# -# Purpose: -# For switch between AMD and Intel graphic driver library. -# -# Usage: -# switchlibGL amd|intel|query -# amd: switches to the AMD version of libGL. -# intel: switches to the open-source version of libGL . -# query: checks, which version is currently active and prints either "amd" -# or "intel" or "unknown" on the standard output. -# must be root to execute this script - -ARCH=`uname -m` -E_ERR=1 - -# Check if root -if [ "`whoami`" != "root" ]; then - echo "Must be root to run this script." 1>&2 - exit $E_ERR -fi - -# One parameter -if [ $# -ne 1 ]; then - echo "Usage: `basename $0` amd|intel|query " 1>&2 - echo "Please choose one parameter " 1>&2 - exit $E_ERR -fi - -current=$(eselect opengl show) -# Switch to right mode -case "$1" in - "amd" ) - if [ $current != ati ] ; then - eselect opengl set ati || return 1 - fi - ;; - "intel" ) - if [ $current != xorg-x11 ] ; then - eselect opengl set xorg-x11 || return 1 - fi - ;; - "query" ) - case "$current" in - "ati" ) - echo "amd" - ;; - "xorg-x11" ) - echo "intel" - ;; - esac - ;; - * ) echo "Usage: `basename $0` amd|intel|query" 1>&2; exit $E_ERR;; - # other than amd|intel|query parameter report an error -esac - -# A zero return value from the script upon exit indicates success. -exit 0 diff --git a/x11-drivers/ati-drivers/metadata.xml b/x11-drivers/ati-drivers/metadata.xml deleted file mode 100644 index 1f3ffe4..0000000 --- a/x11-drivers/ati-drivers/metadata.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - x11 - - lu_zero@gentoo.org - - - enrico.tagliavini@gmail.com - Enrico Tagliavini - Proxied co-maintainer - - - - Install qt4 dependent optional tools (e.g Catalyst Control Panel) - - - - Build the kernel modules - - - - Install OpenCL runtime libraries - - - diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest deleted file mode 100644 index 5ca0ff9..0000000 --- a/x11-drivers/nvidia-drivers/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX 256.35-unified-arch.patch 1380 RMD160 2612cad105f442d4232b99e3054124e8037860bb SHA1 d82433c0b3520c87e05f1013a59b243ec65ebe97 SHA256 5e84bb51e0f9b3ceba270d53ad2a739dc534861df9acd6ab6852670f5a1357d7 -AUX nvidia-169.07 639 RMD160 8baddb6fd1bf7f0e2688870a78e8ace051d62e3f SHA1 b30487ba2a24a6b1359d1fd831eeb1705060953c SHA256 a8c4860f008d53776fda7a17b59524f271236559af688e9a2c9845cbbcba1577 -DIST NVIDIA-FreeBSD-x86-290.10.tar.gz 32042469 RMD160 712cd816ab24319d03ae475af0ac2a56518ef58b SHA1 4fe79060b9e475e4a74b7b17e95410bad1f33427 SHA256 f5accbdac0b231a8073f76c1d1d8ace7cb98ebe167888c31183a2752a669ee92 -DIST NVIDIA-Linux-x86-290.10.run 34691272 RMD160 ddcee14e7b474a646a707fd966cc1d223d3177eb SHA1 dfc095db2bdca672e6cfe7878a75c5d25d8c54a9 SHA256 99be8f53aa1f777445e5a4cac27acd7d85990db712b5c29caac865145fc5adaa -DIST NVIDIA-Linux-x86_64-290.10.run 58334192 RMD160 a850a83643d507ff84be76691188a5ecd870c4d8 SHA1 f3e8b43248d9d167b1c3f67a8cba9c1f2c53e583 SHA256 34a2ab07f4ae7afdeb2c8415f3f37c1099e6690eb25f3dbef92eca771f7ce4cd -EBUILD nvidia-drivers-290.10-r1.ebuild 17682 RMD160 18a761701d554f04169cf1d62ae8c657acafb9c5 SHA1 5dc040795153331012411a0099f2bf5ce2edca41 SHA256 d0d3cc72fbce89860d572a07ac37b5954c2df9e50a3586341a1f4494ed9e896a diff --git a/x11-drivers/nvidia-drivers/files/256.35-unified-arch.patch b/x11-drivers/nvidia-drivers/files/256.35-unified-arch.patch deleted file mode 100644 index 401ce95..0000000 --- a/x11-drivers/nvidia-drivers/files/256.35-unified-arch.patch +++ /dev/null @@ -1,31 +0,0 @@ -Add support for the 'x86' unified kernel arch in conftest.sh - ---- NVIDIA-Linux-x86-256.25/kernel/conftest.sh -+++ NVIDIA-Linux-x86-256.25/kernel/conftest.sh -@@ -101,7 +101,7 @@ build_cflags() { - - if [ "$OUTPUT" != "$SOURCES" ]; then - MACH_CFLAGS="-I$HEADERS/asm-$ARCH/mach-default" -- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then -+ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then - MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default" - MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default" - fi -@@ -110,7 +110,7 @@ build_cflags() { - fi - else - MACH_CFLAGS="-I$HEADERS/asm/mach-default" -- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then -+ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then - MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default" - MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default" - fi -@@ -121,7 +121,7 @@ build_cflags() { - - CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS" - -- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then -+ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then - CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include" - fi - if [ -n "$BUILD_PARAMS" ]; then diff --git a/x11-drivers/nvidia-drivers/files/nvidia-169.07 b/x11-drivers/nvidia-drivers/files/nvidia-169.07 deleted file mode 100644 index a96b0cd..0000000 --- a/x11-drivers/nvidia-drivers/files/nvidia-169.07 +++ /dev/null @@ -1,14 +0,0 @@ -# Nvidia drivers support -alias char-major-195 nvidia -alias /dev/nvidiactl char-major-195 - -# To tweak the driver the following options can be used, note that -# you should be careful, as it could cause instability!! For more -# options see /usr/share/doc/PACKAGE/README -# -# !!! SECURITY WARNING !!! -# DO NOT MODIFY OR REMOVE THE DEVICE FILE RELATED OPTIONS UNLESS YOU KNOW -# WHAT YOU ARE DOING. -# ONLY ADD TRUSTED USERS TO THE VIDEO GROUP, THESE USERS MAY BE ABLE TO CRASH, -# COMPROMISE, OR IRREPARABLY DAMAGE THE MACHINE. -options nvidia NVreg_DeviceFileMode=432 NVreg_DeviceFileUID=0 NVreg_DeviceFileGID=VIDEOGID NVreg_ModifyDeviceFiles=1 diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-290.10-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-290.10-r1.ebuild deleted file mode 100644 index 76fafcf..0000000 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-290.10-r1.ebuild +++ /dev/null @@ -1,561 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-290.10.ebuild,v 1.2 2011/12/16 08:47:09 ago Exp $ - -EAPI="2" - -inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver - -X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}" -AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}" -X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}" - -DESCRIPTION="NVIDIA X11 driver and GLX libraries" -HOMEPAGE="http://www.nvidia.com/" -SRC_URI="x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_NV_PACKAGE}.run ) - amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run ) - x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )" - -LICENSE="NVIDIA" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" -IUSE="acpi custom-cflags gtk multilib kernel_linux" -RESTRICT="strip" -EMULTILIB_PKG="true" - -COMMON="=sys-libs/glibc-2.6.1 ) - multilib? ( app-emulation/emul-linux-x86-xlibs ) - >=app-admin/eselect-opengl-1.0.9 - app-admin/eselect-opencl - !" - eerror " [ ] Lock debugging: detect incorrect freeing of live locks" - eerror " [ ] Lock debugging: prove locking correctness" - eerror " [ ] Lock usage statistics" - eerror "in 'menuconfig'" - die "LOCKDEP enabled" - fi -} - -pkg_setup() { - # try to turn off distcc and ccache for people that have a problem with it - export DISTCC_DISABLE=1 - export CCACHE_DISABLE=1 - - if use amd64 && has_multilib_profile && [ "${DEFAULT_ABI}" != "amd64" ]; then - eerror "This ebuild doesn't currently support changing your default abi." - die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}" - fi - - if use kernel_linux; then - linux-mod_pkg_setup - MODULE_NAMES="nvidia(video:${S}/kernel)" - BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \ - SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)" - mtrr_check - lockdep_check - fi - - # On BSD userland it wants real make command - use userland_BSD && MAKE="$(get_bmake)" - - export _POSIX2_VERSION="199209" - - # Since Nvidia ships 3 different series of drivers, we need to give the user - # some kind of guidance as to what version they should install. This tries - # to point the user in the right direction but can't be perfect. check - # nvidia-driver.eclass - nvidia-driver-check-warning - - # set variables to where files are in the package structure - if use kernel_FreeBSD; then - NV_DOC="${S}/doc" - NV_EXEC="${S}/obj" - NV_LIB="${S}/obj" - NV_SRC="${S}/src" - NV_MAN="${S}/x11/man" - NV_X11="${S}/obj" - NV_X11_DRV="${NV_X11}" - NV_X11_EXT="${NV_X11}" - NV_SOVER=1 - elif use kernel_linux; then - NV_DOC="${S}" - NV_EXEC="${S}" - NV_LIB="${S}" - NV_SRC="${S}/kernel" - NV_MAN="${S}" - NV_X11="${S}" - NV_X11_DRV="${NV_X11}" - NV_X11_EXT="${NV_X11}" - NV_SOVER=${PV} - else - die "Could not determine proper NVIDIA package" - fi -} - -src_unpack() { - if use kernel_linux && kernel_is lt 2 6 7; then - echo - ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}" - ewarn "This is not officially supported for ${P}. It is likely you" - ewarn "will not be able to compile or use the kernel module." - ewarn "It is recommended that you upgrade your kernel to a version >= 2.6.7" - echo - ewarn "DO NOT file bug reports for kernel versions less than 2.6.7 as they will be ignored." - fi - - if ! use x86-fbsd; then - cd "${S}" - unpack_makeself - else - unpack ${A} - fi -} - -src_prepare() { - # Please add a brief description for every added patch - use x86-fbsd && cd doc - - if use kernel_linux; then - # Quiet down warnings the user does not need to see - sed -i \ - -e 's:-Wsign-compare::g' \ - "${NV_SRC}"/Makefile.kbuild - - epatch "${FILESDIR}"/256.35-unified-arch.patch - - # If you set this then it's your own fault when stuff breaks :) - use custom-cflags && sed -i "s:-O:${CFLAGS}:" "${NV_SRC}"/Makefile.* - - # If greater than 2.6.5 use M= instead of SUBDIR= - convert_to_m "${NV_SRC}"/Makefile.kbuild - fi - cat <<- EOF > "${S}"/nvidia.icd - /usr/$(get_libdir)/OpenCL/vendors/nvidia/libcuda.so - EOF -} - -src_compile() { - # This is already the default on Linux, as there's no toplevel Makefile, but - # on FreeBSD there's one and triggers the kernel module build, as we install - # it by itself, pass this. - - cd "${NV_SRC}" - if use x86-fbsd; then - MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \ - LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die - elif use kernel_linux; then - linux-mod_src_compile - fi -} - -src_install() { - if use kernel_linux; then - linux-mod_src_install - - VIDEOGROUP="$(egetent group video | cut -d ':' -f 3)" - if [ -z "$VIDEOGROUP" ]; then - eerror "Failed to determine the video group gid." - die "Failed to determine the video group gid." - fi - - # Add the aliases - [ -f "${FILESDIR}/nvidia-169.07" ] || die "nvidia missing in FILESDIR" - sed -e 's:PACKAGE:'${PF}':g' \ - -e 's:VIDEOGID:'${VIDEOGROUP}':' "${FILESDIR}"/nvidia-169.07 > \ - "${WORKDIR}"/nvidia - insinto /etc/modprobe.d - newins "${WORKDIR}"/nvidia nvidia.conf || die - elif use x86-fbsd; then - insinto /boot/modules - doins "${WORKDIR}/${NV_PACKAGE}/src/nvidia.kld" || die - - exeinto /boot/modules - doexe "${WORKDIR}/${NV_PACKAGE}/src/nvidia.ko" || die - fi - - # NVIDIA kernel <-> userspace driver config lib - dolib.so ${NV_LIB}/libnvidia-cfg.so.${NV_SOVER} || \ - die "failed to install libnvidia-cfg" - dosym libnvidia-cfg.so.${NV_SOVER} \ - /usr/$(get_libdir)/libnvidia-cfg.so.1 || \ - die "failed to create libnvidia-cfg.so symlink" - dosym libnvidia-cfg.so.1 \ - /usr/$(get_libdir)/libnvidia-cfg.so || \ - die "failed to create libnvidia-cfg.so symlink" - - # NVIDIA monitoring library - dolib.so ${NV_LIB}/libnvidia-ml.so.${NV_SOVER} || \ - die "failed to install libnvidia-ml" - dosym libnvidia-ml.so.${NV_SOVER} \ - /usr/$(get_libdir)/libnvidia-ml.so.1 || \ - die "failed to create libnvidia-ml.so symlink" - dosym libnvidia-ml.so.1 \ - /usr/$(get_libdir)/libnvidia-ml.so || \ - die "failed to create libnvidia-ml.so symlink" - - # NVIDIA video decode <-> CUDA - dolib.so ${NV_LIB}/libnvcuvid.so.${NV_SOVER} || \ - die "failed to install libnvcuvid.so" - dosym libnvcuvid.so.${NV_SOVER} \ - /usr/$(get_libdir)/libnvcuvid.so.1 || \ - die "failed to create libnvcuvid.so symlink" - dosym libnvcuvid.so.1 \ - /usr/$(get_libdir)/libnvcuvid.so || \ - die "failed to create libnvcuvid.so symlink" - - # Xorg DDX driver - insinto /usr/$(get_libdir)/xorg/modules/drivers - doins ${NV_X11_DRV}/nvidia_drv.so || die "failed to install nvidia_drv.so" - - # Xorg GLX driver - insinto /usr/$(get_libdir)/opengl/nvidia/extensions - doins ${NV_X11_EXT}/libglx.so.${NV_SOVER} || \ - die "failed to install libglx.so" - dosym libglx.so.${NV_SOVER} \ - /usr/$(get_libdir)/opengl/nvidia/extensions/libglx.so || \ - die "failed to create libglx.so symlink" - - # XvMC driver - dolib.a ${NV_X11}/libXvMCNVIDIA.a || \ - die "failed to install libXvMCNVIDIA.so" - dolib.so ${NV_X11}/libXvMCNVIDIA.so.${NV_SOVER} || \ - die "failed to install libXvMCNVIDIA.so" - dosym libXvMCNVIDIA.so.${NV_SOVER} \ - /usr/$(get_libdir)/libXvMCNVIDIA.so.1 || \ - die "failed to create libXvMCNVIDIA.so symlink" - dosym libXvMCNVIDIA.so.1 /usr/$(get_libdir)/libXvMCNVIDIA.so || \ - die "failed to create libXvMCNVIDIA.so symlink" - dosym libXvMCNVIDIA.so.${NV_SOVER} \ - /usr/$(get_libdir)/libXvMCNVIDIA_dynamic.so.1 || \ - die "failed to create libXvMCNVIDIA_dynamic.so symlink" - - # OpenCL ICD for NVIDIA - if use kernel_linux; then - insinto /etc/OpenCL/vendors - doins nvidia.icd - fi - - # Documentation - dohtml ${NV_DOC}/html/* - if use x86-fbsd; then - dodoc "${NV_DOC}/README" - doman "${NV_MAN}/nvidia-xconfig.1" - use gtk && doman "${NV_MAN}/nvidia-settings.1" - else - # Docs - newdoc "${NV_DOC}/README.txt" README - dodoc "${NV_DOC}/NVIDIA_Changelog" - doman "${NV_MAN}/nvidia-smi.1.gz" - doman "${NV_MAN}/nvidia-xconfig.1.gz" - use gtk && doman "${NV_MAN}/nvidia-settings.1.gz" - fi - - # Helper Apps - dobin ${NV_EXEC}/nvidia-xconfig || die - if use gtk; then - dobin ${NV_EXEC}/nvidia-settings || die - fi - dobin ${NV_EXEC}/nvidia-bug-report.sh || die - if use kernel_linux; then - dobin ${NV_EXEC}/nvidia-smi || die - fi - - # Desktop entries for nvidia-settings - if use gtk; then - sed -e 's:__UTILS_PATH__:/usr/bin:' \ - -e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' \ - -i "${NV_EXEC}/nvidia-settings.desktop" - domenu ${NV_EXEC}/nvidia-settings.desktop - - doicon ${NV_EXEC}/nvidia-settings.png - fi - - if has_multilib_profile ; then - local OABI=${ABI} - for ABI in $(get_install_abis) ; do - src_install-libs - done - ABI=${OABI} - unset OABI - else - src_install-libs - fi - - is_final_abi || die "failed to iterate through all ABIs" -} - -# Install nvidia library: -# the first parameter is the place where to install it -# the second parameter is the base name of the library -# the third parameter is the provided soversion -donvidia() { - dodir $1 - exeinto $1 - - libname=$(basename $2) - - doexe $2.$3 || die "failed to install $2" - dosym ${libname}.$3 $1/${libname} || die "failed to symlink $2" - [[ $3 != "1" ]] && dosym ${libname}.$3 $1/${libname}.1 -} - -src_install-libs() { - local inslibdir=$(get_libdir) - local NV_ROOT="/usr/${inslibdir}/opengl/nvidia" - local CL_ROOT=/usr/${inslibdir}/OpenCL/vendors/nvidia - local libdir= sover= - - if use kernel_linux; then - if has_multilib_profile && [[ ${ABI} == "x86" ]] ; then - libdir=32 - else - libdir=. - fi - sover=${PV} - else - libdir=obj - # on FreeBSD it has just .1 suffix - sover=1 - fi - - # The GLX libraries - donvidia ${NV_ROOT}/lib ${libdir}/libGL.so ${sover} - donvidia /usr/${inslibdir} ${libdir}/libnvidia-glcore.so ${sover} - if use x86-fbsd; then - donvidia ${NV_ROOT}/lib ${libdir}/libnvidia-tls.so ${sover} - else - donvidia ${NV_ROOT}/lib ${libdir}/tls/libnvidia-tls.so ${sover} - fi - - # VDPAU - donvidia /usr/${inslibdir} ${libdir}/libvdpau_nvidia.so ${sover} - - # CUDA & OpenCL - if use kernel_linux; then - donvidia ${CL_ROOT} ${libdir}/libcuda.so ${sover} - donvidia ${CL_ROOT} ${libdir}/libnvidia-compiler.so ${sover} - donvidia ${CL_ROOT} ${libdir}/libOpenCL.so 1.0.0 - #dosym libOpenCL.so.1 ${CL_ROOT}/libOpenCL.so - fi -} - -pkg_preinst() { - if use kernel_linux; then - linux-mod_pkg_postinst - fi - - # Clean the dynamic libGL stuff's home to ensure - # we dont have stale libs floating around - if [ -d "${ROOT}"/usr/lib/opengl/nvidia ] ; then - rm -rf "${ROOT}"/usr/lib/opengl/nvidia/* - fi - # Make sure we nuke the old nvidia-glx's env.d file - if [ -e "${ROOT}"/etc/env.d/09nvidia ] ; then - rm -f "${ROOT}"/etc/env.d/09nvidia - fi -} - -pkg_postinst() { - if use kernel_linux; then - linux-mod_pkg_postinst - fi - - # Switch to the nvidia implementation - eselect opengl set --use-old nvidia - - echo - elog "You must be in the video group to use the NVIDIA device" - elog "For more info, read the docs at" - elog "http://www.gentoo.org/doc/en/nvidia-guide.xml#doc_chap3_sect6" - elog - - elog "This ebuild installs a kernel module and X driver. Both must" - elog "match explicitly in their version. This means, if you restart" - elog "X, you must modprobe -r nvidia before starting it back up" - elog - - elog "To use the NVIDIA GLX, run \"eselect opengl set nvidia\"" - elog - elog "NVIDIA has requested that any bug reports submitted have the" - elog "output of /usr/bin/nvidia-bug-report.sh included." - elog - elog "To work with compiz, you must enable the AddARGBGLXVisuals option." - elog - elog "If you are having resolution problems, try disabling DynamicTwinView." - elog - - if ! use gtk; then - elog "USE=gtk controls whether the nvidia-settings application" - elog "is installed. If you would like to use it, enable that" - elog "flag and re-emerge this ebuild. media-video/nvidia-settings" - elog "no longer installs nvidia-settings but only installs the" - elog "associated user space libraries." - fi -} - -pkg_postrm() { - if use kernel_linux; then - linux-mod_pkg_postrm - fi - eselect opengl set --use-old xorg-x11 -} -- cgit v1.2.3-65-gdbad