mirror of
https://gitdl.cn/https://github.com/chakralinux/core.git
synced 2025-02-11 19:14:37 +08:00
removed nvidia-*-bumblebee because now is supported directly by nvidia and intel-dri, and there are no conflics with those pkgs anymore.
This commit is contained in:
AlmAck
parent
c2ae2eac28
commit
a9868b5be2
@ -1,43 +0,0 @@
|
||||
# Platform Packages for Chakra, part of chakra-project.org
|
||||
#
|
||||
# Maintainer: Neophytos Kolokotronis <tetris4@gmail.com>
|
||||
# Contributions from AUR: https://aur.archlinux.org/packages/nvidia-bumblebee/
|
||||
|
||||
_extramodules=extramodules-3.15.1-CHAKRA
|
||||
_kver=$(cat /lib/modules/${_extramodules}/version)
|
||||
|
||||
pkgname=nvidia-bumblebee
|
||||
pkgver=331.79
|
||||
pkgrel=2
|
||||
pkgdesc="NVIDIA drivers for linux. Packaged for Bumblebee"
|
||||
arch=('x86_64')
|
||||
url="http://www.nvidia.com/"
|
||||
depends=('linux>=3.15' 'linux<3.16' "nvidia-utils-bumblebee")
|
||||
provides=("nvidia=${pkgver}")
|
||||
makedepends=('linux-headers>=3.15' 'linux-headers<3.16')
|
||||
conflicts=('nvidia' 'nvidia-96xx' 'nvidia-173xx' 'nvidia-304xx' 'dkms-nvidia')
|
||||
license=('custom')
|
||||
install=nvidia.install
|
||||
options=(!strip)
|
||||
|
||||
_ARCH='x86_64'
|
||||
_pkg="NVIDIA-Linux-${_ARCH}-${pkgver}-no-compat32"
|
||||
source=("ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run")
|
||||
md5sums=('1f0708b913403b4f5b494b0daf0415eb')
|
||||
|
||||
build() {
|
||||
cd "${srcdir}"
|
||||
sh "${_pkg}.run" --extract-only
|
||||
|
||||
cd "${_pkg}/kernel"
|
||||
make SYSSRC=/lib/modules/"${_kver}/build" module
|
||||
}
|
||||
|
||||
package() {
|
||||
install -D -m644 "${srcdir}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32/kernel/nvidia.ko" \
|
||||
"${pkgdir}/lib/modules/${_extramodules}/nvidia.ko"
|
||||
install -d -m755 "${pkgdir}/etc/modprobe.d"
|
||||
echo "blacklist nouveau" >> "${pkgdir}/etc/modprobe.d/nouveau_blacklist.conf"
|
||||
sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install"
|
||||
gzip "${pkgdir}/lib/modules/${_extramodules}/nvidia.ko"
|
||||
}
|
||||
@ -1,34 +0,0 @@
|
||||
diff --git a/modules/nvidia-kernel/nv-i2c.c b/modules/nvidia-kernel/nv-i2c.c
|
||||
index a702506..ece9c3c 100644
|
||||
--- a/modules/nvidia-kernel/nv-i2c.c
|
||||
+++ b/modules/nvidia-kernel/nv-i2c.c
|
||||
@@ -324,13 +324,10 @@ BOOL NV_API_CALL nv_i2c_del_adapter(nv_state_t *nv, void *data)
|
||||
if (!pI2cAdapter) return FALSE;
|
||||
|
||||
// attempt release with the OS
|
||||
- osstatus = i2c_del_adapter(pI2cAdapter);
|
||||
+ i2c_del_adapter(pI2cAdapter);
|
||||
|
||||
- if (!osstatus)
|
||||
- {
|
||||
- os_free_mem(pI2cAdapter);
|
||||
- wasReleased = TRUE;
|
||||
- }
|
||||
+ os_free_mem(pI2cAdapter);
|
||||
+ wasReleased = TRUE;
|
||||
|
||||
return wasReleased;
|
||||
}
|
||||
diff --git a/modules/nvidia-kernel/nv-procfs.c b/modules/nvidia-kernel/nv-procfs.c
|
||||
index 3e05ef5..75fc7e0 100644
|
||||
--- a/modules/nvidia-kernel/nv-procfs.c
|
||||
+++ b/modules/nvidia-kernel/nv-procfs.c
|
||||
@@ -14,6 +14,8 @@
|
||||
#include "os-interface.h"
|
||||
#include "nv-linux.h"
|
||||
|
||||
+#undef CONFIG_PROC_FS
|
||||
+
|
||||
#if defined(CONFIG_PROC_FS)
|
||||
|
||||
#include "nv_compiler.h"
|
||||
@ -1,15 +0,0 @@
|
||||
post_install() {
|
||||
EXTRAMODULES='extramodules-3.10-CHAKRA'
|
||||
depmod $(cat /lib/modules/$EXTRAMODULES/version)
|
||||
#echo 'In order to use nvidia module, reboot the system.'
|
||||
}
|
||||
|
||||
post_upgrade() {
|
||||
EXTRAMODULES='extramodules-3.10-CHAKRA'
|
||||
depmod $(cat /lib/modules/$EXTRAMODULES/version)
|
||||
}
|
||||
|
||||
post_remove() {
|
||||
EXTRAMODULES='extramodules-3.10-CHAKRA'
|
||||
depmod $(cat /lib/modules/$EXTRAMODULES/version)
|
||||
}
|
||||
@ -1,81 +0,0 @@
|
||||
# Platform Packages for Chakra, part of chakra-project.org
|
||||
#
|
||||
# Maintainer: Neophytos Kolokotronis <tetris4@gmail.com>
|
||||
# Contributions from AUR: https://aur.archlinux.org/packages/nvidia-utils-bumblebee/
|
||||
|
||||
pkgname=nvidia-utils-bumblebee
|
||||
|
||||
pkgver=331.79
|
||||
pkgrel=1
|
||||
pkgdesc="NVIDIA drivers utilities and libraries. Repacked and installed in different folder to be used simultaneously with libgl."
|
||||
arch=('x86_64')
|
||||
url="http://www.nvidia.com/"
|
||||
depends=('xorg-server' 'pango' 'pangox-compat')
|
||||
optdepends=('gtk2: nvidia-settings' 'pkgconfig: nvidia-xconfig' 'opencl-nvidia: OpenCL support')
|
||||
conflicts=('nvidia-utils' 'nvidia-settings')
|
||||
provides=("nvidia-utils=$pkgver" 'nvidia-settings')
|
||||
license=('custom')
|
||||
install=nvidia.install
|
||||
source=("ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run")
|
||||
md5sums=('1f0708b913403b4f5b494b0daf0415eb')
|
||||
|
||||
|
||||
create_links() {
|
||||
# create soname links
|
||||
while read -d '' _lib; do
|
||||
_soname="$(dirname "${_lib}")/$(readelf -d "${_lib}" | sed -nr 's/.*Library soname: \[(.*)\].*/\1/p')"
|
||||
[[ -e "${_soname}" ]] || ln -s "$(basename "${_lib}")" "${_soname}"
|
||||
[[ -e "${_soname/.[0-9]*/}" ]] || ln -s "$(basename "${_soname}")" "${_soname/.[0-9]*/}"
|
||||
done < <(find "${pkgdir}" -type f -name '*.so*' -print0)
|
||||
}
|
||||
|
||||
build() {
|
||||
cd "${srcdir}"
|
||||
sh "NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run" --extract-only
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "${srcdir}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
|
||||
# X driver
|
||||
install -D -m755 nvidia_drv.so "${pkgdir}/usr/lib/xorg/modules/drivers/nvidia_drv.so"
|
||||
# GLX extension module for X
|
||||
install -D -m755 "libglx.so.${pkgver}" "${pkgdir}/usr/lib/nvidia-bumblebee/xorg/modules/extensions/libglx.so.${pkgver}"
|
||||
ln -s "libglx.so.${pkgver}" "${pkgdir}/usr/lib/nvidia-bumblebee/xorg/modules/extensions/libglx.so" # X doesn't find glx otherwise
|
||||
# OpenGL library
|
||||
install -D -m755 "libGL.so.${pkgver}" "${pkgdir}/usr/lib/nvidia-bumblebee/libGL.so.${pkgver}"
|
||||
# OpenGL core library
|
||||
install -D -m755 "libnvidia-glcore.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-glcore.so.${pkgver}"
|
||||
# VDPAU
|
||||
install -D -m755 "libvdpau_nvidia.so.${pkgver}" "${pkgdir}/usr/lib/vdpau/libvdpau_nvidia.so.${pkgver}"
|
||||
# nvidia-tls library
|
||||
install -D -m755 "tls/libnvidia-tls.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-tls.so.${pkgver}"
|
||||
install -D -m755 "libnvidia-cfg.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-cfg.so.${pkgver}"
|
||||
|
||||
install -D -m755 "libnvidia-ml.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-ml.so.${pkgver}"
|
||||
# CUDA
|
||||
install -D -m755 "libcuda.so.${pkgver}" "${pkgdir}/usr/lib/libcuda.so.${pkgver}"
|
||||
install -D -m755 "libnvcuvid.so.${pkgver}" "${pkgdir}/usr/lib/libnvcuvid.so.${pkgver}"
|
||||
# nvidia-xconfig
|
||||
install -D -m755 nvidia-xconfig "${pkgdir}/usr/bin/nvidia-xconfig"
|
||||
install -D -m644 nvidia-xconfig.1.gz "${pkgdir}/usr/share/man/man1/nvidia-xconfig.1.gz"
|
||||
# nvidia-settings
|
||||
install -D -m755 nvidia-settings "${pkgdir}/usr/bin/nvidia-settings"
|
||||
install -D -m644 nvidia-settings.1.gz "${pkgdir}/usr/share/man/man1/nvidia-settings.1.gz"
|
||||
install -D -m644 nvidia-settings.desktop "${pkgdir}/usr/share/applications/nvidia-settings.desktop"
|
||||
install -D -m644 nvidia-settings.png "${pkgdir}/usr/share/pixmaps/nvidia-settings.png"
|
||||
sed -e 's:__UTILS_PATH__:/usr/bin:' -e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' -i "${pkgdir}/usr/share/applications/nvidia-settings.desktop"
|
||||
# nvidia-bug-report
|
||||
install -D -m755 nvidia-bug-report.sh "${pkgdir}/usr/bin/nvidia-bug-report.sh"
|
||||
# nvidia-smi
|
||||
install -D -m755 nvidia-smi "${pkgdir}/usr/bin/nvidia-smi"
|
||||
install -D -m644 nvidia-smi.1.gz "${pkgdir}/usr/share/man/man1/nvidia-smi.1.gz"
|
||||
|
||||
|
||||
install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/nvidia/LICENSE"
|
||||
ln -s nvidia "${pkgdir}/usr/share/licenses/nvidia-utils"
|
||||
install -D -m644 README.txt "${pkgdir}/usr/share/doc/nvidia/README"
|
||||
install -D -m644 NVIDIA_Changelog "${pkgdir}/usr/share/doc/nvidia/NVIDIA_Changelog"
|
||||
ln -s nvidia "${pkgdir}/usr/share/doc/nvidia-utils"
|
||||
|
||||
create_links
|
||||
}
|
||||
@ -1,6 +0,0 @@
|
||||
post_install() {
|
||||
echo By using this package you accept the NVIDIA license,
|
||||
echo which has been installed in /usr/share/licenses/nvidia/LICENSE
|
||||
echo If you do not accept this license, you must remove the package immediately.
|
||||
echo Dont forget to update your /etc/X11/xorg.conf
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user