Update graphic #1600
Merged
Update graphic #1600
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This lib replace libgl{,x} from mesa and nvidia
Now mesa and nvidia use the same
Closed
pmenzel
reviewed
Jan 17, 2020
|
|
||
| for i in ${UP[@]}; do | ||
| bee update $i | ||
| done |
There was a problem hiding this comment.
No need to use this array syntax. Next time, the below is shorter.
UP="libglvnd mesa-demos mesalib nvidia-mxlinks"; for i in ${UP}; do echo $i; done
libglvnd
mesa-demos
mesalib
nvidia-mxlinks
| @@ -0,0 +1,12 @@ | |||
| #!/usr/bin/bash | |||
|
|
|||
| UP=("libglvnd" "mesa-demos" "mesalib" "nvidia-mxlinks") | |||
There was a problem hiding this comment.
Update mesalib first to avoid warning messages?
$ sudo scripts/update-graphic-nvidia.sh
installing /src/mariux/beeroot/packages/libglvnd-1.3.0-0.x86_64.bee.tar.bz2 ..
Conflicts with installed package found: mesalib-19.3.1-0.x86_64:
/usr/include/EGL/eglext.h
/usr/include/EGL/eglplatform.h
/usr/include/GL/glcorearb.h
/usr/include/GL/glext.h
/usr/include/GL/glx.h
/usr/include/GL/glxext.h
/usr/include/GLES/gl.h
/usr/include/GLES/glext.h
/usr/include/GLES2/gl2.h
/usr/include/GLES2/gl2ext.h
/usr/include/GLES3/gl3.h
/usr/include/GLES3/gl31.h
/usr/include/GLES3/gl32.h
/usr/include/GLES3/gl3ext.h
/usr/include/KHR/khrplatform.h
/usr/lib/libEGL.so.1
/usr/lib/libGL.so.1
/usr/lib/libGLESv1_CM.so.1
/usr/lib/libGLESv2.so.2
/usr/lib/pkgconfig/egl.pc
/usr/lib/pkgconfig/gl.pc
/usr/lib/pkgconfig/glesv1_cm.pc
/usr/lib/pkgconfig/glesv2.pc
installing /src/mariux/beeroot/packages/mesa-demos-8.4.0-2.x86_64.bee.tar.bz2 ..
removing mesa-demos-8.4.0-0.x86_64 ..
installing /src/mariux/beeroot/packages/mesalib-19.3.2-0.x86_64.bee.tar.bz2 ..
removing mesalib-19.3.1-0.x86_64 ..
installing /src/mariux/beeroot/packages/nvidia-mxlinks-0.12-0.x86_64.bee.tar.bz2 ..
removing nvidia-mxlinks-0.11-0.x86_64 ..
removing nvidia_current-440.44-0.x86_64 ..
installing /src/mariux/beeroot/packages/nvidia_current-440.44-1.x86_64.bee.tar.bz2 ..
removing nvidia_current-418.56-1.x86_64 ..
installing /src/mariux/beeroot/packages/nvidia_current-418.56-2.x86_64.bee.tar.bz2 ..
There was a problem hiding this comment.
this files comes now from glvnd.
if you install mesalib first, the warning is gone
nvidia_current-440.44-1.bee
Outdated
| mkdir -vp ${D}/usr/lib/xorg/modules/extensions | ||
|
|
||
| #Zusatz | ||
| cd ${D}/usr/lib/xorg/modules/extensions |
There was a problem hiding this comment.
the bee-file overwrite the LIBDIR to /usr/share/nvidia ..
nvidia_current-440.44-1.bee
Outdated
| ln -sv libglxserver_nvidia.so.$PKGVERSION ${D}${LIBDIR}/libglxserver_nvidia.so | ||
| mkdir -vp ${D}/usr/lib/xorg/modules/extensions | ||
|
|
||
| #Zusatz |
mesalib.be0
Outdated
| # | ||
| # rm ${D}${LIBDIR}/libGL.so.1 | ||
| # ln -sf ${DATAROOTDIR}/mxgfx/lib/libGL.so.1 ${D}${LIBDIR}/libGL.so.1 | ||
| #} |
There was a problem hiding this comment.
Remove. It’s in the git history.
|
|
||
| # sourcesubdir_append src | ||
|
|
||
| BEE_BUILDTYPE=meson |
There was a problem hiding this comment.
Is it not detected automatically?
There was a problem hiding this comment.
yes
[BEE] /scratch/local/bee-schrader/libglvnd/libglvnd-1.3.0-0/source/autogen.sh --prefix=/usr --bindir=/usr/bin --sbindir=/usr/sbin --libexecdir=/usr/libexec --sysconfdir=/etc --sharedstatedir=/var --localstatedir=/var --libdir=/usr/lib --includedir=/usr/include --datarootdir=/usr/share --datadir=/usr/share --infodir=/usr/share/info --localedir=/usr/share/locale --mandir=/usr/share/man --docdir=/usr/share/doc/libglvnd --exec-prefix=/usr
autoreconf: Entering directory `.'
autoreconf: configure.ac: not using Gettext
autoreconf: running: aclocal --force -I m4
autoreconf: configure.ac: tracing
autoreconf: running: libtoolize --copy --force
libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `bin'.
libtoolize: copying file `bin/ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: copying file `m4/ltoptions.m4'
libtoolize: copying file `m4/ltsugar.m4'
libtoolize: copying file `m4/ltversion.m4'
libtoolize: copying file `m4/lt~obsolete.m4'
autoreconf: running: /usr/bin/autoconf --force
autoreconf: running: /usr/bin/autoheader --force
autoreconf: running: automake --add-missing --copy --force-missing
configure.ac:16: installing 'bin/compile'
configure.ac:11: installing 'bin/config.guess'
configure.ac:11: installing 'bin/config.sub'
configure.ac:18: installing 'bin/install-sh'
configure.ac:18: installing 'bin/missing'
src/EGL/Makefile.am: installing 'bin/depcomp'
parallel-tests: installing 'bin/test-driver'
autoreconf: Leaving directory `.'
[BEE] <= leaving bee_configure() ..
[BEE] => entering bee_build() ..
[BEE] make
make: *** No targets specified and no makefile found. Stop.
| ln -sv libglxserver_nvidia.so.$PKGVERSION ${D}${LIBDIR}/libglxserver_nvidia.so | ||
| mkdir -vp ${D}/usr/lib/xorg/modules/extensions | ||
|
|
||
| #Zusatz |
There was a problem hiding this comment.
working comment
can be remove
pmenzel
reviewed
Jan 18, 2020
| @@ -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" \ | |||
There was a problem hiding this comment.
Why do we need the OpenSWR Gallium driver?
commit 2b2d3680bf164ec4f8b50436b96c3fc195318ea5
Author: Tim Rowley <timothy.o.rowley@intel.com>
Date: Tue Feb 16 17:27:28 2016 -0600
gallium/swr: add OpenSWR driver
OpenSWR is a new software rasterizer for x86 processors designed
for high performance and high scalablility on visualization workloads.
There was a problem hiding this comment.
@david told me, it’s supposedly better than swrast, and it’s for testing.
1. add option for glvnd 2. Enable Gallium driver *swr*, which supposedly better than *swrast*
rebuild with glvnd installed
change symlink for glxserver_nvidia
change symlink for glxserver-nvidia
add new nvidai libs
pmenzel
force-pushed
the
update-graphic
branch
from
c838840
to
e36861b
Compare
Sign in
to join this conversation on GitHub.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.