diff --git a/packages/compat/box64/package.mk b/packages/compat/box64/package.mk index dd8e3a60c1..0aff9abd78 100644 --- a/packages/compat/box64/package.mk +++ b/packages/compat/box64/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="box64" -PKG_VERSION="067cf75c658c632b7c476036e6b21d985cbe67a2" +PKG_VERSION="d4e32fdbc0a971ce5c6f2880b38df7789b9d64a5" PKG_ARCH="aarch64" PKG_LICENSE="MIT" PKG_SITE="https://github.com/ptitSeb/box64" diff --git a/packages/compat/box86/package.mk b/packages/compat/box86/package.mk index e2cd25dc43..e1c95a71f7 100644 --- a/packages/compat/box86/package.mk +++ b/packages/compat/box86/package.mk @@ -2,12 +2,12 @@ # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="box86" -PKG_VERSION="266392e315bb5e7827928512c930e04448f137d1" +PKG_VERSION="22ee4685a18981983eb6c0031da37a8ca2b87b1f" PKG_ARCH="arm aarch64" PKG_LICENSE="MIT" PKG_SITE="https://github.com/ptitSeb/box86" PKG_URL="${PKG_SITE}.git" -PKG_DEPENDS_TARGET="toolchain ncurses SDL_sound libXdmcp libXft" +PKG_DEPENDS_TARGET="toolchain ncurses SDL_sound libXdmcp libXft libXcomposite cups" PKG_LONGDESC="Box86 lets you run x86 Linux programs (such as games) on non-x86 Linux systems, like ARM." PKG_TOOLCHAIN="cmake" diff --git a/packages/compat/lutris-wine/package.mk b/packages/compat/lutris-wine/package.mk deleted file mode 100644 index 65021e1617..0000000000 --- a/packages/compat/lutris-wine/package.mk +++ /dev/null @@ -1,59 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS) - -PKG_NAME="lutris-wine" -PKG_VERSION="7.2-2" -PKG_ARCH="x86_64 i686" -PKG_LICENSE="GPL" -PKG_SITE="https://github.com/lutris/wine" -PKG_URL="${PKG_SITE}/archive/refs/tags/${PKG_NAME}-${PKG_VERSION}.tar.gz" -PKG_DEPENDS_TARGET="toolchain bison flex lutris-wine:host" -PKG_DEPENDS_HOST="toolchain bison:host flex:host" -PKG_TOOLCHAIN="configure" - -pre_configure_host() { - PKG_CONFIGURE_OPTS_HOST+=" --enable-win64 --disable-tests" - - case ${TARGET_ARCH} in - i686) - PKG_CONFIGURE_OPTS_HOST+=" --without-freetype" - ;; - esac -} - -pre_configure_target() { - PKG_CONFIGURE_OPTS_TARGET+=" --disable-tests --with-wine-tools=${TOOLCHAIN}/wine" - - case ${TARGET_ARCH} in - x86_64) - PKG_CONFIGURE_OPTS_TARGET+=" --enable-win64" - ;; - i686) - PKG_CONFIGURE_OPTS_TARGET+=" --without-freetype" - ;; - esac -} - -make_host() { - make -C ${PKG_BUILD}/.${HOST_NAME} - make -C ${PKG_BUILD}/.${HOST_NAME}/tools - make -C ${PKG_BUILD}/.${HOST_NAME}/tools/sfnt2fon - make -C ${PKG_BUILD}/.${HOST_NAME}/tools/widl - make -C ${PKG_BUILD}/.${HOST_NAME}/tools/winebuild - make -C ${PKG_BUILD}/.${HOST_NAME}/tools/winegcc - make -C ${PKG_BUILD}/.${HOST_NAME}/tools/wmc - make -C ${PKG_BUILD}/.${HOST_NAME}/tools/wrc -} - -makeinstall_host() { - mkdir -p ${TOOLCHAIN}/wine/tools - cp -rf ${PKG_BUILD}/.${HOST_NAME}/tools/* ${TOOLCHAIN}/wine/tools -} - -post_install() { - case ${TARGET_ARCH} in - x86_64) - cp -vPr ${ROOT}/build.${DISTRO}-${DEVICE}.i686/lutris-wine-*/.install_pkg/usr/ ${INSTALL}/ - ;; - esac -} diff --git a/packages/compat/wine/package.mk b/packages/compat/wine/package.mk index ee7e88f223..df64f233e8 100644 --- a/packages/compat/wine/package.mk +++ b/packages/compat/wine/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2024-present JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="wine" -PKG_VERSION="9.4" +PKG_VERSION="9.6" PKG_LICENSE="MIT" PKG_SITE="https://github.com/Kron4ek/Wine-Builds" PKG_URL="${PKG_SITE}/releases/download/${PKG_VERSION}/wine-${PKG_VERSION}-x86.tar.xz" diff --git a/packages/graphics/mesa/package.mk b/packages/graphics/mesa/package.mk index 7185e797c1..d8e7b6a79c 100644 --- a/packages/graphics/mesa/package.mk +++ b/packages/graphics/mesa/package.mk @@ -17,19 +17,19 @@ case ${DEVICE} in ;; RK3*|S922X) if [ "${DEVICE}" = "S922X" -a "${USE_MALI}" != "no" ]; then - PKG_VERSION="24.0.4" + PKG_VERSION="24.0.5" PKG_SITE="http://www.mesa3d.org/" PKG_URL="https://gitlab.freedesktop.org/mesa/mesa/-/archive/mesa-${PKG_VERSION}/mesa-mesa-${PKG_VERSION}.tar.gz" else #Using upstream dev for panfrost - PKG_VERSION="db29984c254f60f5daeec0ea4e6048b6ee7902f8" + PKG_VERSION="5363f7cce5c967bd84210b0a316cd502e197609f" PKG_SITE="https://gitlab.freedesktop.org/mesa/mesa" PKG_URL="${PKG_SITE}.git" PKG_PATCH_DIRS+=" panfrost" fi ;; *) - PKG_VERSION="24.0.4" + PKG_VERSION="24.0.5" PKG_SITE="http://www.mesa3d.org/" PKG_URL="https://gitlab.freedesktop.org/mesa/mesa/-/archive/mesa-${PKG_VERSION}/mesa-mesa-${PKG_VERSION}.tar.gz" ;; diff --git a/packages/kernel/linux/package.mk b/packages/kernel/linux/package.mk index badb14f468..2c76c59654 100644 --- a/packages/kernel/linux/package.mk +++ b/packages/kernel/linux/package.mk @@ -29,7 +29,7 @@ case ${DEVICE} in PKG_URL="https://git.kernel.org/torvalds/t/linux-${PKG_VERSION}.tar.gz" ;; *) - PKG_VERSION="6.8.5" + PKG_VERSION="6.8.6" PKG_URL="${PKG_SITE}/pub/linux/kernel/v6.x/${PKG_NAME}-${PKG_VERSION}.tar.xz" ;; esac diff --git a/packages/virtual/x86/package.mk b/packages/virtual/x86/package.mk index f7b400b1c9..87f96bcd7a 100644 --- a/packages/virtual/x86/package.mk +++ b/packages/virtual/x86/package.mk @@ -26,7 +26,3 @@ if [ "${DISPLAYSERVER}" = "wl" ]; then PKG_DEPENDS_TARGET+=" wayland ${WINDOWMANAGER}" fi -### Compatability -#PKG_DEPENDS_TARGET+=" lutris-wine" - - diff --git a/scripts/update_packages b/scripts/update_packages index 1eeea2a826..8cf16a6025 100755 --- a/scripts/update_packages +++ b/scripts/update_packages @@ -4,7 +4,7 @@ # Based on work by ToKe79 and Shanti Gilbert -OPTIONS="distributions/rocknix/options" +OPTIONS="distributions/ROCKNIX/options" PACKAGES=("packages/virtual/emulators/package.mk" \ "packages/virtual/es-themes/package.mk" \ "packages/virtual/gamesupport/package.mk" )