Merge pull request #1600 from mariux64/update-graphic

Update graphic
mariux64 · Jan 20, 2020 · 4149e1a · 4149e1a
2 parents 030fc95 + e36861b
commit 4149e1a
Show file tree

Hide file tree

Showing 7 changed files with 76 additions and 15 deletions.
diff --git a/libglvnd.be0 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}"'
diff --git 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.)

diff --git 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}"'
 
 ###############################################################################

diff --git 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

diff --git a/nvidia_current-418.56-1.bee → nvidia_current-418.56-2.bee b/nvidia_current-418.56-1.bee → nvidia_current-418.56-2.bee
@@ -63,7 +63,13 @@ mee_install() {
     # 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
+    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

diff --git a/nvidia_current-440.44-0.bee → nvidia_current-440.44-1.bee b/nvidia_current-440.44-0.bee → nvidia_current-440.44-1.bee
@@ -56,14 +56,20 @@ mee_install() {
         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}/libglx.so
+    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

diff --git a/scripts/update-graphic-nvidia.sh 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