Skip to content

Update graphic #1600

Merged
merged 9 commits into from
Jan 20, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
34 changes: 34 additions & 0 deletions libglvnd.be0
Original file line number Diff line number Diff line change
@@ -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
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it not detected automatically?

Copy link
Collaborator Author

@david david Jan 17, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.


#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}"'
2 changes: 1 addition & 1 deletion mesa-demos.be0
Original file line number Diff line number Diff line change
@@ -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.)
Expand Down
15 changes: 4 additions & 11 deletions mesalib.be0
Original file line number Diff line number Diff line change
@@ -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.)
Expand Down Expand Up @@ -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" \
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@david told me, it’s supposedly better than swrast, and it’s for testing.

-Dvulkan-drivers="amd,intel" \
-Dosmesa=gallium \
-Dvalgrind=false
-Dvalgrind=false \
-Dglvnd=true
}

#mee_build() {
Expand All @@ -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}"'

###############################################################################
Expand Down
12 changes: 11 additions & 1 deletion nvidia-mxlinks.be0
Original file line number Diff line number Diff line change
@@ -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))$")

Expand All @@ -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
Expand Down
8 changes: 7 additions & 1 deletion nvidia_current-418.56-1.bee → nvidia_current-418.56-2.bee
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What do you mean?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

working comment
can be remove

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
Expand Down
8 changes: 7 additions & 1 deletion nvidia_current-440.44-0.bee → nvidia_current-440.44-1.bee
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 12 additions & 0 deletions scripts/update-graphic-nvidia.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/usr/bin/bash

UP=("libglvnd" "mesa-demos" "mesalib" "nvidia-mxlinks")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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 ..

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this files comes now from glvnd.
if you install mesalib first, the warning is gone


for i in ${UP[@]}; do
bee update $i
done
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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


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