jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-08-02 23:47:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3849 from 5schatten/restore_the_mess

Browse Source 
[GLVND] restore the mess in some graphic packages
This commit is contained in:
Lukas Rusak 2019-09-18 13:42:50 -07:00 committed by GitHub
commit ee1f190c61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/graphics/libepoxy/package.mk
View File

@ -25,5 +25,5 @@ if [ "${OPENGLES_SUPPORT}" = "yes" ]; then
fi fi
if [ "${DISPLAYSERVER}" != "x11" ]; then if [ "${DISPLAYSERVER}" != "x11" ]; then
PKG_MESON_OPTS_TARGET="-D glx=no" PKG_MESON_OPTS_TARGET="-Dglx=no"
fi fi

26
packages/x11/driver/xf86-video-nvidia/package.mk
View File

@ -34,7 +34,7 @@ make_target() {
makeinstall_target() { makeinstall_target() {
mkdir -p ${INSTALL}/${XORG_PATH_MODULES}/drivers mkdir -p ${INSTALL}/${XORG_PATH_MODULES}/drivers
cp -P nvidia_drv.so ${INSTALL}/${XORG_PATH_MODULES}/drivers/nvidia-main_drv.so cp -P nvidia_drv.so ${INSTALL}/${XORG_PATH_MODULES}/drivers/nvidia-main_drv.so
ln -sf /var/lib/nvidia_drv.so ${INSTALL}/${XORG_PATH_MODULES}/drivers/nvidia_drv.so ln -sf /var/lib/nvidia_drv.so ${INSTALL}/${XORG_PATH_MODULES}/drivers/nvidia_drv.so
mkdir -p ${INSTALL}/${XORG_PATH_MODULES}/extensions mkdir -p ${INSTALL}/${XORG_PATH_MODULES}/extensions
@ -45,28 +45,28 @@ makeinstall_target() {
cp ${PKG_DIR}/config/*.conf ${INSTALL}/etc/X11 cp ${PKG_DIR}/config/*.conf ${INSTALL}/etc/X11
mkdir -p ${INSTALL}/usr/lib mkdir -p ${INSTALL}/usr/lib
cp -P libnvidia-glcore.so.${PKG_VERSION} ${INSTALL}/usr/lib cp -P libnvidia-glcore.so.${PKG_VERSION} ${INSTALL}/usr/lib
cp -P libnvidia-ml.so.${PKG_VERSION} ${INSTALL}/usr/lib cp -P libnvidia-ml.so.${PKG_VERSION} ${INSTALL}/usr/lib
ln -sf /var/lib/libnvidia-ml.so.1 ${INSTALL}/usr/lib/libnvidia-ml.so.1 ln -sf /var/lib/libnvidia-ml.so.1 ${INSTALL}/usr/lib/libnvidia-ml.so.1
cp -P libnvidia-tls.so.${PKG_VERSION} ${INSTALL}/usr/lib cp -P libnvidia-tls.so.${PKG_VERSION} ${INSTALL}/usr/lib
cp -P libGLX_nvidia.so.${PKG_VERSION} ${INSTALL}/usr/lib/libGLX_nvidia.so.0 cp -P libGLX_nvidia.so.${PKG_VERSION} ${INSTALL}/usr/lib/libGLX_nvidia.so.0
mkdir -p ${INSTALL}/$(get_full_module_dir)/nvidia mkdir -p ${INSTALL}/$(get_full_module_dir)/nvidia
ln -sf /var/lib/nvidia.ko ${INSTALL}/$(get_full_module_dir)/nvidia/nvidia.ko ln -sf /var/lib/nvidia.ko ${INSTALL}/$(get_full_module_dir)/nvidia/nvidia.ko
cp -P kernel/nvidia-uvm.ko ${INSTALL}/$(get_full_module_dir)/nvidia cp -P kernel/nvidia-uvm.ko ${INSTALL}/$(get_full_module_dir)/nvidia
cp -P kernel/nvidia-modeset.ko ${INSTALL}/$(get_full_module_dir)/nvidia cp -P kernel/nvidia-modeset.ko ${INSTALL}/$(get_full_module_dir)/nvidia
mkdir -p ${INSTALL}/usr/lib/nvidia mkdir -p ${INSTALL}/usr/lib/nvidia
cp -P kernel/nvidia.ko ${INSTALL}/usr/lib/nvidia cp -P kernel/nvidia.ko ${INSTALL}/usr/lib/nvidia
mkdir -p ${INSTALL}/usr/bin mkdir -p ${INSTALL}/usr/bin
ln -s /var/lib/nvidia-smi ${INSTALL}/usr/bin/nvidia-smi ln -s /var/lib/nvidia-smi ${INSTALL}/usr/bin/nvidia-smi
cp nvidia-smi ${INSTALL}/usr/bin/nvidia-main-smi cp nvidia-smi ${INSTALL}/usr/bin/nvidia-main-smi
ln -s /var/lib/nvidia-xconfig ${INSTALL}/usr/bin/nvidia-xconfig ln -s /var/lib/nvidia-xconfig ${INSTALL}/usr/bin/nvidia-xconfig
cp nvidia-xconfig ${INSTALL}/usr/bin/nvidia-main-xconfig cp nvidia-xconfig ${INSTALL}/usr/bin/nvidia-main-xconfig
mkdir -p ${INSTALL}/usr/lib/vdpau mkdir -p ${INSTALL}/usr/lib/vdpau
cp libvdpau_nvidia.so* ${INSTALL}/usr/lib/vdpau/libvdpau_nvidia-main.so.1 cp libvdpau_nvidia.so* ${INSTALL}/usr/lib/vdpau/libvdpau_nvidia-main.so.1
ln -sf /var/lib/libvdpau_nvidia.so ${INSTALL}/usr/lib/vdpau/libvdpau_nvidia.so ln -sf /var/lib/libvdpau_nvidia.so ${INSTALL}/usr/lib/vdpau/libvdpau_nvidia.so
ln -sf /var/lib/libvdpau_nvidia.so.1 ${INSTALL}/usr/lib/vdpau/libvdpau_nvidia.so.1 ln -sf /var/lib/libvdpau_nvidia.so.1 ${INSTALL}/usr/lib/vdpau/libvdpau_nvidia.so.1
} }

34
packages/x11/xserver/xorg-server/scripts/xorg-configure
View File

@ -58,33 +58,33 @@ logger -t Xorg "### creating needed directories and symlinks ###"
# Used to support GeForce 600 Series & newer # Used to support GeForce 600 Series & newer
if [ "${1}" = "nvidia" ]; then if [ "${1}" = "nvidia" ]; then
ln -sf /usr/lib/libGL_glvnd.so.1 /var/lib/libGL.so ln -sf /usr/lib/libGL_glvnd.so.1 /var/lib/libGL.so
ln -sf /usr/lib/xorg/modules/extensions/libglx_nvidia.so /var/lib/libglx.so ln -sf /usr/lib/xorg/modules/extensions/libglx_nvidia.so /var/lib/libglx.so
ln -sf /usr/lib/libnvidia-ml.so.@NVIDIA_VERSION@ /var/lib/libnvidia-ml.so.1 ln -sf /usr/lib/libnvidia-ml.so.@NVIDIA_VERSION@ /var/lib/libnvidia-ml.so.1
ln -sf /usr/lib/xorg/modules/drivers/nvidia-main_drv.so /var/lib/nvidia_drv.so ln -sf /usr/lib/xorg/modules/drivers/nvidia-main_drv.so /var/lib/nvidia_drv.so
ln -sf /usr/lib/nvidia/nvidia.ko /var/lib/nvidia.ko ln -sf /usr/lib/nvidia/nvidia.ko /var/lib/nvidia.ko
ln -sf /usr/lib/vdpau/libvdpau_nvidia-main.so.1 /var/lib/libvdpau_nvidia.so.1 ln -sf /usr/lib/vdpau/libvdpau_nvidia-main.so.1 /var/lib/libvdpau_nvidia.so.1
ln -sf /usr/lib/vdpau/libvdpau_nvidia-main.so.1 /var/lib/libvdpau_nvidia.so ln -sf /usr/lib/vdpau/libvdpau_nvidia-main.so.1 /var/lib/libvdpau_nvidia.so
ln -sf /usr/bin/nvidia-main-smi /var/lib/nvidia-smi ln -sf /usr/bin/nvidia-main-smi /var/lib/nvidia-smi
ln -sf /usr/bin/nvidia-main-xconfig /var/lib/nvidia-xconfig ln -sf /usr/bin/nvidia-main-xconfig /var/lib/nvidia-xconfig
insmod /var/lib/nvidia.ko insmod /var/lib/nvidia.ko
XORG_ARGS="${XORG_ARGS} -ignoreABI" XORG_ARGS="${XORG_ARGS} -ignoreABI"
# Used to support GeForce 500 Series & older # Used to support GeForce 500 Series & older
elif [ "${1}" = "nvidia-legacy" ]; then elif [ "${1}" = "nvidia-legacy" ]; then
ln -sf /usr/lib/libGL_nvidia-legacy.so.1 /var/lib/libGL.so ln -sf /usr/lib/libGL_nvidia-legacy.so.1 /var/lib/libGL.so
ln -sf /usr/lib/xorg/modules/extensions/libglx_nvidia-legacy.so /var/lib/libglx.so ln -sf /usr/lib/xorg/modules/extensions/libglx_nvidia-legacy.so /var/lib/libglx.so
ln -sf /usr/lib/libnvidia-ml.so.@NVIDIA_LEGACY_VERSION@ /var/lib/libnvidia-ml.so.1 ln -sf /usr/lib/libnvidia-ml.so.@NVIDIA_LEGACY_VERSION@ /var/lib/libnvidia-ml.so.1
ln -sf /usr/lib/xorg/modules/drivers/nvidia-legacy_drv.so /var/lib/nvidia_drv.so ln -sf /usr/lib/xorg/modules/drivers/nvidia-legacy_drv.so /var/lib/nvidia_drv.so
ln -sf /usr/lib/nvidia-legacy/nvidia.ko /var/lib/nvidia.ko ln -sf /usr/lib/nvidia-legacy/nvidia.ko /var/lib/nvidia.ko
ln -sf /usr/lib/vdpau/libvdpau_nvidia-legacy.so.1 /var/lib/libvdpau_nvidia.so.1 ln -sf /usr/lib/vdpau/libvdpau_nvidia-legacy.so.1 /var/lib/libvdpau_nvidia.so.1
ln -sf /usr/lib/vdpau/libvdpau_nvidia-legacy.so.1 /var/lib/libvdpau_nvidia.so ln -sf /usr/lib/vdpau/libvdpau_nvidia-legacy.so.1 /var/lib/libvdpau_nvidia.so
ln -sf /usr/bin/nvidia-legacy-smi /var/lib/nvidia-smi ln -sf /usr/bin/nvidia-legacy-smi /var/lib/nvidia-smi
ln -sf /usr/bin/nvidia-legacy-xconfig /var/lib/nvidia-xconfig ln -sf /usr/bin/nvidia-legacy-xconfig /var/lib/nvidia-xconfig
insmod /var/lib/nvidia.ko insmod /var/lib/nvidia.ko
XORG_ARGS="${XORG_ARGS} -ignoreABI" XORG_ARGS="${XORG_ARGS} -ignoreABI"
# Used for AMD & Intel GPUs supported by MESA 3D # Used for AMD & Intel GPUs supported by MESA 3D
else else
ln -sf /usr/lib/libGL_glvnd.so.1 /var/lib/libGL.so ln -sf /usr/lib/libGL_glvnd.so.1 /var/lib/libGL.so
ln -sf /usr/lib/xorg/modules/extensions/libglx_mesa.so /var/lib/libglx.so ln -sf /usr/lib/xorg/modules/extensions/libglx_mesa.so /var/lib/libglx.so
fi fi