summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2019-06-09 02:40:00 +0000
committerDaniel Bermond2019-06-09 02:55:38 +0000
commit4fcefde0cfd5737b856594efbbee61e7d104a578 (patch)
tree09bd0ac9351bb92cdc0626ad9687cebae7fee088
parentdab7ea6a3a02a1c85476769c68ac4f8a5eb45756 (diff)
downloadaur-4fcefde0cfd5737b856594efbbee61e7d104a578.tar.gz
First major rewrite after package adoption
-rw-r--r--.SRCINFO37
-rw-r--r--PKGBUILD130
2 files changed, 52 insertions, 115 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c1bb6a99e91..a21f3bf57c2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,46 +1,35 @@
pkgbase = lib32-nvidia-utils-beta
- pkgdesc = NVIDIA driver utilities and libraries (beta version) (32-bit)
+ pkgdesc = NVIDIA drivers utilities (32-bit, beta version)
pkgver = 430.14
- pkgrel = 1
+ pkgrel = 2
url = https://www.nvidia.com/
arch = x86_64
- license = custom:NVIDIA
- makedepends = nvidia-libgl-beta
+ license = custom
+ makedepends = nvidia-utils-beta>=430.14
options = !strip
source = https://us.download.nvidia.com/XFree86/Linux-x86_64/430.14/NVIDIA-Linux-x86_64-430.14.run
sha256sums = 00d46ffaf3e1e430081ddbd68b74cc361cd1328e8944224dfe69630dd8540f17
pkgname = lib32-nvidia-utils-beta
- pkgdesc = NVIDIA driver utilities and libraries (beta version) (32-bit)
depends = lib32-zlib
depends = lib32-gcc-libs
- depends = nvidia-utils-beta
- depends = lib32-mesa>=17.0.2-1
- optdepends = lib32-opencl-nvidia-beta: OpenCL support
+ depends = lib32-libglvnd
+ depends = nvidia-utils-beta>=430.14
+ optdepends = lib32-opencl-nvidia-beta: for OpenCL support
provides = lib32-nvidia-utils=430.14
- provides = lib32-libglvnd
provides = lib32-vulkan-driver
- conflicts = lib32-nvidia-utils
- conflicts = lib32-libglvnd
-
-pkgname = lib32-nvidia-libgl-beta
- pkgdesc = NVIDIA driver library symlinks for 'lib32-nvidia-utils-beta'
- depends = lib32-nvidia-utils-beta
- depends = nvidia-libgl-beta
+ provides = lib32-opengl-driver
provides = lib32-nvidia-libgl=430.14
- provides = lib32-libgl
- provides = lib32-libegl
- provides = lib32-libgles
+ provides = lib32-nvidia-libgl-beta=430.14
+ conflicts = lib32-nvidia-utils
conflicts = lib32-nvidia-libgl
- conflicts = lib32-libgl
- conflicts = lib32-libegl
- conflicts = lib32-libgles
- replaces = lib32-nvidia-utils<=313.26-1
+ replaces = lib32-nvidia-libgl
pkgname = lib32-opencl-nvidia-beta
- pkgdesc = NVIDIA's OpenCL implemention for 'lib32-nvidia-utils-beta'
+ pkgdesc = OpenCL implemention for NVIDIA (32-bit, beta version)
depends = lib32-zlib
depends = lib32-gcc-libs
+ depends = lib32-nvidia-utils-beta>=430.14
optdepends = opencl-headers: headers necessary for OpenCL development
provides = lib32-opencl-nvidia=430.14
provides = lib32-opencl-driver
diff --git a/PKGBUILD b/PKGBUILD
index f6a6217b13e..e26cfb83d91 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,35 +5,30 @@
# Contributor: Jeremy Sands
# Contributor: Erik Hardesty
# Contributor: josephgbr
-# Based on [multilib]'s lib32-nvidia-utils: https://www.archlinux.org/packages/multilib/x86_64/lib32-nvidia-utils/
pkgbase=lib32-nvidia-utils-beta
-pkgname=('lib32-nvidia-utils-beta' 'lib32-nvidia-libgl-beta' 'lib32-opencl-nvidia-beta')
+pkgname=('lib32-nvidia-utils-beta' 'lib32-opencl-nvidia-beta')
pkgver=430.14
-pkgrel=1
-pkgdesc='NVIDIA driver utilities and libraries (beta version) (32-bit)'
+pkgrel=2
+pkgdesc='NVIDIA drivers utilities (32-bit, beta version)'
arch=('x86_64')
url='https://www.nvidia.com/'
-makedepends=('nvidia-libgl-beta') # to avoid conflict during installation in the build chroot
-license=('custom:NVIDIA')
+license=('custom')
+makedepends=("nvidia-utils-beta>=${pkgver}") # to avoid conflict during installation in the build chroot
options=('!strip')
_pkg="NVIDIA-Linux-${CARCH}-${pkgver}"
source=("https://us.download.nvidia.com/XFree86/Linux-${CARCH}/${pkgver}/${_pkg}.run")
sha256sums=('00d46ffaf3e1e430081ddbd68b74cc361cd1328e8944224dfe69630dd8540f17')
-# create missing soname links
+# create soname links
_create_links() {
local _lib
local _soname
local _base
-
- for _lib in $(find "$pkgdir" -name '*.so*' | grep -v 'xorg/')
+ find "$pkgdir" -type f -name '*.so*' ! -path '*xorg/*' -print0 | while read -d $'\0' _lib
do
- # get soname/base name
_soname="$(dirname "$_lib")/$(readelf -d "$_lib" | grep -Po 'SONAME.*: \[\K[^]]*' || true)"
- _base="$(echo "$_soname" | sed -r 's/(.*).so.*/\1.so/')"
-
- # create missing links
+ _base="$(printf '%s' "$_soname" | sed -r 's/(.*).so.*/\1.so/')"
[ -e "$_soname" ] || ln -s "$(basename "$_lib")" "$_soname"
[ -e "$_base" ] || ln -s "$(basename "$_soname")" "$_base"
done
@@ -47,96 +42,60 @@ prepare() {
}
package_lib32-opencl-nvidia-beta() {
- pkgdesc="NVIDIA's OpenCL implemention for 'lib32-nvidia-utils-beta'"
- depends=('lib32-zlib' 'lib32-gcc-libs')
+ pkgdesc='OpenCL implemention for NVIDIA (32-bit, beta version)'
+ depends=('lib32-zlib' 'lib32-gcc-libs' "lib32-nvidia-utils-beta>=${pkgver}")
optdepends=('opencl-headers: headers necessary for OpenCL development')
provides=("lib32-opencl-nvidia=${pkgver}" 'lib32-opencl-driver')
conflicts=('lib32-opencl-nvidia')
cd "${_pkg}/32"
- # libraries
+ # OpenCL
install -D -m755 "libnvidia-compiler.so.${pkgver}" -t "${pkgdir}/usr/lib32"
install -D -m755 "libnvidia-opencl.so.${pkgver}" -t "${pkgdir}/usr/lib32"
- _create_links
-
- # license
- cd "${srcdir}/${_pkg}"
- install -D -m644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
-}
-
-package_lib32-nvidia-libgl-beta() {
- pkgdesc="NVIDIA driver library symlinks for 'lib32-nvidia-utils-beta'"
- depends=('lib32-nvidia-utils-beta' 'nvidia-libgl-beta')
- provides=("lib32-nvidia-libgl=${pkgver}" 'lib32-libgl' 'lib32-libegl' 'lib32-libgles')
- conflicts=('lib32-nvidia-libgl' 'lib32-libgl' 'lib32-libegl' 'lib32-libgles')
- replaces=('lib32-nvidia-utils<=313.26-1')
-
- cd "$_pkg"
- mkdir -p "${pkgdir}/usr/lib32/"
-
- # libGL (link)
- ln -s /usr/lib32/nvidia/libGL.so.1.7.0 "${pkgdir}/usr/lib32/libGL.so.1"
- ln -s libGL.so.1 "${pkgdir}/usr/lib32/libGL.so"
-
- # EGL (link)
- ln -s /usr/lib32/nvidia/libEGL.so.1.1.0 "${pkgdir}/usr/lib32/libEGL.so.1"
- ln -s libEGL.so.1 "${pkgdir}/usr/lib32/libEGL.so"
-
- # OpenGL ES 1 (link)
- ln -s /usr/lib32/nvidia/libGLESv1_CM.so.1.2.0 "${pkgdir}/usr/lib32/libGLESv1_CM.so.1"
- ln -s libGLESv1_CM.so.1 "${pkgdir}/usr/lib32/libGLESv1_CM.so"
-
- # OpenGL ES 2 (link)
- ln -s /usr/lib32/nvidia/libGLESv2.so.2.1.0 "${pkgdir}/usr/lib32/libGLESv2.so.2"
- ln -s libGLESv2.so.2 "${pkgdir}/usr/lib32/libGLESv2.so"
+ _create_links
# license
- install -D -m644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -D -m644 "${srcdir}/${_pkg}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
}
package_lib32-nvidia-utils-beta() {
- pkgdesc='NVIDIA driver utilities and libraries (beta version) (32-bit)'
- depends=('lib32-zlib' 'lib32-gcc-libs' 'nvidia-utils-beta' 'lib32-mesa>=17.0.2-1')
- optdepends=('lib32-opencl-nvidia-beta: OpenCL support')
- provides=("lib32-nvidia-utils=${pkgver}" 'lib32-libglvnd' 'lib32-vulkan-driver')
- conflicts=('lib32-nvidia-utils' 'lib32-libglvnd')
+ depends=('lib32-zlib' 'lib32-gcc-libs' 'lib32-libglvnd' "nvidia-utils-beta>=${pkgver}")
+ optdepends=('lib32-opencl-nvidia-beta: for OpenCL support')
+ provides=("lib32-nvidia-utils=${pkgver}" 'lib32-vulkan-driver' 'lib32-opengl-driver'
+ "lib32-nvidia-libgl=${pkgver}" "lib32-nvidia-libgl-beta=${pkgver}")
+ conflicts=('lib32-nvidia-utils' 'lib32-nvidia-libgl')
+ replaces=('lib32-nvidia-libgl')
cd "${_pkg}/32"
- # libGL & OpenGL
- install -D -m755 libGL.so.1.7.0 -t "${pkgdir}/usr/lib32/nvidia"
- install -D -m755 libGLdispatch.so.0 -t "${pkgdir}/usr/lib32"
- install -D -m755 "libnvidia-glcore.so.${pkgver}" -t "${pkgdir}/usr/lib32"
- install -D -m755 libOpenGL.so.0 -t "${pkgdir}/usr/lib32"
- install -D -m755 "libnvidia-glvkspirv.so.${pkgver}" -t "${pkgdir}/usr/lib32"
-
- # GLX
- install -D -m755 libGLX.so.0 -t "${pkgdir}/usr/lib32"
install -D -m755 "libGLX_nvidia.so.${pkgver}" -t "${pkgdir}/usr/lib32"
- # now in lib32-mesa driver
- #ln -s "libGLX_nvidia.so.${pkgver}" "${pkgdir}/usr/lib32/libGLX_indirect.so.0"
-
- # EGL
- install -D -m755 libEGL.so.1.1.0 -t "${pkgdir}/usr/lib32/nvidia"
- install -D -m755 "libEGL_nvidia.so.${pkgver}" -t "${pkgdir}/usr/lib32"
- install -D -m755 "libnvidia-eglcore.so.${pkgver}" -t "${pkgdir}/usr/lib32"
- # OpenGL ES
- install -D -m755 libGLESv1_CM.so.1.2.0 -t "${pkgdir}/usr/lib32/nvidia"
+ # OpenGL libraries
+ install -D -m755 "libEGL_nvidia.so.${pkgver}" -t "${pkgdir}/usr/lib32"
install -D -m755 "libGLESv1_CM_nvidia.so.${pkgver}" -t "${pkgdir}/usr/lib32"
- install -D -m755 libGLESv2.so.2.1.0 -t "${pkgdir}/usr/lib32/nvidia"
install -D -m755 "libGLESv2_nvidia.so.${pkgver}" -t "${pkgdir}/usr/lib32"
- install -D -m755 "libnvidia-glsi.so.${pkgver}" -t "${pkgdir}/usr/lib32"
- # VDPAU (Video Decode and Presentation API for Unix)
+ # OpenGL core library
+ install -D -m755 "libnvidia-glcore.so.${pkgver}" -t "${pkgdir}/usr/lib32"
+ install -D -m755 "libnvidia-eglcore.so.${pkgver}" -t "${pkgdir}/usr/lib32"
+ install -D -m755 "libnvidia-glsi.so.${pkgver}" -t "${pkgdir}/usr/lib32"
+
+ # misc
+ install -D -m755 "libnvidia-ifr.so.${pkgver}" -t "${pkgdir}/usr/lib32"
+ install -D -m755 "libnvidia-fbc.so.${pkgver}" -t "${pkgdir}/usr/lib32"
+ install -D -m755 "libnvidia-encode.so.${pkgver}" -t "${pkgdir}/usr/lib32"
+ install -D -m755 "libnvidia-ml.so.${pkgver}" -t "${pkgdir}/usr/lib32"
+ install -D -m755 "libnvidia-glvkspirv.so.${pkgver}" -t "${pkgdir}/usr/lib32"
+
+ # VDPAU
install -D -m755 "libvdpau_nvidia.so.${pkgver}" -t "${pkgdir}/usr/lib32/vdpau"
- # GPU-accelerated video encoding
- install -D -m755 "libnvidia-encode.so.${pkgver}" -t "${pkgdir}/usr/lib32"
+ # nvidia-tls library
+ install -D -m755 "libnvidia-tls.so.${pkgver}" -t "${pkgdir}/usr/lib32"
- # CUDA (Compute Unified Device Architecture) (perform traditional CPU calculations with the GPU)
+ # CUDA
install -D -m755 "libcuda.so.${pkgver}" -t "${pkgdir}/usr/lib32"
install -D -m755 "libnvcuvid.so.${pkgver}" -t "${pkgdir}/usr/lib32"
@@ -146,22 +105,11 @@ package_lib32-nvidia-utils-beta() {
# Fat (multiarchitecture) binary loader
install -D -m755 "libnvidia-fatbinaryloader.so.${pkgver}" -t "${pkgdir}/usr/lib32"
- # TLS (Thread local storage) support for OpenGL libs
- install -D -m755 "libnvidia-tls.so.${pkgver}" -t "${pkgdir}/usr/lib32"
-
- # GPU monitoring and management
- install -D -m755 "libnvidia-ml.so.${pkgver}" -t "${pkgdir}/usr/lib32"
-
- # helper libs for approved partners GRID remote apps
- install -D -m755 "libnvidia-ifr.so.${pkgver}" -t "${pkgdir}/usr/lib32"
- install -D -m755 "libnvidia-fbc.so.${pkgver}" -t "${pkgdir}/usr/lib32"
-
- # Optical Flow
+ # Optical flow
install -D -m755 "libnvidia-opticalflow.so.${pkgver}" -t "${pkgdir}/usr/lib32"
_create_links
# license
- cd "${srcdir}/${_pkg}"
- install -D -m644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -D -m644 "${srcdir}/${_pkg}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
}