Work continues.

config/graphic

@@ -1,33 +1,51 @@
-if [ "${OPENGL}" = no ]; then
+[ -z "${OPENGL}" ] && OPENGL="no"
+[ -z "${OPENGLES}" ] && OPENGLES="no"
+[ -z "${VULKAN}" ] && VULKAN="no"
+
+if [ "${OPENGL}" = "no" ]; then
   OPENGL_SUPPORT="no"
 else
   OPENGL_SUPPORT="yes"
 fi
 
-if [ "${OPENGLES}" = no ]; then
+if [ "${OPENGLES}" = "no" ]; then
   OPENGLES_SUPPORT="no"
 else
   OPENGLES_SUPPORT="yes"
 fi
 
+if [ "${VULKAN}" = "no" ]; then
+  VULKAN_SUPPORT="no"
+else
+  VULKAN_SUPPORT="yes"
+fi
+
 get_graphicdrivers() {
 
   # set defaults
   GALLIUM_DRIVERS=""
-  DRI_DRIVERS=""
   XORG_DRIVERS=""
+  VULKAN_DRIVERS_CONFIG=""
+  VULKAN_DRIVERS_MESA=""
   LLVM_SUPPORT="no"
   COMPOSITE_SUPPORT="no"
   VDPAU_SUPPORT="no"
   VAAPI_SUPPORT="no"
   V4L2_SUPPORT="no"
 
   if [ "${GRAPHIC_DRIVERS}" = "all" ]; then
-    GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 radeonsi nvidia nvidia-legacy vmware virtio vc4"
+    GRAPHIC_DRIVERS="crocus i915 iris r300 r600 radeonsi nvidia nvidia-legacy nvidia-ng vmware virtio vc4"
+  fi
+
+  if listcontains "${GRAPHIC_DRIVERS}" "crocus"; then
+    GALLIUM_DRIVERS+=" crocus"
+    XORG_DRIVERS+=" intel"
+    COMPOSITE_SUPPORT="yes"
+    VAAPI_SUPPORT="yes"
   fi
 
   if listcontains "${GRAPHIC_DRIVERS}" "etnaviv"; then
-    GALLIUM_DRIVERS+=" etnaviv imx"
+    GALLIUM_DRIVERS+=" etnaviv kmsro"
     V4L2_SUPPORT="yes"
     VAAPI_SUPPORT="no"
     VDPAU_SUPPORT="no"
@@ -41,15 +59,16 @@ get_graphicdrivers() {
   fi
 
   if listcontains "${GRAPHIC_DRIVERS}" "i915"; then
-    DRI_DRIVERS+=" i915"
+    GALLIUM_DRIVERS+=" i915"
     XORG_DRIVERS+=" intel"
     COMPOSITE_SUPPORT="yes"
     VAAPI_SUPPORT="yes"
   fi
 
-  if listcontains "${GRAPHIC_DRIVERS}" "i965"; then
-    DRI_DRIVERS+=" i965"
+  if listcontains "${GRAPHIC_DRIVERS}" "iris"; then
+    GALLIUM_DRIVERS+=" iris"
     XORG_DRIVERS+=" intel"
+    VULKAN_DRIVERS_MESA+=" intel"
     COMPOSITE_SUPPORT="yes"
     VAAPI_SUPPORT="yes"
   fi
@@ -59,8 +78,13 @@ get_graphicdrivers() {
     V4L2_SUPPORT="yes"
   fi
 
+  if listcontains "${GRAPHIC_DRIVERS}" "mali"; then
+    V4L2_SUPPORT="yes"
+  fi
+
   if listcontains "${GRAPHIC_DRIVERS}" "nvidia"; then
     XORG_DRIVERS+=" nvidia"
+    VULKAN_DRIVERS_CONFIG+=" nvidia"
     VDPAU_SUPPORT="yes"
   fi
 
@@ -69,17 +93,17 @@ get_graphicdrivers() {
     VDPAU_SUPPORT="yes"
   fi
 
+  if listcontains "${GRAPHIC_DRIVERS}" "nvidia-ng"; then
+    VULKAN_DRIVERS_CONFIG+=" nvidia-ng"
+    VAAPI_SUPPORT="yes"
+  fi
+
   if listcontains "${GRAPHIC_DRIVERS}" "panfrost"; then
     GALLIUM_DRIVERS+=" kmsro panfrost"
+    VULKAN_DRIVERS_MESA+=" panfrost"
     V4L2_SUPPORT="yes"
   fi
 
-  if listcontains "${GRAPHIC_DRIVERS}" "r200"; then
-    DRI_DRIVERS+=" r200"
-    XORG_DRIVERS+=" ati"
-    COMPOSITE_SUPPORT="yes"
-  fi
-
   if listcontains "${GRAPHIC_DRIVERS}" "r300"; then
     GALLIUM_DRIVERS+=" r300"
     XORG_DRIVERS+=" ati"
@@ -100,6 +124,7 @@ get_graphicdrivers() {
   if listcontains "${GRAPHIC_DRIVERS}" "radeonsi"; then
     GALLIUM_DRIVERS+=" radeonsi"
     XORG_DRIVERS+=" ati amdgpu"
+    VULKAN_DRIVERS_MESA+=" amd"
     LLVM_SUPPORT="yes"
     COMPOSITE_SUPPORT="yes"
     VDPAU_SUPPORT="yes"
@@ -108,6 +133,7 @@ get_graphicdrivers() {
 
   if listcontains "${GRAPHIC_DRIVERS}" "vc4"; then
     GALLIUM_DRIVERS+=" vc4 v3d kmsro"
+    VULKAN_DRIVERS_MESA+=" broadcom"
     V4L2_SUPPORT="yes"
     VAAPI_SUPPORT="no"
     VDPAU_SUPPORT="no"
@@ -123,8 +149,16 @@ get_graphicdrivers() {
     COMPOSITE_SUPPORT="yes"
   fi
 
+  # VDPAU Support depends on X11
+  if [ ! "${DISPLAYSERVER}" = "x11" ]; then
+    VDPAU_SUPPORT="no"
+  fi
+
   # remove duplicate entries
   GALLIUM_DRIVERS="$(echo ${GALLIUM_DRIVERS} | xargs -n1 | sort -u | xargs)"
+  GRAPHIC_DRIVERS="$(echo ${GRAPHIC_DRIVERS} | xargs -n1 | sort -u | xargs)"
   XORG_DRIVERS="$(echo ${XORG_DRIVERS} | xargs -n1 | sort -u | xargs)"
-  DRI_DRIVERS="$(echo ${DRI_DRIVERS} | xargs -n1 | sort -u | xargs)"
+  VULKAN_DRIVERS_MESA="$(echo ${VULKAN_DRIVERS_MESA} | xargs -n1 | sort -u | xargs)"
+  VULKAN_DRIVERS_CONFIG+=" ${VULKAN_DRIVERS_MESA}"
+  VULKAN_DRIVERS_CONFIG="$(echo ${VULKAN_DRIVERS_CONFIG} | xargs -n1 | sort -u | xargs)"
 }

config/show_config

@@ -24,27 +24,34 @@ show_config() {
   # config_message="$config_message\n - CFLAGS:\t $TARGET_CFLAGS"
   # config_message="$config_message\n - LDFLAGS:\t $TARGET_LDFLAGS"
 
-  # Graphic configuration
 
-  config_message="$config_message\n\n Graphic configuration:"
-  config_message="$config_message\n $dashes$dashes"
+  # Graphic configuration
 
-  if [ "$DISPLAYSERVER" = "x11" ] ; then
-    config_message="$config_message\n - Xorg Graphic Drivers:\t\t $GRAPHIC_DRIVERS"
-    config_message="$config_message\n - XORG Composite support:\t\t $COMPOSITE_SUPPORT"
-    config_message="$config_message\n - WindowManager:\t\t\t $WINDOWMANAGER"
+  config_message+="\n\n Graphic configuration:"
+  config_message+="\n ${dashes}${dashes}"
+  config_message+="\n - Graphic Drivers:\t\t\t ${GRAPHIC_DRIVERS}"
+  config_message+="\n - Display Server:\t\t\t ${DISPLAYSERVER}"
+  if [ "${DISPLAYSERVER}" = "x11" ] ; then
+    for drv in ${XORG_DRIVERS}; do
+      XORG_DRIVERS_CONFIG+="xf86-video-${drv} "
+    done
+    config_message+="\n - X.Org Graphic Drivers:\t\t ${XORG_DRIVERS_CONFIG}"
+    config_message+="\n - X.Org Composite support:\t\t ${COMPOSITE_SUPPORT}"
+  fi
+  config_message+="\n - Window Manager / Compositor:\t\t ${WINDOWMANAGER}"
+  config_message+="\n - OpenGL (GLX) support (provider):\t ${OPENGL_SUPPORT} (${OPENGL})"
+  config_message+="\n - OpenGL ES support (provider):\t ${OPENGLES_SUPPORT} (${OPENGLES})"
+  config_message+="\n - Vulkan API support (provider):\t ${VULKAN_SUPPORT} (${VULKAN})"
+  if [ "${VULKAN_SUPPORT}" = "yes" ]; then
+    config_message+="\n - Vulkan Graphic Drivers:\t\t ${VULKAN_DRIVERS_CONFIG}"
   fi
-  config_message="$config_message\n - OpenGL (GLX) support (provider):\t $OPENGL_SUPPORT ($OPENGL)"
-  config_message="$config_message\n - OpenGLES support (provider):\t\t $OPENGLES_SUPPORT ($OPENGLES)"
-  config_message="$config_message\n - uvesafb support:\t\t\t $UVESAFB_SUPPORT"
-
-  # Hardware decoder support
 
-  config_message="$config_message\n\n Hardware decoder configuration:"
-  config_message="$config_message\n $dashes$dashes"
+  # Video Acceleration configuration
 
-  config_message="$config_message\n - VAAPI Support:\t\t\t $VAAPI_SUPPORT"
-  config_message="$config_message\n - VDPAU Support:\t\t\t $VDPAU_SUPPORT"
+  config_message+="\n\n Video Acceleration configuration:"
+  config_message+="\n ${dashes}${dashes}"
+  config_message+="\n - VA-API Support:\t\t\t ${VAAPI_SUPPORT}"
+  config_message+="\n - VDPAU Support:\t\t\t ${VDPAU_SUPPORT}"
 
   # Input device configuration
 

packages/jelos/config/system/configs/system.cfg

@@ -186,7 +186,8 @@ pspminis.cpugovernor=performance
 psx.integerscale=1
 psx.ratio=4/3
 psx.rgascale=0
-rotate.root.password=1
+rotate.root.password=0
+root.password=jelos
 samba.enabled=0
 saturn.integerscale=1
 saturn.ratio=4/3

packages/lang/llvm/package.mk

@@ -14,8 +14,8 @@ PKG_LONGDESC="Low-Level Virtual Machine (LLVM) is a compiler infrastructure."
 PKG_TOOLCHAIN="cmake"
 
 PKG_CMAKE_OPTS_COMMON="-DLLVM_INCLUDE_TOOLS=ON \
-                       -DLLVM_BUILD_TOOLS=OFF \
-                       -DLLVM_BUILD_UTILS=OFF \
+                       -DLLVM_BUILD_TOOLS=ON \
+                       -DLLVM_BUILD_UTILS=ON \
                        -DLLVM_BUILD_EXAMPLES=OFF \
                        -DLLVM_INCLUDE_EXAMPLES=OFF \
                        -DLLVM_BUILD_TESTS=OFF \
@@ -28,9 +28,9 @@ PKG_CMAKE_OPTS_COMMON="-DLLVM_INCLUDE_TOOLS=ON \
                        -DLLVM_ENABLE_DOXYGEN=OFF \
                        -DLLVM_ENABLE_SPHINX=OFF \
                        -DLLVM_ENABLE_OCAMLDOC=OFF \
-                       -DLLVM_ENABLE_BINDINGS=OFF \
-                       -DLLVM_ENABLE_TERMINFO=OFF \
-                       -DLLVM_ENABLE_ASSERTIONS=OFF \
+                       -DLLVM_ENABLE_BINDINGS=ON \
+                       -DLLVM_ENABLE_TERMINFO=ON \
+                       -DLLVM_ENABLE_ASSERTIONS=ON \
                        -DLLVM_ENABLE_WERROR=OFF \
                        -DLLVM_ENABLE_ZLIB=OFF \
                        -DLLVM_ENABLE_LIBXML2=OFF \

packages/multimedia/libvdpau/package.mk

@@ -1,16 +1,16 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 # Copyright (C) 2009-2016 Stephan Raue ([email protected])
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
-# Copyright (C) 2022-present Fewtarius
 
 PKG_NAME="libvdpau"
-PKG_VERSION="1.2"
+PKG_VERSION="1.4"
+PKG_SHA256="4258824c5a4555ef31de0a7d82b3caf19e75a16a13949f1edafc5f6fb2d33f30"
 PKG_LICENSE="MIT"
 PKG_SITE="https://wiki.freedesktop.org/www/Software/VDPAU/"
-PKG_URL="https://secure.freedesktop.org/~aplattner/vdpau/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="https://gitlab.freedesktop.org/vdpau/libvdpau/-/archive/${PKG_VERSION}/libvdpau-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain libX11 xorgproto libXext"
 PKG_LONGDESC="VDPAU is the Video Decode and Presentation API for UNIX."
 
-PKG_CONFIGURE_OPTS_TARGET="--enable-dri2 \
-                           --disable-documentation \
-                           --with-module-dir=/usr/lib/vdpau"
+PKG_MESON_OPTS_TARGET="-Ddocumentation=false \
+                       -Ddri2=true \
+                       -Dmoduledir=/usr/lib/vdpau"

packages/x11/app/setxkbmap/package.mk

@@ -3,10 +3,10 @@
 # Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="setxkbmap"
-PKG_VERSION="1.3.2"
-PKG_SHA256="8ff27486442725e50b02d7049152f51d125ecad71b7ce503cfa09d5d8ceeb9f5"
+PKG_VERSION="1.3.3"
+PKG_SHA256="b560c678da6930a0da267304fa3a41cc5df39a96a5e23d06f14984c87b6f587b"
 PKG_LICENSE="OSS"
-PKG_SITE="http://www.X.org"
-PKG_URL="http://xorg.freedesktop.org/archive/individual/app/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
-PKG_DEPENDS_TARGET="toolchain libX11 libxkbfile"
+PKG_SITE="https://www.X.org"
+PKG_URL="https://xorg.freedesktop.org/archive/individual/app/${PKG_NAME}-${PKG_VERSION}.tar.xz"
+PKG_DEPENDS_TARGET="toolchain libX11 libxkbfile xrandr"
 PKG_LONGDESC="Setxkbmap sets the keyboard using the X Keyboard Extension."

packages/x11/data/xkeyboard-config/package.mk

@@ -24,6 +24,7 @@ pre_configure_target() {
                              --disable-runtime-deps \
                              --enable-nls \
                              --disable-rpath \
+                             --datadir=/usr/lib \
                              --with-gnu-ld"
 
   if [ "${DISPLAYSERVER}" = "x11" ]; then

packages/x11/driver/xf86-input-libinput/package.mk

@@ -3,11 +3,11 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="xf86-input-libinput"
-PKG_VERSION="1.2.0"
-PKG_SHA256="f80da3c514fe1cbf57fa1b1bd6ff97f6b0a1f87466ad89247bac59cd0a5869f6"
+PKG_VERSION="1.2.1"
+PKG_SHA256="8151db5b9ddb317c0ce92dcb62da9a8db5079e5b8a95b60abc854da21e7e971b"
 PKG_LICENSE="MIT"
 PKG_SITE="http://www.freedesktop.org/wiki/Software/libinput/"
-PKG_URL="http://xorg.freedesktop.org/archive/individual/driver/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
+PKG_URL="http://xorg.freedesktop.org/archive/individual/driver/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain libinput"
 PKG_LONGDESC="This is an X driver based on libinput."
 PKG_TOOLCHAIN="autotools"

packages/x11/driver/xf86-input-synaptics/package.mk

@@ -12,3 +12,7 @@ PKG_LONGDESC="Synaptics touchpad driver for X.Org."
 PKG_TOOLCHAIN="autotools"
 
 PKG_CONFIGURE_OPTS_TARGET="--with-xorg-module-dir=${XORG_PATH_MODULES}"
+
+post_configure_target() {
+  libtool_remove_rpath libtool
+}

packages/x11/driver/xf86-video-amdgpu/package.mk

@@ -3,12 +3,12 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="xf86-video-amdgpu"
-PKG_VERSION="21.0.0"
-PKG_SHA256="607823034defba6152050e5eb1c4df94b38819ef764291abadd81b620bc2ad88"
+PKG_VERSION="22.0.0"
+PKG_SHA256="9d23fb602915dc3ccde92aa4d1e9485e7e54eaae2f41f485e55eb20761778266"
 PKG_ARCH="x86_64"
 PKG_LICENSE="OSS"
 PKG_SITE="https://www.x.org/wiki/RadeonFeature/"
-PKG_URL="http://xorg.freedesktop.org/archive/individual/driver/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
+PKG_URL="https://www.x.org/archive/individual/driver/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain libdrm xorg-server"
 PKG_LONGDESC="Xorg driver for AMD Radeon GPUs using the amdgpu kernel driver."
 PKG_TOOLCHAIN="autotools"

packages/x11/driver/xf86-video-ati/package.mk

@@ -16,6 +16,10 @@ PKG_TOOLCHAIN="autotools"
 PKG_CONFIGURE_OPTS_TARGET="--enable-glamor \
                            --with-xorg-module-dir=${XORG_PATH_MODULES}"
 
+post_configure_target() {
+  libtool_remove_rpath libtool
+}
+
 post_makeinstall_target() {
   mkdir -p ${INSTALL}/etc/X11
     cp ${PKG_DIR}/config/*.conf ${INSTALL}/etc/X11

packages/x11/driver/xf86-video-intel/package.mk

@@ -32,9 +32,18 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-backlight \
                            --disable-tear-free \
                            --disable-create2 \
                            --disable-async-swap \
-                           --with-default-dri=2 \
                            --with-xorg-module-dir=${XORG_PATH_MODULES}"
 
+if [ "${VULKAN_SUPPORT}" = "yes" ]; then
+  PKG_CONFIGURE_OPTS_TARGET+=" --with-default-dri=3"
+else
+  PKG_CONFIGURE_OPTS_TARGET+=" --with-default-dri=2"
+fi
+
+post_configure_target() {
+  libtool_remove_rpath libtool
+}
+
 post_makeinstall_target() {
   rm -rf ${INSTALL}/usr/share/polkit-1
 }

packages/x11/driver/xf86-video-intel/patches/xf86-video-intel-100.01-prefer-iris-and-crocus-over-i965.patch

@@ -0,0 +1,15 @@
+--- /src/sna/sna_dri2.c
++++ /src/sna/sna_dri2.c
+@@ -3707,8 +3707,10 @@
+ 			return has_i830_dri() ? "i830" : "i915";
+ 		else if (sna->kgem.gen < 040)
+ 			return "i915";
++		else if (sna->kgem.gen < 0100)
++			return "crocus";
+ 		else
+-			return "i965";
++			return "iris";
+ 	}
+
+ 	return s;
+