Bump mesa, fix options so we're not linking to things we're not building.

This commit is contained in:
fewtarius 2022-09-10 10:26:25 -04:00
parent fd6ddc60fa
commit 53e7a3efce
No known key found for this signature in database
GPG key ID: F4AE55305D1B8C1A
9 changed files with 36 additions and 12 deletions

View file

@ -3,10 +3,10 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="mesa"
PKG_VERSION="22.1.5"
PKG_VERSION="d5394296becfc97bc992c82d6f5d013b35b5275a"
PKG_LICENSE="OSS"
PKG_SITE="http://www.mesa3d.org/"
PKG_URL="https://mesa.freedesktop.org/archive/mesa-${PKG_VERSION}.tar.xz"
PKG_SITE="https://gitlab.freedesktop.org/mesa/mesa"
PKG_URL="${PKG_SITE}.git"
PKG_DEPENDS_TARGET="toolchain expat libdrm Mako:host"
PKG_LONGDESC="Mesa is a 3-D graphics library with an API."
PKG_TOOLCHAIN="meson"

View file

@ -7,5 +7,4 @@ source /etc/profile
jslisten set "killall retroarch32"
set_kill_keys "retroarch32"
/usr/bin/retroarch32 --appendconfig /usr/config/retroarch/retroarch32bit-append.cfg

View file

@ -14,7 +14,8 @@ PKG_BUILD_FLAGS="-parallel"
configure_package() {
# Sway Support
if [ ! "${WINDOWMANAGER}" = "sway" ]; then
if [ ! "${WINDOWMANAGER}" = "sway" ] || \
[ ! "${WINDOWMANAGER}" = "wl" ]; then
PKG_BUILD_FLAGS+=" -sysroot"
fi
}
@ -24,7 +25,8 @@ PKG_MESON_OPTS_TARGET="-Dupdate-mimedb=false"
post_makeinstall_target() {
# Create /usr/share/mime/mime.cache
if [ "${WINDOWMANAGER}" = "sway" ]; then
if [ "${WINDOWMANAGER}" = "sway" ] || \
[ "${WINDOWMANAGER}" = "wl" ]; then
${TOOLCHAIN}/bin/update-mime-database ${INSTALL}/usr/share/mime
fi
}

View file

@ -51,12 +51,17 @@
MALI_FAMILY="bifrost-g31"
OPENGLES="libmali"
OPENGL="no"
DISPLAYSERVER="no"
VULKAN_SUPPORT="no"
MALI_VERSION="r13p0"
GRAPHIC_DRIVERS=""
# Displayserver to use (weston / x11 / no)
DISPLAYSERVER="no"
# Windowmanager to use (fluxbox / weston / no)
WINDOWMANAGER="no"
# Define the CPU
HW_CPU="Rockchip RK3326"

View file

@ -51,12 +51,17 @@
MALI_FAMILY="bifrost-g31"
OPENGLES="libmali"
OPENGL="no"
DISPLAYSERVER="no"
VULKAN_SUPPORT="no"
MALI_VERSION="r13p0"
GRAPHIC_DRIVERS=""
# Displayserver to use (weston / x11 / no)
DISPLAYSERVER="no"
# Windowmanager to use (fluxbox / weston / no)
WINDOWMANAGER="no"
# Define the CPU
HW_CPU="Rockchip RK3326"

View file

@ -51,12 +51,17 @@
MALI_FAMILY="bifrost-g31"
OPENGLES="libmali"
OPENGL="no"
DISPLAYSERVER="no"
VULKAN_SUPPORT="no"
MALI_VERSION="r13p0"
GRAPHIC_DRIVERS=""
# Displayserver to use (weston / x11 / no)
DISPLAYSERVER="no"
# Windowmanager to use (fluxbox / weston / no)
WINDOWMANAGER="no"
# Define the CPU
HW_CPU="Rockchip RK3326"

View file

@ -56,11 +56,15 @@
MALI_VERSION="g2p0"
OPENGLES="libmali"
OPENGL="no"
DISPLAYSERVER="no"
VULKAN_SUPPORT="no"
GRAPHIC_DRIVERS=""
# Displayserver to use (weston / x11 / no)
DISPLAYSERVER="no"
# Windowmanager to use (fluxbox / weston / no)
WINDOWMANAGER="no"
# kernel serial console
EXTRA_CMDLINE="quiet console=ttyS2,1500000 console=tty0 ssh consoleblank=0 systemd.show_status=0 loglevel=0 panic=20 video=HDMI-A-1:1280x720@60"

View file

@ -56,10 +56,14 @@
MALI_VERSION="g2p0"
OPENGLES="libmali"
OPENGL="no"
DISPLAYSERVER="no"
VULKAN_SUPPORT="no"
GRAPHIC_DRIVERS=""
# Displayserver to use (weston / x11 / no)
DISPLAYSERVER="no"
# Windowmanager to use (fluxbox / weston / no)
WINDOWMANAGER="no"
# kernel serial console
EXTRA_CMDLINE="quiet console=ttyS2,1500000 console=tty0 ssh consoleblank=0 systemd.show_status=0 loglevel=0 panic=20 video=HDMI-A-1:1280x720@60"

View file

@ -80,7 +80,7 @@
# for a list of additional drivers see packages/linux-drivers
# Space separated list is supported,
# e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2"
ADDITIONAL_DRIVERS="RTL8812AU RTL8821AU RTL8821CU RTL88x2BU"
ADDITIONAL_DRIVERS="RTL8188FU RTL8812AU RTL8821AU RTL8821CU RTL88x2BU"
# build and install driver addons (yes / no)
DRIVER_ADDONS_SUPPORT="no"