From ceb27eac0f4379a723a6621c3de29e86f2b31a77 Mon Sep 17 00:00:00 2001 From: david Date: Thu, 16 Jan 2020 17:27:10 +0100 Subject: [PATCH 1/9] libglvnd: Add version 1.3.0 This lib replace libgl{,x} from mesa and nvidia Now mesa and nvidia use the same --- libglvnd.be0 | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100755 libglvnd.be0 diff --git a/libglvnd.be0 b/libglvnd.be0 new file mode 100755 index 000000000..1f492c52c --- /dev/null +++ b/libglvnd.be0 @@ -0,0 +1,34 @@ +#!/usr/bin/env beesh + +# BEE_VERSION libglvnd-1.3.0-0 + +SRCURL[0]="https://github.com/NVIDIA/libglvnd/archive/v${PKGVERSION}.tar.gz libglvnd-${PKGVERSION}.tar.gz" + +# PATCHURL+=() + +# build_in_sourcedir + +# sourcesubdir_append src + +BEE_BUILDTYPE=meson + +#mee_extract() { +# bee_extract "${@}" +#} + +#mee_patch() { +# bee_patch "${@}" +#} + +#mee_configure() { +# bee_configure +#} + +#mee_build() { +# bee_build +#} + +#mee_install() { +# bee_install +#} +## by default this may be 'make install DESTDIR="${D}"' From a3523ed28147a10606f947a568bc13518f5a0325 Mon Sep 17 00:00:00 2001 From: david Date: Thu, 16 Jan 2020 17:30:31 +0100 Subject: [PATCH 2/9] mesalib: Update from version 19.3.1 to 19.3.2 1. add option for glvnd 2. Enable Gallium driver *swr*, which supposedly better than *swrast* --- mesalib.be0 | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/mesalib.be0 b/mesalib.be0 index 4bd22ee5a..7d97bad86 100755 --- a/mesalib.be0 +++ b/mesalib.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION mesalib-19.3.1-0 +# BEE_VERSION mesalib-19.3.2-0 ## this file was created by bee init and should be executed to build a ## bee-package. (Additional hints are located at the end of this file.) @@ -56,10 +56,11 @@ SRCURL[0]="https://mesa.freedesktop.org/archive/mesa-${PKGVERSION}.tar.xz" mee_configure() { bee_configure \ -Dbuildtype=release \ - -Dgallium-drivers="nouveau,r600,radeonsi,svga,swrast" \ + -Dgallium-drivers="nouveau,r600,radeonsi,svga,swrast,swr" \ -Dvulkan-drivers="amd,intel" \ -Dosmesa=gallium \ - -Dvalgrind=false + -Dvalgrind=false \ + -Dglvnd=true } #mee_build() { @@ -70,14 +71,6 @@ mee_configure() { # bee_install #} -mee_install_post() { - mkdir -p ${D}${DATAROOTDIR}/mxgfx-generic/lib - ln -sf ${LIBDIR}/libGL.so.1.2.0 ${D}${DATAROOTDIR}/mxgfx-generic/lib/libGL.so.1 - - rm ${D}${LIBDIR}/libGL.so.1 - ln -sf ${DATAROOTDIR}/mxgfx/lib/libGL.so.1 ${D}${LIBDIR}/libGL.so.1 -} - ## by default this may be 'make install DESTDIR="${D}"' ############################################################################### From e35cb654247023a0710c59c6e50525a2b9c87ba0 Mon Sep 17 00:00:00 2001 From: david Date: Thu, 16 Jan 2020 17:41:01 +0100 Subject: [PATCH 3/9] mesa-demos: new revision rebuild with glvnd installed --- mesa-demos.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mesa-demos.be0 b/mesa-demos.be0 index 79b86ced6..3ba70c991 100755 --- a/mesa-demos.be0 +++ b/mesa-demos.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION mesa-demos-8.4.0-0 +# BEE_VERSION mesa-demos-8.4.0-1 ## this file was created by bee init and should be executed to build a ## bee-package. (Additional hints are located at the end of this file.) From c7b375cbe6b63dabe8241ed3f563312a77f22d24 Mon Sep 17 00:00:00 2001 From: david Date: Thu, 16 Jan 2020 17:59:38 +0100 Subject: [PATCH 4/9] nvidia-418.56: Remove old revision --- nvidia_current-418.56-1.bee | 78 ------------------------------------- 1 file changed, 78 deletions(-) delete mode 100755 nvidia_current-418.56-1.bee diff --git a/nvidia_current-418.56-1.bee b/nvidia_current-418.56-1.bee deleted file mode 100755 index 186d73ccc..000000000 --- a/nvidia_current-418.56-1.bee +++ /dev/null @@ -1,78 +0,0 @@ -#!/bin/env beesh - -# resources: -# http://www.nvidia.com/object/unix.html -# ./README.txt -# ./.manifest -# https://github.com/NVIDIA/nvidia-installer -# ./nvidia-installer -A -# ./nvidia-installer --ui=none --accept-license --no-kernel-module --expert -# - -NVIDIA_ARCHIVE="NVIDIA-Linux-x86_64-${PKGVERSION}${PKGEXTRAVERSION:+-${PKGEXTRAVERSION}}.run" - -SRCURL[0]="https://download.nvidia.com/XFree86/Linux-x86_64/${PKGVERSION}/${NVIDIA_ARCHIVE}" - -BEE_CONFIGURE=none - -build_in_sourcedir - -PREFIX=/usr/share/nvidia/${PKGVERSION} -LIBDIR=${PREFIX}/lib -BINDIR=${PREFIX}/bin - -mee_extract() { - rmdir ${S} - sh ${F}/${NVIDIA_ARCHIVE} -x --target ${S} -} - -#mee_patch() { -# bee_patch -#} - -mee_build() { - #bee_build - true -} - -mee_install() { - #bee_install - - mkdir -pv ${D}${PREFIX}/{bin,lib,drivers,man/man1} - mkdir -pv ${D}/usr/lib - - NVDRV="nvidia_drv.so" - - NVBIN=( \ - "nvidia-cuda-mps-control" \ - "nvidia-modprobe" \ - "nvidia-persistenced" \ - "nvidia-settings" \ - "nvidia-smi" \ - "nvidia-xconfig" \ - ) - - for i in lib*.so.$PKGVERSION; do - install -v -t ${D}${LIBDIR} "$i" - ln -sv "${LIBDIR}/$i" ${D}/usr/lib/ - if soname="$(soname "$i")"; then - test -e "${D}${LIBDIR}/${soname}" || ln -sv "$i" "${D}${LIBDIR}/${soname}" - fi - done - - # libglxserver_nvidia.so should reside in /usr/lib/xorg/modules/extensions, - # here we cheat away and stay in line with the /node/usr_share_mxgfx mechanism. - # Additional note: don't put/link libglx.so into /usr/lib. - ln -sv libglxserver_nvidia.so.$PKGVERSION ${D}${LIBDIR}/libglx.so - - echo "installing ${NVDRV} as drivers/$(basename ${NVDRV})"; - install -c -v ${NVDRV} ${D}${PREFIX}/drivers - - mkdir -pv ${D}/usr/share/man/man1 - - for i in ${NVBIN[@]} ; do - echo "installing ${i} as bin/${i}" - install -v -c -m 755 ${i} ${D}${BINDIR} - install -v -c -m 644 ${i}.1.gz ${D}${PREFIX}/man/man1 - done -} From d58b6d668ec368b1d327b389daac4a8d72a422af Mon Sep 17 00:00:00 2001 From: david Date: Thu, 16 Jan 2020 17:42:28 +0100 Subject: [PATCH 5/9] nvidia-418.56: new revision change symlink for glxserver_nvidia --- nvidia_current-418.56-2.bee | 84 +++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100755 nvidia_current-418.56-2.bee diff --git a/nvidia_current-418.56-2.bee b/nvidia_current-418.56-2.bee new file mode 100755 index 000000000..635fb06dd --- /dev/null +++ b/nvidia_current-418.56-2.bee @@ -0,0 +1,84 @@ +#!/bin/env beesh + +# resources: +# http://www.nvidia.com/object/unix.html +# ./README.txt +# ./.manifest +# https://github.com/NVIDIA/nvidia-installer +# ./nvidia-installer -A +# ./nvidia-installer --ui=none --accept-license --no-kernel-module --expert +# + +NVIDIA_ARCHIVE="NVIDIA-Linux-x86_64-${PKGVERSION}${PKGEXTRAVERSION:+-${PKGEXTRAVERSION}}.run" + +SRCURL[0]="https://download.nvidia.com/XFree86/Linux-x86_64/${PKGVERSION}/${NVIDIA_ARCHIVE}" + +BEE_CONFIGURE=none + +build_in_sourcedir + +PREFIX=/usr/share/nvidia/${PKGVERSION} +LIBDIR=${PREFIX}/lib +BINDIR=${PREFIX}/bin + +mee_extract() { + rmdir ${S} + sh ${F}/${NVIDIA_ARCHIVE} -x --target ${S} +} + +#mee_patch() { +# bee_patch +#} + +mee_build() { + #bee_build + true +} + +mee_install() { + #bee_install + + mkdir -pv ${D}${PREFIX}/{bin,lib,drivers,man/man1} + mkdir -pv ${D}/usr/lib + + NVDRV="nvidia_drv.so" + + NVBIN=( \ + "nvidia-cuda-mps-control" \ + "nvidia-modprobe" \ + "nvidia-persistenced" \ + "nvidia-settings" \ + "nvidia-smi" \ + "nvidia-xconfig" \ + ) + + for i in lib*.so.$PKGVERSION; do + install -v -t ${D}${LIBDIR} "$i" + ln -sv "${LIBDIR}/$i" ${D}/usr/lib/ + if soname="$(soname "$i")"; then + test -e "${D}${LIBDIR}/${soname}" || ln -sv "$i" "${D}${LIBDIR}/${soname}" + fi + done + + # libglxserver_nvidia.so should reside in /usr/lib/xorg/modules/extensions, + # here we cheat away and stay in line with the /node/usr_share_mxgfx mechanism. + # Additional note: don't put/link libglx.so into /usr/lib. + ln -sv libglxserver_nvidia.so.$PKGVERSION ${D}${LIBDIR}/libglxserver_nvidia.so + mkdir -vp ${D}/usr/lib/xorg/modules/extensions + + #Zusatz + cd ${D}/usr/lib/xorg/modules/extensions + ln -sv /usr/share/mxgfx/lib/libglxserver_nvidia.so libglxserver_nvidia.so + cd $B + + echo "installing ${NVDRV} as drivers/$(basename ${NVDRV})"; + install -c -v ${NVDRV} ${D}${PREFIX}/drivers + + mkdir -pv ${D}/usr/share/man/man1 + + for i in ${NVBIN[@]} ; do + echo "installing ${i} as bin/${i}" + install -v -c -m 755 ${i} ${D}${BINDIR} + install -v -c -m 644 ${i}.1.gz ${D}${PREFIX}/man/man1 + done +} From ca55884de991e9b0ef9e6cec3d5ba994020fb38d Mon Sep 17 00:00:00 2001 From: david Date: Thu, 16 Jan 2020 17:49:04 +0100 Subject: [PATCH 6/9] nvidia-440.44: remove revision --- nvidia_current-440.44-0.bee | 78 ------------------------------------- 1 file changed, 78 deletions(-) delete mode 100755 nvidia_current-440.44-0.bee diff --git a/nvidia_current-440.44-0.bee b/nvidia_current-440.44-0.bee deleted file mode 100755 index 186d73ccc..000000000 --- a/nvidia_current-440.44-0.bee +++ /dev/null @@ -1,78 +0,0 @@ -#!/bin/env beesh - -# resources: -# http://www.nvidia.com/object/unix.html -# ./README.txt -# ./.manifest -# https://github.com/NVIDIA/nvidia-installer -# ./nvidia-installer -A -# ./nvidia-installer --ui=none --accept-license --no-kernel-module --expert -# - -NVIDIA_ARCHIVE="NVIDIA-Linux-x86_64-${PKGVERSION}${PKGEXTRAVERSION:+-${PKGEXTRAVERSION}}.run" - -SRCURL[0]="https://download.nvidia.com/XFree86/Linux-x86_64/${PKGVERSION}/${NVIDIA_ARCHIVE}" - -BEE_CONFIGURE=none - -build_in_sourcedir - -PREFIX=/usr/share/nvidia/${PKGVERSION} -LIBDIR=${PREFIX}/lib -BINDIR=${PREFIX}/bin - -mee_extract() { - rmdir ${S} - sh ${F}/${NVIDIA_ARCHIVE} -x --target ${S} -} - -#mee_patch() { -# bee_patch -#} - -mee_build() { - #bee_build - true -} - -mee_install() { - #bee_install - - mkdir -pv ${D}${PREFIX}/{bin,lib,drivers,man/man1} - mkdir -pv ${D}/usr/lib - - NVDRV="nvidia_drv.so" - - NVBIN=( \ - "nvidia-cuda-mps-control" \ - "nvidia-modprobe" \ - "nvidia-persistenced" \ - "nvidia-settings" \ - "nvidia-smi" \ - "nvidia-xconfig" \ - ) - - for i in lib*.so.$PKGVERSION; do - install -v -t ${D}${LIBDIR} "$i" - ln -sv "${LIBDIR}/$i" ${D}/usr/lib/ - if soname="$(soname "$i")"; then - test -e "${D}${LIBDIR}/${soname}" || ln -sv "$i" "${D}${LIBDIR}/${soname}" - fi - done - - # libglxserver_nvidia.so should reside in /usr/lib/xorg/modules/extensions, - # here we cheat away and stay in line with the /node/usr_share_mxgfx mechanism. - # Additional note: don't put/link libglx.so into /usr/lib. - ln -sv libglxserver_nvidia.so.$PKGVERSION ${D}${LIBDIR}/libglx.so - - echo "installing ${NVDRV} as drivers/$(basename ${NVDRV})"; - install -c -v ${NVDRV} ${D}${PREFIX}/drivers - - mkdir -pv ${D}/usr/share/man/man1 - - for i in ${NVBIN[@]} ; do - echo "installing ${i} as bin/${i}" - install -v -c -m 755 ${i} ${D}${BINDIR} - install -v -c -m 644 ${i}.1.gz ${D}${PREFIX}/man/man1 - done -} From 1e148c47ebf08e476b5c680e760f69da3e448811 Mon Sep 17 00:00:00 2001 From: david Date: Thu, 16 Jan 2020 17:50:56 +0100 Subject: [PATCH 7/9] nvidia-440.44: Add new revision change symlink for glxserver-nvidia --- nvidia_current-440.44-1.bee | 84 +++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100755 nvidia_current-440.44-1.bee diff --git a/nvidia_current-440.44-1.bee b/nvidia_current-440.44-1.bee new file mode 100755 index 000000000..403bcc31d --- /dev/null +++ b/nvidia_current-440.44-1.bee @@ -0,0 +1,84 @@ +#!/bin/env beesh + +# resources: +# http://www.nvidia.com/object/unix.html +# ./README.txt +# ./.manifest +# https://github.com/NVIDIA/nvidia-installer +# ./nvidia-installer -A +# ./nvidia-installer --ui=none --accept-license --no-kernel-module --expert +# + +NVIDIA_ARCHIVE="NVIDIA-Linux-x86_64-${PKGVERSION}${PKGEXTRAVERSION:+-${PKGEXTRAVERSION}}.run" + +SRCURL[0]="https://download.nvidia.com/XFree86/Linux-x86_64/${PKGVERSION}/${NVIDIA_ARCHIVE}" + +BEE_CONFIGURE=none + +build_in_sourcedir + +PREFIX=/usr/share/nvidia/${PKGVERSION} +LIBDIR=${PREFIX}/lib +BINDIR=${PREFIX}/bin + +mee_extract() { + rmdir ${S} + sh ${F}/${NVIDIA_ARCHIVE} -x --target ${S} +} + +#mee_patch() { +# bee_patch +#} + +mee_build() { + #bee_build + true +} + +mee_install() { + #bee_install + + mkdir -pv ${D}${PREFIX}/{bin,lib,drivers,man/man1} + mkdir -pv ${D}/usr/lib + + NVDRV="nvidia_drv.so" + + NVBIN=( \ + "nvidia-cuda-mps-control" \ + "nvidia-modprobe" \ + "nvidia-persistenced" \ + "nvidia-settings" \ + "nvidia-smi" \ + "nvidia-xconfig" \ + ) + + for i in lib*.so.$PKGVERSION; do + install -v -t ${D}${LIBDIR} "$i" + ln -sv "${LIBDIR}/$i" ${D}/usr/lib/ + if soname="$(soname "$i")"; then + #echo "$soname\n" + test -e "${D}${LIBDIR}/${soname}" || ln -sv "$i" "${D}${LIBDIR}/${soname}" + fi + done + + # libglxserver_nvidia.so should reside in /usr/lib/xorg/modules/extensions, + # here we cheat away and stay in line with the /node/usr_share_mxgfx mechanism. + # Additional note: don't put/link libglx.so into /usr/lib. + ln -sv libglxserver_nvidia.so.$PKGVERSION ${D}${LIBDIR}/libglxserver_nvidia.so + mkdir -vp ${D}/usr/lib/xorg/modules/extensions + + cd ${D}/usr/lib/xorg/modules/extensions + ln -sv /usr/share/mxgfx/lib/libglxserver_nvidia.so libglxserver_nvidia.so + cd $B + + echo "installing ${NVDRV} as drivers/$(basename ${NVDRV})"; + install -c -v ${NVDRV} ${D}${PREFIX}/drivers + + mkdir -pv ${D}/usr/share/man/man1 + + for i in ${NVBIN[@]} ; do + echo "installing ${i} as bin/${i}" + install -v -c -m 755 ${i} ${D}${BINDIR} + install -v -c -m 644 ${i}.1.gz ${D}${PREFIX}/man/man1 + done +} From 36124333499346287b49d6fdbe7bad5277e63bb7 Mon Sep 17 00:00:00 2001 From: david Date: Thu, 16 Jan 2020 17:57:42 +0100 Subject: [PATCH 8/9] nvidia-mxlinks: Update from version 0.11 to 0.12 add new nvidai libs --- nvidia-mxlinks.be0 | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/nvidia-mxlinks.be0 b/nvidia-mxlinks.be0 index 02f17bbb8..c5589ee0d 100755 --- a/nvidia-mxlinks.be0 +++ b/nvidia-mxlinks.be0 @@ -1,6 +1,6 @@ #!/bin/env beesh -# BEE_VERSION nvidia-mxlinks-0.11-0 +# BEE_VERSION nvidia-mxlinks-0.12-0 EXCLUDE=("^/usr/lib/(X11|xorg)(|/modules(|/drivers))$") @@ -22,6 +22,16 @@ mee_install() { "libGLcore.1" "libnvidia-tls.so.1" "libXvMCNVIDIA_dynamic.so.1" + "libEGL_nvidia.so.0" + "libGLESv1_CM_nvidia.so.1" + "libGLESv2_nvidia.so.2" + "libGLX_nvidia.so.0" + "libnvidia-allocator.so.1" + "libnvidia-fbc.so.1" + "libnvidia-ifr.so.1" + "libnvidia-opticalflow.so.1" + "libnvoptix.so.1" + "libnvidia-opencl.so.1" ) for i in ${NVLIBS[@]} ; do From e36861b102e646127d7f4067597f2c321470561e Mon Sep 17 00:00:00 2001 From: david Date: Thu, 16 Jan 2020 18:03:52 +0100 Subject: [PATCH 9/9] Add update script --- scripts/update-graphic-nvidia.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100755 scripts/update-graphic-nvidia.sh diff --git a/scripts/update-graphic-nvidia.sh b/scripts/update-graphic-nvidia.sh new file mode 100755 index 000000000..909e90475 --- /dev/null +++ b/scripts/update-graphic-nvidia.sh @@ -0,0 +1,12 @@ +#!/usr/bin/bash + +UP=("libglvnd" "mesa-demos" "mesalib" "nvidia-mxlinks") + +for i in ${UP[@]}; do + bee update $i +done + +bee remove nvidia_current-440.44-0.x86_64 +bee install -f nvidia_current-440.44-1 +bee remove nvidia_current-418.56-1.x86_64 +bee install -f nvidia_current-418.56-2